Add Symfony 3 support

Author: wouterj

.travis.yml

@@ -1,30 +1,43 @@
 language: php
 
 php:
-    - 5.3
-    - 5.4
-    - 5.5
-    - 5.6
-    - hhvm
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - hhvm
 
-env:
-  - SYMFONY_VERSION=2.5.*
+sudo: false
+
+cache:
+  directories:
+    - $HOME/.composer/cache/files
 
 matrix:
   include:
-    - php: 5.5
+    - php: 5.6
+      env: SYMFONY_VERSION="3.0.x-dev as 2.8.x-dev" DEPS=dev
+    - php: 5.3
+      env: COMPOSER_FLAGS="--prefer-lowest"
+    - php: 5.6
       env: SYMFONY_VERSION=2.3.*
-    - php: 5.5
-      env: SYMFONY_VERSION=2.4.*
-    - php: 5.5
-      env: SYMFONY_VERSION=2.6.*
+    - php: 5.6
+      env: SYMFONY_VERSION=2.7.*
+  fast_finish: true
 
-before_script:
+before_install:
+  - if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
+  - phpenv config-rm xdebug.ini || true
   - composer self-update
-  - composer require symfony/symfony:${SYMFONY_VERSION} --prefer-source
-  - vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
+  - if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi
+  - if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
+
+install: composer update --prefer-dist $COMPOSER_FLAGS
+
+before_script: vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
 
-script: phpunit --coverage-text
+script: phpunit
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"

Route/TreeControllerRoutesLoader.php

@@ -2,6 +2,7 @@
 
 namespace Symfony\Cmf\Bundle\TreeBrowserBundle\Route;
 
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\FileLoader;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Route;
@@ -19,6 +20,8 @@ class TreeControllerRoutesLoader extends FileLoader
      */
     public function __construct(array $treeControllers)
     {
+        parent::__construct(new FileLocator());
+
         $this->treeControllers = $treeControllers;
     }
 
@@ -36,17 +39,14 @@ public function load($resource, $type = null)
                 $defaults = array(
                     '_controller' => $controller['id'].':'.$definition['action']
                 );
-                $requirements = array(
-                    '_method' => $definition['method']
-                );
-                $pattern = '_cmf_tree/'.$controller['alias'].'/'.$definition['pattern'];
+                $path = '_cmf_tree/'.$controller['alias'].'/'.$definition['path'];
 
-                $route = new Route($pattern, $defaults, $requirements, array('expose' => true));
+                $route = new Route($path, $defaults, array(), array('expose' => true), '', array(), array($definition['method']));
                 $collection->add('_cmf_tree_'.$controller['alias'].'_'.$name, $route);
             }
         }
-        return $collection;
 
+        return $collection;
     }
 
     /**
@@ -70,20 +70,20 @@ protected function getRoutesDefinitions()
     {
         return array(
             'children' => array(
-                'pattern' => 'children',
+                'path'   => 'children',
                 'method' => 'GET',
                 'action' => 'childrenAction'
             ),
             'move' => array(
-                'pattern' => 'move',
+                'path'   => 'move',
                 'method' => 'POST',
                 'action' => 'moveAction'
             ),
             'reorder' => array(
-                'pattern' => 'reorder',
+                'path'   => 'reorder',
                 'method' => 'POST',
                 'action' => 'reorderAction'
             ),
         );
     }
-}
+}

Tests/Functional/PHPCR/PHPCRBrowserTest.php

@@ -12,7 +12,6 @@
  */
 class PHPCRBrowserTest extends BaseTestCase
 {
-
     public function testGetChildrenListFromRoot()
     {
         $this->loadFixtures();
@@ -22,7 +21,7 @@ public function testGetChildrenListFromRoot()
         $client->request('GET', '/_cmf_tree/phpcr_tree/children');
         $response = $client->getResponse();
 
-        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertResponseSuccess($response);
 
         $this->assertEquals(
             '[{"data":"cms","attr":{"id":"\/cms","url_safe_id":"cms","rel":"node"},"state":"closed","children":[{"data":"content","attr":{"id":"\/cms\/content","url_safe_id":"cms\/content","rel":"node"},"state":"closed"}]},{"data":"menus","attr":{"id":"\/menus","url_safe_id":"menus","rel":"node"},"state":"closed","children":[{"data":"test","attr":{"id":"\/menus\/test","url_safe_id":"menus\/test","rel":"node"},"state":null}]}]',
@@ -39,7 +38,7 @@ public function testGetChildrenListFromInnerNode()
         $crawler = $client->request('GET', '/_cmf_tree/phpcr_tree/children?root=%2Fcms%2Fcontent');
         $response = $client->getResponse();
 
-        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertResponseSuccess($response);
 
         $this->assertEquals(
             '[{"data":"static","attr":{"id":"\/cms\/content\/static","url_safe_id":"cms\/content\/static","rel":"node"},"state":"closed","children":[{"data":"test","attr":{"id":"\/cms\/content\/static\/test","url_safe_id":"cms\/content\/static\/test","rel":"node"},"state":null}]}]',

Tests/Resources/app/config/routing.yml

@@ -1,5 +1,5 @@
 symfony_route:
-    pattern:  /symfony_route_test
+    path:     /symfony_route_test
     defaults: { _controller: Test:controller }
 
 cmf_tree:

composer.json

@@ -11,18 +11,17 @@
             "homepage": "https://github.com/symfony-cmf/TreeBrowserBundle/contributors"
         }
     ],
-    "minimum-stability": "dev",
     "require": {
-        "php": ">=5.3.3",
-        "symfony/framework-bundle": "~2.3",
-        "friendsofsymfony/jsrouting-bundle": "~1.1"
+        "php": "^5.3.3|^7.0",
+        "symfony/framework-bundle": "^2.3|^3.0",
+        "friendsofsymfony/jsrouting-bundle": "^1.1@dev"
     },
     "require-dev": {
-        "symfony-cmf/testing": "~1.1"
+        "symfony-cmf/testing": "^1.3@rc"
     },
     "suggest": {
-        "doctrine/phpcr-bundle": "~1.0",
-        "doctrine/phpcr-odm": "~1.0"
+        "doctrine/phpcr-bundle": "^1.0",
+        "doctrine/phpcr-odm": "^1.0"
     },
     "autoload": {
         "psr-4": {
@@ -31,7 +30,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "1.2-dev"
         }
     }
 }