diff --git a/app/AppKernel.php b/app/AppKernel.php index 3789b326e0..8b6b6906d3 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -23,6 +23,10 @@ public function registerBundles() $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle(); + + if ('dev' === $this->getEnvironment()) { + $bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle(); + } } return $bundles; diff --git a/composer.lock b/composer.lock index 5a9bcd66b8..9e493a684b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "e8806838d7235c3d2ab386293836949f", + "content-hash": "dbdc24fc713f6a6da88dcdff23201f1b", "packages": [ { "name": "doctrine/annotations", @@ -700,22 +700,22 @@ }, { "name": "doctrine/orm", - "version": "v2.5.5", + "version": "v2.5.6", "source": { "type": "git", "url": "https://github.com/doctrine/doctrine2.git", - "reference": "73e4be7c7b3ba26f96b781a40b33feba4dfa6d45" + "reference": "e6c434196c8ef058239aaa0724b4aadb0107940b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/73e4be7c7b3ba26f96b781a40b33feba4dfa6d45", - "reference": "73e4be7c7b3ba26f96b781a40b33feba4dfa6d45", + "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/e6c434196c8ef058239aaa0724b4aadb0107940b", + "reference": "e6c434196c8ef058239aaa0724b4aadb0107940b", "shasum": "" }, "require": { "doctrine/cache": "~1.4", "doctrine/collections": "~1.2", - "doctrine/common": ">=2.5-dev,<2.7-dev", + "doctrine/common": ">=2.5-dev,<2.8-dev", "doctrine/dbal": ">=2.5-dev,<2.6-dev", "doctrine/instantiator": "~1.0.1", "ext-pdo": "*", @@ -772,7 +772,7 @@ "database", "orm" ], - "time": "2016-09-10T18:51:13+00:00" + "time": "2016-12-18T15:42:34+00:00" }, { "name": "incenteev/composer-parameter-handler", @@ -1096,16 +1096,16 @@ }, { "name": "sensio/distribution-bundle", - "version": "v5.0.15", + "version": "v5.0.17", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "d294b0665cf09c799e9c1993d5c776a5bf55cb85" + "reference": "4e98a1a6d3935d05414bd11e421a2047c93619f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/d294b0665cf09c799e9c1993d5c776a5bf55cb85", - "reference": "d294b0665cf09c799e9c1993d5c776a5bf55cb85", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/4e98a1a6d3935d05414bd11e421a2047c93619f7", + "reference": "4e98a1a6d3935d05414bd11e421a2047c93619f7", "shasum": "" }, "require": { @@ -1144,20 +1144,20 @@ "configuration", "distribution" ], - "time": "2016-12-06T07:29:27+00:00" + "time": "2017-01-04T13:35:35+00:00" }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.16", + "version": "v3.0.18", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "507a15f56fa7699f6cc8c2c7de4080b19ce22546" + "reference": "c38bc608e12e81089d5d9dfbf72775ed553c61af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/507a15f56fa7699f6cc8c2c7de4080b19ce22546", - "reference": "507a15f56fa7699f6cc8c2c7de4080b19ce22546", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/c38bc608e12e81089d5d9dfbf72775ed553c61af", + "reference": "c38bc608e12e81089d5d9dfbf72775ed553c61af", "shasum": "" }, "require": { @@ -1166,14 +1166,20 @@ "symfony/framework-bundle": "~2.3|~3.0" }, "require-dev": { + "symfony/asset": "~2.7|~3.0", "symfony/browser-kit": "~2.3|~3.0", "symfony/dom-crawler": "~2.3|~3.0", "symfony/expression-language": "~2.4|~3.0", "symfony/finder": "~2.3|~3.0", - "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/phpunit-bridge": "~3.2", + "symfony/psr-http-message-bridge": "^0.3", "symfony/security-bundle": "~2.4|~3.0", + "symfony/templating": "~2.3|~3.0", + "symfony/translation": "~2.3|~3.0", "symfony/twig-bundle": "~2.3|~3.0", - "twig/twig": "~1.11|~2.0" + "symfony/yaml": "~2.3|~3.0", + "twig/twig": "~1.11|~2.0", + "zendframework/zend-diactoros": "^1.3" }, "suggest": { "symfony/expression-language": "", @@ -1206,7 +1212,7 @@ "annotations", "controllers" ], - "time": "2016-03-25T17:08:27+00:00" + "time": "2016-12-14T08:30:06+00:00" }, { "name": "sensiolabs/security-checker", @@ -1254,23 +1260,24 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v5.4.4", + "version": "v5.4.5", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "545ce9136690cea74f98f86fbb9c92dd9ab1a756" + "reference": "cd142238a339459b10da3d8234220963f392540c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/545ce9136690cea74f98f86fbb9c92dd9ab1a756", - "reference": "545ce9136690cea74f98f86fbb9c92dd9ab1a756", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/cd142238a339459b10da3d8234220963f392540c", + "reference": "cd142238a339459b10da3d8234220963f392540c", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "mockery/mockery": "~0.9.1" + "mockery/mockery": "~0.9.1", + "symfony/phpunit-bridge": "~3.2" }, "type": "library", "extra": { @@ -1303,24 +1310,24 @@ "mail", "mailer" ], - "time": "2016-11-24T01:01:23+00:00" + "time": "2016-12-29T10:02:40+00:00" }, { "name": "symfony/monolog-bundle", - "version": "3.0.1", + "version": "v3.0.2", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bundle.git", - "reference": "5f2d2d62530cd66be361216107869a3b061045db" + "reference": "804425dfceec0097bf3e5dea3a73d91e055686be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/5f2d2d62530cd66be361216107869a3b061045db", - "reference": "5f2d2d62530cd66be361216107869a3b061045db", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/804425dfceec0097bf3e5dea3a73d91e055686be", + "reference": "804425dfceec0097bf3e5dea3a73d91e055686be", "shasum": "" }, "require": { - "monolog/monolog": "~1.18", + "monolog/monolog": "~1.22", "php": ">=5.3.2", "symfony/config": "~2.7|~3.0", "symfony/dependency-injection": "~2.7|~3.0", @@ -1363,7 +1370,7 @@ "log", "logging" ], - "time": "2016-11-15T15:54:07+00:00" + "time": "2017-01-03T12:32:45+00:00" }, { "name": "symfony/polyfill-apcu", @@ -1704,16 +1711,16 @@ }, { "name": "symfony/swiftmailer-bundle", - "version": "v2.4.0", + "version": "v2.4.2", "source": { "type": "git", "url": "https://github.com/symfony/swiftmailer-bundle.git", - "reference": "d7b7bd6bb6e9b32ebc5f9778f94d4b4e4af5d069" + "reference": "ad751095576ce0c12a284e30e3fff80c91f27225" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/d7b7bd6bb6e9b32ebc5f9778f94d4b4e4af5d069", - "reference": "d7b7bd6bb6e9b32ebc5f9778f94d4b4e4af5d069", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/ad751095576ce0c12a284e30e3fff80c91f27225", + "reference": "ad751095576ce0c12a284e30e3fff80c91f27225", "shasum": "" }, "require": { @@ -1759,20 +1766,20 @@ ], "description": "Symfony SwiftmailerBundle", "homepage": "http://symfony.com", - "time": "2016-10-27T17:59:30+00:00" + "time": "2016-12-20T04:44:33+00:00" }, { "name": "symfony/symfony", - "version": "v3.2.1", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "5824d423678a0cc44f3eb46efc246aecd1836dd7" + "reference": "6f6100a8e170fafffb47f573a2709dd5368ffa5f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/5824d423678a0cc44f3eb46efc246aecd1836dd7", - "reference": "5824d423678a0cc44f3eb46efc246aecd1836dd7", + "url": "https://api.github.com/repos/symfony/symfony/zipball/6f6100a8e170fafffb47f573a2709dd5368ffa5f", + "reference": "6f6100a8e170fafffb47f573a2709dd5368ffa5f", "shasum": "" }, "require": { @@ -1840,6 +1847,7 @@ "symfony/validator": "self.version", "symfony/var-dumper": "self.version", "symfony/web-profiler-bundle": "self.version", + "symfony/web-server-bundle": "self.version", "symfony/workflow": "self.version", "symfony/yaml": "self.version" }, @@ -1862,7 +1870,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1901,20 +1909,20 @@ "keywords": [ "framework" ], - "time": "2016-12-13T13:20:15+00:00" + "time": "2017-01-06 15:23:52" }, { "name": "twig/twig", - "version": "v1.28.2", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "b22ce0eb070e41f7cba65d78fe216de29726459c" + "reference": "c6ff71094fde15d12398eaba029434b013dc5e59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/b22ce0eb070e41f7cba65d78fe216de29726459c", - "reference": "b22ce0eb070e41f7cba65d78fe216de29726459c", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/c6ff71094fde15d12398eaba029434b013dc5e59", + "reference": "c6ff71094fde15d12398eaba029434b013dc5e59", "shasum": "" }, "require": { @@ -1927,7 +1935,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.28-dev" + "dev-master": "1.30-dev" } }, "autoload": { @@ -1962,7 +1970,7 @@ "keywords": [ "templating" ], - "time": "2016-11-23T18:41:40+00:00" + "time": "2016-12-23T11:06:22+00:00" } ], "packages-dev": [ @@ -2079,7 +2087,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "symfony/symfony": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/var/SymfonyRequirements.php b/var/SymfonyRequirements.php index 7e7723af31..7e7a99de92 100644 --- a/var/SymfonyRequirements.php +++ b/var/SymfonyRequirements.php @@ -780,7 +780,11 @@ protected function getRealpathCacheSize() { $size = ini_get('realpath_cache_size'); $size = trim($size); - $unit = strtolower(substr($size, -1, 1)); + $unit = ''; + if (!ctype_digit($size)) { + $unit = strtolower(substr($size, -1, 1)); + $size = (int) substr($size, 0, -1); + } switch ($unit) { case 'g': return $size * 1024 * 1024 * 1024;