From a9e1ebd92ee2184c642a364ccfc47b2a4154f9f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Sun, 20 Mar 2016 23:23:38 +0100 Subject: [PATCH 1/7] Use controller autowiring --- app/AppKernel.php | 1 + app/SymfonyRequirements.php | 20 +- app/config/config.yml | 1 + app/config/routing.yml | 9 + app/config/services.yml | 20 +- app/data/blog.sqlite | Bin 150528 -> 153600 bytes composer.json | 16 +- composer.lock | 597 ++++++++---------- .../Admin/BlogController.php | 21 +- .../{Controller => Action}/BlogController.php | 20 +- .../SecurityController.php | 23 +- web/config.php | 256 +++++--- 12 files changed, 518 insertions(+), 466 deletions(-) rename src/AppBundle/{Controller => Action}/Admin/BlogController.php (94%) rename src/AppBundle/{Controller => Action}/BlogController.php (88%) rename src/AppBundle/{Controller => Action}/SecurityController.php (74%) diff --git a/app/AppKernel.php b/app/AppKernel.php index bef8fcac8..efb858feb 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -20,6 +20,7 @@ public function registerBundles() new Symfony\Bundle\AsseticBundle\AsseticBundle(), new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(), new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), + new Dunglas\ActionBundle\DunglasActionBundle(), new Knp\Bundle\PaginatorBundle\KnpPaginatorBundle(), new CodeExplorerBundle\CodeExplorerBundle(), new AppBundle\AppBundle(), diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index 28b0dcdbf..841338f44 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -425,11 +425,13 @@ public function __construct() 'Change the permissions of either "app/logs/" or "var/logs/" directory so that the web server can write into it.' ); - $this->addPhpIniRequirement( - 'date.timezone', true, false, - 'date.timezone setting must be set', - 'Set the "date.timezone" setting in php.ini* (like Europe/Paris).' - ); + if (version_compare($installedPhpVersion, '7.0.0', '<')) { + $this->addPhpIniRequirement( + 'date.timezone', true, false, + 'date.timezone setting must be set', + 'Set the "date.timezone" setting in php.ini* (like Europe/Paris).' + ); + } if (version_compare($installedPhpVersion, self::REQUIRED_PHP_VERSION, '>=')) { $timezones = array(); @@ -677,6 +679,14 @@ function_exists('posix_isatty'), 'Upgrade your intl extension with a newer ICU version (4+).' ); + if (class_exists('Symfony\Component\Intl\Intl')) { + $this->addRecommendation( + \Symfony\Component\Intl\Intl::getIcuDataVersion() === \Symfony\Component\Intl\Intl::getIcuVersion(), + sprintf('intl ICU version installed on your system (%s) should match the ICU data bundled with Symfony (%s)', \Symfony\Component\Intl\Intl::getIcuVersion(), \Symfony\Component\Intl\Intl::getIcuDataVersion()), + 'In most cases you should be fine, but please verify there is no inconsistencies between data provided by Symfony and the intl extension. See https://github.com/symfony/symfony/issues/15007 for an example of inconsistencies you might run into.' + ); + } + $this->addPhpIniRecommendation( 'intl.error_level', create_function('$cfgValue', 'return (int) $cfgValue === 0;'), diff --git a/app/config/config.yml b/app/config/config.yml index 2d066320f..eacb2ed48 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -38,6 +38,7 @@ framework: form: ~ csrf_protection: ~ validation: { enable_annotations: true } + serializer: { enable_annotations: true } templating: engines: ['twig'] default_locale: "%locale%" diff --git a/app/config/routing.yml b/app/config/routing.yml index 70879f471..e3fcecc6a 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -5,6 +5,15 @@ # the routes in YAML, XML or PHP files. # See http://symfony.com/doc/current/book/routing.html app: + resource: '@AppBundle/Action/' + type: action-annotation + prefix: /{_locale} + requirements: + _locale: %app_locales% + defaults: + _locale: %locale% + +old_app: resource: '@AppBundle/Controller/' type: annotation prefix: /{_locale} diff --git a/app/config/services.yml b/app/config/services.yml index 75d07f552..5cfa004c0 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -1,18 +1,13 @@ services: - # First we define some basic services to make these utilities available in - # the entire application - slugger: - class: AppBundle\Utils\Slugger - - markdown: - class: AppBundle\Utils\Markdown - # These are the Twig extensions that create new filters and functions for # using them in the templates app.twig.app_extension: public: false class: AppBundle\Twig\AppExtension - arguments: ['@markdown', %app_locales%] + autowire: true + arguments: + # the first argument is autowired + 1: %app_locales% tags: - { name: twig.extension } @@ -23,8 +18,11 @@ services: - { name: twig.extension } app.redirect_to_preferred_locale_listener: - class: AppBundle\EventListener\RedirectToPreferredLocaleListener - arguments: ['@router', %app_locales%, %locale%] + class: AppBundle\EventListener\RedirectToPreferredLocaleListener + autowire: true + arguments: + 1: %app_locales% + 2: %locale% tags: - { name: kernel.event_listener, event: kernel.request, method: onKernelRequest } diff --git a/app/data/blog.sqlite b/app/data/blog.sqlite index 287a6fc07676c9e145a9e67644043a9e54431975..1830fa5141880a7e9e94c9152f1aa83321a6a0c4 100644 GIT binary patch literal 153600 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 diff --git a/composer.json b/composer.json index 7b78dffb8..23d3c3b46 100644 --- a/composer.json +++ b/composer.json @@ -7,6 +7,12 @@ "psr-4": { "": "src/" }, "classmap": [ "app/AppKernel.php", "app/AppCache.php" ] }, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/dunglas/symfony" + } + ], "require": { "php" : ">=5.3.9", "ext-pdo_sqlite" : "*", @@ -25,8 +31,9 @@ "symfony/assetic-bundle" : "~2.6", "symfony/monolog-bundle" : "~2.7", "symfony/swiftmailer-bundle" : "~2.3", - "symfony/symfony" : "~2.8", - "twig/extensions" : "~1.2" + "symfony/symfony" : "dev-action as 3.1.0", + "twig/extensions" : "~1.2", + "dunglas/action-bundle" : "dev-master" }, "require-dev": { "sensio/generator-bundle": "~3.0" @@ -50,10 +57,7 @@ ] }, "config": { - "bin-dir": "bin", - "platform": { - "php": "5.3.9" - } + "bin-dir": "bin" }, "extra": { "symfony-app-dir": "app", diff --git a/composer.lock b/composer.lock index 94b94650d..df1660da8 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": "41d575e7bd2fd8f7dc20543cc751e975", - "content-hash": "d03660a96f1d5f2f6b6bc93f894b244b", + "hash": "7320f4e2ff3228c505943b68b0e569ad", + "content-hash": "e585bb0ab9e4908035a893d617aad050", "packages": [ { "name": "doctrine/annotations", @@ -77,33 +77,33 @@ }, { "name": "doctrine/cache", - "version": "v1.5.4", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136" + "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/47cdc76ceb95cc591d9c79a36dc3794975b5d136", - "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136", + "url": "https://api.github.com/repos/doctrine/cache/zipball/f8af318d14bdb0eff0336795b428b547bd39ccb6", + "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": "~5.5|~7.0" }, "conflict": { "doctrine/common": ">2.2,<2.4" }, "require-dev": { - "phpunit/phpunit": ">=3.7", + "phpunit/phpunit": "~4.8|~5.0", "predis/predis": "~1.0", "satooshi/php-coveralls": "~0.6" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.5.x-dev" + "dev-master": "1.6.x-dev" } }, "autoload": { @@ -143,7 +143,7 @@ "cache", "caching" ], - "time": "2015-12-19 05:03:47" + "time": "2015-12-31 16:37:02" }, { "name": "doctrine/collections", @@ -213,16 +213,16 @@ }, { "name": "doctrine/common", - "version": "v2.5.3", + "version": "v2.6.1", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "10f1f19651343f87573129ca970aef1a47a6f29e" + "reference": "a579557bc689580c19fee4e27487a67fe60defc0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/10f1f19651343f87573129ca970aef1a47a6f29e", - "reference": "10f1f19651343f87573129ca970aef1a47a6f29e", + "url": "https://api.github.com/repos/doctrine/common/zipball/a579557bc689580c19fee4e27487a67fe60defc0", + "reference": "a579557bc689580c19fee4e27487a67fe60defc0", "shasum": "" }, "require": { @@ -231,20 +231,20 @@ "doctrine/collections": "1.*", "doctrine/inflector": "1.*", "doctrine/lexer": "1.*", - "php": ">=5.3.2" + "php": "~5.5|~7.0" }, "require-dev": { - "phpunit/phpunit": "~3.7" + "phpunit/phpunit": "~4.8|~5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5.x-dev" + "dev-master": "2.7.x-dev" } }, "autoload": { - "psr-0": { - "Doctrine\\Common\\": "lib/" + "psr-4": { + "Doctrine\\Common\\": "lib/Doctrine/Common" } }, "notification-url": "https://packagist.org/downloads/", @@ -282,7 +282,7 @@ "persistence", "spl" ], - "time": "2015-12-25 13:10:16" + "time": "2015-12-25 13:18:31" }, { "name": "doctrine/data-fixtures", @@ -703,6 +703,60 @@ ], "time": "2015-11-06 14:35:42" }, + { + "name": "doctrine/instantiator", + "version": "1.0.5", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "shasum": "" + }, + "require": { + "php": ">=5.3,<8.0-DEV" + }, + "require-dev": { + "athletic/athletic": "~0.1.8", + "ext-pdo": "*", + "ext-phar": "*", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://github.com/doctrine/instantiator", + "keywords": [ + "constructor", + "instantiate" + ], + "time": "2015-06-14 21:17:01" + }, { "name": "doctrine/lexer", "version": "v1.0.1", @@ -759,28 +813,31 @@ }, { "name": "doctrine/orm", - "version": "v2.4.8", + "version": "v2.5.4", "source": { "type": "git", "url": "https://github.com/doctrine/doctrine2.git", - "reference": "5aedac1e5c5caaeac14798822c70325dc242d467" + "reference": "bc4ddbfb0114cb33438cc811c9a740d8aa304aab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/5aedac1e5c5caaeac14798822c70325dc242d467", - "reference": "5aedac1e5c5caaeac14798822c70325dc242d467", + "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/bc4ddbfb0114cb33438cc811c9a740d8aa304aab", + "reference": "bc4ddbfb0114cb33438cc811c9a740d8aa304aab", "shasum": "" }, "require": { - "doctrine/collections": "~1.1", - "doctrine/dbal": "~2.4", + "doctrine/cache": "~1.4", + "doctrine/collections": "~1.2", + "doctrine/common": ">=2.5-dev,<2.7-dev", + "doctrine/dbal": ">=2.5-dev,<2.6-dev", + "doctrine/instantiator": "~1.0.1", "ext-pdo": "*", - "php": ">=5.3.2", - "symfony/console": "~2.0" + "php": ">=5.4", + "symfony/console": "~2.5|~3.0" }, "require-dev": { - "satooshi/php-coveralls": "dev-master", - "symfony/yaml": "~2.1" + "phpunit/phpunit": "~4.0", + "symfony/yaml": "~2.3|~3.0" }, "suggest": { "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" @@ -792,7 +849,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4.x-dev" + "dev-master": "2.6.x-dev" } }, "autoload": { @@ -828,7 +885,68 @@ "database", "orm" ], - "time": "2015-08-31 13:19:01" + "time": "2016-01-05 21:34:58" + }, + { + "name": "dunglas/action-bundle", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/dunglas/DunglasActionBundle.git", + "reference": "db0039f330216d7cd3186c0359b8b2903a8347d8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dunglas/DunglasActionBundle/zipball/db0039f330216d7cd3186c0359b8b2903a8347d8", + "reference": "db0039f330216d7cd3186c0359b8b2903a8347d8", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "symfony/config": "~2.8|~3.0", + "symfony/dependency-injection": "~2.8|~3.0", + "symfony/http-kernel": "~2.8|~3.0" + }, + "require-dev": { + "sensio/framework-extra-bundle": "~3.0", + "symfony/browser-kit": "~2.8|~3.0", + "symfony/console": "~2.8|~3.0", + "symfony/expression-language": "~2.8|~3.0", + "symfony/framework-bundle": "~2.8|~3.0" + }, + "suggest": { + "symfony/routing": "To use the @Route annotation provided by the bundle." + }, + "type": "symfony-bundle", + "autoload": { + "psr-4": { + "Dunglas\\ActionBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kévin Dunglas", + "email": "dunglas@gmail.com", + "homepage": "https://dunglas.fr" + } + ], + "description": "Symfony controllers, redesigned", + "homepage": "https://dunglas.fr/2016/01/dunglasactionbundle-symfony-controllers-redesigned/", + "keywords": [ + "Autowiring", + "action", + "controllers", + "routing", + "symfony" + ], + "time": "2016-03-20 21:53:21" }, { "name": "erusev/parsedown", @@ -1320,16 +1438,16 @@ }, { "name": "monolog/monolog", - "version": "1.18.0", + "version": "1.18.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "e19b764b5c855580e8ffa7e615f72c10fd2f99cc" + "reference": "a5f2734e8c16f3aa21b3da09715d10e15b4d2d45" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/e19b764b5c855580e8ffa7e615f72c10fd2f99cc", - "reference": "e19b764b5c855580e8ffa7e615f72c10fd2f99cc", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/a5f2734e8c16f3aa21b3da09715d10e15b4d2d45", + "reference": "a5f2734e8c16f3aa21b3da09715d10e15b4d2d45", "shasum": "" }, "require": { @@ -1394,20 +1512,20 @@ "logging", "psr-3" ], - "time": "2016-03-01 18:00:40" + "time": "2016-03-13 16:08:35" }, { "name": "paragonie/random_compat", - "version": "v1.2.1", + "version": "v1.4.1", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "f078eba3bcf140fd69b5fcc3ea5ac809abf729dc" + "reference": "c7e26a21ba357863de030f0b9e701c7d04593774" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/f078eba3bcf140fd69b5fcc3ea5ac809abf729dc", - "reference": "f078eba3bcf140fd69b5fcc3ea5ac809abf729dc", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/c7e26a21ba357863de030f0b9e701c7d04593774", + "reference": "c7e26a21ba357863de030f0b9e701c7d04593774", "shasum": "" }, "require": { @@ -1442,7 +1560,7 @@ "pseudorandom", "random" ], - "time": "2016-02-29 17:25:04" + "time": "2016-03-18 20:34:03" }, { "name": "patchwork/jsqueeze", @@ -1486,6 +1604,52 @@ ], "time": "2015-03-25 10:11:08" }, + { + "name": "psr/cache", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/cache.git", + "reference": "9e66031f41fbbdda45ee11e93c45d480ccba3eb3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/cache/zipball/9e66031f41fbbdda45ee11e93c45d480ccba3eb3", + "reference": "9e66031f41fbbdda45ee11e93c45d480ccba3eb3", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Cache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for caching libraries", + "keywords": [ + "cache", + "psr", + "psr-6" + ], + "time": "2015-12-11 02:52:07" + }, { "name": "psr/log", "version": "1.0.0", @@ -1526,16 +1690,16 @@ }, { "name": "sensio/distribution-bundle", - "version": "v5.0.4", + "version": "v5.0.5", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "2c167426fc24f9de116345195bc1697a748ee847" + "reference": "3a160355bb1364da55ed9e415c1aa1fa8d457b6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/2c167426fc24f9de116345195bc1697a748ee847", - "reference": "2c167426fc24f9de116345195bc1697a748ee847", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/3a160355bb1364da55ed9e415c1aa1fa8d457b6f", + "reference": "3a160355bb1364da55ed9e415c1aa1fa8d457b6f", "shasum": "" }, "require": { @@ -1574,7 +1738,7 @@ "configuration", "distribution" ], - "time": "2016-02-12 16:21:30" + "time": "2016-03-15 16:21:41" }, { "name": "sensio/framework-extra-bundle", @@ -1737,16 +1901,16 @@ }, { "name": "symfony/assetic-bundle", - "version": "v2.7.1", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/symfony/assetic-bundle.git", - "reference": "d885ec8451d5a7b077bda81bb19ac9fbff9cdc76" + "reference": "aa5b4f8b712f38745928fa845ddb73300bb2af6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/d885ec8451d5a7b077bda81bb19ac9fbff9cdc76", - "reference": "d885ec8451d5a7b077bda81bb19ac9fbff9cdc76", + "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/aa5b4f8b712f38745928fa845ddb73300bb2af6d", + "reference": "aa5b4f8b712f38745928fa845ddb73300bb2af6d", "shasum": "" }, "require": { @@ -1803,20 +1967,20 @@ "compression", "minification" ], - "time": "2015-11-17 09:45:47" + "time": "2015-12-28 13:12:39" }, { "name": "symfony/monolog-bundle", - "version": "v2.9.0", + "version": "v2.10.0", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bundle.git", - "reference": "27c2e3eaec7a0ba3462f99ea92678cbfc7b146e4" + "reference": "82fd8f36e2cccbe94faf237403c48052d4d4b77e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/27c2e3eaec7a0ba3462f99ea92678cbfc7b146e4", - "reference": "27c2e3eaec7a0ba3462f99ea92678cbfc7b146e4", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/82fd8f36e2cccbe94faf237403c48052d4d4b77e", + "reference": "82fd8f36e2cccbe94faf237403c48052d4d4b77e", "shasum": "" }, "require": { @@ -1828,6 +1992,7 @@ "symfony/monolog-bridge": "~2.3|~3.0" }, "require-dev": { + "phpunit/phpunit": "^4.8", "symfony/console": "~2.3|~3.0", "symfony/yaml": "~2.3|~3.0" }, @@ -1862,82 +2027,29 @@ "log", "logging" ], - "time": "2016-03-01 17:53:42" - }, - { - "name": "symfony/polyfill-apcu", - "version": "v1.1.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-apcu.git", - "reference": "d1911e6caeb4b6a4c8e2d5c46b978a66b3745e4c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/d1911e6caeb4b6a4c8e2d5c46b978a66b3745e4c", - "reference": "d1911e6caeb4b6a4c8e2d5c46b978a66b3745e4c", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting apcu_* functions to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "apcu", - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2016-01-20 09:13:37" + "time": "2016-03-13 15:55:56" }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.1.0", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "66b0bb4abda229bc073eff6bbc8f2685bdaac165" + "reference": "8328069d9f5322f0e7b3c3518485acfdc94c3942" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/66b0bb4abda229bc073eff6bbc8f2685bdaac165", - "reference": "66b0bb4abda229bc073eff6bbc8f2685bdaac165", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/8328069d9f5322f0e7b3c3518485acfdc94c3942", + "reference": "8328069d9f5322f0e7b3c3518485acfdc94c3942", "shasum": "" }, "require": { "php": ">=5.3.3", "symfony/intl": "~2.3|~3.0" }, + "suggest": { + "ext-intl": "For best performance" + }, "type": "library", "extra": { "branch-alias": { @@ -1973,11 +2085,11 @@ "portable", "shim" ], - "time": "2016-01-20 09:13:37" + "time": "2016-02-26 16:18:12" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.1.0", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", @@ -2034,123 +2146,9 @@ ], "time": "2016-01-20 09:13:37" }, - { - "name": "symfony/polyfill-php54", - "version": "v1.1.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php54.git", - "reference": "74663d5a2ff3c530c1bc0571500e0feec9094054" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/74663d5a2ff3c530c1bc0571500e0feec9094054", - "reference": "74663d5a2ff3c530c1bc0571500e0feec9094054", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php54\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2016-01-20 09:13:37" - }, - { - "name": "symfony/polyfill-php55", - "version": "v1.1.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php55.git", - "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/b4f3f07d91702f8f926339fc4fcf81671d8c27e6", - "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6", - "shasum": "" - }, - "require": { - "ircmaxell/password-compat": "~1.0", - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php55\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2016-01-20 09:13:37" - }, { "name": "symfony/polyfill-php56", - "version": "v1.1.0", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", @@ -2206,16 +2204,16 @@ }, { "name": "symfony/polyfill-php70", - "version": "v1.1.0", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "8428ceddbbaf102f2906769a8ef2438220c5cb95" + "reference": "386c1be9cad3ab531425211919e78c37971be4ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/8428ceddbbaf102f2906769a8ef2438220c5cb95", - "reference": "8428ceddbbaf102f2906769a8ef2438220c5cb95", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/386c1be9cad3ab531425211919e78c37971be4ce", + "reference": "386c1be9cad3ab531425211919e78c37971be4ce", "shasum": "" }, "require": { @@ -2261,11 +2259,11 @@ "portable", "shim" ], - "time": "2016-01-25 08:44:42" + "time": "2016-01-28 22:42:02" }, { "name": "symfony/polyfill-util", - "version": "v1.1.0", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", @@ -2315,67 +2313,6 @@ ], "time": "2016-01-20 09:13:37" }, - { - "name": "symfony/security-acl", - "version": "v2.8.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/security-acl.git", - "reference": "4a3f7327ad215242c78f6564ad4ea6d2db1b8347" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/security-acl/zipball/4a3f7327ad215242c78f6564ad4ea6d2db1b8347", - "reference": "4a3f7327ad215242c78f6564ad4ea6d2db1b8347", - "shasum": "" - }, - "require": { - "php": ">=5.3.9", - "symfony/security-core": "~2.4|~3.0.0" - }, - "require-dev": { - "doctrine/common": "~2.2", - "doctrine/dbal": "~2.2", - "psr/log": "~1.0", - "symfony/phpunit-bridge": "~2.7|~3.0.0" - }, - "suggest": { - "doctrine/dbal": "For using the built-in ACL implementation", - "symfony/class-loader": "For using the ACL generateSql script", - "symfony/finder": "For using the ACL generateSql script" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Security\\Acl\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Security Component - ACL (Access Control List)", - "homepage": "https://symfony.com", - "time": "2015-12-28 09:39:09" - }, { "name": "symfony/swiftmailer-bundle", "version": "v2.3.11", @@ -2435,39 +2372,37 @@ }, { "name": "symfony/symfony", - "version": "v2.8.3", + "version": "dev-action", "source": { "type": "git", - "url": "https://github.com/symfony/symfony.git", - "reference": "7a9a5fce7ce6e448e527f635463dda00761e12c2" + "url": "https://github.com/dunglas/symfony.git", + "reference": "b519e532003efe4b9e40c132b52089eb44ce7f38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/7a9a5fce7ce6e448e527f635463dda00761e12c2", - "reference": "7a9a5fce7ce6e448e527f635463dda00761e12c2", + "url": "https://api.github.com/repos/dunglas/symfony/zipball/b519e532003efe4b9e40c132b52089eb44ce7f38", + "reference": "b519e532003efe4b9e40c132b52089eb44ce7f38", "shasum": "" }, "require": { "doctrine/common": "~2.4", - "php": ">=5.3.9", + "php": ">=5.5.9", + "psr/cache": "~1.0", "psr/log": "~1.0", - "symfony/polyfill-apcu": "~1.1", "symfony/polyfill-intl-icu": "~1.0", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php54": "~1.0", - "symfony/polyfill-php55": "~1.0", "symfony/polyfill-php56": "~1.0", "symfony/polyfill-php70": "~1.0", "symfony/polyfill-util": "~1.0", - "symfony/security-acl": "~2.7", "twig/twig": "~1.23|~2.0" }, "conflict": { - "phpdocumentor/reflection": "<1.0.7" + "phpdocumentor/reflection-docblock": "<3.0" }, "replace": { "symfony/asset": "self.version", "symfony/browser-kit": "self.version", + "symfony/cache": "self.version", "symfony/class-loader": "self.version", "symfony/config": "self.version", "symfony/console": "self.version", @@ -2487,7 +2422,6 @@ "symfony/http-kernel": "self.version", "symfony/intl": "self.version", "symfony/ldap": "self.version", - "symfony/locale": "self.version", "symfony/monolog-bridge": "self.version", "symfony/options-resolver": "self.version", "symfony/process": "self.version", @@ -2503,7 +2437,6 @@ "symfony/security-http": "self.version", "symfony/serializer": "self.version", "symfony/stopwatch": "self.version", - "symfony/swiftmailer-bridge": "self.version", "symfony/templating": "self.version", "symfony/translation": "self.version", "symfony/twig-bridge": "self.version", @@ -2514,19 +2447,23 @@ "symfony/yaml": "self.version" }, "require-dev": { + "cache/integration-tests": "dev-master", + "doctrine/cache": "~1.6", "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": "~2.4", - "doctrine/doctrine-bundle": "~1.2", + "doctrine/doctrine-bundle": "~1.4", "doctrine/orm": "~2.4,>=2.4.5", "egulias/email-validator": "~1.2", "monolog/monolog": "~1.11", "ocramius/proxy-manager": "~0.4|~1.0|~2.0", - "phpdocumentor/reflection": "^1.0.7" + "phpdocumentor/reflection-docblock": "^3.0", + "symfony/polyfill-apcu": "~1.1", + "symfony/security-acl": "~2.8|~3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -2534,7 +2471,6 @@ "Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/", "Symfony\\Bridge\\Monolog\\": "src/Symfony/Bridge/Monolog/", "Symfony\\Bridge\\ProxyManager\\": "src/Symfony/Bridge/ProxyManager/", - "Symfony\\Bridge\\Swiftmailer\\": "src/Symfony/Bridge/Swiftmailer/", "Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/", "Symfony\\Bundle\\": "src/Symfony/Bundle/", "Symfony\\Component\\": "src/Symfony/Component/" @@ -2546,7 +2482,6 @@ "**/Tests/" ] }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -2565,7 +2500,10 @@ "keywords": [ "framework" ], - "time": "2016-02-28 21:06:29" + "support": { + "source": "https://github.com/dunglas/symfony/tree/action" + }, + "time": "2016-03-20 20:46:45" }, { "name": "twig/extensions", @@ -2735,17 +2673,24 @@ "time": "2016-02-26 04:36:01" } ], - "aliases": [], + "aliases": [ + { + "alias": "3.1.0", + "alias_normalized": "3.1.0.0", + "version": "dev-action", + "package": "symfony/symfony" + } + ], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "symfony/symfony": 20, + "dunglas/action-bundle": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { "php": ">=5.3.9", "ext-pdo_sqlite": "*" }, - "platform-dev": [], - "platform-overrides": { - "php": "5.3.9" - } + "platform-dev": [] } diff --git a/src/AppBundle/Controller/Admin/BlogController.php b/src/AppBundle/Action/Admin/BlogController.php similarity index 94% rename from src/AppBundle/Controller/Admin/BlogController.php rename to src/AppBundle/Action/Admin/BlogController.php index e26a29ade..af5312089 100644 --- a/src/AppBundle/Controller/Admin/BlogController.php +++ b/src/AppBundle/Action/Admin/BlogController.php @@ -9,10 +9,11 @@ * file that was distributed with this source code. */ -namespace AppBundle\Controller\Admin; +namespace AppBundle\Action\Admin; +use AppBundle\Utils\Slugger; +use Symfony\Bundle\FrameworkBundle\Controller\ControllerTrait; use Symfony\Component\HttpFoundation\Request; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; @@ -31,9 +32,19 @@ * * @author Ryan Weaver * @author Javier Eguiluz + * @author Kévin Dunglas */ -class BlogController extends Controller +class BlogController { + use ControllerTrait; + + private $slugger; + + public function __construct(Slugger $slugger) + { + $this->slugger = $slugger; + } + /** * Lists all Post entities. * @@ -83,7 +94,7 @@ public function newAction(Request $request) // However, we explicitly add it to improve code readability. // See http://symfony.com/doc/current/best_practices/forms.html#handling-form-submits if ($form->isSubmitted() && $form->isValid()) { - $post->setSlug($this->get('slugger')->slugify($post->getTitle())); + $post->setSlug($this->slugger->slugify($post->getTitle())); $entityManager = $this->getDoctrine()->getManager(); $entityManager->persist($post); @@ -151,7 +162,7 @@ public function editAction(Post $post, Request $request) $editForm->handleRequest($request); if ($editForm->isSubmitted() && $editForm->isValid()) { - $post->setSlug($this->get('slugger')->slugify($post->getTitle())); + $post->setSlug($this->slugger->slugify($post->getTitle())); $entityManager->flush(); $this->addFlash('success', 'post.updated_successfully'); diff --git a/src/AppBundle/Controller/BlogController.php b/src/AppBundle/Action/BlogController.php similarity index 88% rename from src/AppBundle/Controller/BlogController.php rename to src/AppBundle/Action/BlogController.php index 520691025..62ab5e228 100644 --- a/src/AppBundle/Controller/BlogController.php +++ b/src/AppBundle/Action/BlogController.php @@ -9,16 +9,17 @@ * file that was distributed with this source code. */ -namespace AppBundle\Controller; +namespace AppBundle\Action; use AppBundle\Entity\Comment; use AppBundle\Entity\Post; +use Knp\Component\Pager\PaginatorInterface; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\ControllerTrait; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -29,9 +30,19 @@ * * @author Ryan Weaver * @author Javier Eguiluz + * @author Kévin Dunglas */ -class BlogController extends Controller +class BlogController { + use ControllerTrait; + + private $paginator; + + public function __construct(PaginatorInterface $paginator) // Typehint services you need here, they will be automatically autowired + { + $this->paginator = $paginator; + } + /** * @Route("/", defaults={"page": 1}, name="blog_index") * @Route("/page/{page}", requirements={"page": "[1-9]\d*"}, name="blog_index_paginated") @@ -42,8 +53,7 @@ public function indexAction($page) { $query = $this->getDoctrine()->getRepository('AppBundle:Post')->queryLatest(); - $paginator = $this->get('knp_paginator'); - $posts = $paginator->paginate($query, $page, Post::NUM_ITEMS); + $posts = $this->paginator->paginate($query, $page, Post::NUM_ITEMS); $posts->setUsedRoute('blog_index_paginated'); if (0 === count($posts)) { diff --git a/src/AppBundle/Controller/SecurityController.php b/src/AppBundle/Action/SecurityController.php similarity index 74% rename from src/AppBundle/Controller/SecurityController.php rename to src/AppBundle/Action/SecurityController.php index 7e6203dbe..88761cf91 100644 --- a/src/AppBundle/Controller/SecurityController.php +++ b/src/AppBundle/Action/SecurityController.php @@ -9,11 +9,12 @@ * file that was distributed with this source code. */ -namespace AppBundle\Controller; +namespace AppBundle\Action; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; +use Symfony\Bundle\FrameworkBundle\Controller\ControllerTrait; +use Symfony\Component\Security\Http\Authentication\AuthenticationUtils; /** * Controller used to manage the application security. @@ -21,22 +22,30 @@ * * @author Ryan Weaver * @author Javier Eguiluz + * @author Kévin Dunglas */ -class SecurityController extends Controller +class SecurityController { + use ControllerTrait; + + private $authenticationUtils; + + public function __construct(AuthenticationUtils $authenticationUtils) + { + $this->authenticationUtils = $authenticationUtils; + } + /** * @Route("/login", name="security_login_form") * @Method("GET") */ public function loginAction() { - $helper = $this->get('security.authentication_utils'); - return $this->render('security/login.html.twig', array( // last username entered by the user (if any) - 'last_username' => $helper->getLastUsername(), + 'last_username' => $this->authenticationUtils->getLastUsername(), // last authentication error (if any) - 'error' => $helper->getLastAuthenticationError(), + 'error' => $this->authenticationUtils->getLastAuthenticationError(), )); } diff --git a/web/config.php b/web/config.php index cc030ad87..2e153097b 100644 --- a/web/config.php +++ b/web/config.php @@ -1,10 +1,23 @@ getFailedRecommendations(); ?> - - - Symfony Demo Application - - + + + Symfony Configuration Checker + + + + +
+
+ + +
+
+
- -
- -
-
-
-
-
+
+
+
+

Configuration Checker

+

+ This script analyzes your system to check whether is + ready to run Symfony applications. +

+ -
-
-

- - Fix these problems before continuing -

-
-
-

These mandatory requirements must be fixed before running Symfony applications:

- -
    - -
  1. getHelpHtml() ?>
    2. - -
-
-
+

Major problems

+

Major problems have been detected and must be fixed before continuing:

+
    + +
  1. getHelpHtml() ?>
    2. + +
-
-
-

- - Fix these problems to improve your experience -

-
-
-

These optional requirements should be fixed to improve your experience running Symfony applications:

- -
    - -
  1. getHelpHtml() ?>
    2. - -
-
-
+

Recommendations

+

+ Additionally, toTo enhance your Symfony experience, + it’s recommended that you fix the following: +

+
    + +
  1. getHelpHtml() ?>
    2. + +
hasPhpIniConfigIssue()): ?>

