From 9607673b7857f4a3d5dd9a9b14ec72ce1c7acde5 Mon Sep 17 00:00:00 2001 From: WouterJ Date: Thu, 4 Feb 2016 21:31:55 +0100 Subject: [PATCH] Fix deprecation notices --- .travis.yml | 4 + composer.json | 2 +- composer.lock | 320 +++++++++++------- .../Controller/SecurityController.php | 20 +- .../Resources/views/Menu/bootstrap.html.twig | 6 +- .../Resources/views/layout.html.twig | 4 +- 6 files changed, 206 insertions(+), 150 deletions(-) diff --git a/.travis.yml b/.travis.yml index b5fae90b87..d4c935355c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,10 @@ cache: directories: - $HOME/.composer/cache +env: + global: + - SYMFONY_DEPRECATIONS_HELPER=34 + matrix: finish_fast: true include: diff --git a/composer.json b/composer.json index 4d57a7bf39..cc03b49043 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "prefer-stable": true, "require": { "php": "^5.3.9|^7.0", - "symfony/symfony": "~2.6", + "symfony/symfony": "~2.8", "doctrine/orm": "^2.4.8", "doctrine/doctrine-bundle": "~1.4", "doctrine/data-fixtures": "~1.0", diff --git a/composer.lock b/composer.lock index c24e054511..a2cf486bbd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "185c42bec2924c4a2bb9f06babd4539e", - "content-hash": "8f4c383d2c78927466377e616cfaddad", + "hash": "0ebb640eac295c39663e6a06ba073df4", + "content-hash": "280eb0af5274047cb57823eba6991d9c", "packages": [ { "name": "cocur/slugify", @@ -555,16 +555,16 @@ }, { "name": "doctrine/doctrine-cache-bundle", - "version": "1.2.2", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineCacheBundle.git", - "reference": "030ff41ef1db66370b36467086bfb817a661fe6a" + "reference": "18c600a9b82f6454d2e81ca4957cdd56a1cf3504" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/030ff41ef1db66370b36467086bfb817a661fe6a", - "reference": "030ff41ef1db66370b36467086bfb817a661fe6a", + "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/18c600a9b82f6454d2e81ca4957cdd56a1cf3504", + "reference": "18c600a9b82f6454d2e81ca4957cdd56a1cf3504", "shasum": "" }, "require": { @@ -578,6 +578,7 @@ "instaclick/object-calisthenics-sniffs": "dev-master", "instaclick/symfony2-coding-standard": "dev-remaster", "phpunit/phpunit": "~4", + "predis/predis": "~0.8", "satooshi/php-coveralls": "~0.6.1", "squizlabs/php_codesniffer": "~1.5", "symfony/console": "~2.2|~3.0", @@ -638,7 +639,7 @@ "cache", "caching" ], - "time": "2015-11-27 04:59:07" + "time": "2016-01-26 17:28:51" }, { "name": "doctrine/inflector", @@ -1397,16 +1398,16 @@ }, { "name": "knplabs/knp-menu", - "version": "v2.1.0", + "version": "v2.1.1", "source": { "type": "git", "url": "https://github.com/KnpLabs/KnpMenu.git", - "reference": "c6ad49933babd06a27b2f962a3469601ec9038b8" + "reference": "9917b999a3c3d3901386d60c4888b07679291031" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KnpLabs/KnpMenu/zipball/c6ad49933babd06a27b2f962a3469601ec9038b8", - "reference": "c6ad49933babd06a27b2f962a3469601ec9038b8", + "url": "https://api.github.com/repos/KnpLabs/KnpMenu/zipball/9917b999a3c3d3901386d60c4888b07679291031", + "reference": "9917b999a3c3d3901386d60c4888b07679291031", "shasum": "" }, "require": { @@ -1415,7 +1416,8 @@ "require-dev": { "pimple/pimple": "~1.0", "silex/silex": "~1.0", - "symfony/phpunit-bridge": "~2.7", + "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/routing": "~2.3|~3.0", "twig/twig": "~1.16|~2.0" }, "suggest": { @@ -1458,7 +1460,7 @@ "menu", "tree" ], - "time": "2015-09-20 08:23:47" + "time": "2016-01-08 15:42:54" }, { "name": "knplabs/knp-menu-bundle", @@ -1777,16 +1779,16 @@ }, { "name": "paragonie/random_compat", - "version": "1.1.5", + "version": "1.1.6", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "dd8998b7c846f6909f4e7a5f67fabebfc412a4f7" + "reference": "e6f80ab77885151908d0ec743689ca700886e8b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/dd8998b7c846f6909f4e7a5f67fabebfc412a4f7", - "reference": "dd8998b7c846f6909f4e7a5f67fabebfc412a4f7", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/e6f80ab77885151908d0ec743689ca700886e8b0", + "reference": "e6f80ab77885151908d0ec743689ca700886e8b0", "shasum": "" }, "require": { @@ -1821,7 +1823,7 @@ "pseudorandom", "random" ], - "time": "2016-01-06 13:31:20" + "time": "2016-01-29 16:19:52" }, { "name": "phpcr/phpcr", @@ -2361,16 +2363,16 @@ }, { "name": "symfony-cmf/content-bundle", - "version": "dev-master", + "version": "1.3.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony-cmf/ContentBundle.git", - "reference": "68dd570ee098f35b8bfabcba3591099eab7d29e6" + "reference": "431b035c22a00b3d9610dc3a037691a78c2b9197" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/ContentBundle/zipball/68dd570ee098f35b8bfabcba3591099eab7d29e6", - "reference": "68dd570ee098f35b8bfabcba3591099eab7d29e6", + "url": "https://api.github.com/repos/symfony-cmf/ContentBundle/zipball/431b035c22a00b3d9610dc3a037691a78c2b9197", + "reference": "431b035c22a00b3d9610dc3a037691a78c2b9197", "shasum": "" }, "require": { @@ -2382,15 +2384,15 @@ }, "require-dev": { "sonata-project/doctrine-phpcr-admin-bundle": "^1.1", - "symfony-cmf/testing": "^1.3", + "symfony-cmf/testing": "^1.3@dev", "symfony-cmf/tree-browser-bundle": "^1.0.0-RC1", "symfony/monolog-bundle": "^2.3" }, "suggest": { "doctrine/phpcr-bundle": "To integrate PHPCR-ODM with Symfony", "doctrine/phpcr-odm": "To persist content with the PHP content repository", + "egeloen/ckeditor-bundle": "to provide a CKEditor in the admin interface", "friendsofsymfony/rest-bundle": "Improved handling for different output formats", - "ivory/ckeditor-bundle": "to provide a CKEditor in the admin interface", "sonata-project/doctrine-phpcr-admin-bundle": "To provide admin interfaces for the content (^1.1)" }, "type": "symfony-bundle", @@ -2419,42 +2421,44 @@ "keywords": [ "Symfony CMF" ], - "time": "2016-01-05 07:39:42" + "time": "2016-01-24 17:20:14" }, { "name": "symfony-cmf/core-bundle", - "version": "dev-master", + "version": "1.3.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony-cmf/CoreBundle.git", - "reference": "b1c6d6bfe6ef51b087fa489fa1d63c5e8e3d4e69" + "reference": "6d608febc5f37df61fa155b5d54a555d01fa5119" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/CoreBundle/zipball/b1c6d6bfe6ef51b087fa489fa1d63c5e8e3d4e69", - "reference": "b1c6d6bfe6ef51b087fa489fa1d63c5e8e3d4e69", + "url": "https://api.github.com/repos/symfony-cmf/CoreBundle/zipball/6d608febc5f37df61fa155b5d54a555d01fa5119", + "reference": "6d608febc5f37df61fa155b5d54a555d01fa5119", "shasum": "" }, "require": { "php": "^5.3.9|^7.0", - "symfony/framework-bundle": "~2.3" + "symfony-cmf/slugifier-api": "^1.0@dev", + "symfony/framework-bundle": "^2.3" }, "require-dev": { "doctrine/dbal": "2.5.*", - "mockery/mockery": "~0.9.4", - "sonata-project/admin-bundle": "~2.2", - "symfony-cmf/routing-bundle": "~1.2,>=1.2.0-RC3", - "symfony-cmf/testing": "~1.2,>=1.2.6", - "symfony/security-bundle": "~2.1" + "mockery/mockery": "^0.9.4", + "sonata-project/admin-bundle": "^2.2", + "symfony-cmf/routing-bundle": "^1.2.0-RC3", + "symfony-cmf/testing": "^1.3@dev", + "symfony/security-bundle": "^2.1" }, "suggest": { - "doctrine/phpcr-bundle": "To be able to use the CMF twig extension, ~1.0", - "doctrine/phpcr-odm": "To be able to use the CMF twig extension, ~1.0", - "sonata-project/admin-bundle": "To be able to enable the publish_workflow_listener extension, ~2.2", - "symfony-cmf/routing": "To be able to use the CMF twig extension functions cmf_prev_linkable/cmf_next_linkable, ~1.0", - "symfony-cmf/routing-bundle": "To be able to enable the publish_workflow_listener, ~1.0", - "symfony/security-bundle": "To be able to use the publish workflow system, ~2.1", - "symfony/twig-bundle": "To get access to the CMF twig extension, ~2.1" + "doctrine/phpcr-bundle": "To be able to use the CMF twig extension (^1.0)", + "doctrine/phpcr-odm": "To be able to use the CMF twig extension (^1.0)", + "sonata-project/admin-bundle": "To be able to enable the publish_workflow_listener extension (^2.2)", + "sonata-project/translation-bundle": "To be able to edit translatable documents (^1.0)", + "symfony-cmf/routing": "To be able to use the CMF twig extension functions cmf_prev_linkable/cmf_next_linkable (^1.2)", + "symfony-cmf/routing-bundle": "To be able to enable the publish_workflow_listener (^1.2)", + "symfony/security-bundle": "To be able to use the publish workflow system (^2.1)", + "symfony/twig-bundle": "To get access to the CMF twig extension (^2.1)" }, "type": "symfony-bundle", "extra": { @@ -2482,7 +2486,7 @@ "keywords": [ "Symfony CMF" ], - "time": "2016-01-05 07:38:41" + "time": "2016-02-01 12:09:30" }, { "name": "symfony-cmf/create-bundle", @@ -2548,12 +2552,12 @@ "source": { "type": "git", "url": "https://github.com/symfony-cmf/MediaBundle.git", - "reference": "c0700b90b47210cd4696c1d29232d444b4f89a43" + "reference": "7593e35baa26661a3230a7e13dbfb783f3df055c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/MediaBundle/zipball/c0700b90b47210cd4696c1d29232d444b4f89a43", - "reference": "c0700b90b47210cd4696c1d29232d444b4f89a43", + "url": "https://api.github.com/repos/symfony-cmf/MediaBundle/zipball/7593e35baa26661a3230a7e13dbfb783f3df055c", + "reference": "7593e35baa26661a3230a7e13dbfb783f3df055c", "shasum": "" }, "require": { @@ -2605,20 +2609,20 @@ "image", "media" ], - "time": "2016-01-05 07:43:01" + "time": "2016-02-03 12:37:12" }, { "name": "symfony-cmf/menu-bundle", - "version": "dev-master", + "version": "2.0.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony-cmf/MenuBundle.git", - "reference": "ee6ace86d753b346ff3526abde59a1f26f7c4ec6" + "reference": "c391535555e4a794501d14c5aa137a8e9a4f1aa4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/MenuBundle/zipball/ee6ace86d753b346ff3526abde59a1f26f7c4ec6", - "reference": "ee6ace86d753b346ff3526abde59a1f26f7c4ec6", + "url": "https://api.github.com/repos/symfony-cmf/MenuBundle/zipball/c391535555e4a794501d14c5aa137a8e9a4f1aa4", + "reference": "c391535555e4a794501d14c5aa137a8e9a4f1aa4", "shasum": "" }, "require": { @@ -2639,7 +2643,7 @@ "symfony-cmf/testing": "^1.3@dev", "symfony-cmf/tree-browser-bundle": "^1.0.0-RC1", "symfony/monolog-bundle": "^2.3", - "twig/twig": "^1.12.1" + "twig/twig": "^1.18" }, "suggest": { "burgov/key-value-form-bundle": "if you want to edit the advanced options on the node with the menu options extension", @@ -2672,7 +2676,7 @@ "Symfony CMF", "menu" ], - "time": "2016-01-03 16:34:28" + "time": "2016-01-23 15:44:42" }, { "name": "symfony-cmf/routing", @@ -2733,16 +2737,16 @@ }, { "name": "symfony-cmf/routing-bundle", - "version": "dev-master", + "version": "1.4.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony-cmf/RoutingBundle.git", - "reference": "9c746de8a4af393d418977d9b31fc0c0e2206ce1" + "reference": "827703c49b81dd34833aca8b493ab717a38e5afa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/9c746de8a4af393d418977d9b31fc0c0e2206ce1", - "reference": "9c746de8a4af393d418977d9b31fc0c0e2206ce1", + "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/827703c49b81dd34833aca8b493ab717a38e5afa", + "reference": "827703c49b81dd34833aca8b493ab717a38e5afa", "shasum": "" }, "require": { @@ -2797,7 +2801,7 @@ "database", "routing" ], - "time": "2015-12-29 19:47:17" + "time": "2016-01-21 16:20:40" }, { "name": "symfony-cmf/simple-cms-bundle", @@ -2870,6 +2874,52 @@ ], "time": "2016-01-05 07:41:39" }, + { + "name": "symfony-cmf/slugifier-api", + "version": "1.0.0-RC1", + "source": { + "type": "git", + "url": "https://github.com/symfony-cmf/slugifier-api.git", + "reference": "960f8d312e2fdff1bbb73f2b154989f0091b5596" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony-cmf/slugifier-api/zipball/960f8d312e2fdff1bbb73f2b154989f0091b5596", + "reference": "960f8d312e2fdff1bbb73f2b154989f0091b5596", + "shasum": "" + }, + "require": { + "php": "^5.3.9|^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Cmf\\Api\\Slugifier\\": "", + "Symfony\\Cmf\\Bundle\\CoreBundle\\Slugifier\\": "CoreBundle" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony CMF Community", + "homepage": "https://github.com/symfony-cmf/RoutingBundle/contributors" + } + ], + "description": "Provides a basic slugifier interface", + "homepage": "http://cmf.symfony.com", + "keywords": [ + "slugify" + ], + "time": "2016-02-01 11:26:43" + }, { "name": "symfony-cmf/symfony-cmf", "version": "dev-master", @@ -3061,16 +3111,16 @@ }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "2deb44160e1c886241c06602b12b98779f728177" + "reference": "66b0bb4abda229bc073eff6bbc8f2685bdaac165" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/2deb44160e1c886241c06602b12b98779f728177", - "reference": "2deb44160e1c886241c06602b12b98779f728177", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/66b0bb4abda229bc073eff6bbc8f2685bdaac165", + "reference": "66b0bb4abda229bc073eff6bbc8f2685bdaac165", "shasum": "" }, "require": { @@ -3080,7 +3130,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3112,20 +3162,20 @@ "portable", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25" + "reference": "1289d16209491b584839022f29257ad859b8532d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/49ff736bd5d41f45240cec77b44967d76e0c3d25", - "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d", + "reference": "1289d16209491b584839022f29257ad859b8532d", "shasum": "" }, "require": { @@ -3137,7 +3187,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3171,20 +3221,20 @@ "portable", "shim" ], - "time": "2015-11-20 09:19:13" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/polyfill-php54", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php54.git", - "reference": "2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc" + "reference": "74663d5a2ff3c530c1bc0571500e0feec9094054" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc", - "reference": "2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc", + "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/74663d5a2ff3c530c1bc0571500e0feec9094054", + "reference": "74663d5a2ff3c530c1bc0571500e0feec9094054", "shasum": "" }, "require": { @@ -3193,7 +3243,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3229,20 +3279,20 @@ "portable", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/polyfill-php55", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php55.git", - "reference": "3adc962a6250c02adb508e85ecfa6fcfee9eec47" + "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/3adc962a6250c02adb508e85ecfa6fcfee9eec47", - "reference": "3adc962a6250c02adb508e85ecfa6fcfee9eec47", + "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/b4f3f07d91702f8f926339fc4fcf81671d8c27e6", + "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6", "shasum": "" }, "require": { @@ -3252,7 +3302,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3285,20 +3335,20 @@ "portable", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/polyfill-php56", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f" + "reference": "4d891fff050101a53a4caabb03277284942d1ad9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/e2e77609a9e2328eb370fbb0e0d8b2000ebb488f", - "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/4d891fff050101a53a4caabb03277284942d1ad9", + "reference": "4d891fff050101a53a4caabb03277284942d1ad9", "shasum": "" }, "require": { @@ -3308,7 +3358,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3341,20 +3391,20 @@ "portable", "shim" ], - "time": "2015-12-18 15:10:25" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/polyfill-php70", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "7f7f3c9c2b9f17722e0cd64fdb4f957330c53146" + "reference": "8428ceddbbaf102f2906769a8ef2438220c5cb95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/7f7f3c9c2b9f17722e0cd64fdb4f957330c53146", - "reference": "7f7f3c9c2b9f17722e0cd64fdb4f957330c53146", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/8428ceddbbaf102f2906769a8ef2438220c5cb95", + "reference": "8428ceddbbaf102f2906769a8ef2438220c5cb95", "shasum": "" }, "require": { @@ -3364,7 +3414,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3400,20 +3450,20 @@ "portable", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2016-01-25 08:44:42" }, { "name": "symfony/polyfill-util", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "4271c55cbc0a77b2641f861b978123e46b3da969" + "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4271c55cbc0a77b2641f861b978123e46b3da969", - "reference": "4271c55cbc0a77b2641f861b978123e46b3da969", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4", + "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4", "shasum": "" }, "require": { @@ -3422,7 +3472,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3452,7 +3502,7 @@ "polyfill", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/security-acl", @@ -3517,16 +3567,16 @@ }, { "name": "symfony/swiftmailer-bundle", - "version": "v2.3.9", + "version": "v2.3.11", "source": { "type": "git", "url": "https://github.com/symfony/swiftmailer-bundle.git", - "reference": "3d21ada19f23631f558ad6df653b168e35362e78" + "reference": "5e1a90f28213231ceee19c953bbebc5b5b95c690" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/3d21ada19f23631f558ad6df653b168e35362e78", - "reference": "3d21ada19f23631f558ad6df653b168e35362e78", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/5e1a90f28213231ceee19c953bbebc5b5b95c690", + "reference": "5e1a90f28213231ceee19c953bbebc5b5b95c690", "shasum": "" }, "require": { @@ -3570,20 +3620,20 @@ ], "description": "Symfony SwiftmailerBundle", "homepage": "http://symfony.com", - "time": "2015-11-28 10:59:29" + "time": "2016-01-15 16:41:20" }, { "name": "symfony/symfony", - "version": "v2.8.1", + "version": "v2.8.2", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "8956ed50a44c5c4e02f2176c0773e24487477b09" + "reference": "f3e6a82bcbea4db3b56df08e491e20a1faae82b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/8956ed50a44c5c4e02f2176c0773e24487477b09", - "reference": "8956ed50a44c5c4e02f2176c0773e24487477b09", + "url": "https://api.github.com/repos/symfony/symfony/zipball/f3e6a82bcbea4db3b56df08e491e20a1faae82b5", + "reference": "f3e6a82bcbea4db3b56df08e491e20a1faae82b5", "shasum": "" }, "require": { @@ -3703,7 +3753,7 @@ "keywords": [ "framework" ], - "time": "2015-12-26 15:56:52" + "time": "2016-01-14 12:01:11" }, { "name": "twig/extensions", @@ -3759,16 +3809,16 @@ }, { "name": "twig/twig", - "version": "v1.23.1", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6" + "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/d9b6333ae8dd2c8e3fd256e127548def0bc614c6", - "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8", + "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8", "shasum": "" }, "require": { @@ -3781,7 +3831,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.23-dev" + "dev-master": "1.24-dev" } }, "autoload": { @@ -3816,7 +3866,7 @@ "keywords": [ "templating" ], - "time": "2015-11-05 12:49:06" + "time": "2016-01-25 21:22:18" }, { "name": "willdurand/jsonp-callback-validator", @@ -3962,35 +4012,45 @@ }, { "name": "liip/functional-test-bundle", - "version": "1.3.4", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/liip/LiipFunctionalTestBundle.git", - "reference": "0981fc0a18678b50a53410496239b602dc5a355b" + "reference": "1382ed3a04efa777084e6112c02a9ccd23901325" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/liip/LiipFunctionalTestBundle/zipball/0981fc0a18678b50a53410496239b602dc5a355b", - "reference": "0981fc0a18678b50a53410496239b602dc5a355b", + "url": "https://api.github.com/repos/liip/LiipFunctionalTestBundle/zipball/1382ed3a04efa777084e6112c02a9ccd23901325", + "reference": "1382ed3a04efa777084e6112c02a9ccd23901325", "shasum": "" }, "require": { "doctrine/common": "~2.0", "php": "^5.3.9|^7.0", "symfony/browser-kit": "~2.3|~3.0", - "symfony/framework-bundle": "~2.3|~3.0", - "symfony/validator": "~2.5|~3.0" + "symfony/framework-bundle": "2.3.*|~2.7|~3.0" + }, + "require-dev": { + "doctrine/doctrine-fixtures-bundle": "~2.3", + "doctrine/orm": "^2.4.8", + "nelmio/alice": "~1.7|~2.0", + "phpunit/phpunit": "4.8.*|5.1.*", + "symfony/assetic-bundle": "~2.3", + "symfony/monolog-bundle": "~2.4", + "symfony/symfony": "~2.3.1|~2.7|~3.0", + "twig/twig": "~1.12" }, "suggest": { "doctrine/dbal": "Required when using the fixture loading functionality with an ORM and SQLite", "doctrine/doctrine-fixtures-bundle": "Required when using the fixture loading functionality", "doctrine/orm": "Required when using the fixture loading functionality with an ORM and SQLite", - "nelmio/alice": "Required when using loadFixtureFiles functionality" + "nelmio/alice": "Required when using loadFixtureFiles functionality", + "symfony/framework-bundle": "To use assertStatusCode and assertValidationErrors ~2.5" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "1.4.x-dev" } }, "autoload": { @@ -4016,7 +4076,7 @@ "keywords": [ "Symfony2" ], - "time": "2015-12-28 19:04:56" + "time": "2016-02-02 21:30:21" }, { "name": "sensio/distribution-bundle", @@ -4168,16 +4228,16 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v2.8.1", + "version": "v2.8.2", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "2deb2ccbe184948ae4e85e7b99e962738d3d2d69" + "reference": "855dc0e829fad123966347612b4183e307338c11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/2deb2ccbe184948ae4e85e7b99e962738d3d2d69", - "reference": "2deb2ccbe184948ae4e85e7b99e962738d3d2d69", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/855dc0e829fad123966347612b4183e307338c11", + "reference": "855dc0e829fad123966347612b4183e307338c11", "shasum": "" }, "require": { @@ -4219,7 +4279,7 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2015-12-11 08:57:52" + "time": "2016-01-06 09:59:23" } ], "aliases": [], diff --git a/src/Acme/DemoBundle/Controller/SecurityController.php b/src/Acme/DemoBundle/Controller/SecurityController.php index a51d711521..54c607ed17 100644 --- a/src/Acme/DemoBundle/Controller/SecurityController.php +++ b/src/Acme/DemoBundle/Controller/SecurityController.php @@ -2,29 +2,21 @@ namespace Acme\DemoBundle\Controller; -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Security\Core\SecurityContext; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; class SecurityController extends Controller { /** * @Route("/login", name="_demo_login") - * @Template */ - public function loginAction(Request $request) + public function loginAction() { - if ($request->attributes->has(SecurityContext::AUTHENTICATION_ERROR)) { - $error = $request->attributes->get(SecurityContext::AUTHENTICATION_ERROR); - } else { - $error = $request->getSession()->get(SecurityContext::AUTHENTICATION_ERROR); - } + $authenticationUtils = $this->get('security.authentication_utils'); - return array( - 'last_username' => $request->getSession()->get(SecurityContext::LAST_USERNAME), - 'error' => $error, - ); + return $this->render('AppBundle:Security:login.html.twig', array( + 'last_username' => $authenticationUtils->getLastUsername(), + 'error' => $authenticationUtils->getLastAuthenticationError(), + )); } } diff --git a/src/Acme/DemoBundle/Resources/views/Menu/bootstrap.html.twig b/src/Acme/DemoBundle/Resources/views/Menu/bootstrap.html.twig index 8c33909f7b..eb9d8ce79d 100644 --- a/src/Acme/DemoBundle/Resources/views/Menu/bootstrap.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Menu/bootstrap.html.twig @@ -2,14 +2,14 @@ {% macro attributes(attributes) %} {% for name, value in attributes %} - {%- if value is not none and value is not sameas(false) -%} - {{- ' %s="%s"'|format(name, value is sameas(true) ? name|e : value|e)|raw -}} + {%- if value is not none and value is not same as(false) -%} + {{- ' %s="%s"'|format(name, value is same as(true) ? name|e : value|e)|raw -}} {%- endif -%} {%- endfor -%} {% endmacro %} {% block list %} - {% if item.hasChildren and options.depth is not sameas(0) and item.displayChildren %} + {% if item.hasChildren and options.depth is not same as(0) and item.displayChildren %} {{ block('children') }} diff --git a/src/Acme/DemoBundle/Resources/views/layout.html.twig b/src/Acme/DemoBundle/Resources/views/layout.html.twig index 1b26f22388..7aa955a779 100644 --- a/src/Acme/DemoBundle/Resources/views/layout.html.twig +++ b/src/Acme/DemoBundle/Resources/views/layout.html.twig @@ -11,7 +11,7 @@ {% endblock %} {# CreateJS is only available for admins by default #} - {% if app.security is not null and is_granted('ROLE_ADMIN') %} + {% if app.user and is_granted('ROLE_ADMIN') %} {% include "CmfCreateBundle::includecssfiles.html.twig" %} {% endif %} @@ -34,6 +34,6 @@ {% block main %}{% endblock %} - {% render(controller("cmf_create.jsloader.controller:includeJSFilesAction")) %} + {{ render(controller("cmf_create.jsloader.controller:includeJSFilesAction")) }}