Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow php 8 #125

Merged
merged 9 commits into from
Oct 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ matrix:
env:
- SYMFONY_REQUIRE="5.1.*"
- PHPUNIT_VERSION="9.*"
- php: nightly
env:
- SYMFONY_REQUIRE="5.1.*"
- PHPUNIT_VERSION="9.*"
- STABILITY=dev
- SKIP_CS_FIXER=1

before_install:
- phpenv config-rm xdebug.ini || echo "xDebug not disabled"
Expand All @@ -42,7 +48,8 @@ install:
script:
- cp tests/Functional/parameters.yml.dist tests/Functional/parameters.yml
- rm -rf tests/Functional/cache
- make phpstan php_cs_fixer_check
- if [[ ${SKIP_CS_FIXER} != "1" ]]; then make php_cs_fixer_check; fi
- make phpstan
- |
if [[ ${TEST_COVERAGE} ]]; then phpdbg -qrr vendor/bin/phpunit -c tests/ --coverage-clover ./build/logs/clover.xml;
elif [[ ${PHPUNIT_VERSION} == "7.*" ]]; then vendor/bin/phpunit -c tests/phpunit7.xml tests/;
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [6.4.0]
### Changed
- add support for php 8

## [6.3.0]
### Changed
- add support for enabling static transactional handling per doctrine dbal connection
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
}
],
"require": {
"php": "^7.1",
"php": "^7.1 || ^8.0",
"symfony/framework-bundle": "^3.4 || ^4.3 || ^5.0",
"doctrine/dbal": "^2.9,>=2.9.3",
"doctrine/doctrine-bundle": "^1.11 || ^2.0"
},
"require-dev": {
"phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
"symfony/yaml": "^3.4 || ^4.3 || ^5.0",
"symfony/phpunit-bridge": "^4.3 || ^5.0",
"symfony/phpunit-bridge": "^5.1",
"phpstan/phpstan": "^0.12"
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ php_cs_fixer_check: php-cs-fixer.phar
./php-cs-fixer.phar fix --config .php_cs src tests --dry-run

php-cs-fixer.phar:
wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.16.1/php-cs-fixer.phar && chmod 777 php-cs-fixer.phar
wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.16.6/php-cs-fixer.phar && chmod 777 php-cs-fixer.phar
2 changes: 1 addition & 1 deletion tests/phpunit.bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function bootstrap(): void
]));

$application->run(new \Symfony\Component\Console\Input\ArrayInput([
'command' => 'doctrine:query:sql',
'command' => $application->has('dbal:run-sql') ? 'dbal:run-sql' : 'doctrine:query:sql',
'sql' => 'CREATE TABLE test (test VARCHAR(10))',
]));

Expand Down
2 changes: 1 addition & 1 deletion tests/phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
bootstrap="./phpunit.bootstrap.php"
>
<php>
<env name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=0" />
<env name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=1" />
</php>

<extensions>
Expand Down
2 changes: 1 addition & 1 deletion tests/phpunit7.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
bootstrap="./phpunit.bootstrap.php"
>
<php>
<env name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=0" />
<env name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=1" />
</php>

<testsuites>
Expand Down