* getPhpIniConfigPath()): ?> - Changes to the php.ini file must be done in the "getPhpIniConfigPath() ?>" file. + Changes to the php.ini file must be done in "getPhpIniConfigPath() ?>". To change settings, create a "php.ini". @@ -95,57 +188,18 @@ -

-
-

- - All checks passed successfully -

-
-
-

Your configuration looks good to run the Symfony Demo application.

-
-
+

All checks passed successfully. Your system is ready to run Symfony applications.

-
-
-
+
Symfony Standard Edition
- -
-
-
- - -
-
-
From 2dbd8ab50515fe1ae69e2b2023219f277d6af3be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Sun, 20 Mar 2016 23:26:12 +0100 Subject: [PATCH 2/7] Remove useless routing config --- app/config/routing.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/config/routing.yml b/app/config/routing.yml index e3fcecc6a..c9fb66e67 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -13,15 +13,6 @@ app: defaults: _locale: %locale% -old_app: - resource: '@AppBundle/Controller/' - type: annotation - prefix: /{_locale} - requirements: - _locale: %app_locales% - defaults: - _locale: %locale% - # These lines define a route using YAML configuration. The controller used by # the route (FrameworkBundle:Template:template) is a convenient shortcut when # the template can be rendered without executing any logic in your own controller. From be48eb49288f2178ecc58869beb6cba19c47de11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Mon, 21 Mar 2016 08:53:24 +0100 Subject: [PATCH 3/7] Add some autowired commands --- app/data/blog.sqlite | Bin 153600 -> 153600 bytes composer.lock | 8 +++--- .../{Command => Console}/AddUserCommand.php | 25 +++++++++++++----- .../DeleteUserCommand.php | 18 ++++++++++--- 4 files changed, 37 insertions(+), 14 deletions(-) rename src/AppBundle/{Command => Console}/AddUserCommand.php (93%) rename src/AppBundle/{Command => Console}/DeleteUserCommand.php (92%) diff --git a/app/data/blog.sqlite b/app/data/blog.sqlite index 1830fa5141880a7e9e94c9152f1aa83321a6a0c4..800879defecff7ae52bb199174a4ed721ca632cd 100644 GIT binary patch delta 224 zcmZqJz}c{YbAmJ@*F+g-My`zsOZd5%nGP{9&t}$OI<#3(U<*@P3Nt%{uzn+}dUk4A zN@-qtPGYe`dTwH7j$U$pu8L8milMQJuVGerMQT_|kW*!mVUC+gPNk=RiC#{riK$~s zs<*ygXjQnMae9GyYKg0vSxTs(V}^0Dd$dxJzmIEtXs~OLQtW08;X52$%*=Nfn4d6z zX1=poQ05#n2RpMcBhXsr$xq}JfRfu7n9ne8V}1^lT)`|R%B;_b;UMPbGs^8}lo_|5 JQD!nR0RY3mMI8VD delta 86 zcmZqJz}c{YbAmJ@=R_H2M$U~1OZYjMm^B!fXESST7L<`;-mD>fhXW||gn{`9^Jk#Y nY37Lmypx~ED*y%0FfgBCehw5oz}$RBx&4eX + * @author Kévin Dunglas */ -class AddUserCommand extends ContainerAwareCommand +class AddUserCommand extends Command { const MAX_ATTEMPTS = 5; + private $doctrine; + private $passwordEndoder; + /** * @var ObjectManager */ private $entityManager; + public function __construct(ManagerRegistry $doctrine, UserPasswordEncoderInterface $passwordEncoder) + { + parent::__construct(); + + $this->doctrine = $doctrine; + $this->passwordEndoder = $passwordEncoder; + } + /** * {@inheritdoc} */ @@ -73,7 +87,7 @@ protected function configure() */ protected function initialize(InputInterface $input, OutputInterface $output) { - $this->entityManager = $this->getContainer()->get('doctrine')->getManager(); + $this->entityManager = $this->doctrine->getManager(); } /** @@ -190,8 +204,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $user->setRoles(array($isAdmin ? 'ROLE_ADMIN' : 'ROLE_USER')); // See http://symfony.com/doc/current/book/security.html#security-encoding-password - $encoder = $this->getContainer()->get('security.password_encoder'); - $encodedPassword = $encoder->encodePassword($user, $plainPassword); + $encodedPassword = $this->passwordEndoder->encodePassword($user, $plainPassword); $user->setPassword($encodedPassword); $this->entityManager->persist($user); diff --git a/src/AppBundle/Command/DeleteUserCommand.php b/src/AppBundle/Console/DeleteUserCommand.php similarity index 92% rename from src/AppBundle/Command/DeleteUserCommand.php rename to src/AppBundle/Console/DeleteUserCommand.php index a775ca878..34cfb8f03 100644 --- a/src/AppBundle/Command/DeleteUserCommand.php +++ b/src/AppBundle/Console/DeleteUserCommand.php @@ -9,10 +9,11 @@ * file that was distributed with this source code. */ -namespace AppBundle\Command; +namespace AppBundle\Console; use AppBundle\Entity\User; -use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; +use Doctrine\Common\Persistence\ManagerRegistry; +use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -32,15 +33,24 @@ * * @author Oleg Voronkovich */ -class DeleteUserCommand extends ContainerAwareCommand +class DeleteUserCommand extends Command { const MAX_ATTEMPTS = 5; + private $doctrine; + /** * @var ObjectManager */ private $entityManager; + public function __construct(ManagerRegistry $doctrine) + { + parent::__construct(); + + $this->doctrine = $doctrine; + } + /** * {@inheritdoc} */ @@ -65,7 +75,7 @@ protected function configure() protected function initialize(InputInterface $input, OutputInterface $output) { - $this->entityManager = $this->getContainer()->get('doctrine')->getManager(); + $this->entityManager = $this->doctrine->getManager(); } protected function interact(InputInterface $input, OutputInterface $output) From 539dfd86ef2d8520b283cc95a75103d9f4798a6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Fri, 25 Mar 2016 21:53:43 +0100 Subject: [PATCH 4/7] Sync with symfony/symfony#960 --- app/AppKernel.php | 2 +- app/config/routing.yml | 4 +- composer.json | 7 +- composer.lock | 28 +- .../{Console => Command}/AddUserCommand.php | 2 +- .../DeleteUserCommand.php | 2 +- .../Admin/BlogController.php | 2 +- .../{Action => Controller}/BlogController.php | 2 +- .../SecurityController.php | 2 +- web/config.php | 256 +++++++----------- 10 files changed, 131 insertions(+), 176 deletions(-) rename src/AppBundle/{Console => Command}/AddUserCommand.php (99%) rename src/AppBundle/{Console => Command}/DeleteUserCommand.php (99%) rename src/AppBundle/{Action => Controller}/Admin/BlogController.php (99%) rename src/AppBundle/{Action => Controller}/BlogController.php (99%) rename src/AppBundle/{Action => Controller}/SecurityController.php (98%) diff --git a/app/AppKernel.php b/app/AppKernel.php index efb858feb..14df2a14f 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -19,8 +19,8 @@ public function registerBundles() new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(), new Symfony\Bundle\AsseticBundle\AsseticBundle(), new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(), - new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), new Dunglas\ActionBundle\DunglasActionBundle(), + new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), new Knp\Bundle\PaginatorBundle\KnpPaginatorBundle(), new CodeExplorerBundle\CodeExplorerBundle(), new AppBundle\AppBundle(), diff --git a/app/config/routing.yml b/app/config/routing.yml index c9fb66e67..70879f471 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -5,8 +5,8 @@ # the routes in YAML, XML or PHP files. # See http://symfony.com/doc/current/book/routing.html app: - resource: '@AppBundle/Action/' - type: action-annotation + resource: '@AppBundle/Controller/' + type: annotation prefix: /{_locale} requirements: _locale: %app_locales% diff --git a/composer.json b/composer.json index 23d3c3b46..eb907fc12 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "symfony/swiftmailer-bundle" : "~2.3", "symfony/symfony" : "dev-action as 3.1.0", "twig/extensions" : "~1.2", - "dunglas/action-bundle" : "dev-master" + "dunglas/action-bundle" : "~1.0@dev" }, "require-dev": { "sensio/generator-bundle": "~3.0" @@ -57,7 +57,10 @@ ] }, "config": { - "bin-dir": "bin" + "bin-dir": "bin", + "platform": { + "php": "5.5.9" + } }, "extra": { "symfony-app-dir": "app", diff --git a/composer.lock b/composer.lock index 030afa1c2..e97e88ad6 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": "7320f4e2ff3228c505943b68b0e569ad", - "content-hash": "e585bb0ab9e4908035a893d617aad050", + "hash": "a38ab8edfb63d4ee21a9197d670ee30b", + "content-hash": "a11160ba30aa6d7ea898c1e53b9746e5", "packages": [ { "name": "doctrine/annotations", @@ -893,18 +893,19 @@ "source": { "type": "git", "url": "https://github.com/dunglas/DunglasActionBundle.git", - "reference": "db0039f330216d7cd3186c0359b8b2903a8347d8" + "reference": "5194e0b273e0f13c6e54a16aeb47ed2590c29116" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dunglas/DunglasActionBundle/zipball/db0039f330216d7cd3186c0359b8b2903a8347d8", - "reference": "db0039f330216d7cd3186c0359b8b2903a8347d8", + "url": "https://api.github.com/repos/dunglas/DunglasActionBundle/zipball/5194e0b273e0f13c6e54a16aeb47ed2590c29116", + "reference": "5194e0b273e0f13c6e54a16aeb47ed2590c29116", "shasum": "" }, "require": { "php": ">=5.5.9", "symfony/config": "~2.8|~3.0", "symfony/dependency-injection": "~2.8|~3.0", + "symfony/finder": "~2.8|~3.0", "symfony/http-kernel": "~2.8|~3.0" }, "require-dev": { @@ -918,6 +919,11 @@ "symfony/routing": "To use the @Route annotation provided by the bundle." }, "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, "autoload": { "psr-4": { "Dunglas\\ActionBundle\\": "" @@ -946,7 +952,7 @@ "routing", "symfony" ], - "time": "2016-03-20 21:53:21" + "time": "2016-03-25 19:41:41" }, { "name": "erusev/parsedown", @@ -1742,16 +1748,16 @@ }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.14", + "version": "v3.0.16", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "cccf975c565ccd835bddc30a8fea5cdfe3357bf1" + "reference": "507a15f56fa7699f6cc8c2c7de4080b19ce22546" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/cccf975c565ccd835bddc30a8fea5cdfe3357bf1", - "reference": "cccf975c565ccd835bddc30a8fea5cdfe3357bf1", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/507a15f56fa7699f6cc8c2c7de4080b19ce22546", + "reference": "507a15f56fa7699f6cc8c2c7de4080b19ce22546", "shasum": "" }, "require": { @@ -1800,7 +1806,7 @@ "annotations", "controllers" ], - "time": "2016-03-01 10:50:07" + "time": "2016-03-25 17:08:27" }, { "name": "sensiolabs/security-checker", diff --git a/src/AppBundle/Console/AddUserCommand.php b/src/AppBundle/Command/AddUserCommand.php similarity index 99% rename from src/AppBundle/Console/AddUserCommand.php rename to src/AppBundle/Command/AddUserCommand.php index 3f2d659fd..deeb74a0c 100644 --- a/src/AppBundle/Console/AddUserCommand.php +++ b/src/AppBundle/Command/AddUserCommand.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace AppBundle\Console; +namespace AppBundle\Command; use Doctrine\Common\Persistence\ManagerRegistry; use Symfony\Component\Console\Command\Command; diff --git a/src/AppBundle/Console/DeleteUserCommand.php b/src/AppBundle/Command/DeleteUserCommand.php similarity index 99% rename from src/AppBundle/Console/DeleteUserCommand.php rename to src/AppBundle/Command/DeleteUserCommand.php index 34cfb8f03..5bf6fa1a5 100644 --- a/src/AppBundle/Console/DeleteUserCommand.php +++ b/src/AppBundle/Command/DeleteUserCommand.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace AppBundle\Console; +namespace AppBundle\Command; use AppBundle\Entity\User; use Doctrine\Common\Persistence\ManagerRegistry; diff --git a/src/AppBundle/Action/Admin/BlogController.php b/src/AppBundle/Controller/Admin/BlogController.php similarity index 99% rename from src/AppBundle/Action/Admin/BlogController.php rename to src/AppBundle/Controller/Admin/BlogController.php index af5312089..f0743193a 100644 --- a/src/AppBundle/Action/Admin/BlogController.php +++ b/src/AppBundle/Controller/Admin/BlogController.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace AppBundle\Action\Admin; +namespace AppBundle\Controller\Admin; use AppBundle\Utils\Slugger; use Symfony\Bundle\FrameworkBundle\Controller\ControllerTrait; diff --git a/src/AppBundle/Action/BlogController.php b/src/AppBundle/Controller/BlogController.php similarity index 99% rename from src/AppBundle/Action/BlogController.php rename to src/AppBundle/Controller/BlogController.php index 62ab5e228..65a099e1c 100644 --- a/src/AppBundle/Action/BlogController.php +++ b/src/AppBundle/Controller/BlogController.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace AppBundle\Action; +namespace AppBundle\Controller; use AppBundle\Entity\Comment; use AppBundle\Entity\Post; diff --git a/src/AppBundle/Action/SecurityController.php b/src/AppBundle/Controller/SecurityController.php similarity index 98% rename from src/AppBundle/Action/SecurityController.php rename to src/AppBundle/Controller/SecurityController.php index 88761cf91..72ea30ab5 100644 --- a/src/AppBundle/Action/SecurityController.php +++ b/src/AppBundle/Controller/SecurityController.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace AppBundle\Action; +namespace AppBundle\Controller; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; diff --git a/web/config.php b/web/config.php index 2e153097b..cc030ad87 100644 --- a/web/config.php +++ b/web/config.php @@ -1,23 +1,10 @@ getFailedRecommendations(); ?> + - - - Symfony Configuration Checker - - - + + Symfony Demo Application + + - -
-
- - -
-
-
- - - - - + +
+ +
-
-
-
-

