fix build matrix

Author: dbu

.styleci.yml

@@ -26,4 +26,6 @@ enabled:
   - strict
   - php_unit_construct
 
-disabled: [single_line_class_definition]
+disabled:
+  - single_line_class_definition
+  - single_line_throw

.travis.yml

@@ -7,7 +7,7 @@
 ############################################################################
 # This file is part of the Symfony CMF package.                            #
 #                                                                          #
-# (c) 2011-2017 Symfony CMF                                                #
+# (c) Symfony CMF                                                          #
 #                                                                          #
 # For the full copyright and license information, please view the LICENSE  #
 # file that was distributed with this source code.                         #
@@ -16,52 +16,49 @@
 language: php
 
 php:
-  - 7.1
   - 7.2
   - 7.3
+  - 7.4
 sudo: false
 
 cache:
   directories:
     - .phpunit
-    - $HOME/.composer/cache/files
+    - $HOME/.composer/cache
 
 env:
-  matrix: SYMFONY_VERSION=4.2.*
   global:
-    - SYMFONY_DEPRECATIONS_HELPER="/.*each.*/"
-    - SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
-    - SYMFONY_PHPUNIT_VERSION=7
-    - PHPUNIT_VERSION=7
+    - SYMFONY_PHPUNIT_VERSION=8
     - TARGET=test
+    - COMPOSER_MEMORY_LIMIT=-1
 
 matrix:
   include:
-    - php: 7.3
-      env: STABILITY="dev" SYMFONY_VERSION=4.3.*
-    - php: 7.3
-      env: SYMFONY_VERSION=4.2.*
     - php: 7.1
-      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=3.4.* SYMFONY_DEPRECATIONS_HELPER="/.*each.*/"
-    - php: 7.2
-      env: SYMFONY_VERSION=4.1.*
+      env: COMPOSER_FLAGS="--prefer-lowest --prefer-stable" SYMFONY_REQUIRE=3.4.* SYMFONY_PHPUNIT_VERSION=6 SYMFONY_DEPRECATIONS_HELPER=weak
+    - php: 7.4
+      env: SYMFONY_REQUIRE=4.3.*
+    - php: 7.4
+      env: SYMFONY_REQUIRE=4.4.*
+    - php: 7.4
+      env: SYMFONY_REQUIRE=4.4.* SYMFONY_PHPUNIT_VERSION=7
+    - php: 7.4
+      env: STABILITY="dev" SYMFONY_VERSION=4.4.*
   fast_finish: true
   allow_failures:
-    - php: 7.3
-      env: STABILITY="dev" SYMFONY_VERSION=4.3.*
+    - php: 7.4
+      env: STABILITY="dev" SYMFONY_REQUIRE=4.4.*
 
 before_install:
   - phpenv config-rm xdebug.ini || true
-  - composer self-update
-  - composer validate --no-check-all --ansi
+  - composer global require --no-progress --no-scripts --no-plugins symfony/flex
   - if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; composer config prefer-stable true; fi;
-  - if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
-  - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
 
 install: travis_wait composer update --prefer-dist $COMPOSER_FLAGS
 
 script:
-  - if [ "${TEST_INSTALLATION}" == true ]; then make test_installation; else make test; fi
+  - composer validate --no-check-all --ansi
+  - make test
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"

CHANGELOG.md

@@ -4,6 +4,7 @@ Changelog
 3.0.0 (unreleased)
 ------------------
 
+* **2019-12-05**: [BC-BREAK] Support PHPUnit 6, 7 and 8, drop support for PHPUnit 5.7
 * **2019-07-26**: [BC-BREAK] Remove deprecated `BaseTestCase::getClient`, use `BaseTestCase::getFrameworkBundleClient` instead.
 * **2019-02-28**: [BC-BREAK] Remove `DatabaseTestListener`, use scripts in `bin/make/` to ramp up your testing environment for several test suites
 * **2019-02-28**: [BC-BREAK] Introduce PHPUnit 6 Support, Remove PHPUnit 5.7.

