From 700412265e5e2e3d1857001df75fc0842a04f3fb Mon Sep 17 00:00:00 2001 From: Wouter J Date: Thu, 27 Aug 2015 00:02:13 +0200 Subject: [PATCH 1/3] Allow Symfony 3 --- .travis.yml | 2 ++ composer.json | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index cb8f2bbd..00eb66e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,8 @@ matrix: env: SYMFONY_VERSION='2.3.*' - php: 5.6 env: SYMFONY_VERSION='2.5.*' + - php: 5.6 + env: SYMFONY_VERSION='3.0.*' sudo: false diff --git a/composer.json b/composer.json index 707ba204..f0333f4e 100644 --- a/composer.json +++ b/composer.json @@ -17,14 +17,16 @@ ], "require": { "php": ">=5.3.2", - "symfony/framework-bundle": "~2.0", - "symfony/serializer": "~2.0", - "symfony/console": "~2.0", + "symfony/framework-bundle": "~2.0|3.*", + "symfony/serializer": "~2.0|3.*", + "symfony/console": "~2.0|3.*", "willdurand/jsonp-callback-validator": "~1.0" }, "require-dev": { - "symfony/expression-language": "~2.4" + "symfony/expression-language": "~2.4|3.*" }, + "minimum-stability": "dev", + "prefer-stable": true, "autoload": { "psr-4": { "FOS\\JsRoutingBundle\\": "" } }, From 5d4bfdf989c9e5cb9ffaa174e51ce112d929ff2d Mon Sep 17 00:00:00 2001 From: WouterJ Date: Thu, 27 Aug 2015 00:38:43 +0200 Subject: [PATCH 2/3] [2.7] ConfigCache::__toString is deprecated in favor of getPath --- Controller/Controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Controller/Controller.php b/Controller/Controller.php index 69dc4bfd..e1e84804 100644 --- a/Controller/Controller.php +++ b/Controller/Controller.php @@ -90,7 +90,7 @@ public function indexAction(Request $request, $_format) $serializedRoutes = $this->serializer->serialize($exposedRoutes, 'json'); $cache->write($serializedRoutes, $this->exposedRoutesExtractor->getResources()); } else { - $serializedRoutes = file_get_contents((string) $cache); + $serializedRoutes = file_get_contents(method_exists($cache, 'getPath') ? $cache->getPath() : (string) $cache); $exposedRoutes = json_decode($serializedRoutes, true); } From 9a5aae72ca32575e5b46161ff84ee5b0cfc251f7 Mon Sep 17 00:00:00 2001 From: Vadim Kharitonov Date: Wed, 28 Oct 2015 17:54:58 +0300 Subject: [PATCH 3/3] Fix deprecation notice at routing.xml Option patter was replaced with path --- Resources/config/routing/routing.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/config/routing/routing.xml b/Resources/config/routing/routing.xml index 7914673b..7d50a3b6 100644 --- a/Resources/config/routing/routing.xml +++ b/Resources/config/routing/routing.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd"> - + fos_js_routing.controller:indexAction js js|json