Configuration Checker

-

- This script analyzes your system to check whether is - ready to run Symfony applications. -

- +
+
+
+
-

Major problems

-

Major problems have been detected and must be fixed before continuing:

-
    - -
  1. getHelpHtml() ?>
    2. - -
+
+
+

+ + Fix these problems before continuing +

+
+
+

These mandatory requirements must be fixed before running Symfony applications:

+ +
    + +
  1. getHelpHtml() ?>
    2. + +
+
+
-

Recommendations

-

- Additionally, toTo enhance your Symfony experience, - it’s recommended that you fix the following: -

-
    - -
  1. getHelpHtml() ?>
    2. - -
+
+
+

+ + Fix these problems to improve your experience +

+
+
+

These optional requirements should be fixed to improve your experience running Symfony applications:

+ +
    + +
  1. getHelpHtml() ?>
    2. + +
+
+
hasPhpIniConfigIssue()): ?>

* getPhpIniConfigPath()): ?> - Changes to the php.ini file must be done in "getPhpIniConfigPath() ?>". + Changes to the php.ini file must be done in the "getPhpIniConfigPath() ?>" file. To change settings, create a "php.ini". @@ -188,18 +95,57 @@ -

All checks passed successfully. Your system is ready to run Symfony applications.

+
+
+

