Master dev kit (#403)

* changes to get symfony 3.4 working without deprecations

* testing app directory structure and php version reducing

* DevKit updates

* make provider public, enable bundle.php

* make alias public only

* apply style fixes

Author: ElectricMaxxx

.gitignore

@@ -1,5 +1,4 @@
 phpunit.xml
 composer.lock
 vendor
-tests/Resources/app/cache
-tests/Resources/app/logs
+tests/Fixtures/App/var/

.travis.yml

@@ -26,31 +26,30 @@ cache:
     - $HOME/.composer/cache/files
 
 env:
-  matrix: SYMFONY_VERSION=3.4
+  matrix: SYMFONY_VERSION=^3.4@dev
   global:
-    - SYMFONY_DEPRECATIONS_HELPER=48
+    - SYMFONY_DEPRECATIONS_HELPER=0
     - SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
+    - KERNEL_CLASS=Symfony\Cmf\Bundle\RoutingBundle\Tests\Fixtures\App\Kernel
     - SYMFONY_PHPUNIT_VERSION=5.7
     - TEST_INSTALLATION=false
 
 matrix:
   include:
     - php: 7.1
-      env: SYMFONY_VERSION=3.4.*
+      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: SYMFONY_VERSION=3.4.*
+      env: DEPS=dev SYMFONY_VERSION=^4@dev
     - env: TEST_INSTALLATION=true
 
 

CHANGELOG.md

@@ -1,6 +1,8 @@
 Changelog
 =========
 
+* **2017-11-11**: Removed php 5.6 and 7.0 support, removed Symfony 3.0.* and 3.1.* support
+
 2.0.1
 -----
 

Makefile

@@ -20,7 +20,7 @@ ifdef BRANCH
 	VERSION=dev-${BRANCH}
 endif
 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'

README.md

@@ -23,8 +23,8 @@ controller for redirection routes.
 
 ## Requirements
 
-* PHP 5.6 / 7.0 / 7.1
-* Symfony 2.8 / 3.1 / 3.2 / 3.3
+* PHP 7.1
+* Symfony 2.8 / 3.3 / ^3.4@dev
 * See also the `require` section of [composer.json](composer.json)
 
 ## Documentation

composer.json

@@ -12,18 +12,18 @@
         }
     ],
     "require": {
-        "php": "^5.6|^7.0",
+        "php": "^7.1",
         "symfony-cmf/routing": "^2.0",
         "symfony/framework-bundle": "^2.8|^3.0",
-        "symfony/twig-bundle": "^2.8|^3.0",
-        "symfony-cmf/testing": "^2.1@dev"
+        "symfony/twig-bundle": "^2.8|^3.0"
     },
     "require-dev": {
-        "doctrine/phpcr-odm": "^1.4",
+        "doctrine/phpcr-odm": "^1.4|^2.0",
         "symfony/phpunit-bridge": "^3.2",
         "matthiasnoback/symfony-dependency-injection-test": "~0.6",
         "matthiasnoback/symfony-config-test": "^1.3.1",
         "doctrine/orm": "^2.5",
+        "symfony-cmf/testing": "^2.1@dev",
         "doctrine/data-fixtures": "^1.0.0"
     },
     "suggest": {
@@ -48,5 +48,7 @@
         "branch-alias": {
             "dev-master": "2.1-dev"
         }
-    }
+    },
+    "minimum-stability":"dev",
+    "prefer-stable": true
 }

phpunit.xml.dist

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

src/DependencyInjection/CmfRoutingExtension.php

@@ -124,6 +124,7 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
 
         if (isset($config['route_provider_service_id'])) {
             $container->setAlias('cmf_routing.route_provider', $config['route_provider_service_id']);
+            $container->getAlias('cmf_routing.route_provider')->setPublic(true);
             $hasProvider = true;
         }
 

src/Resources/config/provider-orm.xml

@@ -17,7 +17,10 @@
             <argument>%cmf_routing.dynamic.limit_candidates%</argument>
         </service>
 
-        <service id="cmf_routing.route_provider" class="Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm\RouteProvider">
+        <service
+                id="cmf_routing.route_provider"
+                class="Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm\RouteProvider"
+                public="true">
             <argument type="service" id="doctrine" />
             <argument type="service" id="cmf_routing.orm_candidates" />
             <argument>%cmf_routing.dynamic.persistence.orm.route_class%</argument>

src/Resources/config/provider-phpcr.xml

@@ -14,7 +14,10 @@
             <call method="setRouteCollectionLimit"><argument>%cmf_routing.route_collection_limit%</argument></call>
         </service>
 
-        <service id="cmf_routing.route_provider" alias="cmf_routing.phpcr_route_provider"/>
+        <service
+                id="cmf_routing.route_provider"
+                alias="cmf_routing.phpcr_route_provider"
+                public="true"/>
 
         <service id="cmf_routing.phpcr_candidates_prefix" class="Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\PrefixCandidates">
             <argument>%cmf_routing.dynamic.persistence.phpcr.route_basepaths%</argument>