Makefile

@@ -30,7 +30,7 @@ list:
 include ${TESTING_SCRIPTS_DIR}/make/unit_tests.mk
 
 .PHONY: test
-test: build/xdebug-filter.php unit_tests
+test: unit_tests
 lint-php:
 	php-cs-fixer fix --ansi --verbose --diff --dry-run
 .PHONY: lint-php

README.md

@@ -20,13 +20,6 @@ under the [MIT License](LICENSE).
 **NOTE**: This is an internal tool and is not intended to be used outside of
 the context of the CMF.
 
-
-## Requirements
-
-* PHP 7.1 / 7.2 / 7.3
-* Symfony 3.4 / 4.0 / 4.1 / 4.2
-* See also the `require` section of [composer.json](composer.json)
-
 ## Documentation
 
 For the install guide and reference, see:

bin/make/functional_tests_orm.mk

@@ -8,8 +8,8 @@ functional_tests_orm:
 	@${CONSOLE} doctrine:schema:create --env=orm
 	@echo '+++ run ORM functional tests +++'
 ifeq ($(HAS_XDEBUG), 0)
-	@vendor/bin/simple-phpunit --prepend build/xdebug-filter.php -c phpunit.xml.dist --coverage-clover build/logs/clover.xml --testsuite "functional tests with orm"
+	@vendor/bin/simple-phpunit --coverage-clover build/logs/clover.xml --testsuite "functional tests with orm"
 else
-	@vendor/bin/simple-phpunit -c phpunit.xml.dist --testsuite "functional tests with orm"
+	@vendor/bin/simple-phpunit --testsuite "functional tests with orm"
 endif
 	@${CONSOLE} doctrine:database:drop --force

bin/make/functional_tests_phpcr.mk

@@ -7,8 +7,8 @@ functional_tests_phpcr:
 	@${CONSOLE} doctrine:phpcr:repository:init
 	@echo '+++ run PHPCR functional tests +++'
 ifeq ($(HAS_XDEBUG), 0)
-	@vendor/bin/simple-phpunit --prepend build/xdebug-filter.php -c phpunit.xml.dist --coverage-clover build/logs/clover.xml --testsuite "functional tests with phpcr"
+	@vendor/bin/simple-phpunit --coverage-clover build/logs/clover.xml --testsuite "functional tests with phpcr"
 else
-	@vendor/bin/simple-phpunit -c phpunit.xml.dist --testsuite "functional tests with phpcr"
+	@vendor/bin/simple-phpunit --testsuite "functional tests with phpcr"
 endif
 	@${CONSOLE} doctrine:database:drop --force

bin/make/unit_tests.mk

@@ -3,7 +3,7 @@ unit_tests:
 	@echo
 	@echo '+++ run unit tests +++'
 ifeq ($(HAS_XDEBUG), 0)
-	@vendor/bin/simple-phpunit --prepend build/xdebug-filter.php -c phpunit.xml.dist --coverage-clover build/logs/clover.xml --testsuite "unit tests"
+	@vendor/bin/simple-phpunit --coverage-clover build/logs/clover.xml --testsuite "unit tests"
 else
-	@vendor/bin/simple-phpunit -c phpunit.xml.dist --testsuite "unit tests"
+	@vendor/bin/simple-phpunit --testsuite "unit tests"
 endif

src/Functional/BaseTestCase.php

@@ -46,44 +46,31 @@ abstract class BaseTestCase extends WebTestCase
      *
      *  * environment - The environment to use (defaults to 'phpcr')
      *  * debug - If debug should be enabled/disabled (defaults to true)
-     *
-     * @return array
      */
-    protected function getKernelConfiguration()
+    protected function getKernelConfiguration(): array
     {
         return [];
     }
 