+ + All checks passed successfully +

+
+
+

Your configuration looks good to run the Symfony Demo application.

+
+
+
+
- +
-
Symfony Standard Edition
+ +
+
+
+ + +
+
+
From 35f1ea2fc733c2d87d1da8b345af00c1dcd5af81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Fri, 25 Mar 2016 21:56:09 +0100 Subject: [PATCH 5/7] Remove some craps --- .gitignore | 1 + app/data/blog.sqlite | Bin 153600 -> 0 bytes 2 files changed, 1 insertion(+) delete mode 100644 app/data/blog.sqlite diff --git a/.gitignore b/.gitignore index 46d2f59ac..fc9b96879 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ /app/bootstrap.php.cache /app/cache/* /app/logs/* +/app/data/blog.sqlite !app/cache/.gitkeep !app/logs/.gitkeep /build/ diff --git a/app/data/blog.sqlite b/app/data/blog.sqlite deleted file mode 100644 index 800879defecff7ae52bb199174a4ed721ca632cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 153600 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 From 6985cec1793e957615718b50339c0ec85e8da002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Sat, 26 Mar 2016 07:28:07 +0100 Subject: [PATCH 6/7] Update Travis config --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b38a1e29..ac02639a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,6 @@ cache: matrix: fast_finish: true include: - - php: 5.3 - - php: 5.4 - php: 5.5 - php: 5.6 - php: 7.0 From 436265ddee06019b9fd85328762c3e13654cb8a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Tue, 29 Mar 2016 22:49:46 +0200 Subject: [PATCH 7/7] Update to new DunglasActionBundle version --- app/config/config.yml | 2 +- app/config/services.yml | 4 + composer.json | 8 +- composer.lock | 344 +++++++++++++----- .../Controller/Admin/BlogController.php | 5 +- src/AppBundle/Controller/BlogController.php | 6 +- .../Controller/SecurityController.php | 12 +- web/config.php | 256 ++++++++----- 8 files changed, 430 insertions(+), 207 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index eacb2ed48..c303d4217 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -38,7 +38,7 @@ framework: form: ~ csrf_protection: ~ validation: { enable_annotations: true } - serializer: { enable_annotations: true } + #serializer: { enable_annotations: true } templating: engines: ['twig'] default_locale: "%locale%" diff --git a/app/config/services.yml b/app/config/services.yml index 5cfa004c0..3a853520e 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -1,4 +1,8 @@ services: + # Required for fixtures + slugger: + class: AppBundle\Utils\Slugger + # These are the Twig extensions that create new filters and functions for # using them in the templates app.twig.app_extension: diff --git a/composer.json b/composer.json index eb907fc12..b4b5d6cc3 100644 --- a/composer.json +++ b/composer.json @@ -7,12 +7,6 @@ "psr-4": { "": "src/" }, "classmap": [ "app/AppKernel.php", "app/AppCache.php" ] }, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/dunglas/symfony" - } - ], "require": { "php" : ">=5.3.9", "ext-pdo_sqlite" : "*", @@ -31,7 +25,7 @@ "symfony/assetic-bundle" : "~2.6", "symfony/monolog-bundle" : "~2.7", "symfony/swiftmailer-bundle" : "~2.3", - "symfony/symfony" : "dev-action as 3.1.0", + "symfony/symfony" : "~2.8", "twig/extensions" : "~1.2", "dunglas/action-bundle" : "~1.0@dev" }, diff --git a/composer.lock b/composer.lock index e97e88ad6..b1f5f189f 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": "a38ab8edfb63d4ee21a9197d670ee30b", - "content-hash": "a11160ba30aa6d7ea898c1e53b9746e5", + "hash": "6bf69bb8673e9db417e92b497ce57695", + "content-hash": "658db82d1feaebc7bb7578d0c36d2465", "packages": [ { "name": "doctrine/annotations", @@ -893,12 +893,12 @@ "source": { "type": "git", "url": "https://github.com/dunglas/DunglasActionBundle.git", - "reference": "5194e0b273e0f13c6e54a16aeb47ed2590c29116" + "reference": "2c262bc28e7b2629de98aca1840cdb15dc21d06e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dunglas/DunglasActionBundle/zipball/5194e0b273e0f13c6e54a16aeb47ed2590c29116", - "reference": "5194e0b273e0f13c6e54a16aeb47ed2590c29116", + "url": "https://api.github.com/repos/dunglas/DunglasActionBundle/zipball/2c262bc28e7b2629de98aca1840cdb15dc21d06e", + "reference": "2c262bc28e7b2629de98aca1840cdb15dc21d06e", "shasum": "" }, "require": { @@ -952,7 +952,7 @@ "routing", "symfony" ], - "time": "2016-03-25 19:41:41" + "time": "2016-03-29 20:24:33" }, { "name": "erusev/parsedown", @@ -1610,52 +1610,6 @@ ], "time": "2015-03-25 10:11:08" }, - { - "name": "psr/cache", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/cache.git", - "reference": "9e66031f41fbbdda45ee11e93c45d480ccba3eb3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/9e66031f41fbbdda45ee11e93c45d480ccba3eb3", - "reference": "9e66031f41fbbdda45ee11e93c45d480ccba3eb3", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Cache\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for caching libraries", - "keywords": [ - "cache", - "psr", - "psr-6" - ], - "time": "2015-12-11 02:52:07" - }, { "name": "psr/log", "version": "1.0.0", @@ -2035,6 +1989,59 @@ ], "time": "2016-03-13 15:55:56" }, + { + "name": "symfony/polyfill-apcu", + "version": "v1.1.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-apcu.git", + "reference": "0c901e4e65a2f7ece68f0fd249b56d6ad3adc214" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/0c901e4e65a2f7ece68f0fd249b56d6ad3adc214", + "reference": "0c901e4e65a2f7ece68f0fd249b56d6ad3adc214", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting apcu_* functions to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "apcu", + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2016-03-03 16:49:40" + }, { "name": "symfony/polyfill-intl-icu", "version": "v1.1.1", @@ -2152,6 +2159,120 @@ ], "time": "2016-01-20 09:13:37" }, + { + "name": "symfony/polyfill-php54", + "version": "v1.1.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php54.git", + "reference": "9ba741ca01c77282ecf5796c2c1d667f03454ffb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/9ba741ca01c77282ecf5796c2c1d667f03454ffb", + "reference": "9ba741ca01c77282ecf5796c2c1d667f03454ffb", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php54\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2016-01-25 19:13:00" + }, + { + "name": "symfony/polyfill-php55", + "version": "v1.1.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php55.git", + "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/b4f3f07d91702f8f926339fc4fcf81671d8c27e6", + "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6", + "shasum": "" + }, + "require": { + "ircmaxell/password-compat": "~1.0", + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php55\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2016-01-20 09:13:37" + }, { "name": "symfony/polyfill-php56", "version": "v1.1.1", @@ -2319,6 +2440,67 @@ ], "time": "2016-01-20 09:13:37" }, + { + "name": "symfony/security-acl", + "version": "v2.8.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/security-acl.git", + "reference": "4a3f7327ad215242c78f6564ad4ea6d2db1b8347" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/security-acl/zipball/4a3f7327ad215242c78f6564ad4ea6d2db1b8347", + "reference": "4a3f7327ad215242c78f6564ad4ea6d2db1b8347", + "shasum": "" + }, + "require": { + "php": ">=5.3.9", + "symfony/security-core": "~2.4|~3.0.0" + }, + "require-dev": { + "doctrine/common": "~2.2", + "doctrine/dbal": "~2.2", + "psr/log": "~1.0", + "symfony/phpunit-bridge": "~2.7|~3.0.0" + }, + "suggest": { + "doctrine/dbal": "For using the built-in ACL implementation", + "symfony/class-loader": "For using the ACL generateSql script", + "symfony/finder": "For using the ACL generateSql script" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Security\\Acl\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Security Component - ACL (Access Control List)", + "homepage": "https://symfony.com", + "time": "2015-12-28 09:39:09" + }, { "name": "symfony/swiftmailer-bundle", "version": "v2.3.11", @@ -2378,37 +2560,39 @@ }, { "name": "symfony/symfony", - "version": "dev-action", + "version": "v2.8.4", "source": { "type": "git", - "url": "https://github.com/dunglas/symfony.git", - "reference": "f8a895a48e3cf0ddc68d3dc4846b2f1e2984b7c9" + "url": "https://github.com/symfony/symfony.git", + "reference": "9e14f9f4869c19188a376eab61d9a1c1f1fee347" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dunglas/symfony/zipball/f8a895a48e3cf0ddc68d3dc4846b2f1e2984b7c9", - "reference": "f8a895a48e3cf0ddc68d3dc4846b2f1e2984b7c9", + "url": "https://api.github.com/repos/symfony/symfony/zipball/9e14f9f4869c19188a376eab61d9a1c1f1fee347", + "reference": "9e14f9f4869c19188a376eab61d9a1c1f1fee347", "shasum": "" }, "require": { "doctrine/common": "~2.4", - "php": ">=5.5.9", - "psr/cache": "~1.0", + "php": ">=5.3.9", "psr/log": "~1.0", + "symfony/polyfill-apcu": "~1.1", "symfony/polyfill-intl-icu": "~1.0", "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php54": "~1.0", + "symfony/polyfill-php55": "~1.0", "symfony/polyfill-php56": "~1.0", "symfony/polyfill-php70": "~1.0", "symfony/polyfill-util": "~1.0", + "symfony/security-acl": "~2.7", "twig/twig": "~1.23|~2.0" }, "conflict": { - "phpdocumentor/reflection-docblock": "<3.0" + "phpdocumentor/reflection": "<1.0.7" }, "replace": { "symfony/asset": "self.version", "symfony/browser-kit": "self.version", - "symfony/cache": "self.version", "symfony/class-loader": "self.version", "symfony/config": "self.version", "symfony/console": "self.version", @@ -2428,6 +2612,7 @@ "symfony/http-kernel": "self.version", "symfony/intl": "self.version", "symfony/ldap": "self.version", + "symfony/locale": "self.version", "symfony/monolog-bridge": "self.version", "symfony/options-resolver": "self.version", "symfony/process": "self.version", @@ -2443,6 +2628,7 @@ "symfony/security-http": "self.version", "symfony/serializer": "self.version", "symfony/stopwatch": "self.version", + "symfony/swiftmailer-bridge": "self.version", "symfony/templating": "self.version", "symfony/translation": "self.version", "symfony/twig-bridge": "self.version", @@ -2453,31 +2639,24 @@ "symfony/yaml": "self.version" }, "require-dev": { - "cache/integration-tests": "dev-master", - "doctrine/cache": "~1.6", "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": "~2.4", - "doctrine/doctrine-bundle": "~1.4", + "doctrine/doctrine-bundle": "~1.2", "doctrine/orm": "~2.4,>=2.4.5", "egulias/email-validator": "~1.2", "monolog/monolog": "~1.11", "ocramius/proxy-manager": "~0.4|~1.0|~2.0", - "phpdocumentor/reflection-docblock": "^3.0", - "symfony/polyfill-apcu": "~1.1", - "symfony/security-acl": "~2.8|~3.0" + "phpdocumentor/reflection": "^1.0.7" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { - "Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/", - "Symfony\\Bridge\\Monolog\\": "src/Symfony/Bridge/Monolog/", - "Symfony\\Bridge\\ProxyManager\\": "src/Symfony/Bridge/ProxyManager/", - "Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/", + "Symfony\\Bridge\\": "src/Symfony/Bridge/", "Symfony\\Bundle\\": "src/Symfony/Bundle/", "Symfony\\Component\\": "src/Symfony/Component/" }, @@ -2488,6 +2667,7 @@ "**/Tests/" ] }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -2506,10 +2686,7 @@ "keywords": [ "framework" ], - "support": { - "source": "https://github.com/dunglas/symfony/tree/action" - }, - "time": "2016-03-21 07:28:59" + "time": "2016-03-27 12:57:53" }, { "name": "twig/extensions", @@ -2679,17 +2856,9 @@ "time": "2016-02-26 04:36:01" } ], - "aliases": [ - { - "alias": "3.1.0", - "alias_normalized": "3.1.0.0", - "version": "dev-action", - "package": "symfony/symfony" - } - ], + "aliases": [], "minimum-stability": "stable", "stability-flags": { - "symfony/symfony": 20, "dunglas/action-bundle": 20 }, "prefer-stable": false, @@ -2698,5 +2867,8 @@ "php": ">=5.3.9", "ext-pdo_sqlite": "*" }, - "platform-dev": [] + "platform-dev": [], + "platform-overrides": { + "php": "5.5.9" + } } diff --git a/src/AppBundle/Controller/Admin/BlogController.php b/src/AppBundle/Controller/Admin/BlogController.php index f0743193a..4f11f37d9 100644 --- a/src/AppBundle/Controller/Admin/BlogController.php +++ b/src/AppBundle/Controller/Admin/BlogController.php @@ -12,6 +12,7 @@ namespace AppBundle\Controller\Admin; use AppBundle\Utils\Slugger; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Bundle\FrameworkBundle\Controller\ControllerTrait; use Symfony\Component\HttpFoundation\Request; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; @@ -34,10 +35,8 @@ * @author Javier Eguiluz * @author Kévin Dunglas */ -class BlogController +class BlogController extends Controller { - use ControllerTrait; - private $slugger; public function __construct(Slugger $slugger) diff --git a/src/AppBundle/Controller/BlogController.php b/src/AppBundle/Controller/BlogController.php index 65a099e1c..55afcefff 100644 --- a/src/AppBundle/Controller/BlogController.php +++ b/src/AppBundle/Controller/BlogController.php @@ -19,7 +19,7 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; -use Symfony\Bundle\FrameworkBundle\Controller\ControllerTrait; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -32,10 +32,8 @@ * @author Javier Eguiluz * @author Kévin Dunglas */ -class BlogController +class BlogController extends Controller { - use ControllerTrait; - private $paginator; public function __construct(PaginatorInterface $paginator) // Typehint services you need here, they will be automatically autowired diff --git a/src/AppBundle/Controller/SecurityController.php b/src/AppBundle/Controller/SecurityController.php index 72ea30ab5..3a61fe6e7 100644 --- a/src/AppBundle/Controller/SecurityController.php +++ b/src/AppBundle/Controller/SecurityController.php @@ -13,7 +13,9 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Bundle\FrameworkBundle\Controller\ControllerTrait; +use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Security\Http\Authentication\AuthenticationUtils; /** @@ -26,13 +28,13 @@ */ class SecurityController { - use ControllerTrait; - private $authenticationUtils; + private $twig; - public function __construct(AuthenticationUtils $authenticationUtils) + public function __construct(AuthenticationUtils $authenticationUtils, \Twig_Environment $twig) { $this->authenticationUtils = $authenticationUtils; + $this->twig = $twig; } /** @@ -41,12 +43,12 @@ public function __construct(AuthenticationUtils $authenticationUtils) */ public function loginAction() { - return $this->render('security/login.html.twig', array( + return new Response($this->twig->render('security/login.html.twig', array( // last username entered by the user (if any) 'last_username' => $this->authenticationUtils->getLastUsername(), // last authentication error (if any) 'error' => $this->authenticationUtils->getLastAuthenticationError(), - )); + ))); } /** diff --git a/web/config.php b/web/config.php index cc030ad87..2e153097b 100644 --- a/web/config.php +++ b/web/config.php @@ -1,10 +1,23 @@ getFailedRecommendations(); ?> - - - Symfony Demo Application - - + + + Symfony Configuration Checker + + + + +
+
+ + +
+
+
- -
- -
-
-
-
-
+
+
+
+

