Merge pull request #443 from symfony-cmf/fix-build

clean up 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.                         #
@@ -17,46 +17,44 @@ language: php
 
 php:
   - 7.1
+  - 7.2
+  - 7.3
 
 sudo: false
 
 cache:
   directories:
     - .phpunit
-    - $HOME/.composer/cache/files
+    - $HOME/.composer/cache
 
 env:
-  matrix: SYMFONY_VERSION=4.0.*
   global:
-    - SYMFONY_DEPRECATIONS_HELPER="/.*each.*/"
-    - SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
     - SYMFONY_PHPUNIT_VERSION=6
-    - TEST_INSTALLATION=false
+    - COMPOSER_MEMORY_LIMIT=-1
+    - SYMFONY_DEPRECATIONS_HELPER="max[self]=0"
 
 matrix:
   include:
-    - php: 7.2
-      env: SYMFONY_VERSION=4.0.*
     - php: 7.1
-      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
-    - php: 7.2
-      env: SYMFONY_VERSION=3.3.*
-    - php: 7.2
-      env: SYMFONY_VERSION=3.4.*
+      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_REQUIRE=3.4.* SYMFONY_DEPRECATIONS_HELPER=weak
+    - php: 7.4
+      env: SYMFONY_REQUIRE=3.4.*
+    - php: 7.4
+      env: SYMFONY_REQUIRE=4.3.*
+    - php: 7.4
+      env: SYMFONY_REQUIRE=4.4.*
   fast_finish: true
   allow_failures:
 
 before_install:
   - phpenv config-rm xdebug.ini || true
-  - composer self-update
-  - composer validate --no-check-all --ansi
-  - 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)
+  - composer global require --no-progress --no-scripts --no-plugins symfony/flex
+
+install: travis_wait composer update -n --prefer-stable --prefer-dist $COMPOSER_FLAGS
 
-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"

Makefile

@@ -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.                         #
@@ -23,7 +23,7 @@ PACKAGE=symfony-cmf/routing-bundle
 export KERNEL_CLASS=Symfony\Cmf\Bundle\RoutingBundle\Tests\Fixtures\App\Kernel
 list:
 	@echo 'test:                    will run all tests'
-	@echo 'unit_tests:               will run unit tests only'
+	@echo 'unit_tests:              will run unit tests only'
 	@echo 'functional_tests_phpcr:  will run functional tests with PHPCR'
 	@echo 'functional_tests_orm:    will run functional tests with ORM'
 

composer.json

@@ -17,7 +17,7 @@
     "require": {
         "php": "^7.1",
         "symfony-cmf/routing": "^2.1.0",
-        "symfony/framework-bundle": "^2.8 || ^3.3 || ^4.0",
+        "symfony/framework-bundle": "^3.4 || ^4.3",
         "twig/twig": "^1.35 || ^2.4.4"
     },
     "require-dev": {
@@ -26,9 +26,11 @@
         "matthiasnoback/symfony-dependency-injection-test": "^2.3.1",
         "matthiasnoback/symfony-config-test": "^3.1.1",
         "doctrine/orm": "^2.5",
-        "symfony-cmf/testing": "^2.1.11",
+        "symfony-cmf/testing": "^3@dev",
         "doctrine/data-fixtures": "^1.0.0",
-        "symfony/validator": "^2.8 || ^3.3 || ^4.0"
+        "symfony/form": "^3.4 || ^4.3",
+        "symfony/translation": "^3.4 || ^4.3",
+        "symfony/validator": "^3.4 || ^4.3"
     },
     "suggest": {
         "doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents (^1.4)",

src/Doctrine/Phpcr/Route.php

@@ -52,7 +52,7 @@ class Route extends RouteModel implements PrefixInterface, HierarchyInterface
      *
      * This field is not persisted in storage.
      *
-     * @var string
+     * @var string|null
      */
     protected $idPrefix;
 
@@ -231,7 +231,7 @@ public function getStaticPrefix()
      */
     public function generateStaticPrefix($id, $idPrefix)
     {
-        if ('' === $idPrefix) {
+        if ('' === $idPrefix || null === $idPrefix) {
             throw new \LogicException('Can not determine the prefix. Either this is a new, unpersisted document or the listener that calls setPrefix is not set up correctly.');
         }
 

tests/Fixtures/App/config/config.yml

@@ -1,2 +1,3 @@
 framework:
     serializer: ~
+    templating: false

tests/Functional/Doctrine/Orm/OrmTestCase.php

@@ -16,7 +16,7 @@
 
 class OrmTestCase extends ComponentBaseTestCase
 {
-    protected function getKernelConfiguration()
+    protected function getKernelConfiguration(): array
     {
         return [
             'environment' => 'orm',

tests/Unit/DependencyInjection/Compiler/TemplatingValidatorPassTest.php

@@ -16,11 +16,16 @@
 use Symfony\Cmf\Bundle\RoutingBundle\Validator\Constraints\RouteDefaultsTemplatingValidator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\Templating\EngineInterface;
 
 class TemplatingValidatorPassTest extends AbstractCompilerPassTestCase
 {
     public function setUp()
     {
+        if (!\class_exists(EngineInterface::class)) {
+            $this->markTestSkipped();
+        }
+
         parent::setUp();
 
         $this->registerValidatorService();

tests/Unit/Validator/Constraints/RouteDefaultsTemplatingValidatorTest.php

@@ -11,8 +11,8 @@
 
 namespace Symfony\Cmf\Bundle\RoutingBundle\Tests\Unit\Validator\Constraints;
 
-use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Cmf\Bundle\RoutingBundle\Validator\Constraints\RouteDefaultsTemplatingValidator;
+use Symfony\Component\Templating\EngineInterface;
 
 class RouteDefaultsTemplatingValidatorTest extends RouteDefaultsValidatorTest
 {
@@ -21,6 +21,15 @@ protected function mockEngine()
         return $this->createMock(EngineInterface::class);
     }
 
+    protected function setUp()
+    {
+        if (!\class_exists(EngineInterface::class)) {
+            $this->markTestSkipped();
+        }
+
+        parent::setUp();
+    }
+
     protected function createValidator()
     {
         return new RouteDefaultsTemplatingValidator($this->controllerResolver, $this->engine);