Skip to content

Commit

Permalink
Merge pull request #13 from luyadev/issue-12
Browse files Browse the repository at this point in the history
fix template error reporting variable issue and test php 8
  • Loading branch information
nadar authored Dec 30, 2020
2 parents 7d63050 + 623c39c commit c9c018a
Show file tree
Hide file tree
Showing 9 changed files with 91 additions and 3,841 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Tests
on: [push, pull_request]

env:
DEFAULT_COMPOSER_FLAGS: "--prefer-dist --no-interaction --ignore-platform-reqs"
DEFAULT_COMPOSER_FLAGS: "--prefer-dist --no-interaction"
PHPUNIT_EXCLUDE_GROUP: mssql,oci,wincache,xcache,zenddata,cubrid
CC_TEST_REPORTER_ID: 7390f2da2caa279a5aa7c0580275d37cec8afaac8d543897b57bfb96030c3df0
jobs:
Expand All @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
php: ['7.1', '7.2', '7.3', '7.4']
php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0']

steps:
## checkout the repoistory
Expand All @@ -39,7 +39,7 @@ jobs:
apikey: ${{ secrets.APIKEY }}
apisecret: ${{ secrets.APISECRET }}
run: vendor/bin/phpunit --verbose --configuration actions.phpunit.xml
if: matrix.php == '7.4' || matrix.php == '7.3' || matrix.php == '7.2' || matrix.php == '7.0'
if: matrix.php == '8.0' || matrix.php == '7.4' || matrix.php == '7.3' || matrix.php == '7.2' || matrix.php == '7.0'

## unit test with coverage
- name: PHP Unit tests for PHP 7.1
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
/vendor
/luya
/tests/.env
/.env
/.env
composer.lock
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
In order to read more about upgrading and BC breaks have a look at the [UPGRADE Document](UPGRADE.md).

## 1.6.2 (30. December 2020)

+ [#13](https://github.com/luyadev/luya-mailjet/pull/13) Fix issue when sending emails with enabled template error reporting

## 1.6.1 (1. December 2020)

+ [#11](https://github.com/luyadev/luya-mailjet/pull/11) Allow none scalar values as variable when using `setVariables()` in `MailerMessage`.
Expand Down
15 changes: 13 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"mailjet/mailjet-apiv3-php": "^1.3"
},
"require-dev" : {
"luyadev/luya-testsuite" : "^1.0",
"luyadev/luya-testsuite" : "^2.0",
"vlucas/phpdotenv": "^2.5"
},
"autoload" : {
Expand All @@ -28,5 +28,16 @@
"psr-4" : {
"luya\\mailjet\\tests\\" : "tests/"
}
}
},
"config": {
"fxp-asset": {
"enabled": false
}
},
"repositories": [
{
"type": "composer",
"url": "https://asset-packagist.org"
}
]
}
Loading

0 comments on commit c9c018a

Please sign in to comment.