-    /**
-     * Gets the Client.
-     *
-     * @return Client
-     */
-    public function getFrameworkBundleClient()
+    public function getFrameworkBundleClient(): Client
     {
         if (null === $this->client) {
+            // property does not exist in all symfony versions
+            if (\property_exists(self::class, 'booted') && self::$booted) {
+                self::ensureKernelShutdown();
+            }
             $this->client = self::createClient($this->getKernelConfiguration());
         }
 
         return $this->client;
     }
 
-    /**
-     * Gets the container.
-     *
-     * @return ContainerInterface
-     */
-    public function getContainer()
+    public function getContainer(): ContainerInterface
     {
         return $this->getKernel()->getContainer();
     }
 
-    /**
-     * Ensures the kernel is available.
-     *
-     * @return KernelInterface
-     */
-    public function getKernel()
+    public function getKernel(): KernelInterface
     {
         if (null === static::$kernel) {
             parent::bootKernel(static::getKernelConfiguration());
@@ -152,7 +139,7 @@ public function getDbManager($type)
         return $dbManager;
     }
 
-    public static function getKernelClass()
+    public static function getKernelClass(): string
     {
         if (isset($_SERVER['KERNEL_CLASS']) || isset($_ENV['KERNEL_CLASS'])) {
             $class = isset($_SERVER['KERNEL_CLASS']) ? $_SERVER['KERNEL_CLASS'] : $_ENV['KERNEL_CLASS'];
@@ -171,7 +158,7 @@ public static function getKernelClass()
      *
      * This is overriden to set the default environment to 'phpcr'
      */
-    protected static function createKernel(array $options = [])
+    protected static function createKernel(array $options = []): KernelInterface
     {
         // default environment is 'phpcr'
         if (!isset($options['environment'])) {

src/Functional/DbManager/ORM.php

@@ -55,24 +55,12 @@ public function __construct(ContainerInterface $container)
         $this->container = $container;
     }
 
-    /**
-     * Gets the Doctrine ManagerRegistry.
-     *
-     * @return ManagerRegistry
-     */
-    public function getRegistry()
+    public function getRegistry(): ManagerRegistry
     {
         return $this->container->get('doctrine');
     }
 
-    /**
-     * Gets the Doctrine ObjectManager.
-     *
-     * @param null $managerName
-     *
-     * @return ObjectManager
-     */
-    public function getOm($managerName = null)
+    public function getOm($managerName = null): ObjectManager
     {
         if (!$this->om) {
             $this->om = $this->getRegistry()->getManager($managerName);
@@ -84,19 +72,17 @@ public function getOm($managerName = null)
     /**
      * Purge the database.
      */
-    public function purgeDatabase()
+    public function purgeDatabase(): void
     {
         $referenceRepository = new ProxyReferenceRepository($this->getOm());
         $this->getExecutor()->setReferenceRepository($referenceRepository);
         $this->getExecutor()->purge();
     }
 
     /**
-     * Loads fixture classes.
-     *
      * @param string[] $classNames
      */
-    public function loadFixtures(array $classNames)
+    public function loadFixtures(array $classNames): void
     {
         $this->purgeDatabase();
         $loader = new ContainerAwareLoader($this->container);
@@ -108,13 +94,7 @@ public function loadFixtures(array $classNames)
         $this->getExecutor()->execute($loader->getFixtures(), true);
     }
 
-    /**
-     * Loads a single fixture.
-     *
-     * @param Loader $loader
-     * @param string $className
-     */
-    protected function loadFixtureClass(Loader $loader, $className)
+    protected function loadFixtureClass(Loader $loader, string $className): void
     {
         if (!class_exists($className)) {
             throw new \InvalidArgumentException(sprintf(
@@ -140,12 +120,7 @@ protected function loadFixtureClass(Loader $loader, $className)
         }
     }
 
-    /**
-     * Return the ORM Executor class.
-     *
-     * @return ORMExecutor
-     */
-    private function getExecutor()
+    private function getExecutor(): ORMExecutor
     {
         if ($this->executor) {
             return $this->executor;