diff --git a/app/AppKernel.php b/app/AppKernel.php
index 3789b326e0..dcd5da09f7 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -15,6 +15,7 @@ public function registerBundles()
new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
+ new Dunglas\ActionBundle\DunglasActionBundle(),
new AppBundle\AppBundle(),
];
diff --git a/app/config/config.yml b/app/config/config.yml
index 3292445f91..4d7f81fc4e 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -66,3 +66,5 @@ swiftmailer:
username: "%mailer_user%"
password: "%mailer_password%"
spool: { type: memory }
+
+
diff --git a/bin/symfony_requirements b/bin/symfony_requirements
index 1eca6719c4..7cd559a451 100755
--- a/bin/symfony_requirements
+++ b/bin/symfony_requirements
@@ -7,7 +7,7 @@ $lineSize = 70;
$symfonyRequirements = new SymfonyRequirements();
$iniPath = $symfonyRequirements->getPhpIniConfigPath();
-echo_title('Symfony2 Requirements Checker');
+echo_title('Symfony Requirements Checker');
echo '> PHP is using the following php.ini file:'.PHP_EOL;
if ($iniPath) {
@@ -43,9 +43,9 @@ foreach ($symfonyRequirements->getRecommendations() as $req) {
}
if ($checkPassed) {
- echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects');
+ echo_block('success', 'OK', 'Your system is ready to run Symfony projects');
} else {
- echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects');
+ echo_block('error', 'ERROR', 'Your system is not ready to run Symfony projects');
echo_title('Fix the following mandatory requirements', 'red');
diff --git a/composer.json b/composer.json
index 4918aa3b69..78a7c982b7 100644
--- a/composer.json
+++ b/composer.json
@@ -10,9 +10,15 @@
"autoload-dev": {
"psr-4": { "Tests\\": "tests/" }
},
+ "repositories": [
+ {
+ "type": "vcs",
+ "url": "https://github.com/dunglas/symfony"
+ }
+ ],
"require": {
"php": ">=5.5.9",
- "symfony/symfony": "3.1.*@dev",
+ "symfony/symfony": "dev-action as 3.1.0",
"doctrine/orm": "^2.5",
"doctrine/doctrine-bundle": "^1.6",
"doctrine/doctrine-cache-bundle": "^1.2",
@@ -20,7 +26,8 @@
"symfony/monolog-bundle": "^2.8",
"sensio/distribution-bundle": "^5.0",
"sensio/framework-extra-bundle": "^3.0.2",
- "incenteev/composer-parameter-handler": "^2.0"
+ "incenteev/composer-parameter-handler": "^2.0",
+ "dunglas/action-bundle": "~1.0@dev"
},
"require-dev": {
"sensio/generator-bundle": "^3.0",
diff --git a/composer.lock b/composer.lock
index 43bb2dd86f..2cbff2c049 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": "1b97e5a240e769e4a7afa9b8c4de1849",
- "content-hash": "d6693c8d3ad436468f9258f22a5a49b0",
+ "hash": "c8ec970699bfc2ef57302b8815534257",
+ "content-hash": "b54028e2924240d3ef774026608551d5",
"packages": [
{
"name": "doctrine/annotations",
@@ -357,16 +357,16 @@
},
{
"name": "doctrine/doctrine-bundle",
- "version": "1.6.1",
+ "version": "1.6.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/DoctrineBundle.git",
- "reference": "c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b"
+ "reference": "e9c2ccf573b59b7cea566390f34254fed3c20ed9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b",
- "reference": "c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b",
+ "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/e9c2ccf573b59b7cea566390f34254fed3c20ed9",
+ "reference": "e9c2ccf573b59b7cea566390f34254fed3c20ed9",
"shasum": ""
},
"require": {
@@ -382,6 +382,7 @@
"doctrine/orm": "~2.3",
"phpunit/phpunit": "~4",
"satooshi/php-coveralls": "~0.6.1",
+ "symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/validator": "~2.2|~3.0",
"symfony/yaml": "~2.2|~3.0",
"twig/twig": "~1.10"
@@ -431,20 +432,20 @@
"orm",
"persistence"
],
- "time": "2015-11-16 17:11:46"
+ "time": "2016-01-10 17:21:44"
},
{
"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": {
@@ -458,6 +459,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",
@@ -518,7 +520,7 @@
"cache",
"caching"
],
- "time": "2015-11-27 04:59:07"
+ "time": "2016-01-26 17:28:51"
},
{
"name": "doctrine/inflector",
@@ -771,6 +773,73 @@
],
"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": "83034c14b2b5cf09683f3ae66041867c176ae67d"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/dunglas/DunglasActionBundle/zipball/83034c14b2b5cf09683f3ae66041867c176ae67d",
+ "reference": "83034c14b2b5cf09683f3ae66041867c176ae67d",
+ "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": {
+ "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",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "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-25 16:19:42"
+ },
{
"name": "incenteev/composer-parameter-handler",
"version": "v2.1.2",
@@ -874,16 +943,16 @@
},
{
"name": "monolog/monolog",
- "version": "1.17.2",
+ "version": "1.18.1",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24"
+ "reference": "a5f2734e8c16f3aa21b3da09715d10e15b4d2d45"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bee7f0dc9c3e0b69a6039697533dca1e845c8c24",
- "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/a5f2734e8c16f3aa21b3da09715d10e15b4d2d45",
+ "reference": "a5f2734e8c16f3aa21b3da09715d10e15b4d2d45",
"shasum": ""
},
"require": {
@@ -912,6 +981,7 @@
"ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
"ext-mongo": "Allow sending log messages to a MongoDB server",
"graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
+ "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
"php-console/php-console": "Allow sending log messages to Google Chrome",
"raven/raven": "Allow sending log messages to a Sentry server",
"rollbar/rollbar": "Allow sending log messages to Rollbar",
@@ -921,7 +991,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.16.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
@@ -947,20 +1017,20 @@
"logging",
"psr-3"
],
- "time": "2015-10-14 12:51:02"
+ "time": "2016-03-13 16:08:35"
},
{
"name": "paragonie/random_compat",
- "version": "1.1.5",
+ "version": "v1.4.1",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
- "reference": "dd8998b7c846f6909f4e7a5f67fabebfc412a4f7"
+ "reference": "c7e26a21ba357863de030f0b9e701c7d04593774"
},
"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/c7e26a21ba357863de030f0b9e701c7d04593774",
+ "reference": "c7e26a21ba357863de030f0b9e701c7d04593774",
"shasum": ""
},
"require": {
@@ -995,7 +1065,7 @@
"pseudorandom",
"random"
],
- "time": "2016-01-06 13:31:20"
+ "time": "2016-03-18 20:34:03"
},
{
"name": "psr/cache",
@@ -1083,16 +1153,16 @@
},
{
"name": "sensio/distribution-bundle",
- "version": "v5.0.3",
+ "version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
- "reference": "419c1824af940e2be0f833aca2327e1181a6b503"
+ "reference": "3a160355bb1364da55ed9e415c1aa1fa8d457b6f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/419c1824af940e2be0f833aca2327e1181a6b503",
- "reference": "419c1824af940e2be0f833aca2327e1181a6b503",
+ "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/3a160355bb1364da55ed9e415c1aa1fa8d457b6f",
+ "reference": "3a160355bb1364da55ed9e415c1aa1fa8d457b6f",
"shasum": ""
},
"require": {
@@ -1131,29 +1201,36 @@
"configuration",
"distribution"
],
- "time": "2015-12-18 17:44:11"
+ "time": "2016-03-15 16:21:41"
},
{
"name": "sensio/framework-extra-bundle",
- "version": "v3.0.12",
+ "version": "v3.0.15",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git",
- "reference": "3e8936fe13aa4086644977d334d8fcd275f50357"
+ "reference": "40431d338da7ab4ef5f9edc1ba4551ea1d4d0782"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/3e8936fe13aa4086644977d334d8fcd275f50357",
- "reference": "3e8936fe13aa4086644977d334d8fcd275f50357",
+ "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/40431d338da7ab4ef5f9edc1ba4551ea1d4d0782",
+ "reference": "40431d338da7ab4ef5f9edc1ba4551ea1d4d0782",
"shasum": ""
},
"require": {
"doctrine/common": "~2.2",
+ "symfony/dependency-injection": "~2.3|~3.0",
"symfony/framework-bundle": "~2.3|~3.0"
},
"require-dev": {
+ "symfony/browser-kit": "~2.3|~3.0",
+ "symfony/dom-crawler": "~2.3|~3.0",
"symfony/expression-language": "~2.4|~3.0",
- "symfony/security-bundle": "~2.4|~3.0"
+ "symfony/finder": "~2.3|~3.0",
+ "symfony/phpunit-bridge": "~2.7|~3.0",
+ "symfony/security-bundle": "~2.4|~3.0",
+ "symfony/twig-bundle": "~2.3|~3.0",
+ "twig/twig": "~1.11|~2.0"
},
"suggest": {
"symfony/expression-language": "",
@@ -1186,7 +1263,7 @@
"annotations",
"controllers"
],
- "time": "2015-12-18 17:39:27"
+ "time": "2016-03-22 12:39:08"
},
{
"name": "sensiolabs/security-checker",
@@ -1287,20 +1364,20 @@
},
{
"name": "symfony/monolog-bundle",
- "version": "v2.8.2",
+ "version": "v2.10.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/monolog-bundle.git",
- "reference": "84785c4d44801c4dd82829fa2e1820cacfe2c46f"
+ "reference": "82fd8f36e2cccbe94faf237403c48052d4d4b77e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/84785c4d44801c4dd82829fa2e1820cacfe2c46f",
- "reference": "84785c4d44801c4dd82829fa2e1820cacfe2c46f",
+ "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/82fd8f36e2cccbe94faf237403c48052d4d4b77e",
+ "reference": "82fd8f36e2cccbe94faf237403c48052d4d4b77e",
"shasum": ""
},
"require": {
- "monolog/monolog": "~1.8",
+ "monolog/monolog": "~1.12",
"php": ">=5.3.2",
"symfony/config": "~2.3|~3.0",
"symfony/dependency-injection": "~2.3|~3.0",
@@ -1308,13 +1385,14 @@
"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"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "2.8.x-dev"
+ "dev-master": "2.9.x-dev"
}
},
"autoload": {
@@ -1342,82 +1420,29 @@
"log",
"logging"
],
- "time": "2015-11-17 10:02:29"
- },
- {
- "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": {
@@ -1453,11 +1478,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",
@@ -1516,7 +1541,7 @@
},
{
"name": "symfony/polyfill-php56",
- "version": "v1.1.0",
+ "version": "v1.1.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php56.git",
@@ -1572,16 +1597,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": {
@@ -1627,11 +1652,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",
@@ -1740,16 +1765,16 @@
},
{
"name": "symfony/symfony",
- "version": "dev-master",
+ "version": "dev-action",
"source": {
"type": "git",
- "url": "https://github.com/symfony/symfony.git",
- "reference": "36c2961def4c5df511abe2a64b5d58e62a3a932c"
+ "url": "https://github.com/dunglas/symfony.git",
+ "reference": "f8a895a48e3cf0ddc68d3dc4846b2f1e2984b7c9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/symfony/zipball/36c2961def4c5df511abe2a64b5d58e62a3a932c",
- "reference": "36c2961def4c5df511abe2a64b5d58e62a3a932c",
+ "url": "https://api.github.com/repos/dunglas/symfony/zipball/f8a895a48e3cf0ddc68d3dc4846b2f1e2984b7c9",
+ "reference": "f8a895a48e3cf0ddc68d3dc4846b2f1e2984b7c9",
"shasum": ""
},
"require": {
@@ -1757,7 +1782,6 @@
"php": ">=5.5.9",
"psr/cache": "~1.0",
"psr/log": "~1.0",
- "symfony/polyfill-apcu": "~1.0,>=1.0.2",
"symfony/polyfill-intl-icu": "~1.0",
"symfony/polyfill-mbstring": "~1.0",
"symfony/polyfill-php56": "~1.0",
@@ -1766,7 +1790,7 @@
"twig/twig": "~1.23|~2.0"
},
"conflict": {
- "phpdocumentor/reflection": "<1.0.7"
+ "phpdocumentor/reflection-docblock": "<3.0"
},
"replace": {
"symfony/asset": "self.version",
@@ -1816,7 +1840,7 @@
"symfony/yaml": "self.version"
},
"require-dev": {
- "cache/integration-tests": "^0.6",
+ "cache/integration-tests": "dev-master",
"doctrine/cache": "~1.6",
"doctrine/data-fixtures": "1.0.*",
"doctrine/dbal": "~2.4",
@@ -1824,8 +1848,9 @@
"doctrine/orm": "~2.4,>=2.4.5",
"egulias/email-validator": "~1.2",
"monolog/monolog": "~1.11",
- "ocramius/proxy-manager": "~0.4|~1.0",
- "phpdocumentor/reflection": "^1.0.7",
+ "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"
},
"type": "library",
@@ -1850,7 +1875,6 @@
"**/Tests/"
]
},
- "notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
@@ -1869,20 +1893,23 @@
"keywords": [
"framework"
],
- "time": "2016-01-25 08:16:45"
+ "support": {
+ "source": "https://github.com/dunglas/symfony/tree/action"
+ },
+ "time": "2016-03-21 07:28:59"
},
{
"name": "twig/twig",
- "version": "v1.23.3",
+ "version": "v1.24.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "ae53fc2c312fdee63773b75cb570304f85388b08"
+ "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/ae53fc2c312fdee63773b75cb570304f85388b08",
- "reference": "ae53fc2c312fdee63773b75cb570304f85388b08",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8",
+ "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8",
"shasum": ""
},
"require": {
@@ -1895,7 +1922,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.23-dev"
+ "dev-master": "1.24-dev"
}
},
"autoload": {
@@ -1930,22 +1957,22 @@
"keywords": [
"templating"
],
- "time": "2016-01-11 14:02:19"
+ "time": "2016-01-25 21:22:18"
}
],
"packages-dev": [
{
"name": "sensio/generator-bundle",
- "version": "v3.0.5",
+ "version": "v3.0.6",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/SensioGeneratorBundle.git",
- "reference": "5274eafa251359087230bade2ff35dd6cec2e530"
+ "reference": "ac91535054d025937d897d78ebb5fc2da5e955a4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/5274eafa251359087230bade2ff35dd6cec2e530",
- "reference": "5274eafa251359087230bade2ff35dd6cec2e530",
+ "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/ac91535054d025937d897d78ebb5fc2da5e955a4",
+ "reference": "ac91535054d025937d897d78ebb5fc2da5e955a4",
"shasum": ""
},
"require": {
@@ -1984,24 +2011,24 @@
}
],
"description": "This bundle generates code for you",
- "time": "2016-01-05 16:30:36"
+ "time": "2016-02-26 04:36:01"
},
{
"name": "symfony/phpunit-bridge",
- "version": "v2.8.2",
+ "version": "v3.0.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git",
- "reference": "855dc0e829fad123966347612b4183e307338c11"
+ "reference": "4580ae86cde5497d38fc971192cd2c37e546eb4f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/855dc0e829fad123966347612b4183e307338c11",
- "reference": "855dc0e829fad123966347612b4183e307338c11",
+ "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/4580ae86cde5497d38fc971192cd2c37e546eb4f",
+ "reference": "4580ae86cde5497d38fc971192cd2c37e546eb4f",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.5.9"
},
"suggest": {
"symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
@@ -2009,7 +2036,7 @@
"type": "symfony-bridge",
"extra": {
"branch-alias": {
- "dev-master": "2.8-dev"
+ "dev-master": "3.0-dev"
}
},
"autoload": {
@@ -2039,13 +2066,21 @@
],
"description": "Symfony PHPUnit Bridge",
"homepage": "https://symfony.com",
- "time": "2016-01-06 09:59:23"
+ "time": "2016-01-21 09:38:31"
+ }
+ ],
+ "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
+ "symfony/symfony": 20,
+ "dunglas/action-bundle": 20
},
"prefer-stable": false,
"prefer-lowest": false,
diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php
index 5d4bb7e857..e1de31f1e5 100644
--- a/src/AppBundle/Controller/DefaultController.php
+++ b/src/AppBundle/Controller/DefaultController.php
@@ -2,20 +2,35 @@
namespace AppBundle\Controller;
+use AppBundle\MyService;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\ControllerTrait;
+use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
-class DefaultController extends Controller
+class DefaultController
{
+ use ControllerTrait;
+
+ private $myService;
+ private $container;
+
+ public function __construct(MyService $myService, ContainerInterface $container) // to be removed, just to show advantages of this system
+ {
+ $this->myService = $myService;
+ $this->container = $container;
+ }
+
/**
* @Route("/", name="homepage")
*/
public function indexAction(Request $request)
{
+ $this->myService->sayHello($request->query->get('name', 'Kévin'));
+
// replace this example code with whatever you need
return $this->render('default/index.html.twig', [
- 'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..'),
+ 'base_dir' => realpath($this->container->getParameter('kernel.root_dir').'/..'),
]);
}
}
diff --git a/src/AppBundle/MyService.php b/src/AppBundle/MyService.php
new file mode 100644
index 0000000000..ecfd908c48
--- /dev/null
+++ b/src/AppBundle/MyService.php
@@ -0,0 +1,23 @@
+logger = $logger;
+ }
+
+ public function sayHello($name)
+ {
+ $this->logger->info('Hello {name}', array('name' => $name));
+ }
+}
diff --git a/var/SymfonyRequirements.php b/var/SymfonyRequirements.php
index 28b0dcdbfc..841338f443 100644
--- a/var/SymfonyRequirements.php
+++ b/var/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;'),