support symfony 3.4, new testing app structure (#216)

Author: ElectricMaxxx

.gitignore

@@ -1,4 +1,4 @@
-tests/Resources/app/cache
-tests/Resources/app/logs
+tests/Fixtures/App/var
+!tests/Fixtures/App/var/.gitempty
 composer.lock
 vendor

.travis.yml

@@ -28,29 +28,28 @@ cache:
 env:
   matrix: SYMFONY_VERSION=^3.4@dev
   global:
-    - SYMFONY_DEPRECATIONS_HELPER=24
+    - SYMFONY_DEPRECATIONS_HELPER=0
     - SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
+    - KERNEL_CLASS=Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Fixtures\App\Kernel
     - SYMFONY_PHPUNIT_VERSION=5.7
     - TEST_INSTALLATION=false
 
 matrix:
   include:
+    - php: 7.1
+      env: DEPS=dev SYMFONY_VERSION=^4@dev
     - php: 7.1
       env: DEPS=dev SYMFONY_VERSION=^3.4@dev
     - php: 7.1
-      env: DEPS=dev SYMFONY_VERSION=3.3.*
-    - php: 5.6
       env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
-    - php: 7.0
-      env: SYMFONY_VERSION=3.1.*
-    - php: 7.0
-      env: SYMFONY_VERSION=3.2.*
+    - php: 7.1
+      env: SYMFONY_VERSION=3.3.*
     - env: TEST_INSTALLATION=true
 
   fast_finish: true
   allow_failures:
     - php: 7.1
-      env: DEPS=dev SYMFONY_VERSION=^3.4@dev
+      env: DEPS=dev SYMFONY_VERSION=^4@dev
     - env: TEST_INSTALLATION=true
 
 

CHANGELOG.md

@@ -20,7 +20,7 @@ ifdef BRANCH
 	VERSION=dev-${BRANCH}
 endif
 PACKAGE=symfony-cmf/routing-auto-bundle
-
+export KERNEL_CLASS=Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Fixtures\App\Kernel
 list:
 	@echo 'test:                    will run all tests'
 	@echo 'unit_tests:               will run unit tests only'

Makefile

@@ -11,19 +11,19 @@
     ],
     "require": {
         "php": "^5.6|^7.0",
-        "symfony/framework-bundle": "^2.8|^3.0",
-        "symfony-cmf/routing-auto": "^2.0.0-RC5",
+        "symfony/framework-bundle": "^2.8|^3.3",
+        "symfony-cmf/routing-auto": "^2.0",
         "symfony-cmf/routing-bundle": "^1.2.0|^2.0",
         "aferrandini/urlizer": "1.0.*",
-        "phpdocumentor/reflection-docblock": "^3.1, !=3.2.0",
-        "symfony-cmf/testing": "^2.1@dev"
+        "phpdocumentor/reflection-docblock": "^3.1, !=3.2.0"
     },
     "require-dev": {
         "symfony/phpunit-bridge": "^3.2",
-        "symfony/yaml": "^2.8|^3.0",
+        "symfony/yaml": "^2.8|^3.3",
         "matthiasnoback/symfony-dependency-injection-test": "~0.6",
         "matthiasnoback/symfony-config-test": "^1.3.1",
-        "doctrine/phpcr-odm": "^1.3"
+        "symfony-cmf/testing": "^2.1@dev",
+        "doctrine/phpcr-odm": "^1.4|^2.0"
     },
     "suggest": {
         "doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents",
@@ -50,5 +50,7 @@
             "vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh",
             "SYMFONY_PHPUNIT_REMOVE=\"symfony/yaml\" vendor/bin/simple-phpunit"
         ]
-    }
+    },
+    "minimum-stability":"dev",
+    "prefer-stable": true
 }

README.md

@@ -30,8 +30,4 @@
         </whitelist>
     </filter>
 
-    <php>
-        <server name="KERNEL_DIR" value="tests/Resources/app" />
-    </php>
-
 </phpunit>

composer.json

@@ -215,7 +215,7 @@ public function compareAutoRouteLocale(AutoRouteInterface $autoRoute, $locale)
     {
         $autoRouteLocale = $autoRoute->getLocale();
 
-        if ($autoRouteLocale === self::TAG_NO_MULTILANG) {
+        if (self::TAG_NO_MULTILANG === $autoRouteLocale) {
             $autoRouteLocale = null;
         }
 

phpunit.xml.dist

@@ -59,5 +59,6 @@ public function process(ContainerBuilder $container)
 
         $managerDef = $container->getDefinition('cmf_routing_auto.auto_route_manager');
         $container->setAlias('cmf_routing_auto.adapter', $adapterId);
+        $container->getAlias('cmf_routing_auto.adapter')->setPublic(true);
     }
 }

src/Adapter/PhpcrOdmAdapter.php

@@ -9,7 +9,10 @@
         </service>
 
         <!-- Auto Route Manager -->
-        <service id="cmf_routing_auto.auto_route_manager" class="Symfony\Cmf\Component\RoutingAuto\AutoRouteManager">
+        <service
+                id="cmf_routing_auto.auto_route_manager"
+                class="Symfony\Cmf\Component\RoutingAuto\AutoRouteManager"
+                public="true">
             <argument type="service" id="cmf_routing_auto.adapter" />
             <argument type="service" id="cmf_routing_auto.uri_generator" />
             <argument type="service" id="cmf_routing_auto.defunct_route_handler.delegating" />
@@ -54,12 +57,18 @@
             <argument>%cmf_routing_auto.metadata.loader.resources%</argument>
         </service>
 
-        <service id="cmf_routing_auto.metadata.factory" class="Symfony\Cmf\Component\RoutingAuto\Mapping\MetadataFactory">
+        <service
+                id="cmf_routing_auto.metadata.factory"
+                class="Symfony\Cmf\Component\RoutingAuto\Mapping\MetadataFactory"
+                public="true">
             <factory service="cmf_routing_auto.metadata.factory.builder" method="getMetadataFactory" />
         </service>
 
         <!-- Controller -->
-        <service id="cmf_routing_auto.redirect_controller" class="Symfony\Cmf\Bundle\RoutingAutoBundle\Controller\RedirectController">
+        <service
+                id="cmf_routing_auto.redirect_controller"
+                class="Symfony\Cmf\Bundle\RoutingAutoBundle\Controller\RedirectController"
+                public="true">
             <argument type="service" id="router" />
         </service>
     </services>