From 762d443018229bc6a9c36ef87422e9f6d4507de9 Mon Sep 17 00:00:00 2001 From: David Maicher Date: Sun, 23 Aug 2020 21:44:08 +0200 Subject: [PATCH 1/8] allow php 8 --- .travis.yml | 7 +++++++ composer.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 716cd99..bbf59fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,13 @@ matrix: env: - SYMFONY_REQUIRE="5.1.*" - PHPUNIT_VERSION="9.*" + - php: nightly + env: + - SYMFONY_REQUIRE="5.1.*" + - PHPUNIT_VERSION="9.*" + - STABILITY=dev + before_install: + - composer config platform.php 7.4.99 before_install: - phpenv config-rm xdebug.ini || echo "xDebug not disabled" diff --git a/composer.json b/composer.json index dbe322c..ff905a7 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ } ], "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" From 1738bb52df31e00802507717a05f7c82dd2bcc41 Mon Sep 17 00:00:00 2001 From: David Maicher Date: Fri, 30 Oct 2020 09:09:59 +0100 Subject: [PATCH 2/8] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bbf59fa..06a0e73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ matrix: - PHPUNIT_VERSION="9.*" - STABILITY=dev before_install: - - composer config platform.php 7.4.99 + #- composer config platform.php 7.4.99 before_install: - phpenv config-rm xdebug.ini || echo "xDebug not disabled" From 17f4222c6c411c6577bdef2bc5a607bf081fcaf6 Mon Sep 17 00:00:00 2001 From: David Maicher Date: Fri, 30 Oct 2020 09:10:18 +0100 Subject: [PATCH 3/8] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ff905a7..b29eac9 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ } ], "require": { - "php": "^7.1 || 8.0", + "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" From fa53ebe22879bd5b3d92cc5a5a172a3e33fcbcdd Mon Sep 17 00:00:00 2001 From: David Maicher Date: Fri, 30 Oct 2020 09:24:50 +0100 Subject: [PATCH 4/8] skip cs fixer on php8 --- .travis.yml | 6 +++--- makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 06a0e73..86a488a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,8 +34,7 @@ matrix: - SYMFONY_REQUIRE="5.1.*" - PHPUNIT_VERSION="9.*" - STABILITY=dev - before_install: - #- composer config platform.php 7.4.99 + - SKIP_CS_FIXER=1 before_install: - phpenv config-rm xdebug.ini || echo "xDebug not disabled" @@ -49,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/; diff --git a/makefile b/makefile index 700d4e7..b32fb66 100644 --- a/makefile +++ b/makefile @@ -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 From 6b22c6ca11931e6ed179ee8f8f6656af87b365fa Mon Sep 17 00:00:00 2001 From: David Maicher Date: Fri, 30 Oct 2020 09:33:30 +0100 Subject: [PATCH 5/8] use latest phpunit bridge --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b29eac9..5583b61 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "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": { From a6e3c82bc057c7b92e6e1e8d9cb4423e20d50677 Mon Sep 17 00:00:00 2001 From: David Maicher Date: Fri, 30 Oct 2020 09:36:04 +0100 Subject: [PATCH 6/8] allow direct deprecation triggered from doctrine/dbal --- tests/phpunit.xml | 2 +- tests/phpunit7.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/phpunit.xml b/tests/phpunit.xml index 89f965d..8c3bd5e 100644 --- a/tests/phpunit.xml +++ b/tests/phpunit.xml @@ -12,7 +12,7 @@ bootstrap="./phpunit.bootstrap.php" > - + diff --git a/tests/phpunit7.xml b/tests/phpunit7.xml index 9dd0754..ce4c33f 100644 --- a/tests/phpunit7.xml +++ b/tests/phpunit7.xml @@ -12,7 +12,7 @@ bootstrap="./phpunit.bootstrap.php" > - + From 2df200a6f3bbc166d5459547ec5bb21170356c25 Mon Sep 17 00:00:00 2001 From: David Maicher Date: Fri, 30 Oct 2020 09:45:12 +0100 Subject: [PATCH 7/8] add changelog for next minor --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f970e41..b2027ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 From 98bd946f99a30be3356c6886625ad6ad698c41ab Mon Sep 17 00:00:00 2001 From: David Maicher Date: Fri, 30 Oct 2020 09:46:53 +0100 Subject: [PATCH 8/8] fix DoctrineBundle deprecation --- tests/phpunit.bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/phpunit.bootstrap.php b/tests/phpunit.bootstrap.php index db0e0d7..fab2210 100644 --- a/tests/phpunit.bootstrap.php +++ b/tests/phpunit.bootstrap.php @@ -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))', ]));