add support for php 8 (#125)

* allow php 8 * skip cs fixer on php8 * use latest phpunit bridge * allow direct deprecation triggered from doctrine/dbal * add changelog for next minor * fix DoctrineBundle deprecation
dmaicher · Oct 30, 2020 · 3dba24d · 3dba24d
1 parent a364cfe
commit 3dba24d
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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"
@@ -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/;

diff --git 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

diff --git a/composer.json b/composer.json
@@ -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": {

diff --git 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
diff --git 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))',
     ]));
 

diff --git a/tests/phpunit.xml b/tests/phpunit.xml
@@ -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>

diff --git a/tests/phpunit7.xml b/tests/phpunit7.xml
@@ -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>