Skip to content

Commit

Permalink
PHP build fixes (#7)
Browse files Browse the repository at this point in the history
PHP build fixes
  • Loading branch information
aik099 authored Dec 13, 2024
1 parent be816cd commit 5d268ad
Show file tree
Hide file tree
Showing 15 changed files with 879 additions and 175 deletions.
28 changes: 26 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,30 @@ jobs:

strategy:
matrix:
php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
include:
- php: '5.6'
phpunit_config: 'phpunit.xml.dist' # PHPUnit 5.7
- php: '7.0'
phpunit_config: 'phpunit.xml.dist' # PHPUnit 6.5
- php: '7.1'
phpunit_config: 'phpunit.xml.dist' # PHPUnit 7.5
- php: '7.2'
phpunit_config: 'phpunit.xml.dist' # PHPUnit 8.5
- php: '7.3'
phpunit_config: 'phpunit9.xml.dist' # PHPUnit 9.6
- php: '7.4'
phpunit_config: 'phpunit9.xml.dist' # PHPUnit 9.6
- php: '8.0'
phpunit_config: 'phpunit9.xml.dist' # PHPUnit 9.6
- php: '8.1'
phpunit_config: 'phpunit10.xml.dist' # PHPUnit 10.5
- php: '8.2'
phpunit_config: 'phpunit10.xml.dist' # PHPUnit 10.5
- php: '8.3'
phpunit_config: 'phpunit10.xml.dist' # PHPUnit 10.5
# Don't test on PHP 8.4 due to "aura/sql" bug: https://github.com/auraphp/Aura.Sql/pull/231.
# - php: '8.4'
# phpunit_config: 'phpunit10.xml.dist' # PHPUnit 10.5
fail-fast: false

steps:
Expand All @@ -44,7 +67,7 @@ jobs:

- name: Run tests
run: |
vendor/bin/phpunit --log-junit junit.xml --coverage-clover=coverage.clover
vendor/bin/phpunit --configuration ${{ matrix.phpunit_config }} --log-junit junit.xml --coverage-clover=coverage.clover
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
Expand All @@ -68,5 +91,6 @@ jobs:
- name: Upload Coverage to Scrutinizer CI (PHP >= 8.0)
if: "${{ matrix.php >= '8.0' }}"
run: |
rm composer.lock
composer require scrutinizer/ocular
vendor/bin/ocular code-coverage:upload --repository=g/console-helpers/db-migration --format=php-clover coverage.clover
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
vendor
phpunit.xml
.phpunit.result.cache
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
...

### Changed
...
- Increase minimal supported version of PHP to 5.6.

### Fixed
...
Expand Down
8 changes: 5 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@
}
],
"require": {
"php": ">=5.4",
"aura/sql": "^2.5 | ^3.0"
"php": ">=5.6",
"aura/sql": "^2.5 || ^3.0 || ^4.0 || ^5.0"
},
"require-dev": {
"aik099/coding-standard": "dev-master",
"yoast/phpunit-polyfills": "^1.0"
"yoast/phpunit-polyfills": "^2.0",
"phpspec/prophecy": "^1.10",
"console-helpers/prophecy-phpunit": "^3.0"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 5d268ad

Please sign in to comment.