Configuration Checker

+

+ This script analyzes your system to check whether is + ready to run Symfony applications. +

+ -
-
-

- - Fix these problems before continuing -

-
-
-

These mandatory requirements must be fixed before running Symfony applications:

- -
    - -
  1. getHelpHtml() ?>
    2. - -
-
-
+

Major problems

+

Major problems have been detected and must be fixed before continuing:

+
    + +
  1. getHelpHtml() ?>
    2. + +
-
-
-

- - Fix these problems to improve your experience -

-
-
-

These optional requirements should be fixed to improve your experience running Symfony applications:

- -
    - -
  1. getHelpHtml() ?>
    2. - -
-
-
+

Recommendations

+

+ Additionally, toTo enhance your Symfony experience, + it’s recommended that you fix the following: +

+
    + +
  1. getHelpHtml() ?>
    2. + +
hasPhpIniConfigIssue()): ?>

* getPhpIniConfigPath()): ?> - Changes to the php.ini file must be done in the "getPhpIniConfigPath() ?>" file. + Changes to the php.ini file must be done in "getPhpIniConfigPath() ?>". To change settings, create a "php.ini". @@ -95,57 +188,18 @@ -

-
-

- - All checks passed successfully -

-
-
-

Your configuration looks good to run the Symfony Demo application.

-
-
+

All checks passed successfully. Your system is ready to run Symfony applications.

-
-
-
+
Symfony Standard Edition
- -