diff --git a/app/AppKernel.php b/app/AppKernel.php index 97c6999c..e1480002 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -62,7 +62,6 @@ public function registerBundles() new HWI\Bundle\OAuthBundle\HWIOAuthBundle(), new Snc\RedisBundle\SncRedisBundle(), new JMS\I18nRoutingBundle\JMSI18nRoutingBundle(), - new JMS\TranslationBundle\JMSTranslationBundle(), new Mmoreram\ControllerExtraBundle\ControllerExtraBundle(), new Mmoreram\CacheFlushBundle\CacheFlushBundle(), new Mmoreram\HttpHeadersBundle\HttpHeadersBundle(), diff --git a/composer.json b/composer.json index 68dbe8d9..5dfeb373 100644 --- a/composer.json +++ b/composer.json @@ -67,7 +67,7 @@ "hwi/oauth-bundle": "0.4.*@dev", "snc/redis-bundle": "^1.1.9", "predis/predis": "^1.0.1", - "jms/i18n-routing-bundle": "1.1.1", + "acasademont/i18n-routing-bundle": "2.0.0", "mmoreram/controller-extra-bundle": "^1.1.11", "mmoreram/extractor": "^1.1.1", diff --git a/composer.lock b/composer.lock index 7aa008b2..5ca0f497 100644 --- a/composer.lock +++ b/composer.lock @@ -4,9 +4,71 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "95a45a769b9b3693c7ab6a64df201426", - "content-hash": "2bb5608a1361db3a746778345836d7e5", + "hash": "f7dfd9e4a63928a68794c28eb76c9b0d", + "content-hash": "347c2e2a3e99a42d24135fd91edda26e", "packages": [ + { + "name": "acasademont/i18n-routing-bundle", + "version": "2.0.0", + "target-dir": "JMS/I18nRoutingBundle", + "source": { + "type": "git", + "url": "https://github.com/acasademont/JMSI18nRoutingBundle.git", + "reference": "75e3d5be45033d4ee6c90ea5e2f5183097e21c78" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/acasademont/JMSI18nRoutingBundle/zipball/75e3d5be45033d4ee6c90ea5e2f5183097e21c78", + "reference": "75e3d5be45033d4ee6c90ea5e2f5183097e21c78", + "shasum": "" + }, + "require": { + "symfony/framework-bundle": "~2.3|~3.0" + }, + "require-dev": { + "jms/di-extra-bundle": "*", + "phpunit/phpunit": "~4", + "sensio/framework-extra-bundle": "*", + "symfony/browser-kit": "*", + "symfony/css-selector": "*", + "symfony/expression-language": "*", + "symfony/form": "*", + "symfony/twig-bundle": "*", + "symfony/validator": "*", + "symfony/yaml": "*" + }, + "suggest": { + "jms/translation-bundle": "If you want to use the RouteTranslation extractor" + }, + "type": "symfony-bundle", + "autoload": { + "psr-0": { + "JMS\\I18nRoutingBundle": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache2" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com" + }, + { + "name": "Albert Casademont", + "email": "albertcasademont@gmail.com" + } + ], + "description": "This bundle allows you to create i18n routes. Fork of the jms/i18n-routing-bundle", + "homepage": "http://jmsyst.com/bundles/JMSI18nRoutingBundle", + "keywords": [ + "multilanguage", + "routing", + "translation" + ], + "time": "2015-09-16 10:16:11" + }, { "name": "doctrine/annotations", "version": "v1.2.7", @@ -1738,74 +1800,6 @@ ], "time": "2015-09-13 08:54:43" }, - { - "name": "jms/i18n-routing-bundle", - "version": "1.1.1", - "target-dir": "JMS/I18nRoutingBundle", - "source": { - "type": "git", - "url": "https://github.com/schmittjoh/JMSI18nRoutingBundle.git", - "reference": "c58e4d99ae867f8b64a481c84cad89e1df03d1c6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/JMSI18nRoutingBundle/zipball/c58e4d99ae867f8b64a481c84cad89e1df03d1c6", - "reference": "c58e4d99ae867f8b64a481c84cad89e1df03d1c6", - "shasum": "" - }, - "require": { - "jms/translation-bundle": "~1.0", - "symfony/framework-bundle": "~2.1" - }, - "require-dev": { - "jms/di-extra-bundle": "*", - "sensio/framework-extra-bundle": "<2.1.5", - "symfony/browser-kit": "<2.1.5", - "symfony/class-loader": "<2.1.5", - "symfony/css-selector": "<2.1.5", - "symfony/finder": "<2.1.5", - "symfony/form": "<2.1.5", - "symfony/framework-bundle": "<2.1.5", - "symfony/http-foundation": "<2.1.5", - "symfony/http-kernel": "<2.1.5", - "symfony/process": "<2.1.5", - "symfony/routing": "<2.1.5", - "symfony/twig-bundle": "<2.1.5", - "symfony/validator": "<2.1.5", - "symfony/yaml": "<2.1.5" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-0": { - "JMS\\I18nRoutingBundle": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache2" - ], - "authors": [ - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" - } - ], - "description": "This bundle allows you to create i18n routes.", - "homepage": "http://jmsyst.com/bundles/JMSI18nRoutingBundle", - "keywords": [ - "multilanguage", - "routing", - "translation" - ], - "time": "2013-12-05 21:19:53" - }, { "name": "jms/metadata", "version": "1.5.1", @@ -2033,80 +2027,6 @@ ], "time": "2013-12-05 14:36:11" }, - { - "name": "jms/translation-bundle", - "version": "1.1.0", - "target-dir": "JMS/TranslationBundle", - "source": { - "type": "git", - "url": "https://github.com/schmittjoh/JMSTranslationBundle.git", - "reference": "6f03035a38badaf8c48767c7664c3196df1eebdf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/JMSTranslationBundle/zipball/6f03035a38badaf8c48767c7664c3196df1eebdf", - "reference": "6f03035a38badaf8c48767c7664c3196df1eebdf", - "shasum": "" - }, - "require": { - "nikic/php-parser": "0.9.1", - "symfony/console": "*", - "symfony/framework-bundle": "~2.1" - }, - "conflict": { - "twig/twig": "1.10.2" - }, - "require-dev": { - "jms/di-extra-bundle": ">=1.1", - "sensio/framework-extra-bundle": "*", - "symfony/browser-kit": "*", - "symfony/class-loader": "*", - "symfony/css-selector": "*", - "symfony/finder": "*", - "symfony/form": "*", - "symfony/process": "*", - "symfony/security": "*", - "symfony/twig-bundle": "*", - "symfony/validator": "*", - "symfony/yaml": "*" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-0": { - "JMS\\TranslationBundle": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache2" - ], - "authors": [ - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" - } - ], - "description": "Puts the Symfony2 Translation Component on steroids", - "homepage": "http://jmsyst.com/bundles/JMSTranslationBundle", - "keywords": [ - "extract", - "extraction", - "i18n", - "interface", - "multilanguage", - "translation", - "ui", - "webinterface" - ], - "time": "2013-06-08 14:08:19" - }, { "name": "knplabs/gaufrette", "version": "v0.1.9", @@ -2736,45 +2656,6 @@ ], "time": "2015-10-14 12:51:02" }, - { - "name": "nikic/php-parser", - "version": "v0.9.1", - "source": { - "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "b1cc9ce676b4350b23d0fafc8244d08eee2fe287" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/b1cc9ce676b4350b23d0fafc8244d08eee2fe287", - "reference": "b1cc9ce676b4350b23d0fafc8244d08eee2fe287", - "shasum": "" - }, - "require": { - "php": ">=5.2" - }, - "type": "library", - "autoload": { - "psr-0": { - "PHPParser": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD" - ], - "authors": [ - { - "name": "Nikita Popov" - } - ], - "description": "A PHP parser written in PHP", - "keywords": [ - "parser", - "php" - ], - "time": "2012-04-23 22:52:11" - }, { "name": "ocramius/proxy-manager", "version": "1.0.2",