From 7ad6b75248c7cbe646d62c52f67d835420902dcf Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 18 Feb 2015 11:24:55 +0100 Subject: [PATCH 01/98] updated composer.lock --- composer.lock | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/composer.lock b/composer.lock index 2c608b1e11..9ca2fbf457 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "44526f16f4abfd18c8a026236c003aa8", + "hash": "31f9aa8adcbc1c8ea7a274560bd1e8d1", "packages": [ { "name": "doctrine/annotations", @@ -1384,25 +1384,26 @@ }, { "name": "symfony/symfony", - "version": "v2.6.4", + "version": "2.7.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "23b647f1e4eeb24a457d3c47f5f5046377d5a3bf" + "reference": "a630d87d5765f63571c7948bab253e18d1a9a194" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/23b647f1e4eeb24a457d3c47f5f5046377d5a3bf", - "reference": "23b647f1e4eeb24a457d3c47f5f5046377d5a3bf", + "url": "https://api.github.com/repos/symfony/symfony/zipball/a630d87d5765f63571c7948bab253e18d1a9a194", + "reference": "a630d87d5765f63571c7948bab253e18d1a9a194", "shasum": "" }, "require": { "doctrine/common": "~2.3", - "php": ">=5.3.3", + "php": ">=5.3.9", "psr/log": "~1.0", - "twig/twig": "~1.12,>=1.12.3" + "twig/twig": "~1.18" }, "replace": { + "symfony/asset": "self.version", "symfony/browser-kit": "self.version", "symfony/class-loader": "self.version", "symfony/config": "self.version", @@ -1426,7 +1427,6 @@ "symfony/monolog-bridge": "self.version", "symfony/options-resolver": "self.version", "symfony/process": "self.version", - "symfony/propel1-bridge": "self.version", "symfony/property-access": "self.version", "symfony/proxy-manager-bridge": "self.version", "symfony/routing": "self.version", @@ -1462,7 +1462,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" } }, "autoload": { @@ -1496,7 +1496,7 @@ "keywords": [ "framework" ], - "time": "2015-02-02 18:02:30" + "time": "2015-02-17 11:55:01" }, { "name": "twig/extensions", @@ -1611,17 +1611,17 @@ "packages-dev": [ { "name": "sensio/generator-bundle", - "version": "v2.5.1", + "version": "v2.5.2", "target-dir": "Sensio/Bundle/GeneratorBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", - "reference": "9e23fc3de265ae013690d84aab98e7a84f46edcd" + "reference": "4b09746520a826a7bf34a466ba31c7d8740fef7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/9e23fc3de265ae013690d84aab98e7a84f46edcd", - "reference": "9e23fc3de265ae013690d84aab98e7a84f46edcd", + "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/4b09746520a826a7bf34a466ba31c7d8740fef7e", + "reference": "4b09746520a826a7bf34a466ba31c7d8740fef7e", "shasum": "" }, "require": { @@ -1655,12 +1655,14 @@ } ], "description": "This bundle generates code for you", - "time": "2015-01-13 07:33:46" + "time": "2015-02-11 07:21:23" } ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "symfony/symfony": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { From 9d15be061df640703d9bb1fc6e27483820532d73 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 2 Mar 2015 13:26:14 +0100 Subject: [PATCH 02/98] updated deps --- composer.json | 2 +- composer.lock | 30 ++++++++++++++---------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/composer.json b/composer.json index 8da1d998d6..5d5968be52 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "symfony/symfony": "2.7.x-dev", "doctrine/orm": "~2.2,>=2.2.3,<2.5", "doctrine/dbal": "<2.5", - "doctrine/doctrine-bundle": "~1.2", + "doctrine/doctrine-bundle": "~1.4", "twig/extensions": "~1.0", "symfony/assetic-bundle": "~2.3", "symfony/swiftmailer-bundle": "~2.3", diff --git a/composer.lock b/composer.lock index 471285d40d..a6013e9b90 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "6ce9f81a7e9fecae63bf90c527f103f2", + "hash": "73f15ad91f600008506b4294b7b7d01c", "packages": [ { "name": "doctrine/annotations", @@ -355,16 +355,16 @@ }, { "name": "doctrine/doctrine-bundle", - "version": "v1.3.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "3beb3a780485ab01f86941f4892cd23ef8c39c6b" + "reference": "1986ff3a945b584c6505d07eae92d77e41131078" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/3beb3a780485ab01f86941f4892cd23ef8c39c6b", - "reference": "3beb3a780485ab01f86941f4892cd23ef8c39c6b", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/1986ff3a945b584c6505d07eae92d77e41131078", + "reference": "1986ff3a945b584c6505d07eae92d77e41131078", "shasum": "" }, "require": { @@ -373,17 +373,15 @@ "jdorn/sql-formatter": "~1.1", "php": ">=5.3.2", "symfony/doctrine-bridge": "~2.2", - "symfony/framework-bundle": "~2.2" + "symfony/framework-bundle": "~2.3" }, "require-dev": { "doctrine/orm": "~2.3", - "phpunit/php-code-coverage": "~1.2", - "phpunit/phpunit": "~3.7", - "phpunit/phpunit-mock-objects": "~1.2", + "phpunit/phpunit": "~4", "satooshi/php-coveralls": "~0.6.1", "symfony/validator": "~2.2", "symfony/yaml": "~2.2", - "twig/twig": "~1" + "twig/twig": "~1.10" }, "suggest": { "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.", @@ -392,7 +390,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "1.4.x-dev" } }, "autoload": { @@ -430,7 +428,7 @@ "orm", "persistence" ], - "time": "2014-11-28 08:32:03" + "time": "2015-02-28 11:04:45" }, { "name": "doctrine/doctrine-cache-bundle", @@ -1395,12 +1393,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "2b036ecbb547afcaf4a785448638b2f7f97658fc" + "reference": "755ea09a440c1b8ea560e403b442fc9f53e0ae93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/2b036ecbb547afcaf4a785448638b2f7f97658fc", - "reference": "2b036ecbb547afcaf4a785448638b2f7f97658fc", + "url": "https://api.github.com/repos/symfony/symfony/zipball/755ea09a440c1b8ea560e403b442fc9f53e0ae93", + "reference": "755ea09a440c1b8ea560e403b442fc9f53e0ae93", "shasum": "" }, "require": { @@ -1504,7 +1502,7 @@ "keywords": [ "framework" ], - "time": "2015-02-25 12:51:44" + "time": "2015-03-02 10:21:01" }, { "name": "twig/extensions", From bc9215b54305defbc7dbe761e7ee59d7dd529e76 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 17 Mar 2015 15:47:58 +0100 Subject: [PATCH 03/98] updated VENDORS for 2.3.26 --- composer.lock | 68 +++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/composer.lock b/composer.lock index 26a4a1af9c..f8030d3d09 100644 --- a/composer.lock +++ b/composer.lock @@ -355,16 +355,16 @@ }, { "name": "doctrine/doctrine-bundle", - "version": "v1.3.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "3beb3a780485ab01f86941f4892cd23ef8c39c6b" + "reference": "1986ff3a945b584c6505d07eae92d77e41131078" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/3beb3a780485ab01f86941f4892cd23ef8c39c6b", - "reference": "3beb3a780485ab01f86941f4892cd23ef8c39c6b", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/1986ff3a945b584c6505d07eae92d77e41131078", + "reference": "1986ff3a945b584c6505d07eae92d77e41131078", "shasum": "" }, "require": { @@ -373,17 +373,15 @@ "jdorn/sql-formatter": "~1.1", "php": ">=5.3.2", "symfony/doctrine-bridge": "~2.2", - "symfony/framework-bundle": "~2.2" + "symfony/framework-bundle": "~2.3" }, "require-dev": { "doctrine/orm": "~2.3", - "phpunit/php-code-coverage": "~1.2", - "phpunit/phpunit": "~3.7", - "phpunit/phpunit-mock-objects": "~1.2", + "phpunit/phpunit": "~4", "satooshi/php-coveralls": "~0.6.1", "symfony/validator": "~2.2", "symfony/yaml": "~2.2", - "twig/twig": "~1" + "twig/twig": "~1.10" }, "suggest": { "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.", @@ -392,7 +390,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "1.4.x-dev" } }, "autoload": { @@ -430,7 +428,7 @@ "orm", "persistence" ], - "time": "2014-11-28 08:32:03" + "time": "2015-02-28 11:04:45" }, { "name": "doctrine/doctrine-cache-bundle", @@ -888,16 +886,16 @@ }, { "name": "monolog/monolog", - "version": "1.12.0", + "version": "1.13.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f" + "reference": "c31a2c4e8db5da8b46c74cf275d7f109c0f249ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1fbe8c2641f2b163addf49cc5e18f144bec6b19f", - "reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c31a2c4e8db5da8b46c74cf275d7f109c0f249ac", + "reference": "c31a2c4e8db5da8b46c74cf275d7f109c0f249ac", "shasum": "" }, "require": { @@ -914,6 +912,7 @@ "phpunit/phpunit": "~4.0", "raven/raven": "~0.5", "ruflin/elastica": "0.90.*", + "swiftmailer/swiftmailer": "~5.3", "videlalvaro/php-amqplib": "~2.4" }, "suggest": { @@ -930,7 +929,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12.x-dev" + "dev-master": "1.13.x-dev" } }, "autoload": { @@ -956,7 +955,7 @@ "logging", "psr-3" ], - "time": "2014-12-29 21:29:35" + "time": "2015-03-09 09:58:04" }, { "name": "psr/log", @@ -1044,17 +1043,17 @@ }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.4", + "version": "v3.0.5", "target-dir": "Sensio/Bundle/FrameworkExtraBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "b3bc3e67c8b6b68b18d727012183520d35ee762a" + "reference": "a72ce75a73d86c3593eceed5650b58fd3807a0cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/b3bc3e67c8b6b68b18d727012183520d35ee762a", - "reference": "b3bc3e67c8b6b68b18d727012183520d35ee762a", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/a72ce75a73d86c3593eceed5650b58fd3807a0cf", + "reference": "a72ce75a73d86c3593eceed5650b58fd3807a0cf", "shasum": "" }, "require": { @@ -1095,7 +1094,7 @@ "annotations", "controllers" ], - "time": "2014-12-02 09:52:52" + "time": "2015-02-05 07:39:23" }, { "name": "sensio/generator-bundle", @@ -1147,16 +1146,16 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v5.3.1", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "c5f963e7f9d6f6438fda4f22d5cc2db296ec621a" + "reference": "31454f258f10329ae7c48763eb898a75c39e0a9f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/c5f963e7f9d6f6438fda4f22d5cc2db296ec621a", - "reference": "c5f963e7f9d6f6438fda4f22d5cc2db296ec621a", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/31454f258f10329ae7c48763eb898a75c39e0a9f", + "reference": "31454f258f10329ae7c48763eb898a75c39e0a9f", "shasum": "" }, "require": { @@ -1168,7 +1167,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.3-dev" + "dev-master": "5.4-dev" } }, "autoload": { @@ -1195,7 +1194,7 @@ "mail", "mailer" ], - "time": "2014-12-05 14:17:14" + "time": "2015-03-14 06:06:39" }, { "name": "symfony/assetic-bundle", @@ -1380,16 +1379,16 @@ }, { "name": "symfony/symfony", - "version": "v2.3.25", + "version": "v2.3.26", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "959733dc4b1da99b9e93a1762f4217eee20fc933" + "reference": "dd70065d94468de18b722ec692fc3c34e87fd863" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/959733dc4b1da99b9e93a1762f4217eee20fc933", - "reference": "959733dc4b1da99b9e93a1762f4217eee20fc933", + "url": "https://api.github.com/repos/symfony/symfony/zipball/dd70065d94468de18b722ec692fc3c34e87fd863", + "reference": "dd70065d94468de18b722ec692fc3c34e87fd863", "shasum": "" }, "require": { @@ -1444,7 +1443,8 @@ "ircmaxell/password-compat": "~1.0", "monolog/monolog": "~1.3", "ocramius/proxy-manager": "~0.3.1", - "propel/propel1": "~1.6" + "propel/propel1": "~1.6", + "symfony/phpunit-bridge": "~2.7" }, "type": "library", "extra": { @@ -1483,7 +1483,7 @@ "keywords": [ "framework" ], - "time": "2015-01-30 13:55:40" + "time": "2015-03-17 14:18:00" }, { "name": "twig/extensions", From 3c7e796e96026fe4600b948e963ca7b99eedde2d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 1 Apr 2015 17:17:53 +0200 Subject: [PATCH 04/98] updated VENDORS for 2.3.27 --- app/SymfonyRequirements.php | 46 ++++++++++++++++++------------------- composer.lock | 30 ++++++++++++------------ 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index 0f8999622c..1854856b8a 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -77,7 +77,7 @@ public function getTestMessage() } /** - * Returns the help text for resolving the problem + * Returns the help text for resolving the problem. * * @return string The help text */ @@ -119,14 +119,14 @@ class PhpIniRequirement extends Requirement * * @param string $cfgName The configuration name used for ini_get() * @param Boolean|callback $evaluation Either a Boolean indicating whether the configuration should evaluate to true or false, - or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement - * @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false. - This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin. - Example: You require a config to be true but PHP later removes this config and defaults it to true internally. - * @param string|null $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived) - * @param string|null $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived) - * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) - * @param Boolean $optional Whether this is only an optional recommendation not a mandatory requirement + * or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement + * @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false. + * This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin. + * Example: You require a config to be true but PHP later removes this config and defaults it to true internally. + * @param string|null $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived) + * @param string|null $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived) + * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) + * @param Boolean $optional Whether this is only an optional recommendation not a mandatory requirement */ public function __construct($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null, $optional = false) { @@ -221,13 +221,13 @@ public function addRecommendation($fulfilled, $testMessage, $helpHtml, $helpText * * @param string $cfgName The configuration name used for ini_get() * @param Boolean|callback $evaluation Either a Boolean indicating whether the configuration should evaluate to true or false, - or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement - * @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false. - This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin. - Example: You require a config to be true but PHP later removes this config and defaults it to true internally. - * @param string $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived) - * @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived) - * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) + * or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement + * @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false. + * This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin. + * Example: You require a config to be true but PHP later removes this config and defaults it to true internally. + * @param string $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived) + * @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived) + * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) */ public function addPhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null) { @@ -239,13 +239,13 @@ public function addPhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence = * * @param string $cfgName The configuration name used for ini_get() * @param Boolean|callback $evaluation Either a Boolean indicating whether the configuration should evaluate to true or false, - or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement - * @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false. - This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin. - Example: You require a config to be true but PHP later removes this config and defaults it to true internally. - * @param string $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived) - * @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived) - * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) + * or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement + * @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false. + * This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin. + * Example: You require a config to be true but PHP later removes this config and defaults it to true internally. + * @param string $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived) + * @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived) + * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) */ public function addPhpIniRecommendation($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null) { diff --git a/composer.lock b/composer.lock index f8030d3d09..cc9711d2e0 100644 --- a/composer.lock +++ b/composer.lock @@ -997,17 +997,17 @@ }, { "name": "sensio/distribution-bundle", - "version": "v2.3.11", + "version": "v2.3.13", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "374bbea795fa69a85b1623048798a89aebffe62b" + "reference": "c344892aa9f09f0005b395d79ad2531a7deaedc9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/374bbea795fa69a85b1623048798a89aebffe62b", - "reference": "374bbea795fa69a85b1623048798a89aebffe62b", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/c344892aa9f09f0005b395d79ad2531a7deaedc9", + "reference": "c344892aa9f09f0005b395d79ad2531a7deaedc9", "shasum": "" }, "require": { @@ -1039,21 +1039,21 @@ "configuration", "distribution" ], - "time": "2015-02-27 12:58:18" + "time": "2015-03-26 11:09:17" }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.5", + "version": "v3.0.6", "target-dir": "Sensio/Bundle/FrameworkExtraBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "a72ce75a73d86c3593eceed5650b58fd3807a0cf" + "reference": "1c3ed356bd1ff67cd71806efbb71511644035c85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/a72ce75a73d86c3593eceed5650b58fd3807a0cf", - "reference": "a72ce75a73d86c3593eceed5650b58fd3807a0cf", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/1c3ed356bd1ff67cd71806efbb71511644035c85", + "reference": "1c3ed356bd1ff67cd71806efbb71511644035c85", "shasum": "" }, "require": { @@ -1094,7 +1094,7 @@ "annotations", "controllers" ], - "time": "2015-02-05 07:39:23" + "time": "2015-03-24 15:12:07" }, { "name": "sensio/generator-bundle", @@ -1379,16 +1379,16 @@ }, { "name": "symfony/symfony", - "version": "v2.3.26", + "version": "v2.3.27", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "dd70065d94468de18b722ec692fc3c34e87fd863" + "reference": "ce4aab1508dd9642906fc9a120e0d8763e689896" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/dd70065d94468de18b722ec692fc3c34e87fd863", - "reference": "dd70065d94468de18b722ec692fc3c34e87fd863", + "url": "https://api.github.com/repos/symfony/symfony/zipball/ce4aab1508dd9642906fc9a120e0d8763e689896", + "reference": "ce4aab1508dd9642906fc9a120e0d8763e689896", "shasum": "" }, "require": { @@ -1483,7 +1483,7 @@ "keywords": [ "framework" ], - "time": "2015-03-17 14:18:00" + "time": "2015-04-01 14:28:26" }, { "name": "twig/extensions", From 8b84461b7aa99c5385a5ea9ec4d092b94ba7b0b6 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Thu, 2 Apr 2015 09:58:03 -0400 Subject: [PATCH 05/98] It's common to need the request, which you get from type-hinting. Adding the use helps to remove a step for users in the future --- src/AppBundle/Controller/DefaultController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php index 541a768838..8569811ee0 100644 --- a/src/AppBundle/Controller/DefaultController.php +++ b/src/AppBundle/Controller/DefaultController.php @@ -4,6 +4,7 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpFoundation\Request; class DefaultController extends Controller { From f0f95828a7fa2cabf784a367584394475f6a73f6 Mon Sep 17 00:00:00 2001 From: Gerry Vandermaesen Date: Fri, 23 Jan 2015 15:43:09 +0100 Subject: [PATCH 06/98] Move %locale% to config.yml --- app/config/config.yml | 7 ++++++- app/config/parameters.yml.dist | 5 ++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index bf4da51352..9036726177 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -3,6 +3,11 @@ imports: - { resource: security.yml } - { resource: services.yml } +# Put parameters here that don't need to change on each machine where the app is deployed +# http://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration +parameters: + locale: en + framework: #esi: ~ #translator: { fallbacks: ["%locale%"] } @@ -46,7 +51,7 @@ assetic: # Doctrine Configuration doctrine: dbal: - driver: "%database_driver%" + driver: pdo_mysql host: "%database_host%" port: "%database_port%" dbname: "%database_name%" diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 1da778f412..886c92bb8c 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -1,6 +1,7 @@ # This file is a "template" of what your parameters.yml file should look like +# Set parameters here that may be different on each deployment target of the app, e.g. development, staging, production. +# http://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration parameters: - database_driver: pdo_mysql database_host: 127.0.0.1 database_port: ~ database_name: symfony @@ -14,7 +15,5 @@ parameters: mailer_user: ~ mailer_password: ~ - locale: en - # A secret key that's used to generate certain security-related tokens secret: ThisTokenIsNotSoSecretChangeIt From 9e1f2f1425e25be0eb0f03c652f62f1e069e113d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 10 Apr 2015 10:57:23 +0200 Subject: [PATCH 07/98] updated version to 2.8 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 5d5968be52..babdf50298 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ }, "require": { "php": ">=5.3.3", - "symfony/symfony": "2.7.x-dev", + "symfony/symfony": "2.8.x-dev", "doctrine/orm": "~2.2,>=2.2.3,<2.5", "doctrine/dbal": "<2.5", "doctrine/doctrine-bundle": "~1.4", @@ -57,7 +57,7 @@ "file": "app/config/parameters.yml" }, "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } } } From e4ab609b645d3ed8933df291ebcc288f91ceb2f0 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 10 Apr 2015 22:35:38 +0200 Subject: [PATCH 08/98] updated Symfony constraint --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5d5968be52..9cf0de925e 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ }, "require": { "php": ">=5.3.3", - "symfony/symfony": "2.7.x-dev", + "symfony/symfony": "~2.7@beta", "doctrine/orm": "~2.2,>=2.2.3,<2.5", "doctrine/dbal": "<2.5", "doctrine/doctrine-bundle": "~1.4", From fa8af3bc58215885bb85d18b93980b1615db2fff Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 10 Apr 2015 22:37:19 +0200 Subject: [PATCH 09/98] updated VENDORS for 2.7.0-BETA1 --- composer.lock | 116 +++++++++++++++++++++++++------------------------- 1 file changed, 59 insertions(+), 57 deletions(-) diff --git a/composer.lock b/composer.lock index a6013e9b90..6155176c56 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "73f15ad91f600008506b4294b7b7d01c", + "hash": "51b1177e01b58944f1d0cb5d18b34b2b", "packages": [ { "name": "doctrine/annotations", @@ -214,16 +214,16 @@ }, { "name": "doctrine/common", - "version": "v2.4.2", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "5db6ab40e4c531f14dad4ca96a394dfce5d4255b" + "reference": "cd8daf2501e10c63dced7b8b9b905844316ae9d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/5db6ab40e4c531f14dad4ca96a394dfce5d4255b", - "reference": "5db6ab40e4c531f14dad4ca96a394dfce5d4255b", + "url": "https://api.github.com/repos/doctrine/common/zipball/cd8daf2501e10c63dced7b8b9b905844316ae9d3", + "reference": "cd8daf2501e10c63dced7b8b9b905844316ae9d3", "shasum": "" }, "require": { @@ -240,7 +240,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4.x-dev" + "dev-master": "2.6.x-dev" } }, "autoload": { @@ -253,17 +253,6 @@ "MIT" ], "authors": [ - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": "Creator" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com", - "homepage": "http://www.instaclick.com" - }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -272,11 +261,17 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, { "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" + "email": "schmittjoh@gmail.com" } ], "description": "Common Library for Doctrine projects", @@ -288,7 +283,7 @@ "persistence", "spl" ], - "time": "2014-05-21 19:28:51" + "time": "2015-04-02 19:55:44" }, { "name": "doctrine/dbal", @@ -886,16 +881,16 @@ }, { "name": "monolog/monolog", - "version": "1.12.0", + "version": "1.13.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f" + "reference": "c31a2c4e8db5da8b46c74cf275d7f109c0f249ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1fbe8c2641f2b163addf49cc5e18f144bec6b19f", - "reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c31a2c4e8db5da8b46c74cf275d7f109c0f249ac", + "reference": "c31a2c4e8db5da8b46c74cf275d7f109c0f249ac", "shasum": "" }, "require": { @@ -912,6 +907,7 @@ "phpunit/phpunit": "~4.0", "raven/raven": "~0.5", "ruflin/elastica": "0.90.*", + "swiftmailer/swiftmailer": "~5.3", "videlalvaro/php-amqplib": "~2.4" }, "suggest": { @@ -928,7 +924,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12.x-dev" + "dev-master": "1.13.x-dev" } }, "autoload": { @@ -954,7 +950,7 @@ "logging", "psr-3" ], - "time": "2014-12-29 21:29:35" + "time": "2015-03-09 09:58:04" }, { "name": "psr/log", @@ -996,17 +992,17 @@ }, { "name": "sensio/distribution-bundle", - "version": "v3.0.18", + "version": "v3.0.21", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "ac026149ffb1d3a5c893290d2d3ca8795013de08" + "reference": "da23c78093676a823a1ff43a214987ea3fbf83c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/ac026149ffb1d3a5c893290d2d3ca8795013de08", - "reference": "ac026149ffb1d3a5c893290d2d3ca8795013de08", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/da23c78093676a823a1ff43a214987ea3fbf83c8", + "reference": "da23c78093676a823a1ff43a214987ea3fbf83c8", "shasum": "" }, "require": { @@ -1052,21 +1048,21 @@ "configuration", "distribution" ], - "time": "2015-02-27 12:59:18" + "time": "2015-04-10 06:20:46" }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.4", + "version": "v3.0.7", "target-dir": "Sensio/Bundle/FrameworkExtraBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "b3bc3e67c8b6b68b18d727012183520d35ee762a" + "reference": "5c37623576ea9e841b87dc0d85414d98fa6f7abb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/b3bc3e67c8b6b68b18d727012183520d35ee762a", - "reference": "b3bc3e67c8b6b68b18d727012183520d35ee762a", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/5c37623576ea9e841b87dc0d85414d98fa6f7abb", + "reference": "5c37623576ea9e841b87dc0d85414d98fa6f7abb", "shasum": "" }, "require": { @@ -1107,7 +1103,7 @@ "annotations", "controllers" ], - "time": "2014-12-02 09:52:52" + "time": "2015-04-02 12:28:58" }, { "name": "sensiolabs/security-checker", @@ -1156,16 +1152,16 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v5.3.1", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "c5f963e7f9d6f6438fda4f22d5cc2db296ec621a" + "reference": "31454f258f10329ae7c48763eb898a75c39e0a9f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/c5f963e7f9d6f6438fda4f22d5cc2db296ec621a", - "reference": "c5f963e7f9d6f6438fda4f22d5cc2db296ec621a", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/31454f258f10329ae7c48763eb898a75c39e0a9f", + "reference": "31454f258f10329ae7c48763eb898a75c39e0a9f", "shasum": "" }, "require": { @@ -1177,7 +1173,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.3-dev" + "dev-master": "5.4-dev" } }, "autoload": { @@ -1204,7 +1200,7 @@ "mail", "mailer" ], - "time": "2014-12-05 14:17:14" + "time": "2015-03-14 06:06:39" }, { "name": "symfony/assetic-bundle", @@ -1389,16 +1385,16 @@ }, { "name": "symfony/symfony", - "version": "2.7.x-dev", + "version": "v2.7.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "755ea09a440c1b8ea560e403b442fc9f53e0ae93" + "reference": "07379d1d80594872bfbb7e9baad2cf7709c73102" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/755ea09a440c1b8ea560e403b442fc9f53e0ae93", - "reference": "755ea09a440c1b8ea560e403b442fc9f53e0ae93", + "url": "https://api.github.com/repos/symfony/symfony/zipball/07379d1d80594872bfbb7e9baad2cf7709c73102", + "reference": "07379d1d80594872bfbb7e9baad2cf7709c73102", "shasum": "" }, "require": { @@ -1431,7 +1427,6 @@ "symfony/locale": "self.version", "symfony/monolog-bridge": "self.version", "symfony/options-resolver": "self.version", - "symfony/phpunit-bridge": "self.version", "symfony/process": "self.version", "symfony/property-access": "self.version", "symfony/proxy-manager-bridge": "self.version", @@ -1463,7 +1458,8 @@ "ircmaxell/password-compat": "~1.0", "monolog/monolog": "~1.11", "ocramius/proxy-manager": "~0.4|~1.0", - "propel/propel1": "~1.6" + "propel/propel1": "~1.6", + "symfony/phpunit-bridge": "self.version" }, "type": "library", "extra": { @@ -1473,7 +1469,13 @@ }, "autoload": { "psr-0": { - "Symfony\\": "src/" + "Symfony\\Bridge\\Doctrine\\": "src/", + "Symfony\\Bridge\\Monolog\\": "src/", + "Symfony\\Bridge\\ProxyManager\\": "src/", + "Symfony\\Bridge\\Swiftmailer\\": "src/", + "Symfony\\Bridge\\Twig\\": "src/", + "Symfony\\Bundle\\": "src/", + "Symfony\\Component\\": "src/" }, "classmap": [ "src/Symfony/Component/HttpFoundation/Resources/stubs", @@ -1502,7 +1504,7 @@ "keywords": [ "framework" ], - "time": "2015-03-02 10:21:01" + "time": "2015-04-10 19:52:02" }, { "name": "twig/extensions", @@ -1617,17 +1619,17 @@ "packages-dev": [ { "name": "sensio/generator-bundle", - "version": "v2.5.2", + "version": "v2.5.3", "target-dir": "Sensio/Bundle/GeneratorBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", - "reference": "4b09746520a826a7bf34a466ba31c7d8740fef7e" + "reference": "e50108c2133ee5c9c484555faed50c17a61221d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/4b09746520a826a7bf34a466ba31c7d8740fef7e", - "reference": "4b09746520a826a7bf34a466ba31c7d8740fef7e", + "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/e50108c2133ee5c9c484555faed50c17a61221d3", + "reference": "e50108c2133ee5c9c484555faed50c17a61221d3", "shasum": "" }, "require": { @@ -1661,13 +1663,13 @@ } ], "description": "This bundle generates code for you", - "time": "2015-02-11 07:21:23" + "time": "2015-03-17 06:36:52" } ], "aliases": [], "minimum-stability": "stable", "stability-flags": { - "symfony/symfony": 20 + "symfony/symfony": 10 }, "prefer-stable": false, "prefer-lowest": false, From 6272b3388862e57f6fd688f06a1d1c9896fd4ffd Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Sun, 12 Apr 2015 16:14:12 +0200 Subject: [PATCH 10/98] use psr-4 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9cf0de925e..554367d6b3 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "project", "description": "The \"Symfony Standard Edition\" distribution", "autoload": { - "psr-0": { "": "src/", "SymfonyStandard": "app/" } + "psr-4": { "": "src/", "SymfonyStandard\\": "app/" } }, "require": { "php": ">=5.3.3", From 52bdb452eaba9f25a5528176523ef19389a0524d Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Wed, 15 Apr 2015 09:30:14 +0200 Subject: [PATCH 11/98] update Doctrine dependencies versions This fixes #798 and symfony/symfony#14353. --- composer.lock | 62 +++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/composer.lock b/composer.lock index 6155176c56..d397429f8d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "51b1177e01b58944f1d0cb5d18b34b2b", + "hash": "4456b6467ab79cc98e6ff63530621563", "packages": [ { "name": "doctrine/annotations", - "version": "v1.2.3", + "version": "v1.2.4", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "eeda578cbe24a170331a1cfdf78be723412df7a4" + "reference": "b5202eb9e83f8db52e0e58867e0a46e63be8332e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/eeda578cbe24a170331a1cfdf78be723412df7a4", - "reference": "eeda578cbe24a170331a1cfdf78be723412df7a4", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/b5202eb9e83f8db52e0e58867e0a46e63be8332e", + "reference": "b5202eb9e83f8db52e0e58867e0a46e63be8332e", "shasum": "" }, "require": { @@ -72,20 +72,20 @@ "docblock", "parser" ], - "time": "2014-12-20 20:49:38" + "time": "2014-12-23 22:40:37" }, { "name": "doctrine/cache", - "version": "v1.4.0", + "version": "v1.4.1", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "2346085d2b027b233ae1d5de59b07440b9f288c8" + "reference": "c9eadeb743ac6199f7eec423cb9426bc518b7b03" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/2346085d2b027b233ae1d5de59b07440b9f288c8", - "reference": "2346085d2b027b233ae1d5de59b07440b9f288c8", + "url": "https://api.github.com/repos/doctrine/cache/zipball/c9eadeb743ac6199f7eec423cb9426bc518b7b03", + "reference": "c9eadeb743ac6199f7eec423cb9426bc518b7b03", "shasum": "" }, "require": { @@ -96,13 +96,13 @@ }, "require-dev": { "phpunit/phpunit": ">=3.7", - "predis/predis": "~0.8", + "predis/predis": "~1.0", "satooshi/php-coveralls": "~0.6" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.5.x-dev" } }, "autoload": { @@ -142,25 +142,28 @@ "cache", "caching" ], - "time": "2015-01-15 20:38:55" + "time": "2015-04-15 00:11:59" }, { "name": "doctrine/collections", - "version": "v1.2", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "b99c5c46c87126201899afe88ec490a25eedd6a2" + "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/b99c5c46c87126201899afe88ec490a25eedd6a2", - "reference": "b99c5c46c87126201899afe88ec490a25eedd6a2", + "url": "https://api.github.com/repos/doctrine/collections/zipball/6c1e4eef75f310ea1b3e30945e9f06e652128b8a", + "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a", "shasum": "" }, "require": { "php": ">=5.3.2" }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, "type": "library", "extra": { "branch-alias": { @@ -177,17 +180,6 @@ "MIT" ], "authors": [ - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": "Creator" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com", - "homepage": "http://www.instaclick.com" - }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -196,11 +188,17 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, { "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" + "email": "schmittjoh@gmail.com" } ], "description": "Collections Abstraction library", @@ -210,7 +208,7 @@ "collections", "iterator" ], - "time": "2014-02-03 23:07:43" + "time": "2015-04-14 22:21:58" }, { "name": "doctrine/common", From 3561a7c44bd647986c633df07acfcd9e449d9755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Thu, 25 Dec 2014 04:28:13 +0100 Subject: [PATCH 12/98] Serializer groups support --- app/config/config.yml | 1 + app/config/config_prod.yml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/config/config.yml b/app/config/config.yml index 25f6647196..8824edaebb 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -13,6 +13,7 @@ framework: form: ~ csrf_protection: ~ validation: { enable_annotations: true } + #serializer: { enable_annotations: true } templating: engines: ['twig'] #assets_version: SomeVersionScheme diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index 342837a031..5e5f0bcb02 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml @@ -3,7 +3,9 @@ imports: #framework: # validation: -# cache: apc +# cache: validator.mapping.cache.apc +# serializer: +# cache: serializer.mapping.cache.apc #doctrine: # orm: From 2f523d8f84f4acc55f1022018a9ec99365db1de4 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Fri, 17 Apr 2015 14:50:28 +0200 Subject: [PATCH 13/98] Update ORM requirements to allow DBAL 2.5 again --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c534808e04..b1caf0f94f 100644 --- a/composer.json +++ b/composer.json @@ -9,8 +9,7 @@ "require": { "php": ">=5.3.3", "symfony/symfony": "2.3.*", - "doctrine/orm": "~2.2,>=2.2.3,<2.5", - "doctrine/dbal": "<2.5", + "doctrine/orm": "~2.2.3||~2.3.0||~2.4.8||~2.5", "doctrine/doctrine-bundle": "~1.2", "twig/extensions": "1.0.*", "symfony/assetic-bundle": "~2.3", From 49b862091c6a5510268c73100e859f8eb00e2dc8 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Fri, 17 Apr 2015 15:56:14 +0200 Subject: [PATCH 14/98] orm 2.2 and 2.3 are end of life --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index b1caf0f94f..a5fe5243f6 100644 --- a/composer.json +++ b/composer.json @@ -9,14 +9,14 @@ "require": { "php": ">=5.3.3", "symfony/symfony": "2.3.*", - "doctrine/orm": "~2.2.3||~2.3.0||~2.4.8||~2.5", + "doctrine/orm": "^2.4.8", "doctrine/doctrine-bundle": "~1.2", "twig/extensions": "1.0.*", "symfony/assetic-bundle": "~2.3", "symfony/swiftmailer-bundle": "~2.3", "symfony/monolog-bundle": "~2.4", "sensio/distribution-bundle": "~2.3", - "sensio/framework-extra-bundle": "~3.0,>=3.0.2", + "sensio/framework-extra-bundle": "^3.0.2", "sensio/generator-bundle": "~2.3", "incenteev/composer-parameter-handler": "~2.0" }, From f92af02090ca1fecde19ef1fe8fdb0602e18a975 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Fri, 17 Apr 2015 16:22:24 +0200 Subject: [PATCH 15/98] allow semantic twig extension versions --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a5fe5243f6..6334cdbee5 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "symfony/symfony": "2.3.*", "doctrine/orm": "^2.4.8", "doctrine/doctrine-bundle": "~1.2", - "twig/extensions": "1.0.*", + "twig/extensions": "~1.0", "symfony/assetic-bundle": "~2.3", "symfony/swiftmailer-bundle": "~2.3", "symfony/monolog-bundle": "~2.4", From 1272c9fff1c6622c683553b545736eda36914e5a Mon Sep 17 00:00:00 2001 From: Tom Corrigan Date: Fri, 28 Nov 2014 10:09:43 +1100 Subject: [PATCH 16/98] Remove unused twig-extensions dependency --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 554367d6b3..1200cf5909 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,6 @@ "doctrine/orm": "~2.2,>=2.2.3,<2.5", "doctrine/dbal": "<2.5", "doctrine/doctrine-bundle": "~1.4", - "twig/extensions": "~1.0", "symfony/assetic-bundle": "~2.3", "symfony/swiftmailer-bundle": "~2.3", "symfony/monolog-bundle": "~2.4", From d5d931c2c6ceb9a2ae8f361962b0aa7f5ba9441d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 5 May 2015 20:47:37 +0200 Subject: [PATCH 17/98] updated deps --- app/SymfonyRequirements.php | 21 ++++++--- composer.lock | 86 ++++++++----------------------------- 2 files changed, 33 insertions(+), 74 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index dbaafa898d..caabe407b1 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -542,11 +542,22 @@ function_exists('simplexml_import_dom'), /* optional recommendations follow */ - $this->addRecommendation( - file_get_contents(__FILE__) === file_get_contents(__DIR__.'/../vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/skeleton/app/SymfonyRequirements.php'), - 'Requirements file should be up-to-date', - 'Your requirements file is outdated. Run composer install and re-check your configuration.' - ); + if (file_exists(__DIR__.'/../vendor/composer')) { + require_once __DIR__.'/../vendor/autoload.php'; + + try { + $r = new \ReflectionClass('Sensio\Bundle\DistributionBundle\SensioDistributionBundle'); + + $contents = file_get_contents(dirname($r->getFileName()).'/Resources/skeleton/app/SymfonyRequirements.php'); + } catch (\ReflectionException $e) { + $contents = ''; + } + $this->addRecommendation( + file_get_contents(__FILE__) === $contents, + 'Requirements file should be up-to-date', + 'Your requirements file is outdated. Run composer install and re-check your configuration.' + ); + } $this->addRecommendation( version_compare($installedPhpVersion, '5.3.4', '>='), diff --git a/composer.lock b/composer.lock index d397429f8d..15d8c83af9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "4456b6467ab79cc98e6ff63530621563", + "hash": "05fb80d1f5c25e14b28b8b1f7aa965e0", "packages": [ { "name": "doctrine/annotations", @@ -990,17 +990,17 @@ }, { "name": "sensio/distribution-bundle", - "version": "v3.0.21", + "version": "v3.0.22", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "da23c78093676a823a1ff43a214987ea3fbf83c8" + "reference": "0fe4ec86db57c232becb694e01cdabe3c4d9af7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/da23c78093676a823a1ff43a214987ea3fbf83c8", - "reference": "da23c78093676a823a1ff43a214987ea3fbf83c8", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/0fe4ec86db57c232becb694e01cdabe3c4d9af7c", + "reference": "0fe4ec86db57c232becb694e01cdabe3c4d9af7c", "shasum": "" }, "require": { @@ -1046,7 +1046,7 @@ "configuration", "distribution" ], - "time": "2015-04-10 06:20:46" + "time": "2015-05-02 16:23:08" }, { "name": "sensio/framework-extra-bundle", @@ -1105,16 +1105,16 @@ }, { "name": "sensiolabs/security-checker", - "version": "v2.0.1", + "version": "v2.0.2", "source": { "type": "git", "url": "https://github.com/sensiolabs/security-checker.git", - "reference": "134cecf1c61256bd8e973e11376891a724543820" + "reference": "cecb1397087dc9c733796eda6e9d121336039cdc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/134cecf1c61256bd8e973e11376891a724543820", - "reference": "134cecf1c61256bd8e973e11376891a724543820", + "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/cecb1397087dc9c733796eda6e9d121336039cdc", + "reference": "cecb1397087dc9c733796eda6e9d121336039cdc", "shasum": "" }, "require": { @@ -1146,7 +1146,7 @@ } ], "description": "A security checker for your composer.lock", - "time": "2015-01-26 16:25:19" + "time": "2015-04-21 07:52:05" }, { "name": "swiftmailer/swiftmailer", @@ -1504,74 +1504,22 @@ ], "time": "2015-04-10 19:52:02" }, - { - "name": "twig/extensions", - "version": "v1.2.0", - "source": { - "type": "git", - "url": "https://github.com/twigphp/Twig-extensions.git", - "reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/8cf4b9fe04077bd54fc73f4fde83347040c3b8cd", - "reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd", - "shasum": "" - }, - "require": { - "twig/twig": "~1.12" - }, - "require-dev": { - "symfony/translation": "~2.3" - }, - "suggest": { - "symfony/translation": "Allow the time_diff output to be translated" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, - "autoload": { - "psr-0": { - "Twig_Extensions_": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Common additional features for Twig that do not directly belong in core", - "homepage": "http://twig.sensiolabs.org/doc/extensions/index.html", - "keywords": [ - "i18n", - "text" - ], - "time": "2014-10-30 14:30:03" - }, { "name": "twig/twig", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf" + "reference": "9f70492f44398e276d1b81c1b43adfe6751c7b7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/4cf7464348e7f9893a93f7096a90b73722be99cf", - "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/9f70492f44398e276d1b81c1b43adfe6751c7b7f", + "reference": "9f70492f44398e276d1b81c1b43adfe6751c7b7f", "shasum": "" }, "require": { - "php": ">=5.2.4" + "php": ">=5.2.7" }, "type": "library", "extra": { @@ -1611,7 +1559,7 @@ "keywords": [ "templating" ], - "time": "2015-01-25 17:32:08" + "time": "2015-04-19 08:30:27" } ], "packages-dev": [ From d6e125067778d64b7b8c61cdce64dafa1217fa86 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 11 May 2015 03:19:53 +0200 Subject: [PATCH 18/98] updated VENDORS for 2.3.28 --- app/SymfonyRequirements.php | 21 ++++-- composer.lock | 137 +++++++++++++++++------------------- 2 files changed, 81 insertions(+), 77 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index 1854856b8a..1e5dbf4418 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -530,11 +530,22 @@ function_exists('simplexml_import_dom'), /* optional recommendations follow */ - $this->addRecommendation( - file_get_contents(__FILE__) === file_get_contents(__DIR__.'/../vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/skeleton/app/SymfonyRequirements.php'), - 'Requirements file should be up-to-date', - 'Your requirements file is outdated. Run composer install and re-check your configuration.' - ); + if (file_exists(__DIR__.'/../vendor/composer')) { + require_once __DIR__.'/../vendor/autoload.php'; + + try { + $r = new \ReflectionClass('Sensio\Bundle\DistributionBundle\SensioDistributionBundle'); + + $contents = file_get_contents(dirname($r->getFileName()).'/Resources/skeleton/app/SymfonyRequirements.php'); + } catch (\ReflectionException $e) { + $contents = ''; + } + $this->addRecommendation( + file_get_contents(__FILE__) === $contents, + 'Requirements file should be up-to-date', + 'Your requirements file is outdated. Run composer install and re-check your configuration.' + ); + } $this->addRecommendation( version_compare($installedPhpVersion, '5.3.4', '>='), diff --git a/composer.lock b/composer.lock index cc9711d2e0..7986cc4aa8 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "doctrine/annotations", - "version": "v1.2.3", + "version": "v1.2.4", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "eeda578cbe24a170331a1cfdf78be723412df7a4" + "reference": "b5202eb9e83f8db52e0e58867e0a46e63be8332e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/eeda578cbe24a170331a1cfdf78be723412df7a4", - "reference": "eeda578cbe24a170331a1cfdf78be723412df7a4", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/b5202eb9e83f8db52e0e58867e0a46e63be8332e", + "reference": "b5202eb9e83f8db52e0e58867e0a46e63be8332e", "shasum": "" }, "require": { @@ -72,20 +72,20 @@ "docblock", "parser" ], - "time": "2014-12-20 20:49:38" + "time": "2014-12-23 22:40:37" }, { "name": "doctrine/cache", - "version": "v1.4.0", + "version": "v1.4.1", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "2346085d2b027b233ae1d5de59b07440b9f288c8" + "reference": "c9eadeb743ac6199f7eec423cb9426bc518b7b03" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/2346085d2b027b233ae1d5de59b07440b9f288c8", - "reference": "2346085d2b027b233ae1d5de59b07440b9f288c8", + "url": "https://api.github.com/repos/doctrine/cache/zipball/c9eadeb743ac6199f7eec423cb9426bc518b7b03", + "reference": "c9eadeb743ac6199f7eec423cb9426bc518b7b03", "shasum": "" }, "require": { @@ -96,13 +96,13 @@ }, "require-dev": { "phpunit/phpunit": ">=3.7", - "predis/predis": "~0.8", + "predis/predis": "~1.0", "satooshi/php-coveralls": "~0.6" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.5.x-dev" } }, "autoload": { @@ -142,25 +142,28 @@ "cache", "caching" ], - "time": "2015-01-15 20:38:55" + "time": "2015-04-15 00:11:59" }, { "name": "doctrine/collections", - "version": "v1.2", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "b99c5c46c87126201899afe88ec490a25eedd6a2" + "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/b99c5c46c87126201899afe88ec490a25eedd6a2", - "reference": "b99c5c46c87126201899afe88ec490a25eedd6a2", + "url": "https://api.github.com/repos/doctrine/collections/zipball/6c1e4eef75f310ea1b3e30945e9f06e652128b8a", + "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a", "shasum": "" }, "require": { "php": ">=5.3.2" }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, "type": "library", "extra": { "branch-alias": { @@ -177,17 +180,6 @@ "MIT" ], "authors": [ - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": "Creator" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com", - "homepage": "http://www.instaclick.com" - }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -196,11 +188,17 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, { "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" + "email": "schmittjoh@gmail.com" } ], "description": "Collections Abstraction library", @@ -210,20 +208,20 @@ "collections", "iterator" ], - "time": "2014-02-03 23:07:43" + "time": "2015-04-14 22:21:58" }, { "name": "doctrine/common", - "version": "v2.4.2", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "5db6ab40e4c531f14dad4ca96a394dfce5d4255b" + "reference": "cd8daf2501e10c63dced7b8b9b905844316ae9d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/5db6ab40e4c531f14dad4ca96a394dfce5d4255b", - "reference": "5db6ab40e4c531f14dad4ca96a394dfce5d4255b", + "url": "https://api.github.com/repos/doctrine/common/zipball/cd8daf2501e10c63dced7b8b9b905844316ae9d3", + "reference": "cd8daf2501e10c63dced7b8b9b905844316ae9d3", "shasum": "" }, "require": { @@ -240,7 +238,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4.x-dev" + "dev-master": "2.6.x-dev" } }, "autoload": { @@ -253,17 +251,6 @@ "MIT" ], "authors": [ - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": "Creator" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com", - "homepage": "http://www.instaclick.com" - }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -272,11 +259,17 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, { "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" + "email": "schmittjoh@gmail.com" } ], "description": "Common Library for Doctrine projects", @@ -288,7 +281,7 @@ "persistence", "spl" ], - "time": "2014-05-21 19:28:51" + "time": "2015-04-02 19:55:44" }, { "name": "doctrine/dbal", @@ -997,17 +990,17 @@ }, { "name": "sensio/distribution-bundle", - "version": "v2.3.13", + "version": "v2.3.16", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "c344892aa9f09f0005b395d79ad2531a7deaedc9" + "reference": "df552307f1426f69ada59cfcae85c43b7c10a8cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/c344892aa9f09f0005b395d79ad2531a7deaedc9", - "reference": "c344892aa9f09f0005b395d79ad2531a7deaedc9", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/df552307f1426f69ada59cfcae85c43b7c10a8cd", + "reference": "df552307f1426f69ada59cfcae85c43b7c10a8cd", "shasum": "" }, "require": { @@ -1039,21 +1032,21 @@ "configuration", "distribution" ], - "time": "2015-03-26 11:09:17" + "time": "2015-05-02 16:01:47" }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.6", + "version": "v3.0.7", "target-dir": "Sensio/Bundle/FrameworkExtraBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "1c3ed356bd1ff67cd71806efbb71511644035c85" + "reference": "5c37623576ea9e841b87dc0d85414d98fa6f7abb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/1c3ed356bd1ff67cd71806efbb71511644035c85", - "reference": "1c3ed356bd1ff67cd71806efbb71511644035c85", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/5c37623576ea9e841b87dc0d85414d98fa6f7abb", + "reference": "5c37623576ea9e841b87dc0d85414d98fa6f7abb", "shasum": "" }, "require": { @@ -1094,7 +1087,7 @@ "annotations", "controllers" ], - "time": "2015-03-24 15:12:07" + "time": "2015-04-02 12:28:58" }, { "name": "sensio/generator-bundle", @@ -1379,16 +1372,16 @@ }, { "name": "symfony/symfony", - "version": "v2.3.27", + "version": "v2.3.28", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "ce4aab1508dd9642906fc9a120e0d8763e689896" + "reference": "56bc4057e3849d38aeb5e9742bc800b0518fe1f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/ce4aab1508dd9642906fc9a120e0d8763e689896", - "reference": "ce4aab1508dd9642906fc9a120e0d8763e689896", + "url": "https://api.github.com/repos/symfony/symfony/zipball/56bc4057e3849d38aeb5e9742bc800b0518fe1f0", + "reference": "56bc4057e3849d38aeb5e9742bc800b0518fe1f0", "shasum": "" }, "require": { @@ -1483,7 +1476,7 @@ "keywords": [ "framework" ], - "time": "2015-04-01 14:28:26" + "time": "2015-05-10 15:02:48" }, { "name": "twig/extensions", @@ -1534,20 +1527,20 @@ }, { "name": "twig/twig", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf" + "reference": "9f70492f44398e276d1b81c1b43adfe6751c7b7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/4cf7464348e7f9893a93f7096a90b73722be99cf", - "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/9f70492f44398e276d1b81c1b43adfe6751c7b7f", + "reference": "9f70492f44398e276d1b81c1b43adfe6751c7b7f", "shasum": "" }, "require": { - "php": ">=5.2.4" + "php": ">=5.2.7" }, "type": "library", "extra": { @@ -1587,7 +1580,7 @@ "keywords": [ "templating" ], - "time": "2015-01-25 17:32:08" + "time": "2015-04-19 08:30:27" } ], "packages-dev": [], From 7489ca3cd6fd57f243b4ae174e055085588d721e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 11 May 2015 04:20:45 +0200 Subject: [PATCH 19/98] updated VENDORS for 2.6.7 --- app/SymfonyRequirements.php | 21 +++-- composer.lock | 149 +++++++++++++++++------------------- 2 files changed, 87 insertions(+), 83 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index dbaafa898d..caabe407b1 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -542,11 +542,22 @@ function_exists('simplexml_import_dom'), /* optional recommendations follow */ - $this->addRecommendation( - file_get_contents(__FILE__) === file_get_contents(__DIR__.'/../vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/skeleton/app/SymfonyRequirements.php'), - 'Requirements file should be up-to-date', - 'Your requirements file is outdated. Run composer install and re-check your configuration.' - ); + if (file_exists(__DIR__.'/../vendor/composer')) { + require_once __DIR__.'/../vendor/autoload.php'; + + try { + $r = new \ReflectionClass('Sensio\Bundle\DistributionBundle\SensioDistributionBundle'); + + $contents = file_get_contents(dirname($r->getFileName()).'/Resources/skeleton/app/SymfonyRequirements.php'); + } catch (\ReflectionException $e) { + $contents = ''; + } + $this->addRecommendation( + file_get_contents(__FILE__) === $contents, + 'Requirements file should be up-to-date', + 'Your requirements file is outdated. Run composer install and re-check your configuration.' + ); + } $this->addRecommendation( version_compare($installedPhpVersion, '5.3.4', '>='), diff --git a/composer.lock b/composer.lock index 4e192bafcd..b723e18e1f 100644 --- a/composer.lock +++ b/composer.lock @@ -1,23 +1,23 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], "hash": "928cf07615062470571573abc0843fa6", "packages": [ { "name": "doctrine/annotations", - "version": "v1.2.3", + "version": "v1.2.4", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "eeda578cbe24a170331a1cfdf78be723412df7a4" + "reference": "b5202eb9e83f8db52e0e58867e0a46e63be8332e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/eeda578cbe24a170331a1cfdf78be723412df7a4", - "reference": "eeda578cbe24a170331a1cfdf78be723412df7a4", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/b5202eb9e83f8db52e0e58867e0a46e63be8332e", + "reference": "b5202eb9e83f8db52e0e58867e0a46e63be8332e", "shasum": "" }, "require": { @@ -72,20 +72,20 @@ "docblock", "parser" ], - "time": "2014-12-20 20:49:38" + "time": "2014-12-23 22:40:37" }, { "name": "doctrine/cache", - "version": "v1.4.0", + "version": "v1.4.1", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "2346085d2b027b233ae1d5de59b07440b9f288c8" + "reference": "c9eadeb743ac6199f7eec423cb9426bc518b7b03" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/2346085d2b027b233ae1d5de59b07440b9f288c8", - "reference": "2346085d2b027b233ae1d5de59b07440b9f288c8", + "url": "https://api.github.com/repos/doctrine/cache/zipball/c9eadeb743ac6199f7eec423cb9426bc518b7b03", + "reference": "c9eadeb743ac6199f7eec423cb9426bc518b7b03", "shasum": "" }, "require": { @@ -96,13 +96,13 @@ }, "require-dev": { "phpunit/phpunit": ">=3.7", - "predis/predis": "~0.8", + "predis/predis": "~1.0", "satooshi/php-coveralls": "~0.6" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.5.x-dev" } }, "autoload": { @@ -142,25 +142,28 @@ "cache", "caching" ], - "time": "2015-01-15 20:38:55" + "time": "2015-04-15 00:11:59" }, { "name": "doctrine/collections", - "version": "v1.2", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "b99c5c46c87126201899afe88ec490a25eedd6a2" + "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/b99c5c46c87126201899afe88ec490a25eedd6a2", - "reference": "b99c5c46c87126201899afe88ec490a25eedd6a2", + "url": "https://api.github.com/repos/doctrine/collections/zipball/6c1e4eef75f310ea1b3e30945e9f06e652128b8a", + "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a", "shasum": "" }, "require": { "php": ">=5.3.2" }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, "type": "library", "extra": { "branch-alias": { @@ -177,17 +180,6 @@ "MIT" ], "authors": [ - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": "Creator" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com", - "homepage": "http://www.instaclick.com" - }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -196,11 +188,17 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, { "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" + "email": "schmittjoh@gmail.com" } ], "description": "Collections Abstraction library", @@ -210,20 +208,20 @@ "collections", "iterator" ], - "time": "2014-02-03 23:07:43" + "time": "2015-04-14 22:21:58" }, { "name": "doctrine/common", - "version": "v2.4.2", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "5db6ab40e4c531f14dad4ca96a394dfce5d4255b" + "reference": "cd8daf2501e10c63dced7b8b9b905844316ae9d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/5db6ab40e4c531f14dad4ca96a394dfce5d4255b", - "reference": "5db6ab40e4c531f14dad4ca96a394dfce5d4255b", + "url": "https://api.github.com/repos/doctrine/common/zipball/cd8daf2501e10c63dced7b8b9b905844316ae9d3", + "reference": "cd8daf2501e10c63dced7b8b9b905844316ae9d3", "shasum": "" }, "require": { @@ -240,7 +238,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4.x-dev" + "dev-master": "2.6.x-dev" } }, "autoload": { @@ -253,17 +251,6 @@ "MIT" ], "authors": [ - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": "Creator" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com", - "homepage": "http://www.instaclick.com" - }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -272,11 +259,17 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, { "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" + "email": "schmittjoh@gmail.com" } ], "description": "Common Library for Doctrine projects", @@ -288,7 +281,7 @@ "persistence", "spl" ], - "time": "2014-05-21 19:28:51" + "time": "2015-04-02 19:55:44" }, { "name": "doctrine/dbal", @@ -997,17 +990,17 @@ }, { "name": "sensio/distribution-bundle", - "version": "v3.0.20", + "version": "v3.0.22", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "48c76189fb0a76a20a4a67a750b513ed06074b55" + "reference": "0fe4ec86db57c232becb694e01cdabe3c4d9af7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/48c76189fb0a76a20a4a67a750b513ed06074b55", - "reference": "48c76189fb0a76a20a4a67a750b513ed06074b55", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/0fe4ec86db57c232becb694e01cdabe3c4d9af7c", + "reference": "0fe4ec86db57c232becb694e01cdabe3c4d9af7c", "shasum": "" }, "require": { @@ -1053,21 +1046,21 @@ "configuration", "distribution" ], - "time": "2015-03-26 11:09:50" + "time": "2015-05-02 16:23:08" }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.6", + "version": "v3.0.7", "target-dir": "Sensio/Bundle/FrameworkExtraBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "1c3ed356bd1ff67cd71806efbb71511644035c85" + "reference": "5c37623576ea9e841b87dc0d85414d98fa6f7abb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/1c3ed356bd1ff67cd71806efbb71511644035c85", - "reference": "1c3ed356bd1ff67cd71806efbb71511644035c85", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/5c37623576ea9e841b87dc0d85414d98fa6f7abb", + "reference": "5c37623576ea9e841b87dc0d85414d98fa6f7abb", "shasum": "" }, "require": { @@ -1108,20 +1101,20 @@ "annotations", "controllers" ], - "time": "2015-03-24 15:12:07" + "time": "2015-04-02 12:28:58" }, { "name": "sensiolabs/security-checker", - "version": "v2.0.1", + "version": "v2.0.2", "source": { "type": "git", "url": "https://github.com/sensiolabs/security-checker.git", - "reference": "134cecf1c61256bd8e973e11376891a724543820" + "reference": "cecb1397087dc9c733796eda6e9d121336039cdc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/134cecf1c61256bd8e973e11376891a724543820", - "reference": "134cecf1c61256bd8e973e11376891a724543820", + "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/cecb1397087dc9c733796eda6e9d121336039cdc", + "reference": "cecb1397087dc9c733796eda6e9d121336039cdc", "shasum": "" }, "require": { @@ -1153,7 +1146,7 @@ } ], "description": "A security checker for your composer.lock", - "time": "2015-01-26 16:25:19" + "time": "2015-04-21 07:52:05" }, { "name": "swiftmailer/swiftmailer", @@ -1390,16 +1383,16 @@ }, { "name": "symfony/symfony", - "version": "v2.6.6", + "version": "v2.6.7", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "48c9e835a877adfb023b8b6d033d9dd14f342b4b" + "reference": "0449d0e1178bc8e934520b20432d1705c3b25e7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/48c9e835a877adfb023b8b6d033d9dd14f342b4b", - "reference": "48c9e835a877adfb023b8b6d033d9dd14f342b4b", + "url": "https://api.github.com/repos/symfony/symfony/zipball/0449d0e1178bc8e934520b20432d1705c3b25e7e", + "reference": "0449d0e1178bc8e934520b20432d1705c3b25e7e", "shasum": "" }, "require": { @@ -1503,7 +1496,7 @@ "keywords": [ "framework" ], - "time": "2015-04-01 16:55:26" + "time": "2015-05-11 01:58:49" }, { "name": "twig/extensions", @@ -1559,20 +1552,20 @@ }, { "name": "twig/twig", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf" + "reference": "9f70492f44398e276d1b81c1b43adfe6751c7b7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/4cf7464348e7f9893a93f7096a90b73722be99cf", - "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/9f70492f44398e276d1b81c1b43adfe6751c7b7f", + "reference": "9f70492f44398e276d1b81c1b43adfe6751c7b7f", "shasum": "" }, "require": { - "php": ">=5.2.4" + "php": ">=5.2.7" }, "type": "library", "extra": { @@ -1612,7 +1605,7 @@ "keywords": [ "templating" ], - "time": "2015-01-25 17:32:08" + "time": "2015-04-19 08:30:27" } ], "packages-dev": [ From 3865af303fe49e22374895385ffd293b37242f51 Mon Sep 17 00:00:00 2001 From: Vincent AUBERT Date: Tue, 12 May 2015 20:59:47 +0200 Subject: [PATCH 20/98] [2.8] update composer.lock --- composer.lock | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/composer.lock b/composer.lock index 15d8c83af9..450826bc86 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "05fb80d1f5c25e14b28b8b1f7aa965e0", + "hash": "b045457c50da64e428e512e06a526717", "packages": [ { "name": "doctrine/annotations", @@ -1383,16 +1383,16 @@ }, { "name": "symfony/symfony", - "version": "v2.7.0-BETA1", + "version": "2.8.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "07379d1d80594872bfbb7e9baad2cf7709c73102" + "reference": "bb8b0769cbaa6f0eb75787ca293b3becaa1d5af8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/07379d1d80594872bfbb7e9baad2cf7709c73102", - "reference": "07379d1d80594872bfbb7e9baad2cf7709c73102", + "url": "https://api.github.com/repos/symfony/symfony/zipball/bb8b0769cbaa6f0eb75787ca293b3becaa1d5af8", + "reference": "bb8b0769cbaa6f0eb75787ca293b3becaa1d5af8", "shasum": "" }, "require": { @@ -1456,24 +1456,23 @@ "ircmaxell/password-compat": "~1.0", "monolog/monolog": "~1.11", "ocramius/proxy-manager": "~0.4|~1.0", - "propel/propel1": "~1.6", "symfony/phpunit-bridge": "self.version" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { - "psr-0": { - "Symfony\\Bridge\\Doctrine\\": "src/", - "Symfony\\Bridge\\Monolog\\": "src/", - "Symfony\\Bridge\\ProxyManager\\": "src/", - "Symfony\\Bridge\\Swiftmailer\\": "src/", - "Symfony\\Bridge\\Twig\\": "src/", - "Symfony\\Bundle\\": "src/", - "Symfony\\Component\\": "src/" + "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\\Swiftmailer\\": "src/Symfony/Bridge/Swiftmailer/", + "Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/", + "Symfony\\Bundle\\": "src/Symfony/Bundle/", + "Symfony\\Component\\": "src/Symfony/Component/" }, "classmap": [ "src/Symfony/Component/HttpFoundation/Resources/stubs", @@ -1502,7 +1501,7 @@ "keywords": [ "framework" ], - "time": "2015-04-10 19:52:02" + "time": "2015-05-12 15:16:46" }, { "name": "twig/twig", @@ -1615,7 +1614,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "symfony/symfony": 10 + "symfony/symfony": 20 }, "prefer-stable": false, "prefer-lowest": false, From 74c6d743c9c34d5f489afc9b1afdeb6ac7d531c9 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 14 May 2015 00:11:43 +0200 Subject: [PATCH 21/98] updated VENDORS for 2.7.0-BETA2 --- composer.lock | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/composer.lock b/composer.lock index 15d8c83af9..a69fc6de99 100644 --- a/composer.lock +++ b/composer.lock @@ -1,7 +1,7 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], "hash": "05fb80d1f5c25e14b28b8b1f7aa965e0", @@ -1383,16 +1383,16 @@ }, { "name": "symfony/symfony", - "version": "v2.7.0-BETA1", + "version": "v2.7.0-BETA2", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "07379d1d80594872bfbb7e9baad2cf7709c73102" + "reference": "5cfcce37fa070f7765559156634c9ef2724e9545" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/07379d1d80594872bfbb7e9baad2cf7709c73102", - "reference": "07379d1d80594872bfbb7e9baad2cf7709c73102", + "url": "https://api.github.com/repos/symfony/symfony/zipball/5cfcce37fa070f7765559156634c9ef2724e9545", + "reference": "5cfcce37fa070f7765559156634c9ef2724e9545", "shasum": "" }, "require": { @@ -1456,7 +1456,6 @@ "ircmaxell/password-compat": "~1.0", "monolog/monolog": "~1.11", "ocramius/proxy-manager": "~0.4|~1.0", - "propel/propel1": "~1.6", "symfony/phpunit-bridge": "self.version" }, "type": "library", @@ -1466,14 +1465,14 @@ } }, "autoload": { - "psr-0": { - "Symfony\\Bridge\\Doctrine\\": "src/", - "Symfony\\Bridge\\Monolog\\": "src/", - "Symfony\\Bridge\\ProxyManager\\": "src/", - "Symfony\\Bridge\\Swiftmailer\\": "src/", - "Symfony\\Bridge\\Twig\\": "src/", - "Symfony\\Bundle\\": "src/", - "Symfony\\Component\\": "src/" + "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\\Swiftmailer\\": "src/Symfony/Bridge/Swiftmailer/", + "Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/", + "Symfony\\Bundle\\": "src/Symfony/Bundle/", + "Symfony\\Component\\": "src/Symfony/Component/" }, "classmap": [ "src/Symfony/Component/HttpFoundation/Resources/stubs", @@ -1488,21 +1487,21 @@ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, { "name": "Fabien Potencier", "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], "description": "The Symfony PHP framework", - "homepage": "http://symfony.com", + "homepage": "https://symfony.com", "keywords": [ "framework" ], - "time": "2015-04-10 19:52:02" + "time": "2015-05-13 20:25:22" }, { "name": "twig/twig", From a94aa2b1d32b6dd488d6808c5031bdc032adb811 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sat, 16 May 2015 12:00:13 +0200 Subject: [PATCH 22/98] fix documentation URLs forSensio bundles --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 52dddb3264..8feff6ec5e 100644 --- a/README.md +++ b/README.md @@ -59,11 +59,11 @@ released under the MIT or BSD license. Enjoy! [1]: http://symfony.com/doc/2.3/book/installation.html -[6]: http://symfony.com/doc/2.3/bundles/SensioFrameworkExtraBundle/index.html +[6]: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html [7]: http://symfony.com/doc/2.3/book/doctrine.html [8]: http://symfony.com/doc/2.3/book/templating.html [9]: http://symfony.com/doc/2.3/book/security.html [10]: http://symfony.com/doc/2.3/cookbook/email.html [11]: http://symfony.com/doc/2.3/cookbook/logging/monolog.html [12]: http://symfony.com/doc/2.3/cookbook/assetic/asset_management.html -[13]: http://symfony.com/doc/2.3/bundles/SensioGeneratorBundle/index.html +[13]: http://symfony.com/doc/current/bundles/SensioGeneratorBundle/index.html From b712c39ff27050107e1328677213d97d63089cea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Haso=C5=88?= Date: Fri, 22 May 2015 15:17:45 +0200 Subject: [PATCH 23/98] Changed ORM default naming strategy to underscore --- app/config/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/config/config.yml b/app/config/config.yml index 0843a2e6d6..b4a2d0a4c2 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -68,6 +68,7 @@ doctrine: orm: auto_generate_proxy_classes: "%kernel.debug%" + naming_strategy: doctrine.orm.naming_strategy.underscore auto_mapping: true # Swiftmailer Configuration From 8f2d0fe961f6d94f44660d6e5554d50379a71b5c Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 27 May 2015 01:30:35 +0200 Subject: [PATCH 24/98] updated VENDORS for 2.3.29 --- composer.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index 7986cc4aa8..32b8bfa2ba 100644 --- a/composer.lock +++ b/composer.lock @@ -1,7 +1,7 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], "hash": "8b02bb324925eec9e704367ae521a85a", @@ -1372,16 +1372,16 @@ }, { "name": "symfony/symfony", - "version": "v2.3.28", + "version": "v2.3.29", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "56bc4057e3849d38aeb5e9742bc800b0518fe1f0" + "reference": "c4da51ce0f2ef890d5ab77d91064f2f579076b24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/56bc4057e3849d38aeb5e9742bc800b0518fe1f0", - "reference": "56bc4057e3849d38aeb5e9742bc800b0518fe1f0", + "url": "https://api.github.com/repos/symfony/symfony/zipball/c4da51ce0f2ef890d5ab77d91064f2f579076b24", + "reference": "c4da51ce0f2ef890d5ab77d91064f2f579076b24", "shasum": "" }, "require": { @@ -1462,21 +1462,21 @@ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, { "name": "Fabien Potencier", "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], "description": "The Symfony PHP framework", - "homepage": "http://symfony.com", + "homepage": "https://symfony.com", "keywords": [ "framework" ], - "time": "2015-05-10 15:02:48" + "time": "2015-05-26 21:55:27" }, { "name": "twig/extensions", From 98fb8dec3f6fab1d2fa0784ad294124cda1f0562 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 27 May 2015 02:38:31 +0200 Subject: [PATCH 25/98] updated VENDORS for 2.6.8 --- composer.lock | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/composer.lock b/composer.lock index b723e18e1f..374c6fa327 100644 --- a/composer.lock +++ b/composer.lock @@ -990,17 +990,17 @@ }, { "name": "sensio/distribution-bundle", - "version": "v3.0.22", + "version": "v3.0.24", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "0fe4ec86db57c232becb694e01cdabe3c4d9af7c" + "reference": "79b820aee1f1daeb2717fa9471ee19275cc1d638" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/0fe4ec86db57c232becb694e01cdabe3c4d9af7c", - "reference": "0fe4ec86db57c232becb694e01cdabe3c4d9af7c", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/79b820aee1f1daeb2717fa9471ee19275cc1d638", + "reference": "79b820aee1f1daeb2717fa9471ee19275cc1d638", "shasum": "" }, "require": { @@ -1046,7 +1046,7 @@ "configuration", "distribution" ], - "time": "2015-05-02 16:23:08" + "time": "2015-05-16 12:57:08" }, { "name": "sensio/framework-extra-bundle", @@ -1105,16 +1105,16 @@ }, { "name": "sensiolabs/security-checker", - "version": "v2.0.2", + "version": "v2.0.3", "source": { "type": "git", "url": "https://github.com/sensiolabs/security-checker.git", - "reference": "cecb1397087dc9c733796eda6e9d121336039cdc" + "reference": "cde03c48d490d805ef1349e5108f8b3085981ead" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/cecb1397087dc9c733796eda6e9d121336039cdc", - "reference": "cecb1397087dc9c733796eda6e9d121336039cdc", + "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/cde03c48d490d805ef1349e5108f8b3085981ead", + "reference": "cde03c48d490d805ef1349e5108f8b3085981ead", "shasum": "" }, "require": { @@ -1146,7 +1146,7 @@ } ], "description": "A security checker for your composer.lock", - "time": "2015-04-21 07:52:05" + "time": "2015-05-22 14:21:04" }, { "name": "swiftmailer/swiftmailer", @@ -1383,16 +1383,16 @@ }, { "name": "symfony/symfony", - "version": "v2.6.7", + "version": "v2.6.8", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "0449d0e1178bc8e934520b20432d1705c3b25e7e" + "reference": "7ae1934082d9ac299303b146e4a999274a723e94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/0449d0e1178bc8e934520b20432d1705c3b25e7e", - "reference": "0449d0e1178bc8e934520b20432d1705c3b25e7e", + "url": "https://api.github.com/repos/symfony/symfony/zipball/7ae1934082d9ac299303b146e4a999274a723e94", + "reference": "7ae1934082d9ac299303b146e4a999274a723e94", "shasum": "" }, "require": { @@ -1482,21 +1482,21 @@ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, { "name": "Fabien Potencier", "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], "description": "The Symfony PHP framework", - "homepage": "http://symfony.com", + "homepage": "https://symfony.com", "keywords": [ "framework" ], - "time": "2015-05-11 01:58:49" + "time": "2015-05-27 00:17:10" }, { "name": "twig/extensions", From 07dacd2ef8df78a3d9b651fd064cdd4a9a077456 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 30 May 2015 00:31:13 +0200 Subject: [PATCH 26/98] updated VENDORS for 2.3.30 --- composer.lock | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/composer.lock b/composer.lock index 32b8bfa2ba..eb5de85b94 100644 --- a/composer.lock +++ b/composer.lock @@ -348,16 +348,16 @@ }, { "name": "doctrine/doctrine-bundle", - "version": "v1.4.0", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "1986ff3a945b584c6505d07eae92d77e41131078" + "reference": "0b9e27037c4fdbad515ee5ec89842e9091a6480f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/1986ff3a945b584c6505d07eae92d77e41131078", - "reference": "1986ff3a945b584c6505d07eae92d77e41131078", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/0b9e27037c4fdbad515ee5ec89842e9091a6480f", + "reference": "0b9e27037c4fdbad515ee5ec89842e9091a6480f", "shasum": "" }, "require": { @@ -365,6 +365,7 @@ "doctrine/doctrine-cache-bundle": "~1.0", "jdorn/sql-formatter": "~1.1", "php": ">=5.3.2", + "symfony/console": "~2.3", "symfony/doctrine-bridge": "~2.2", "symfony/framework-bundle": "~2.3" }, @@ -383,7 +384,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.5.x-dev" } }, "autoload": { @@ -421,7 +422,7 @@ "orm", "persistence" ], - "time": "2015-02-28 11:04:45" + "time": "2015-05-28 12:27:15" }, { "name": "doctrine/doctrine-cache-bundle", @@ -1036,17 +1037,16 @@ }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.7", - "target-dir": "Sensio/Bundle/FrameworkExtraBundle", + "version": "v3.0.8", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "5c37623576ea9e841b87dc0d85414d98fa6f7abb" + "reference": "a30fc18bf147bc25faf6b1d54bf55cfad4b63cba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/5c37623576ea9e841b87dc0d85414d98fa6f7abb", - "reference": "5c37623576ea9e841b87dc0d85414d98fa6f7abb", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/a30fc18bf147bc25faf6b1d54bf55cfad4b63cba", + "reference": "a30fc18bf147bc25faf6b1d54bf55cfad4b63cba", "shasum": "" }, "require": { @@ -1059,6 +1059,7 @@ }, "suggest": { "symfony/expression-language": "", + "symfony/psr-http-message-bridge": "To use the PSR-7 converters", "symfony/security-bundle": "" }, "type": "symfony-bundle", @@ -1068,8 +1069,8 @@ } }, "autoload": { - "psr-0": { - "Sensio\\Bundle\\FrameworkExtraBundle": "" + "psr-4": { + "Sensio\\Bundle\\FrameworkExtraBundle\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -1087,7 +1088,7 @@ "annotations", "controllers" ], - "time": "2015-04-02 12:28:58" + "time": "2015-05-29 18:27:23" }, { "name": "sensio/generator-bundle", @@ -1372,16 +1373,16 @@ }, { "name": "symfony/symfony", - "version": "v2.3.29", + "version": "v2.3.30", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "c4da51ce0f2ef890d5ab77d91064f2f579076b24" + "reference": "6dfe5551b71d156739a0df1043ba81b326e36f4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/c4da51ce0f2ef890d5ab77d91064f2f579076b24", - "reference": "c4da51ce0f2ef890d5ab77d91064f2f579076b24", + "url": "https://api.github.com/repos/symfony/symfony/zipball/6dfe5551b71d156739a0df1043ba81b326e36f4a", + "reference": "6dfe5551b71d156739a0df1043ba81b326e36f4a", "shasum": "" }, "require": { @@ -1476,7 +1477,7 @@ "keywords": [ "framework" ], - "time": "2015-05-26 21:55:27" + "time": "2015-05-29 22:16:04" }, { "name": "twig/extensions", From da914fbcdcdf9730dd316be8419de39f512d4da7 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 30 May 2015 01:11:51 +0200 Subject: [PATCH 27/98] updated VENDORS for 2.6.9 --- composer.lock | 59 ++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/composer.lock b/composer.lock index 374c6fa327..c9b8c5f0bf 100644 --- a/composer.lock +++ b/composer.lock @@ -348,16 +348,16 @@ }, { "name": "doctrine/doctrine-bundle", - "version": "v1.4.0", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "1986ff3a945b584c6505d07eae92d77e41131078" + "reference": "0b9e27037c4fdbad515ee5ec89842e9091a6480f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/1986ff3a945b584c6505d07eae92d77e41131078", - "reference": "1986ff3a945b584c6505d07eae92d77e41131078", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/0b9e27037c4fdbad515ee5ec89842e9091a6480f", + "reference": "0b9e27037c4fdbad515ee5ec89842e9091a6480f", "shasum": "" }, "require": { @@ -365,6 +365,7 @@ "doctrine/doctrine-cache-bundle": "~1.0", "jdorn/sql-formatter": "~1.1", "php": ">=5.3.2", + "symfony/console": "~2.3", "symfony/doctrine-bridge": "~2.2", "symfony/framework-bundle": "~2.3" }, @@ -383,7 +384,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.5.x-dev" } }, "autoload": { @@ -421,7 +422,7 @@ "orm", "persistence" ], - "time": "2015-02-28 11:04:45" + "time": "2015-05-28 12:27:15" }, { "name": "doctrine/doctrine-cache-bundle", @@ -990,17 +991,17 @@ }, { "name": "sensio/distribution-bundle", - "version": "v3.0.24", + "version": "v3.0.25", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "79b820aee1f1daeb2717fa9471ee19275cc1d638" + "reference": "01931139b0f067a4016d5d56e82c2b3086533b89" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/79b820aee1f1daeb2717fa9471ee19275cc1d638", - "reference": "79b820aee1f1daeb2717fa9471ee19275cc1d638", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/01931139b0f067a4016d5d56e82c2b3086533b89", + "reference": "01931139b0f067a4016d5d56e82c2b3086533b89", "shasum": "" }, "require": { @@ -1046,21 +1047,20 @@ "configuration", "distribution" ], - "time": "2015-05-16 12:57:08" + "time": "2015-05-29 22:35:41" }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.7", - "target-dir": "Sensio/Bundle/FrameworkExtraBundle", + "version": "v3.0.8", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "5c37623576ea9e841b87dc0d85414d98fa6f7abb" + "reference": "a30fc18bf147bc25faf6b1d54bf55cfad4b63cba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/5c37623576ea9e841b87dc0d85414d98fa6f7abb", - "reference": "5c37623576ea9e841b87dc0d85414d98fa6f7abb", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/a30fc18bf147bc25faf6b1d54bf55cfad4b63cba", + "reference": "a30fc18bf147bc25faf6b1d54bf55cfad4b63cba", "shasum": "" }, "require": { @@ -1073,6 +1073,7 @@ }, "suggest": { "symfony/expression-language": "", + "symfony/psr-http-message-bridge": "To use the PSR-7 converters", "symfony/security-bundle": "" }, "type": "symfony-bundle", @@ -1082,8 +1083,8 @@ } }, "autoload": { - "psr-0": { - "Sensio\\Bundle\\FrameworkExtraBundle": "" + "psr-4": { + "Sensio\\Bundle\\FrameworkExtraBundle\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -1101,20 +1102,20 @@ "annotations", "controllers" ], - "time": "2015-04-02 12:28:58" + "time": "2015-05-29 18:27:23" }, { "name": "sensiolabs/security-checker", - "version": "v2.0.3", + "version": "v2.0.5", "source": { "type": "git", "url": "https://github.com/sensiolabs/security-checker.git", - "reference": "cde03c48d490d805ef1349e5108f8b3085981ead" + "reference": "2c2a71f1c77d9765c12638c4724d9ca23658a810" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/cde03c48d490d805ef1349e5108f8b3085981ead", - "reference": "cde03c48d490d805ef1349e5108f8b3085981ead", + "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/2c2a71f1c77d9765c12638c4724d9ca23658a810", + "reference": "2c2a71f1c77d9765c12638c4724d9ca23658a810", "shasum": "" }, "require": { @@ -1146,7 +1147,7 @@ } ], "description": "A security checker for your composer.lock", - "time": "2015-05-22 14:21:04" + "time": "2015-05-28 14:22:40" }, { "name": "swiftmailer/swiftmailer", @@ -1383,16 +1384,16 @@ }, { "name": "symfony/symfony", - "version": "v2.6.8", + "version": "v2.6.9", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "7ae1934082d9ac299303b146e4a999274a723e94" + "reference": "b06539573ccf64dd3a62852685f052553d02c5ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/7ae1934082d9ac299303b146e4a999274a723e94", - "reference": "7ae1934082d9ac299303b146e4a999274a723e94", + "url": "https://api.github.com/repos/symfony/symfony/zipball/b06539573ccf64dd3a62852685f052553d02c5ba", + "reference": "b06539573ccf64dd3a62852685f052553d02c5ba", "shasum": "" }, "require": { @@ -1496,7 +1497,7 @@ "keywords": [ "framework" ], - "time": "2015-05-27 00:17:10" + "time": "2015-05-29 22:55:07" }, { "name": "twig/extensions", From dd2ae9b4320c5f2165ece23c5ec7d8377d063030 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 30 May 2015 19:12:34 +0200 Subject: [PATCH 28/98] updated VENDORS for 2.7.0 --- composer.lock | 59 ++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/composer.lock b/composer.lock index a69fc6de99..0650b0aeb0 100644 --- a/composer.lock +++ b/composer.lock @@ -348,16 +348,16 @@ }, { "name": "doctrine/doctrine-bundle", - "version": "v1.4.0", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "1986ff3a945b584c6505d07eae92d77e41131078" + "reference": "0b9e27037c4fdbad515ee5ec89842e9091a6480f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/1986ff3a945b584c6505d07eae92d77e41131078", - "reference": "1986ff3a945b584c6505d07eae92d77e41131078", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/0b9e27037c4fdbad515ee5ec89842e9091a6480f", + "reference": "0b9e27037c4fdbad515ee5ec89842e9091a6480f", "shasum": "" }, "require": { @@ -365,6 +365,7 @@ "doctrine/doctrine-cache-bundle": "~1.0", "jdorn/sql-formatter": "~1.1", "php": ">=5.3.2", + "symfony/console": "~2.3", "symfony/doctrine-bridge": "~2.2", "symfony/framework-bundle": "~2.3" }, @@ -383,7 +384,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.5.x-dev" } }, "autoload": { @@ -421,7 +422,7 @@ "orm", "persistence" ], - "time": "2015-02-28 11:04:45" + "time": "2015-05-28 12:27:15" }, { "name": "doctrine/doctrine-cache-bundle", @@ -990,17 +991,17 @@ }, { "name": "sensio/distribution-bundle", - "version": "v3.0.22", + "version": "v3.0.25", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "0fe4ec86db57c232becb694e01cdabe3c4d9af7c" + "reference": "01931139b0f067a4016d5d56e82c2b3086533b89" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/0fe4ec86db57c232becb694e01cdabe3c4d9af7c", - "reference": "0fe4ec86db57c232becb694e01cdabe3c4d9af7c", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/01931139b0f067a4016d5d56e82c2b3086533b89", + "reference": "01931139b0f067a4016d5d56e82c2b3086533b89", "shasum": "" }, "require": { @@ -1046,21 +1047,20 @@ "configuration", "distribution" ], - "time": "2015-05-02 16:23:08" + "time": "2015-05-29 22:35:41" }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.7", - "target-dir": "Sensio/Bundle/FrameworkExtraBundle", + "version": "v3.0.8", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "5c37623576ea9e841b87dc0d85414d98fa6f7abb" + "reference": "a30fc18bf147bc25faf6b1d54bf55cfad4b63cba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/5c37623576ea9e841b87dc0d85414d98fa6f7abb", - "reference": "5c37623576ea9e841b87dc0d85414d98fa6f7abb", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/a30fc18bf147bc25faf6b1d54bf55cfad4b63cba", + "reference": "a30fc18bf147bc25faf6b1d54bf55cfad4b63cba", "shasum": "" }, "require": { @@ -1073,6 +1073,7 @@ }, "suggest": { "symfony/expression-language": "", + "symfony/psr-http-message-bridge": "To use the PSR-7 converters", "symfony/security-bundle": "" }, "type": "symfony-bundle", @@ -1082,8 +1083,8 @@ } }, "autoload": { - "psr-0": { - "Sensio\\Bundle\\FrameworkExtraBundle": "" + "psr-4": { + "Sensio\\Bundle\\FrameworkExtraBundle\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -1101,20 +1102,20 @@ "annotations", "controllers" ], - "time": "2015-04-02 12:28:58" + "time": "2015-05-29 18:27:23" }, { "name": "sensiolabs/security-checker", - "version": "v2.0.2", + "version": "v2.0.5", "source": { "type": "git", "url": "https://github.com/sensiolabs/security-checker.git", - "reference": "cecb1397087dc9c733796eda6e9d121336039cdc" + "reference": "2c2a71f1c77d9765c12638c4724d9ca23658a810" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/cecb1397087dc9c733796eda6e9d121336039cdc", - "reference": "cecb1397087dc9c733796eda6e9d121336039cdc", + "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/2c2a71f1c77d9765c12638c4724d9ca23658a810", + "reference": "2c2a71f1c77d9765c12638c4724d9ca23658a810", "shasum": "" }, "require": { @@ -1146,7 +1147,7 @@ } ], "description": "A security checker for your composer.lock", - "time": "2015-04-21 07:52:05" + "time": "2015-05-28 14:22:40" }, { "name": "swiftmailer/swiftmailer", @@ -1383,16 +1384,16 @@ }, { "name": "symfony/symfony", - "version": "v2.7.0-BETA2", + "version": "v2.7.0", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "5cfcce37fa070f7765559156634c9ef2724e9545" + "reference": "9975b1eca3de4db792a2c3e4e16f676a4aadcd46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/5cfcce37fa070f7765559156634c9ef2724e9545", - "reference": "5cfcce37fa070f7765559156634c9ef2724e9545", + "url": "https://api.github.com/repos/symfony/symfony/zipball/9975b1eca3de4db792a2c3e4e16f676a4aadcd46", + "reference": "9975b1eca3de4db792a2c3e4e16f676a4aadcd46", "shasum": "" }, "require": { @@ -1501,7 +1502,7 @@ "keywords": [ "framework" ], - "time": "2015-05-13 20:25:22" + "time": "2015-05-30 16:52:28" }, { "name": "twig/twig", From 20971f252c12e916000c8457eea0868603f9613b Mon Sep 17 00:00:00 2001 From: Ivan Kurnosov Date: Sun, 31 May 2015 22:42:44 +1200 Subject: [PATCH 29/98] PSR-4 path to `SymfonyStandard` is incorrect It was simply replaced `psr-0` with `psr-4` but it additionally requires fixing the path to the namespace. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1200cf5909..89647fb8fd 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "project", "description": "The \"Symfony Standard Edition\" distribution", "autoload": { - "psr-4": { "": "src/", "SymfonyStandard\\": "app/" } + "psr-4": { "": "src/", "SymfonyStandard\\": "app/SymfonyStandard/" } }, "require": { "php": ">=5.3.3", From 49a4e62e5f32d1632b4a7b73cbd98ec2bbb200e1 Mon Sep 17 00:00:00 2001 From: Marc Aschmann Date: Sat, 30 May 2015 21:18:13 +0200 Subject: [PATCH 30/98] Removed beta flag from release version --- composer.json | 2 +- composer.lock | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 1200cf5909..42fad7cefd 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ }, "require": { "php": ">=5.3.3", - "symfony/symfony": "~2.7@beta", + "symfony/symfony": "2.7.*", "doctrine/orm": "~2.2,>=2.2.3,<2.5", "doctrine/dbal": "<2.5", "doctrine/doctrine-bundle": "~1.4", diff --git a/composer.lock b/composer.lock index 0650b0aeb0..fe1946d34e 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" ], - "hash": "05fb80d1f5c25e14b28b8b1f7aa965e0", + "hash": "bdc767b66153dae59e04d9a6630fc1eb", "packages": [ { "name": "doctrine/annotations", @@ -1614,9 +1614,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "symfony/symfony": 10 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { From edc56be365ea2daebcacb0f99e9416ea894f9ddc Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Fri, 5 Jun 2015 16:06:18 +0200 Subject: [PATCH 31/98] Removed AcmeDemoBundle --- app/AppKernel.php | 1 - app/config/routing_dev.yml | 4 - app/config/security.yml | 17 --- src/Acme/DemoBundle/AcmeDemoBundle.php | 9 -- .../DemoBundle/Controller/DemoController.php | 57 ---------- .../Controller/SecuredController.php | 68 ------------ .../Controller/WelcomeController.php | 18 ---- .../DependencyInjection/AcmeDemoExtension.php | 22 ---- .../EventListener/ControllerListener.php | 24 ----- src/Acme/DemoBundle/Form/ContactType.php | 20 ---- .../DemoBundle/Resources/config/routing.yml | 12 --- .../DemoBundle/Resources/config/services.xml | 18 ---- .../DemoBundle/Resources/public/css/demo.css | 101 ------------------ .../Resources/public/images/blue-arrow.png | Bin 181 -> 0 bytes .../public/images/field-background.gif | Bin 63 -> 0 bytes .../Resources/public/images/logo.gif | Bin 1698 -> 0 bytes .../Resources/public/images/search.png | Bin 737 -> 0 bytes .../public/images/welcome-configure.gif | Bin 3530 -> 0 bytes .../Resources/public/images/welcome-demo.gif | Bin 4053 -> 0 bytes .../public/images/welcome-quick-tour.gif | Bin 4770 -> 0 bytes .../Resources/views/Demo/contact.html.twig | 15 --- .../Resources/views/Demo/hello.html.twig | 9 -- .../Resources/views/Demo/index.html.twig | 14 --- .../Resources/views/Secured/hello.html.twig | 11 -- .../views/Secured/helloadmin.html.twig | 9 -- .../Resources/views/Secured/layout.html.twig | 6 -- .../Resources/views/Secured/login.html.twig | 35 ------ .../Resources/views/Welcome/index.html.twig | 83 -------------- .../Resources/views/layout.html.twig | 37 ------- .../Tests/Controller/DemoControllerTest.php | 17 --- .../Twig/Extension/DemoExtension.php | 81 -------------- 31 files changed, 688 deletions(-) delete mode 100644 src/Acme/DemoBundle/AcmeDemoBundle.php delete mode 100644 src/Acme/DemoBundle/Controller/DemoController.php delete mode 100644 src/Acme/DemoBundle/Controller/SecuredController.php delete mode 100644 src/Acme/DemoBundle/Controller/WelcomeController.php delete mode 100644 src/Acme/DemoBundle/DependencyInjection/AcmeDemoExtension.php delete mode 100644 src/Acme/DemoBundle/EventListener/ControllerListener.php delete mode 100644 src/Acme/DemoBundle/Form/ContactType.php delete mode 100644 src/Acme/DemoBundle/Resources/config/routing.yml delete mode 100644 src/Acme/DemoBundle/Resources/config/services.xml delete mode 100644 src/Acme/DemoBundle/Resources/public/css/demo.css delete mode 100644 src/Acme/DemoBundle/Resources/public/images/blue-arrow.png delete mode 100644 src/Acme/DemoBundle/Resources/public/images/field-background.gif delete mode 100644 src/Acme/DemoBundle/Resources/public/images/logo.gif delete mode 100644 src/Acme/DemoBundle/Resources/public/images/search.png delete mode 100644 src/Acme/DemoBundle/Resources/public/images/welcome-configure.gif delete mode 100644 src/Acme/DemoBundle/Resources/public/images/welcome-demo.gif delete mode 100644 src/Acme/DemoBundle/Resources/public/images/welcome-quick-tour.gif delete mode 100644 src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig delete mode 100644 src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig delete mode 100644 src/Acme/DemoBundle/Resources/views/Demo/index.html.twig delete mode 100644 src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig delete mode 100644 src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig delete mode 100644 src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig delete mode 100644 src/Acme/DemoBundle/Resources/views/Secured/login.html.twig delete mode 100644 src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig delete mode 100644 src/Acme/DemoBundle/Resources/views/layout.html.twig delete mode 100644 src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php delete mode 100644 src/Acme/DemoBundle/Twig/Extension/DemoExtension.php diff --git a/app/AppKernel.php b/app/AppKernel.php index 91e33bebca..a49f5f50f0 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -20,7 +20,6 @@ public function registerBundles() ); if (in_array($this->getEnvironment(), array('dev', 'test'))) { - $bundles[] = new Acme\DemoBundle\AcmeDemoBundle(); $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle(); diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml index c45f361bdb..ff93a02ba0 100644 --- a/app/config/routing_dev.yml +++ b/app/config/routing_dev.yml @@ -12,7 +12,3 @@ _configurator: _main: resource: routing.yml - -# AcmeDemoBundle routes (to be removed) -_acme_demo: - resource: "@AcmeDemoBundle/Resources/config/routing.yml" diff --git a/app/config/security.yml b/app/config/security.yml index 243aa71b44..fc6ae49d04 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -18,22 +18,5 @@ security: pattern: ^/(_(profiler|wdt)|css|images|js)/ security: false - login: - pattern: ^/demo/secured/login$ - security: false - - secured_area: - pattern: ^/demo/secured/ - form_login: - check_path: _security_check - login_path: _demo_login - logout: - path: _demo_logout - target: _demo - #anonymous: ~ - #http_basic: - # realm: "Secured Demo Area" - access_control: - - { path: ^/demo/secured/hello/admin/, roles: ROLE_ADMIN } #- { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https } diff --git a/src/Acme/DemoBundle/AcmeDemoBundle.php b/src/Acme/DemoBundle/AcmeDemoBundle.php deleted file mode 100644 index 269fc1e063..0000000000 --- a/src/Acme/DemoBundle/AcmeDemoBundle.php +++ /dev/null @@ -1,9 +0,0 @@ - $name); - } - - /** - * @Route("/contact", name="_demo_contact") - * @Template() - */ - public function contactAction() - { - $form = $this->get('form.factory')->create(new ContactType()); - - $request = $this->get('request'); - if ($request->isMethod('POST')) { - $form->submit($request); - if ($form->isValid()) { - $mailer = $this->get('mailer'); - // .. setup a message and send it - // http://symfony.com/doc/current/cookbook/email.html - - $this->get('session')->getFlashBag()->set('notice', 'Message sent!'); - - return new RedirectResponse($this->generateUrl('_demo')); - } - } - - return array('form' => $form->createView()); - } -} diff --git a/src/Acme/DemoBundle/Controller/SecuredController.php b/src/Acme/DemoBundle/Controller/SecuredController.php deleted file mode 100644 index f6d3005eeb..0000000000 --- a/src/Acme/DemoBundle/Controller/SecuredController.php +++ /dev/null @@ -1,68 +0,0 @@ -attributes->has(SecurityContext::AUTHENTICATION_ERROR)) { - $error = $request->attributes->get(SecurityContext::AUTHENTICATION_ERROR); - } else { - $error = $request->getSession()->get(SecurityContext::AUTHENTICATION_ERROR); - } - - return array( - 'last_username' => $request->getSession()->get(SecurityContext::LAST_USERNAME), - 'error' => $error, - ); - } - - /** - * @Route("/login_check", name="_security_check") - */ - public function securityCheckAction() - { - // The security layer will intercept this request - } - - /** - * @Route("/logout", name="_demo_logout") - */ - public function logoutAction() - { - // The security layer will intercept this request - } - - /** - * @Route("/hello", defaults={"name"="World"}), - * @Route("/hello/{name}", name="_demo_secured_hello") - * @Template() - */ - public function helloAction($name) - { - return array('name' => $name); - } - - /** - * @Route("/hello/admin/{name}", name="_demo_secured_hello_admin") - * @Template() - */ - public function helloadminAction($name) - { - return array('name' => $name); - } -} diff --git a/src/Acme/DemoBundle/Controller/WelcomeController.php b/src/Acme/DemoBundle/Controller/WelcomeController.php deleted file mode 100644 index acceedfd90..0000000000 --- a/src/Acme/DemoBundle/Controller/WelcomeController.php +++ /dev/null @@ -1,18 +0,0 @@ -render('AcmeDemoBundle:Welcome:index.html.twig'); - } -} diff --git a/src/Acme/DemoBundle/DependencyInjection/AcmeDemoExtension.php b/src/Acme/DemoBundle/DependencyInjection/AcmeDemoExtension.php deleted file mode 100644 index 6dfcc8229c..0000000000 --- a/src/Acme/DemoBundle/DependencyInjection/AcmeDemoExtension.php +++ /dev/null @@ -1,22 +0,0 @@ -load('services.xml'); - } - - public function getAlias() - { - return 'acme_demo'; - } -} diff --git a/src/Acme/DemoBundle/EventListener/ControllerListener.php b/src/Acme/DemoBundle/EventListener/ControllerListener.php deleted file mode 100644 index aa117d7426..0000000000 --- a/src/Acme/DemoBundle/EventListener/ControllerListener.php +++ /dev/null @@ -1,24 +0,0 @@ -extension = $extension; - } - - public function onKernelController(FilterControllerEvent $event) - { - if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) { - $this->extension->setController($event->getController()); - } - } -} diff --git a/src/Acme/DemoBundle/Form/ContactType.php b/src/Acme/DemoBundle/Form/ContactType.php deleted file mode 100644 index 2c76cdb27e..0000000000 --- a/src/Acme/DemoBundle/Form/ContactType.php +++ /dev/null @@ -1,20 +0,0 @@ -add('email', 'email'); - $builder->add('message', 'textarea'); - } - - public function getName() - { - return 'contact'; - } -} diff --git a/src/Acme/DemoBundle/Resources/config/routing.yml b/src/Acme/DemoBundle/Resources/config/routing.yml deleted file mode 100644 index 3402ca17cf..0000000000 --- a/src/Acme/DemoBundle/Resources/config/routing.yml +++ /dev/null @@ -1,12 +0,0 @@ -_welcome: - pattern: / - defaults: { _controller: AcmeDemoBundle:Welcome:index } - -_demo_secured: - resource: "@AcmeDemoBundle/Controller/SecuredController.php" - type: annotation - -_demo: - resource: "@AcmeDemoBundle/Controller/DemoController.php" - type: annotation - prefix: /demo \ No newline at end of file diff --git a/src/Acme/DemoBundle/Resources/config/services.xml b/src/Acme/DemoBundle/Resources/config/services.xml deleted file mode 100644 index d6274ce90e..0000000000 --- a/src/Acme/DemoBundle/Resources/config/services.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/Acme/DemoBundle/Resources/public/css/demo.css b/src/Acme/DemoBundle/Resources/public/css/demo.css deleted file mode 100644 index 4dd2f16c2f..0000000000 --- a/src/Acme/DemoBundle/Resources/public/css/demo.css +++ /dev/null @@ -1,101 +0,0 @@ -body { - font-size: 14px; - font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif; -} -h1.title { - font-size: 45px; - padding-bottom: 30px; -} -.sf-reset h2 { - font-weight: bold; - color: #FFFFFF; - /* Font is duplicated of body (sans-serif) */ - font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif; - - margin-bottom: 10px; - background-color: #aacd4e; - padding: 2px 4px; - display: inline-block; - text-transform: uppercase; - -} -p { - line-height: 20px; - padding-bottom: 20px; -} -ul#demo-list a { - background: url(../images/blue-arrow.png) no-repeat right 6px; - padding-right: 10px; - margin-right: 30px; -} -#symfony-header { - position: relative; - padding: 30px 30px 20px 30px; -} -.sf-reset .symfony-blocks-welcome { - overflow: hidden; -} -.sf-reset .symfony-blocks-welcome > div { - background-color: whitesmoke; - float: left; - width: 240px; - margin-right: 14px; - text-align: center; - padding: 26px 20px; -} -.sf-reset .symfony-blocks-welcome > div.block-demo { - margin-right: 0; -} -.sf-reset .symfony-blocks-welcome .illustration { - padding-bottom: 20px; -} -.sf-reset .symfony-blocks-help { - overflow: hidden; -} -.sf-reset .symfony-blocks-help { - margin-top: 30px; - padding: 18px; - border: 1px solid #E6E6E6; -} -.sf-reset .symfony-blocks-help > div { - width: 254px; - float: left; -} -.flash-message { - padding: 10px; - margin: 5px; - margin-top: 15px; - background-color: #ffe; -} -.sf-reset .error { - color: red; -} -#login label, #contact_form label { - display: block; - float: left; - width: 90px; -} -.sf-reset ul#menu { - float: right; - margin-bottom: 20px; - padding-left: 0; -} -.sf-reset #menu li { - padding-left: 0; - margin-right: 10px; - display: inline; -} -.sf-reset a, -.sf-reset li a { - color: #08C; - text-decoration: none; -} -.sf-reset a:hover, -.sf-reset li a:hover { - color: #08C; - text-decoration: underline; -} -.sf-reset .symfony-content pre { - white-space: pre; - font-family: monospace; -} diff --git a/src/Acme/DemoBundle/Resources/public/images/blue-arrow.png b/src/Acme/DemoBundle/Resources/public/images/blue-arrow.png deleted file mode 100644 index fa82d4b4fff6414062efb2a02049cfeb9e8e7cb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1c!3HD^Kbl$tDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9Md6+I= zhqi>4PnzMOuO)K~*(RkoSoCn7)R^#~T4CSujwM;<0=t>E&QEnQ(&y3G(9U?$#xX^m ckwt=G)hqGzYlDe*q4@=v9Pj!eSesj znO9X=ad2|Jy}yf!jHIKbv9Yp#e1F*3*>P`jS5;V~q@}*Tzl({C|Ns9mE;9fB{{R30 z000000000000000A^8LW000^QEC2ui0JZ==06+!*peBxFX^z0-1i_MJ3+p_pEh_&5dM^QH^o`2q?YC;|Y#eo6?SBFL~IkO9*W zUWrg(6a+6t1e9~gkzoUD0u)q?cL8IkHxMNMW_YDz4U&xn4G;-%fMrJwrreB*aD?3_ z1wa){Fo|t|jsdNTB$!ozNI7K6ROJ$p6pPVgF9`4wMB>|mt0D|wjG70m21m-KH6S4q zhKOfKG;JyM!j7010!F!0IkQPpts|OdaKxZQty_Z;XW06P@mIDOfgM&{!i#`0fD`e3 zQEdyS&0Nj2C9?Kr8lnz-R4p>0a~KE_K`S#&yS5Dk42ZH}fWWNn-@r{EpxZBi&EUv6 z8aN0#2?2n~qoYCA9N}^4*n51eZlv`Vo}$7KN0+^P4l3M z2>3zos9Q+@lo%19fEJ&v_eMl=Ver}i6~3L26fm|Wb=^(lB>@IXO1OprcmzanA$V+L zb^~<*z@))9>6GxyTD2hYPk$N-mINXQ^p_PtcqCwBVHzYQp9trqhK*03$jI3zp=`EL z4gk;<4l+DyFhEu)P)UL+z8NDzFH^jr%?TK>h?fa6iXfN(BusNv6&G%ik!z~7xy6*t zIl-j}Y9eFPWF!!y%L|M_g5H-VU{nL2eF8edifzfKN)iT20F<12yZv3FsjK z;Rr5efTm$DL^*<=i7qz6og;{q#A5}anraE7fn!1!py{+pbtXdbOp509;L?wY*qD(5 z06@@Q5uSu`O>_G}VTmEZ{vb*JgE&xUL1w2rpe-Fev@4h-90G~<(Y|8JzQl6785e#5UFuM(io2~!?FPxpW2UiiX#KE~* z@e34008|A3Hij{FaHUIu9SUF;&k<9N3>-uiQxHZ4U%WA%01CV85UvN?MKf#F{QQ#6 zwS{a20W27sMHohcl(Pv9{JSJU??&s;yP0%mi5&wxi^V4(W-tK+3tD074XPv%P67Jn zgWlPu)oR5^7&M*1$rz+WHy1@*`e+rU;lOHbgVTm}65KMKgaFOHA#`1H_0h5o&rIGb zE)5zmMj3GkP)KY67-azeT>((?w-JLB@U8#{nAQ0qC1>EkRbD)Is|#A0lK2~y79sN} zNG@y24sdXt_r~;iTHpx_=E*BaSP{$|$EWviZgdX{vBSluA zfC7ZqxHo|4cW)@0O6rG$hWUwSS3w4Z5G8{2&1zKz6h<&!@COo>P*Ep(L223&B{pG- z2y^&^Ds~qJqs^mjH~7XN@K6{!CC`PjdZDVeRKRC^iZLxrq7p~2JUof2D@uqT9E_kv z39)c17fSdz2oVk(|*9gP26mT@rLI(4sh?6#MCjsXOoCcz2gl2{9QVN>M zDBh=%)a0N50dPS1QV22^6&KcVi9jlXAybu*3hZqF zu;Jn-Qqr8K6@)kfNWj!GMXb&_vW`!zqp1P`D-sM~lX-ZeEsNm?6HFs{LTHX2-e5P0 zkjo5$5s}2!XM@Adqk=r!%(|SQh-ZjzVV3BW)ka{=J|u_>4l{-2o)9YhVN4aQ+W{Xl zVi%ZY#c|acCDCl7u_MR{1AEbx1k!1WaqiPJ^IWEzLb9vsZ1bQIlEVaoGL-Z@6r#YP s-o}b>F^nP~2bk%~rANzE00$7X3b6#@NZAEF2Ha}_46x5i%M$_sJDrx#NB{r; diff --git a/src/Acme/DemoBundle/Resources/public/images/search.png b/src/Acme/DemoBundle/Resources/public/images/search.png deleted file mode 100644 index 3c88b6a4234ef5bb048bcecdc210c603c629339d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 737 zcmV<70v`Q|P)gsCw z?(Xh4xV&O-EF1{%v$Hc}p-`|-CXOKadE^5EYyTmDC?Y##GKKABNo`~s zLF(c`qtW1~>;;02jSb|4JwHFws4L4|dU$xyR;yJpOS9ShvMeIucDqsPSgls04i67^ zudlCF^5t+iY`DL_|1z7+aDpH(kH^D-eYOw*djIL-;^K2ImlLBXmCC7Ft?t1k1=OrV zbAs&K+uPHdo134KPSg28(u0uZL?W^N`1ttdAju2Ftl!?=rk4qjs%Q?Fd_K=)G8uKb zTo#2g8jZr%)|L>D$5ow9N4&r=Od}GBJXx*QsZ4-L%BlhHkl28gxh{~|Y<4Xa3hBGu zu2>GdkJj<=@lzlWc##P(sRN|cXSr3Vr388oK=SeO^3nk1iX?iyzH@SN@`IQwQIH~z zr6EEXNki4N+wE*L8s+4vY`5DqkeV=*!G8c{N&(F2bov`SHs96N)ps~Ee+3u-E3-EG TZ0Qdg@&dtu!(bC4n#!gC6v$3?Nrl_Q&rEYC-z`wzoGFfKFn^z_}_-9SD=NJUGMkd*WC^1{Kx=H}*CR#`$nMLaq` zgMoxyT3|msLFwq|sHdq+NKa~MYfej1goA}eLP$$UPHbv#S5#U$H#~H5cCW3lE-f%Y zK0`)CNk&6SK0HB%goZ*uMR<03LqJA8J3vH2M`>qkKRrTVUSdp1PpPP?HZwSKaCA~n zRGOHZkdKi^L`q3UOo@n!etdpPMop2Bl6G`>Jvu+Zz`=lifr5a9u&=R*hKXESUaqaL zjf;&uIX>6c)>Kkgt*oxAs;n_DGsecpV_;>9iHjm2BdV#ZXJl&2%F4sS!-j>3p`W4K z+S}RK+11q4tgEeLVrIp}##&fhEGjNaM@_%J!E0!3qM@U4aC2>IaC~}xDJUx>BPJ^; zEn;9}C?+bsy}nFKPI`EIB_tn0QpCf>=;!Cu)74E%P%|+#G%_}UfP%ljzdATQJ2^f%Haj;pIXgH#H8VF) zOjAutQS0mLHZ(XmHaj>qIyW^sHZ(amG&%3@?=&$sH8M9iHaapeHSzKBG%`2D!^AT& zHZw3aIX62XA0i_mC8wsR?d|RE?(X2<-|+D8#l*$%@9*sF?Ck67IygM#<>uz)g%truv%AJ*45VO>FGB%IcsTd^6~MerKZcv%sV$U0~49&!eKGGBGrjl$P=E@apO6 zM@C40eSt(mMNdsqo0^=Qo1ITiQMk9c*Vow7($nAH-*t3%?(OaD?CsFc&^kFgP)t)W zE;8if`03oqv!~CWK!XY$ zI+P2?qYaxtih`s@4HzEoA)R{k5KyXE3zERZNz$fJnNabfiinGlX_pcnS;d&lr|8Xe9chMqKjNBmdN4T)z!-Q?!@)SX$1RphWXmCoI#2XtA8B-4s5-V{_?F%I-f2{?u+W`EmcVCI=Z z;+2uQ_##oLrmE_yL7@-~rxgwVfgzwA&H!tB>+N)_L|+go;gKqAR0|iD6l;km4jEu< zu^`};t4_N{#KD0HF38CNs43t}E9r6MKnDx#(M& z*>@cVm&DT8KQTz+@4u3;1I<4d#3Ku6?!x;Jf274{uWDd?Bge!P%b`mWsX;L@82Ypz z2QRLaA%_UK5QfMw>{gVp!VNKuoN^DF!-p0$*W8B$58t81J`J#-g%S@Vh98V9FXVDR z4hOCD()A7f8Ot+_DfQF>!p2u2egRf3gF&X~=;wwV3L0goCR&*ymNw;tDwmZC zGxgjwGLe-m2S^yUQ)37J3gru+rc^;K2r0vXO{emcGN#c0u*@KkM=tr~lvi%~<(Ov< z`6`?j;CTTcgf2P=JCwe|7O1CQ#p-0V-Z~YqQ}M*?E3Dwm?M&p(L>=`M?fdV*2QU2Z z78KAy+9rf>WtNGv>iqN2@3e+Da1U=#FG4H;BH&W0R791^ug#*VZbxta`9uL@eL-1h z$f1V|*t-5jE6@K=6Jj%Yg#8xPKmQjgI8u^=#gSU9VF`<42sGYslbaYIIQg+33GC!G zJUyZZ9AQNaeDD%CRPP|sK*391at?!d;tuerO9bb~fgjPS6Lw-oRuq5*7wqAK0#Sks zcF02)w80rS=;0gxR7f-y@@NqU`Vk;th8RT1LLC?}Mh04NgI)-P08PrG7PUACr1)=r zOVCk)ioryCorf9>*}?`M!A3T+Ax2-c9)GG;-|AZ9UvP#+?wVi5u$ z1|8zS0U4-*81}-zEcEpcU|9A&!_tAi+=*q43p&_Qbag(W*mGD#=NvguF-1gn8wA7t0s` z(2m+jpanuABYs2)u6QM(7Nk&;l=LUEnJr2btrChLh0&qlusvY%s7`HEH7gLvKnPNh zNx!1dBk^fgE{!PnP$H_Agil2^?a57v6SbYvEeM9p3N|7%p`{#kNe_kJ_FgazhIC+j zH>pGxG-ZH7SoN(q>gi8KS}m?P2rMbx8;0ChHtn4)rlZnL zN`8_ph&O>Z1eVeYzyTh}fPdG7mHJ642`0#beb)p5UMRU6iADk)f(&e|fB?YQa7HFv zv@fJ|PZ-8XEpAYg7(j#xK4{Sh9tgoAt}h060viT35)C&zY6Q_}h#DRhlLDAf8AN=V z1iOMzU$p@#qlm^D(r|*Q3S$5Y~&R9v%m*HqgJ2@nPD0MWz`N1|dY@+0g#MK*At}L)uu5axH`?j?GAI<)T{! z0Y@apO>QW3iNq{>k8J9=Pr@KW1w4qiyvu9aJ8$2 zq7;i!0$=>Fj&u~FkXb>u!s027|%EhfJT^du;312*ai#Afq^Bk;0D0|8D+48 ziO*9i?Fr~WgUn}+26v3%Fh-F159;9pH0;3@dqBet6oBcCNE}`iUm6hL!1Sg!oeisj z0vym#jV=fR4l{6t6W{=d!@L?F;Eu@Aqm}fBDS;1YPkY+);0oq^fe+tk00MNuhargJ z9ehy1a+1Algp7SxWv`Dp;1CBsT)`jWh=bzcfQ|WZAP)VwKm*VahaV*38gV$re7qg@ zZm#^BEgxph{y+j<&}Tnfo6JN8Y1fPdEf=UJ~2pz?scCBoCR$LyUzkU z`w6Xo!pG(9PJVfauTlHmUir{x4f6~8{ODW%Fw-}FY4Umf?qk39zdKt09vKE%pEaD!76y2mozB zfi;qCtF~uDg;&4gRZf9a@ADyl)l|u|JjAsV6)=QEScF4}ESB1%gV|Jw8Y(Q6&^smKWu)ggYgJKvh>=@fBPpKsh)zJLp#;CLf8X~l(? zVh3ROR!xY3Pk2x$^(#~8C$z#`zco=K7+AwaK0ncgcp*1;7$$kAU<8`OIjitFqcb|D zb2>y|16{>Xd*xC**oGBVf^8#Jm(mA~cq8SI7gCT{E2V?m^;;rB7YgACQxJr9b}7qn ziZ^lwbwCx_pa&C>V;06zd?kp0GY<;k4bhb)+>j{`po?HAh9X5$HCR+QXkbY-D8N;S z!Zj1`a0r}Y4F>>?OPGgxw1*prC&NgEO=5-36*$~z0!u&-5mt}(c#rs)kNUWe77-8t EJ3feF)c^nh diff --git a/src/Acme/DemoBundle/Resources/public/images/welcome-demo.gif b/src/Acme/DemoBundle/Resources/public/images/welcome-demo.gif deleted file mode 100644 index 0623de54c9501be250cd0907bd09f6b452c53fe6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4053 zcmV;`4=V6SNk%w1VX^>Z0Qdg@<>cf~Oj15OLCVR>IygOCSzhVr=u}Wwot&P7f`q}q z!aX`bsHUjl;NW?8dptTnjEattkdkk0adB>Qw6nF&&CW3{GfhfRLO?~9l$cIRQ9wRJ z*45Uls;rNWkb!@KrlqIa+S^c0QGb4bmX(*Wu(C!(NN8qhrKF}`U0_T|Prbdqu&=RW zVP$l4c71z(h=z&gw>L_j@4tgEe*la=V^=07|^l8}@|LP)Q!v5AO^Oi53; zxVbhnI7dWE-QC?%PE}f0U1?@)&d$%w%gjqjO-o2lNk&Z4(b92nb75a%oSB_5FEev+ zb(eSe3Ah|9{%j*XAT#>a|@jGmpJW@Kl!wYS*U*j7_mJUKqb#m7iTN_Ta5 zOiE7G)YWQfYtYZpPE1f>U1GVoxmj3Svaz$Tt*=c?PitvyN=HpHFf=nUH8nFgG%_~x z^Yb?~IW{ynJ2^f$H99ypIyg2v@$vCDG&wmoJ2y2t@9*#R_4PC{HZ?Lg=jP@!F*fV! z>NYevGB7ncH#_O+>iYWnGcYyu^z<|`H}382;NRfl;o|D)>G1IJ?Cb33=jXt`!1(z1 zG z=I7(%lq$*eL;(9X}dwz#^vyHHG1;+-i!kaXEGMu-qLkRYuA z1Lnd7BTzUPj0I(%)2C3QN_9Gb! zZA!(10Hz077B&d*Gw7NrdW;$|5@1Rthi9Y~07bFGhlHR=b)8JPvJbH?2^1;2Y)^s& z!DfYmz_LWyvLsxxE4u=7%Q62dHH#F9l_XJ=HvAe1N}rsm!1oOqNM}m$r$j0%UtSrH zYnFUYOOJKLWf7&MXJ4m|w?loAP5A`THzRpC%8oVfGKHl}DH8IO~FBf^nK zMv@mrN#OZhcyZ7s$&}`aaY|gCq(T4zfIJ{TeDoc0!~|AVYH32ubN~Vc71VO+r=W%^ z>ZqiaYU-(|rmE_ythVavLY&C|!Vd!}M1p4*c0{x4Jyqc7R0f>9+TxsC(U6UwVu?_K zXk`&Yfh91pkkA_sz$f1Z^?9jNn0*OFluD!M32aOODppl>=2>~D^1Of)u&Q~7>OgQ968H5Qv)c{4u zi-^@Mogm#FbSt8e17Yd^aS#`Aq;1d#>Lp6ZVGbeCpHM^5IM@_7CWuemaSstzAEzZ_ zLeru66M@xTGysts+qJ+%J{8zP!W%Ae?KPq2ol>}>j9M$-*M5} zd}Pr}M>Wum86gFXfCmHhpwavE)K_o)_1I^x{r22<@BR1ShcEs^t!x9#K89N9fX* z!nC*xe#;0`P{u(20s)*q;K3Zh`bR7nP=Me7fmD&9D0G6Y_^GwzGnN z?4e4tgF!=*Aq4&aWeOP7z!V;WCaIi(3&?Lhgr;m4@aT^I9^93F-WT+eNaFfl1Pyo`0AGgVL`;Ef`C#w2pP{Y z0e1W`fIYT^1lZx5)nJnbu0>){l(0cWD$#~|G=c!KXA$ak~v_f0CXb+K^W0OZ-UbmlQ0ybyyz%MZ9r1F15;0U_N{jUO`gHYK|Prx zgRlVLGzoCY7NqlsmZ(BHWKdoq4RR;&s7w-)paen{nu#@}ARdfr=(Ql4pDyep4GP(X z1J;PqrxakLJ;IC$lwb=EaG)L$IOR*EDIG`9O-TpgMOZ8l9)&Ta4|jQ#d>-?Vb{yrR zAY=eim(zf`SuLMsF$Uf8v5+x@r3MFC2Oh9m5I4}pE)+Nj0E~fYenfrN4M(kcd1mg zw{`C&&%e;~3Fq470f~477v{iUQGE_XU64Ty>;Qr#R6rLE&aj3z%;64u_`@I$v4}@Z z;u4$q#3)X&idW3y7Q6VxFphDVOo59iIRY1W?2mIKTlN7|{maIiv!KaGM+q_^KvXgE9?hL3@3$iZm$t52tC(OC}+( zg}fsdFLET~D*7Ky9>fV{C~6y1m1SHk=LYQ!28A}qk}H;F6)l8G3lh?UCg4|R1`~?U zjxq%f5@Zm^Ilu&53!F1}R#ew8z>Zd_JOa?7EZT8NHnQLb9lsnt~66`3)O9 z;wMkgby1{H2`40WAAd+ULR8U2sXWmtmDq);icoibiaKJvKV31JgLf%M?HfAD$bbrKx zLoIm#32xzxKTNGG4`zupZ^6Llgd+`>z=2iVq6Dl4ksfS79`m3l4-Rp_mk@D=7vKR4`M?3c z9RdR!wc#L{2M!BB-xUTtCk5ESg0)%lfo#%E25AsfOc6?^N_8OAI6?;hL6UzQ2r!>3 zS=dh9rLzo^yQBlyk$b)3@sDwchnHX2NC@Uo0vl8T1`==rXr)+OKm=0YD<^P%ThVdP zVFUUkS1qv_(!o#q(ggxx2wa6+FhvP`Kn@2{4TsPNJzxh8&;n{8UE30Fj~90ER8$J$ z2MWj!EPxp)PzP1h4Qu<6b${SwdsdPt{}vxOq(i#nb&=G9 zE;toB5Q9;031M+kW$^(n;Re!?ek>74uQq*nLIMR*0dtdqv|$@EwOq|bU(j_eD5xJk zfm(+pg;V$xTo8l&@B(3h49((xEb#`X(FZP33DPl0Ruc(?Mi4Up(N05TGCdpD0gcz=sroKah4Bu|PL(kPr;`5?m7x zKb8>2fB}xO1-C;8_V5r8fQKNY2zISs;AZt=iwMDxFyS`_F%Oadz;*@!0|o{G5J3e8!-63h z9Ay9tB*_n#5f=V*8qwGfbx;;~qc4cihzj8WVc`Z5aR!Q)D8b+m25g71B@;mB0z0@Cv423ZwvcYsCOm6cd)P2oZTChLCL#p$nK{lMA5)-?V)RrFff= z0wo|s|6l+tFbF&FP~X-CbodjLvJi(CG2~_up}+~l@Cv_R3bjBA8^;_C00FSrKn0*= z6R`-c!3TFa5WT=Ukcb;dSU5EUaA%WWJ75AmK}-#@;cJ)j44j|~k||pQPy?BXECs*| z^f(dBW;JSfnr#?ba41&A$Wykt1A*W@m0%3WFak0_XT=}`GT;p)P-z~a2>*4RRC0Cf zv4l5+J3nxISB4O^&}H?xfrP!BwLn5dk>b4}Z`CBR~QmkOtE!q)z&zP#UFDI;B)vrB-Sw H0RaFzT>Bsn diff --git a/src/Acme/DemoBundle/Resources/public/images/welcome-quick-tour.gif b/src/Acme/DemoBundle/Resources/public/images/welcome-quick-tour.gif deleted file mode 100644 index b9018b11dd21302f850984fe9b49e49828101a00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4770 zcmWmDhd;>NTP8@B}G;x z4R2>=zW(%XH@m8@)s z4Nms98+Y&8^W(?QN7av!)r@<^C3|Xky z?BmBztj!(+10QUx?Ck9v*4x;3babR7r;Lt{T3Og;q-Tzde9pa==k4LUiRrS@o_QeX z(ADf~H?H66dDA1fncvjdtj*B*Hzl>Lt^MYWTiI8x_V)Ji)6&yY`H`p3HaE905bgf{ z_wU}m+qvEU<;$0Ib8|_F$s&Bnw zg}1+a`BGN;upqza;`x74lK)+!qlaPj!G}XG$0zO$2yA=RrlYmyY~;C!u*lZdSNVd1 z=g(gp3qIlL=JTxfxtojU$>X7i4+dwXXE-~$&d<*`HZ<~h(MN+rPDey?FY$`+-g9zr zPEAd#t$oJ!@qO~RW^r+`y}cuh6Vcw*{_@4k#>S@dhZPsjUBv3@pFewEQ}guho#M?- ztk<2d`TTTYeZ%Y5UFrOc)|S@FimDgSUtIc!*C1?kuyLP%g4*Z$HU#z!_6b%a-yy6 zdKYI`N2b#T`;8{X>#QuS%}{eMcecB$*IHxLWs@7a*35(DZDO>}be*}8fr+7kv6mZr zor$TwuA#fDx3S?`BSRBIePaVXBLh7{Gt|NywKO-iv@o->G`F@ev$is~S#P`1+S1O} z+J0zgXl7>S>(_~?sj11yNr^-YpcJ$nU|4`+_KmhNV@(0-geqj z^@%r!r9)f<>|`q5{S>>(`_F2XeXW^BJ6;}n90Ins+v<59d^$Tu$NSra7Tm%9Y5%Sy zUELMgRys4@bAQLagKfX+=bU4A`P6MZuLhc82%w#VF(%e9KXNr0pK+)Ghu^BsVQguO zfnD^6W0kfC563C`Yw=A{6ar1bDI|!1&+hL=g*!Ph76A`NMw0J~v_7X;^ag+a*XB#k z0X0xQTu4P?5fR1mW#CBqDndh&qNml@(M)z*Lo*y=FL5zj$q;v}O2$uvRC|l57^>MH zk&qtJDsagS49IL{((M;W84-~Y@wBtv5<0;8BZ(oO^DLms4MY_AX!1PK*cI&J88?Hi zVuP!<^L6m!%ZUR3)+WPJBl8F-8bo0%Kp0gC^jMsh}GFe*l zrDU?KCfAX)^#Sn$j20^$`&QAad;eQyhgF`jIj9^HEprb0MK^DCLLQU|1H|8-h~tfZ z)Qn~yE30v)#)2!>0r#D1OpZU>Zfa1LldzIACQEay4}hEN0FrSzW{aP?8Qx+X)P_+> zDfH`#0`8bY68U=Ba{@uT!&a4L-lVz^KgiN@Oo39+ri-y|4C5!?D%(A5R9@pPQ27Ma zWqn~7Z8_GDtowRFGA%MbW-0=;Joyt2C!Tvk%?L$ddUqlRp`kyJ9=4oD#P`|0J!itG zK_`y$<29BMelziie(z}e;&g?`;2(hkxe=&-{Eb zH%e9_n_u))FwyV75dFu$)54hoNm|xP|NQDZCH*_qPQFAuo>SkT-B#Y)9fd+`s5(m1 zeoc#>)g(POPASfvh3*%FD+M^vt2lbij|$4FYNl7zbk8+^rjr6#LgQjQ(~ToM>tC-( zTNCoB_r$SZO+?Oz*<3kgF=hKV$z>+B0G3|1arXZ8lTPP2Dx7R}PK`J~{j3ebs8f@n ze|nNR*+cQkm6Qmb3G&|7dZ3xrY?eEf66{&1-Zfthu!d7M+6eO=+aS2(!>MOG3RnGZ zZP~aum3AQ@mKhsV8Yp6rE(G9KCi>xb+DxbOQ;Kx-++Ml+n`P`%O;E@dL~9^xGF)~a z35dWFn{s+1mg^h>V7FvVSeToKpS_s%}lAG=@Ojz(R4#J$C&IWfM@T*@eJ5D z@UR+q&4rn+*7>+G{N^lGZLd;BG???NNZ;!y?pq+co>~B$v)Q?Ft9uU!GZ8u1@s0js znpe?V>-sR4NqjolK@6ylsTu?mw?yBuo4x0Kn>$L@CPrmp@-gxdl_h$+DTPON7RQIz z0PiZTENT8rEm{bQbNoRmQ5r9HN-(7dsyaHBX1X|LbSJ-DoP8K&851sW#MOBVS363K zfRQf%X4m`h2;7PySnrzU7=ZgOGvIDzBK7QCmEi9;P^JoysSZ+O3IG+nBDrgOy?{h6 zJ?^Lh@uUyLco-HrMCao~C%Jd?Iw{~r=HQ6>@0tTSUg%9m&H?f;WSX#BIn`s&#Cb<# z5XMox193d#;Ti{W*;a3U@^tR+=i??1mF&@+z(EGkkg!|Zo&Rxh;7qEe4Gu@u=dTr5 zmyY};n+@WqN1rpG5>|P%N{5(eo12cQO_dEA zT6ozqRz=c|j*%75=9|#e&}3-K7BW|G9h|}?-;fU=?QAH!z-qj3)%vmx3sPqQ*-U+Y zlJ5G2SM1cvth=6LhMR25z%4lQWvt^88Eo_Uuz$&E6KQ+SLPxN7Rc>F$7prHxq@8@2 zr4@)koy&#fqrLmN@(P#7hI=$uV2wsZuW=`hMNxuxb%Dx>U^nb2(X1w#Sr9bt`C~yh z61#QB+QdOyE}xLL(*?g$AzEFBs}==jJc3Of4h1ag`sM^tm*jbd5(fR0gz1_zTw*NX zsoASG>Nan^qoBUj|Drxdw%OD)R^r%Oc;S&(EQ7wHTpZL6@Te|lb@`}`g#7t(nsUq*y_+q5|Ncel1*<`R0@qZ3()et>RuyM zN!9ZiummmHkOsQ_MA@P)Fn} zt`@d~UivTV<#hc0;*|j{Kb1FL?A5GLL7HfjLfJ%Gg zb1@=;ezDJsi9|E7^ARsI3T~xE3A^8D;3;JtFMgc)*=9p-l)wJ=yMxxnwzVH_A_g{B zr>}PX2|v05=<(%!DS*qqY1Sd~=$*MIU4QrQ-GQ($P%2Zql!gbYWct>T*XWivKA7+Q6v}5AWFob78}3(g!`01J6OL@Dk1b$%ezR6igIm!$Rk1_XY+zv)b|N;u0^j*s`Nv1_j)ZaaX-1TmChz;d%6 z3Ef75fTL_6LrkYM_?D#0-Olknh{B3|iy84AgLinLFBJf&rXna2AuLyKupMY$#i_wHr}g5?NJsgPr7UEi?4Xe2a^jAUiJhJ_!6Hpmu$x z3W0!8N8m}2#%5H5%T(85s$5f10jtu(M>CC@)CwKvcg8(wkxHK`hH>4`s1ZOORS$q*W~dYZ2Vt`7 z#Pl7QtT}9*iC%wWdt)P@_ow?%0D3*BH}7=0?8k*0Vzrykq=6t~oIX@3Ybb_LZc-J4 zwg$N=q1>88;AoNU^#wW^zIjxX2j=5zB)0%{0VpH5B_cYF)9W!jR4bq^-g@+l9tGg~ zxCCem9vp!FsDY2m^EC(ZS1sm0W>Z#*X-Vd)3^s0?L>8$nFs{u%EK*X7q&=Od>xuIt z<>I9+h44rQi(QUaa0CMTLqc5YpX;AsqAWjo@d_n zuf6>|CSQsG*ro&El10oy{$|ooY zmEOc_ttc$V+%n zUq7kyi9=ztN&Ir+1+hFPg8qTY%3Q)F5jfn7!&^XF&Q1)x&Q1ZDCnCF=!W47DCENNH4#o+7}EL=wuI@Ghl?2N@x75it~Rwx zOb!!;;W5ZTLMmD!l`oRaP{>>ae$sXF0&xFjJB19(8}JD`F+3Xyo{v0L_&(2$c`8dn z#}M#=>`Afi$qouu{H~7$D1muaq1#W$=7G(l3yanS9W7H%u Pcp^k-X1orE1J?f^bf!^p diff --git a/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig b/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig deleted file mode 100644 index e5b7523bac..0000000000 --- a/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "AcmeDemoBundle::layout.html.twig" %} - -{% block title "Symfony - Contact form" %} - -{% block content %} -
- {{ form_errors(form) }} - - {{ form_row(form.email) }} - {{ form_row(form.message) }} - - {{ form_rest(form) }} - -
-{% endblock %} diff --git a/src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig b/src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig deleted file mode 100644 index 3997ff606a..0000000000 --- a/src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "AcmeDemoBundle::layout.html.twig" %} - -{% block title "Hello " ~ name %} - -{% block content %} -

Hello {{ name }}!

-{% endblock %} - -{% set code = code(_self) %} diff --git a/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig b/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig deleted file mode 100644 index 454a3203e4..0000000000 --- a/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "AcmeDemoBundle::layout.html.twig" %} - -{% block title "Symfony - Demos" %} - -{% block content_header '' %} - -{% block content %} -

Available demos

- -{% endblock %} diff --git a/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig deleted file mode 100644 index faf95cf8c1..0000000000 --- a/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "AcmeDemoBundle:Secured:layout.html.twig" %} - -{% block title "Hello " ~ name %} - -{% block content %} -

Hello {{ name }}!

- - Hello resource secured for admin only. -{% endblock %} - -{% set code = code(_self) %} diff --git a/src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig deleted file mode 100644 index 4e3649f77a..0000000000 --- a/src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "AcmeDemoBundle:Secured:layout.html.twig" %} - -{% block title "Hello " ~ name %} - -{% block content %} -

Hello {{ name }} secured for Admins only!

-{% endblock %} - -{% set code = code(_self) %} diff --git a/src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig deleted file mode 100644 index aeea55c5cf..0000000000 --- a/src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "AcmeDemoBundle::layout.html.twig" %} - -{% block content_header_more %} - {{ parent() }} -
  • logged in as {{ app.user ? app.user.username : 'Anonymous' }} - Logout
    • -{% endblock %} diff --git a/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig deleted file mode 100644 index e74a5aa7b6..0000000000 --- a/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig +++ /dev/null @@ -1,35 +0,0 @@ -{% extends 'AcmeDemoBundle::layout.html.twig' %} - -{% block content %} -

    Login

    - -

    - Choose between two default users: user/userpass (ROLE_USER) or admin/adminpass (ROLE_ADMIN) -

    - - {% if error %} -
    {{ error.message }}
    - {% endif %} - -
    -
    - - -
    - -
    - - -
    - - -
    -{% endblock %} - -{% set code = code(_self) %} diff --git a/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig b/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig deleted file mode 100644 index ea3a7299b7..0000000000 --- a/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig +++ /dev/null @@ -1,83 +0,0 @@ -{% extends 'AcmeDemoBundle::layout.html.twig' %} - -{% block title %}Symfony - Welcome{% endblock %} - -{% block content_header '' %} - -{% block content %} - {% set version = constant('Symfony\\Component\\HttpKernel\\Kernel::MAJOR_VERSION') ~ '.' ~ constant('Symfony\\Component\\HttpKernel\\Kernel::MINOR_VERSION')%} - -

    Welcome!

    - -

    Congratulations! You have successfully installed a new Symfony application.

    - -
    -
    -
    - Quick tour -
    - - - - Read the Quick Tour - - - -
    - {% if app.environment == 'dev' %} -
    -
    - Configure your application -
    - - - - Configure - - - -
    - {% endif %} -
    -
    - Demo -
    - - - - Run The Demo - - - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    -{% endblock %} diff --git a/src/Acme/DemoBundle/Resources/views/layout.html.twig b/src/Acme/DemoBundle/Resources/views/layout.html.twig deleted file mode 100644 index d7e97d5638..0000000000 --- a/src/Acme/DemoBundle/Resources/views/layout.html.twig +++ /dev/null @@ -1,37 +0,0 @@ -{% extends "TwigBundle::layout.html.twig" %} - -{% block head %} - - -{% endblock %} - -{% block title 'Demo Bundle' %} - -{% block body %} - {% for flashMessage in app.session.flashbag.get('notice') %} -
    - Notice: {{ flashMessage }} -
    - {% endfor %} - - {% block content_header %} - - -
    - {% endblock %} - -
    - {% block content %}{% endblock %} -
    - - {% if code is defined %} -

    Code behind this page

    -
    -
    {{ code|raw }}
    -
    - {% endif %} -{% endblock %} diff --git a/src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php b/src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php deleted file mode 100644 index 6472ac7a05..0000000000 --- a/src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php +++ /dev/null @@ -1,17 +0,0 @@ -request('GET', '/demo/hello/Fabien'); - - $this->assertGreaterThan(0, $crawler->filter('html:contains("Hello Fabien")')->count()); - } -} diff --git a/src/Acme/DemoBundle/Twig/Extension/DemoExtension.php b/src/Acme/DemoBundle/Twig/Extension/DemoExtension.php deleted file mode 100644 index def07573dd..0000000000 --- a/src/Acme/DemoBundle/Twig/Extension/DemoExtension.php +++ /dev/null @@ -1,81 +0,0 @@ -loader = $loader; - } - - public function setController($controller) - { - $this->controller = $controller; - } - - /** - * {@inheritdoc} - */ - public function getFunctions() - { - return array( - new \Twig_SimpleFunction('code', array($this, 'getCode'), array('is_safe' => array('html'))), - ); - } - - public function getCode($template) - { - // highlight_string highlights php code only if 'getControllerCode(), true); - $controller = str_replace('<?php    ', '    ', $controller); - - $template = htmlspecialchars($this->getTemplateCode($template), ENT_QUOTES, 'UTF-8'); - - // remove the code block - $template = str_replace('{% set code = code(_self) %}', '', $template); - - return <<Controller Code

    -
    $controller
    - -

    Template Code

    -
    $template
    -EOF; - } - - protected function getControllerCode() - { - $class = get_class($this->controller[0]); - if (class_exists('CG\Core\ClassUtils')) { - $class = ClassUtils::getUserClass($class); - } - - $r = new \ReflectionClass($class); - $m = $r->getMethod($this->controller[1]); - - $code = file($r->getFilename()); - - return ' '.$m->getDocComment()."\n".implode('', array_slice($code, $m->getStartline() - 1, $m->getEndLine() - $m->getStartline() + 1)); - } - - protected function getTemplateCode($template) - { - return $this->loader->getSource($template->getTemplateName()); - } - - /** - * Returns the name of the extension. - * - * @return string The extension name - */ - public function getName() - { - return 'demo'; - } -} From eb4a8e13c0cf81b6ebc4087e01cd22af4680a165 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Fri, 5 Jun 2015 16:08:38 +0200 Subject: [PATCH 32/98] Removed AcmeDemoBundle --- app/SymfonyStandard/RootPackageInstallSubscriber.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/SymfonyStandard/RootPackageInstallSubscriber.php b/app/SymfonyStandard/RootPackageInstallSubscriber.php index 89cc2890a9..2f88b61ac4 100644 --- a/app/SymfonyStandard/RootPackageInstallSubscriber.php +++ b/app/SymfonyStandard/RootPackageInstallSubscriber.php @@ -18,11 +18,6 @@ class RootPackageInstallSubscriber implements EventSubscriberInterface { - public static function installAcmeDemoBundle(CommandEvent $event) - { - ScriptHandler::installAcmeDemoBundle($event); - } - public static function setupNewDirectoryStructure(CommandEvent $event) { ScriptHandler::defineDirectoryStructure($event); @@ -33,7 +28,6 @@ public static function getSubscribedEvents() return array( ScriptEvents::POST_INSTALL_CMD => array( array('setupNewDirectoryStructure', 512), - array('installAcmeDemoBundle', 0) ), ); } From 34eaf2f0081250ba70f73e6b05fb19a735009c8a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 10 Jun 2015 16:34:32 +0200 Subject: [PATCH 33/98] fixed PHP dep --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a01485b72e..ff3a81ae10 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "psr-4": { "": "src/", "SymfonyStandard\\": "app/SymfonyStandard/" } }, "require": { - "php": ">=5.3.3", + "php": ">=5.3.9", "symfony/symfony": "2.7.*", "doctrine/orm": "~2.2,>=2.2.3,<2.5", "doctrine/dbal": "<2.5", From 2e60a9f188c216241c86daaad9d8c3ae5c413b40 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Thu, 11 Jun 2015 11:39:22 +0200 Subject: [PATCH 34/98] Simplified the security.yml configuration --- app/config/security.yml | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/app/config/security.yml b/app/config/security.yml index fc6ae49d04..a187595106 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -1,22 +1,13 @@ security: - encoders: - Symfony\Component\Security\Core\User\User: plaintext - - role_hierarchy: - ROLE_ADMIN: ROLE_USER - ROLE_SUPER_ADMIN: [ROLE_USER, ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH] providers: in_memory: - memory: - users: - user: { password: userpass, roles: [ 'ROLE_USER' ] } - admin: { password: adminpass, roles: [ 'ROLE_ADMIN' ] } + memory: ~ firewalls: dev: - pattern: ^/(_(profiler|wdt)|css|images|js)/ + pattern: ^/(_(profiler|wdt|error)|css|images|js)/ security: false - access_control: - #- { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https } + main: + anonymous: ~ From 42b12245bf562c69e6b1243323d90983d52adcee Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Thu, 11 Jun 2015 11:40:50 +0200 Subject: [PATCH 35/98] The security.yml file now uses the same configuration as in Symfony 2.3 (the "default" firewall is now called "main") --- app/config/security.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/config/security.yml b/app/config/security.yml index b891000b1f..a187595106 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -1,4 +1,5 @@ security: + providers: in_memory: memory: ~ @@ -8,5 +9,5 @@ security: pattern: ^/(_(profiler|wdt|error)|css|images|js)/ security: false - default: + main: anonymous: ~ From cdddfa0301e5f34b7020a62e815b7211e691f011 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Thu, 11 Jun 2015 15:31:47 +0200 Subject: [PATCH 36/98] Removed the "_error" path from the sample security.yml file --- app/config/security.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/security.yml b/app/config/security.yml index a187595106..2e5fd0a669 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -6,7 +6,7 @@ security: firewalls: dev: - pattern: ^/(_(profiler|wdt|error)|css|images|js)/ + pattern: ^/(_(profiler|wdt)|css|images|js)/ security: false main: From e722cacb34b2a083f0020df4f9c0c75dd836791d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 11 Jun 2015 23:03:05 +0200 Subject: [PATCH 37/98] updated deps --- app/SymfonyRequirements.php | 14 ++++++-- composer.json | 2 +- composer.lock | 64 ++++++++++++++++++------------------- 3 files changed, 44 insertions(+), 36 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index caabe407b1..b9d62f724b 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -643,15 +643,15 @@ class_exists('Locale'), 'Install and enable the intl extension (used for validators).' ); - if (class_exists('Collator')) { + if (extension_loaded('intl')) { + // in some WAMP server installations, new Collator() returns null $this->addRecommendation( null !== new Collator('fr_FR'), 'intl extension should be correctly configured', 'The intl extension does not behave properly. This problem is typical on PHP 5.3.X x64 WIN builds.' ); - } - if (class_exists('Locale')) { + // check for compatible ICU versions (only done when you have the intl extension) if (defined('INTL_ICU_VERSION')) { $version = INTL_ICU_VERSION; } else { @@ -670,6 +670,14 @@ class_exists('Locale'), 'intl ICU version should be at least 4+', 'Upgrade your intl extension with a newer ICU version (4+).' ); + + $this->addPhpIniRecommendation( + 'intl.error_level', + create_function('$cfgValue', 'return (int) $cfgValue === 0;'), + true, + 'intl.error_level should be 0 in php.ini', + 'Set "intl.error_level" to "0" in php.ini* to inhibit the messages when an error occurs in ICU functions.' + ); } $accelerator = diff --git a/composer.json b/composer.json index 56613b6fbf..96d557ea3e 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "symfony/assetic-bundle": "~2.3", "symfony/swiftmailer-bundle": "~2.3", "symfony/monolog-bundle": "~2.4", - "sensio/distribution-bundle": "~3.0,>=3.0.12", + "sensio/distribution-bundle": "~4.0", "sensio/framework-extra-bundle": "~3.0,>=3.0.2", "incenteev/composer-parameter-handler": "~2.0" }, diff --git a/composer.lock b/composer.lock index c9b8c5f0bf..3e9a5d7035 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" ], - "hash": "928cf07615062470571573abc0843fa6", + "hash": "356286e2d09be6e14659e36a322bcedd", "packages": [ { "name": "doctrine/annotations", @@ -704,17 +704,16 @@ }, { "name": "incenteev/composer-parameter-handler", - "version": "v2.1.0", - "target-dir": "Incenteev/ParameterHandler", + "version": "v2.1.1", "source": { "type": "git", "url": "https://github.com/Incenteev/ParameterHandler.git", - "reference": "143272a0a09c62616a3c8011fc165a10c6b35241" + "reference": "84a205fe80a46101607bafbc423019527893ddd0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/143272a0a09c62616a3c8011fc165a10c6b35241", - "reference": "143272a0a09c62616a3c8011fc165a10c6b35241", + "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/84a205fe80a46101607bafbc423019527893ddd0", + "reference": "84a205fe80a46101607bafbc423019527893ddd0", "shasum": "" }, "require": { @@ -733,8 +732,8 @@ } }, "autoload": { - "psr-0": { - "Incenteev\\ParameterHandler": "" + "psr-4": { + "Incenteev\\ParameterHandler\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -752,7 +751,7 @@ "keywords": [ "parameters management" ], - "time": "2013-12-07 10:10:39" + "time": "2015-06-03 08:27:03" }, { "name": "jdorn/sql-formatter", @@ -991,21 +990,21 @@ }, { "name": "sensio/distribution-bundle", - "version": "v3.0.25", + "version": "v4.0.0", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "01931139b0f067a4016d5d56e82c2b3086533b89" + "reference": "97929c0a642977acead3d911b2c5c1a944739d40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/01931139b0f067a4016d5d56e82c2b3086533b89", - "reference": "01931139b0f067a4016d5d56e82c2b3086533b89", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/97929c0a642977acead3d911b2c5c1a944739d40", + "reference": "97929c0a642977acead3d911b2c5c1a944739d40", "shasum": "" }, "require": { - "php": ">=5.3.3", + "php": ">=5.3.9", "sensiolabs/security-checker": "~2.0", "symfony/class-loader": "~2.2", "symfony/framework-bundle": "~2.3", @@ -1024,7 +1023,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "4.0.x-dev" } }, "autoload": { @@ -1047,20 +1046,20 @@ "configuration", "distribution" ], - "time": "2015-05-29 22:35:41" + "time": "2015-06-11 20:55:01" }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.8", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "a30fc18bf147bc25faf6b1d54bf55cfad4b63cba" + "reference": "0616fd568da051adc19ca63006cc808531ba2da4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/a30fc18bf147bc25faf6b1d54bf55cfad4b63cba", - "reference": "a30fc18bf147bc25faf6b1d54bf55cfad4b63cba", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/0616fd568da051adc19ca63006cc808531ba2da4", + "reference": "0616fd568da051adc19ca63006cc808531ba2da4", "shasum": "" }, "require": { @@ -1102,7 +1101,7 @@ "annotations", "controllers" ], - "time": "2015-05-29 18:27:23" + "time": "2015-06-05 13:59:21" }, { "name": "sensiolabs/security-checker", @@ -1151,23 +1150,23 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v5.4.0", + "version": "v5.4.1", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "31454f258f10329ae7c48763eb898a75c39e0a9f" + "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/31454f258f10329ae7c48763eb898a75c39e0a9f", - "reference": "31454f258f10329ae7c48763eb898a75c39e0a9f", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/0697e6aa65c83edf97bb0f23d8763f94e3f11421", + "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "mockery/mockery": "~0.9.1" + "mockery/mockery": "~0.9.1,<0.9.4" }, "type": "library", "extra": { @@ -1196,10 +1195,11 @@ "description": "Swiftmailer, free feature-rich PHP mailer", "homepage": "http://swiftmailer.org", "keywords": [ + "email", "mail", "mailer" ], - "time": "2015-03-14 06:06:39" + "time": "2015-06-06 14:19:39" }, { "name": "symfony/assetic-bundle", @@ -1553,16 +1553,16 @@ }, { "name": "twig/twig", - "version": "v1.18.1", + "version": "v1.18.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "9f70492f44398e276d1b81c1b43adfe6751c7b7f" + "reference": "e8e6575abf6102af53ec283f7f14b89e304fa602" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/9f70492f44398e276d1b81c1b43adfe6751c7b7f", - "reference": "9f70492f44398e276d1b81c1b43adfe6751c7b7f", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/e8e6575abf6102af53ec283f7f14b89e304fa602", + "reference": "e8e6575abf6102af53ec283f7f14b89e304fa602", "shasum": "" }, "require": { @@ -1606,7 +1606,7 @@ "keywords": [ "templating" ], - "time": "2015-04-19 08:30:27" + "time": "2015-06-06 23:31:24" } ], "packages-dev": [ From eca895f8376d444ffd4b259713f23e66c533195c Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 12 Jun 2015 00:23:12 +0200 Subject: [PATCH 38/98] updated VENDORS for 2.7.1 --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 5144f9e762..d69426966f 100644 --- a/composer.lock +++ b/composer.lock @@ -1384,16 +1384,16 @@ }, { "name": "symfony/symfony", - "version": "v2.7.0", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "9975b1eca3de4db792a2c3e4e16f676a4aadcd46" + "reference": "932b6e7499c670f4db6d0b871477a4a3ca161e74" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/9975b1eca3de4db792a2c3e4e16f676a4aadcd46", - "reference": "9975b1eca3de4db792a2c3e4e16f676a4aadcd46", + "url": "https://api.github.com/repos/symfony/symfony/zipball/932b6e7499c670f4db6d0b871477a4a3ca161e74", + "reference": "932b6e7499c670f4db6d0b871477a4a3ca161e74", "shasum": "" }, "require": { @@ -1502,7 +1502,7 @@ "keywords": [ "framework" ], - "time": "2015-05-30 16:52:28" + "time": "2015-06-11 21:15:28" }, { "name": "twig/twig", From b557e019261c7dae633603191a26b30140c3f4fc Mon Sep 17 00:00:00 2001 From: Edvinas Klovas Date: Fri, 12 Jun 2015 13:18:47 +0300 Subject: [PATCH 39/98] [README] Add DebugBundle to the list --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index cd2bb80269..298d8740b6 100644 --- a/README.md +++ b/README.md @@ -53,6 +53,9 @@ It comes pre-configured with the following bundles: * [**SensioGeneratorBundle**][13] (in dev/test env) - Adds code generation capabilities + * **DebugBundle** (in dev/test env) - Adds Debug and VarDumper component + integration + All libraries and bundles included in the Symfony Standard Edition are released under the MIT or BSD license. From af468905c48fe0f9b9e5169d34e41f570c108485 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Fri, 19 Jun 2015 09:54:23 -0400 Subject: [PATCH 40/98] adding light documentation to security.yml --- app/config/security.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/config/security.yml b/app/config/security.yml index 2e5fd0a669..8072372c44 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -1,13 +1,24 @@ +# To get started with security, check out the documentation: +# http://symfony.com/doc/current/book/security.html security: + # http://symfony.com/doc/current/book/security.html#where-do-users-come-from-user-providers providers: in_memory: memory: ~ firewalls: + # disables authentication for assets and the profiler, adapt it according to your needs dev: pattern: ^/(_(profiler|wdt)|css|images|js)/ security: false main: anonymous: ~ + # activate different ways to authenticate + + # http_basic: ~ + # http://symfony.com/doc/current/book/security.html#a-configuring-how-your-users-will-authenticate + + # form_login: ~ + # http://symfony.com/doc/current/cookbook/security/form_login_setup.html From 9d42632bdf4b53fb06f5cce7104dcae7c334d73e Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Thu, 2 Jul 2015 00:15:06 +0200 Subject: [PATCH 41/98] add hint for symlinked assets in htaccess see https://github.com/symfony/symfony-docs/pull/5020/files#r24984113 --- web/.htaccess | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/.htaccess b/web/.htaccess index 94b38929ed..351052caab 100644 --- a/web/.htaccess +++ b/web/.htaccess @@ -5,6 +5,11 @@ # to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl). DirectoryIndex app.php +# uncomment the following line if you install assets as symlinks +# or run into problems when compiling LESS/Sass/CoffeScript assets +# +# Options FollowSymlinks + # Disabling MultiViews prevents unwanted negotiation, e.g. "/app" should not resolve # to the front controller "/app.php" but be rewritten to "/app.php/app". From 42f1259cdb2109bc5494086ba54a7c8648cdc659 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 2 Jul 2015 01:17:18 +0200 Subject: [PATCH 42/98] fixed version in the README file --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 63ed368195..666c8d1b94 100644 --- a/README.md +++ b/README.md @@ -61,12 +61,12 @@ released under the MIT or BSD license. Enjoy! -[1]: http://symfony.com/doc/2.7/book/installation.html +[1]: http://symfony.com/doc/2.8/book/installation.html [6]: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html -[7]: http://symfony.com/doc/2.7/book/doctrine.html -[8]: http://symfony.com/doc/2.7/book/templating.html -[9]: http://symfony.com/doc/2.7/book/security.html -[10]: http://symfony.com/doc/2.7/cookbook/email.html -[11]: http://symfony.com/doc/2.7/cookbook/logging/monolog.html -[12]: http://symfony.com/doc/2.7/cookbook/assetic/asset_management.html -[13]: http://symfony.com/doc/2.7/bundles/SensioGeneratorBundle/index.html +[7]: http://symfony.com/doc/2.8/book/doctrine.html +[8]: http://symfony.com/doc/2.8/book/templating.html +[9]: http://symfony.com/doc/2.8/book/security.html +[10]: http://symfony.com/doc/2.8/cookbook/email.html +[11]: http://symfony.com/doc/2.8/cookbook/logging/monolog.html +[12]: http://symfony.com/doc/2.8/cookbook/assetic/asset_management.html +[13]: http://symfony.com/doc/2.8/bundles/SensioGeneratorBundle/index.html From 39d1fd099ce50a017a9ec81ae227ebf29b5a7366 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Thu, 2 Jul 2015 09:17:37 +0200 Subject: [PATCH 43/98] tweak follow symlinks options for consistency --- web/.htaccess | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/.htaccess b/web/.htaccess index 351052caab..207f78eecc 100644 --- a/web/.htaccess +++ b/web/.htaccess @@ -5,9 +5,10 @@ # to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl). DirectoryIndex app.php -# uncomment the following line if you install assets as symlinks -# or run into problems when compiling LESS/Sass/CoffeScript assets -# +# By default, Apache does not evaluate symbolic links if you did not enable this +# feature in your server configuration. Uncomment the following line if you +# install assets as symlinks or if you experience problems related to symlinks +# when compiling LESS/Sass/CoffeScript assets. # Options FollowSymlinks # Disabling MultiViews prevents unwanted negotiation, e.g. "/app" should not resolve From 5d67f4512ee9e63f6f3427b38f70ce9f68ae4640 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 13 Jul 2015 11:29:18 +0200 Subject: [PATCH 44/98] updated VENDORS for 2.3.31 --- app/SymfonyRequirements.php | 14 +++-- composer.lock | 101 +++++++++++++++++++----------------- 2 files changed, 63 insertions(+), 52 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index 1e5dbf4418..dd7c2781b7 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -625,15 +625,15 @@ class_exists('Locale'), 'Install and enable the intl extension (used for validators).' ); - if (class_exists('Collator')) { + if (extension_loaded('intl')) { + // in some WAMP server installations, new Collator() returns null $this->addRecommendation( null !== new Collator('fr_FR'), 'intl extension should be correctly configured', 'The intl extension does not behave properly. This problem is typical on PHP 5.3.X x64 WIN builds.' ); - } - if (class_exists('Locale')) { + // check for compatible ICU versions (only done when you have the intl extension) if (defined('INTL_ICU_VERSION')) { $version = INTL_ICU_VERSION; } else { @@ -652,6 +652,14 @@ class_exists('Locale'), 'intl ICU version should be at least 4+', 'Upgrade your intl extension with a newer ICU version (4+).' ); + + $this->addPhpIniRecommendation( + 'intl.error_level', + create_function('$cfgValue', 'return (int) $cfgValue === 0;'), + true, + 'intl.error_level should be 0 in php.ini', + 'Set "intl.error_level" to "0" in php.ini* to inhibit the messages when an error occurs in ICU functions.' + ); } $accelerator = diff --git a/composer.lock b/composer.lock index eb5de85b94..9fab14cce8 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "doctrine/annotations", - "version": "v1.2.4", + "version": "v1.2.6", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "b5202eb9e83f8db52e0e58867e0a46e63be8332e" + "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/b5202eb9e83f8db52e0e58867e0a46e63be8332e", - "reference": "b5202eb9e83f8db52e0e58867e0a46e63be8332e", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/f4a91702ca3cd2e568c3736aa031ed00c3752af4", + "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4", "shasum": "" }, "require": { @@ -72,7 +72,7 @@ "docblock", "parser" ], - "time": "2014-12-23 22:40:37" + "time": "2015-06-17 12:21:22" }, { "name": "doctrine/cache", @@ -704,17 +704,16 @@ }, { "name": "incenteev/composer-parameter-handler", - "version": "v2.1.0", - "target-dir": "Incenteev/ParameterHandler", + "version": "v2.1.1", "source": { "type": "git", "url": "https://github.com/Incenteev/ParameterHandler.git", - "reference": "143272a0a09c62616a3c8011fc165a10c6b35241" + "reference": "84a205fe80a46101607bafbc423019527893ddd0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/143272a0a09c62616a3c8011fc165a10c6b35241", - "reference": "143272a0a09c62616a3c8011fc165a10c6b35241", + "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/84a205fe80a46101607bafbc423019527893ddd0", + "reference": "84a205fe80a46101607bafbc423019527893ddd0", "shasum": "" }, "require": { @@ -733,8 +732,8 @@ } }, "autoload": { - "psr-0": { - "Incenteev\\ParameterHandler": "" + "psr-4": { + "Incenteev\\ParameterHandler\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -752,7 +751,7 @@ "keywords": [ "parameters management" ], - "time": "2013-12-07 10:10:39" + "time": "2015-06-03 08:27:03" }, { "name": "jdorn/sql-formatter", @@ -880,16 +879,16 @@ }, { "name": "monolog/monolog", - "version": "1.13.1", + "version": "1.15.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "c31a2c4e8db5da8b46c74cf275d7f109c0f249ac" + "reference": "dc5150cc608f2334c72c3b6a553ec9668a4156b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c31a2c4e8db5da8b46c74cf275d7f109c0f249ac", - "reference": "c31a2c4e8db5da8b46c74cf275d7f109c0f249ac", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/dc5150cc608f2334c72c3b6a553ec9668a4156b0", + "reference": "dc5150cc608f2334c72c3b6a553ec9668a4156b0", "shasum": "" }, "require": { @@ -900,12 +899,14 @@ "psr/log-implementation": "1.0.0" }, "require-dev": { - "aws/aws-sdk-php": "~2.4, >2.4.8", + "aws/aws-sdk-php": "^2.4.9", "doctrine/couchdb": "~1.0@dev", "graylog2/gelf-php": "~1.0", - "phpunit/phpunit": "~4.0", - "raven/raven": "~0.5", - "ruflin/elastica": "0.90.*", + "php-console/php-console": "^3.1.3", + "phpunit/phpunit": "~4.5", + "phpunit/phpunit-mock-objects": "2.3.0", + "raven/raven": "~0.8", + "ruflin/elastica": ">=0.90 <3.0", "swiftmailer/swiftmailer": "~5.3", "videlalvaro/php-amqplib": "~2.4" }, @@ -915,6 +916,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", + "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", "ruflin/elastica": "Allow sending log messages to an Elastic Search server", @@ -923,7 +925,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13.x-dev" + "dev-master": "1.15.x-dev" } }, "autoload": { @@ -949,7 +951,7 @@ "logging", "psr-3" ], - "time": "2015-03-09 09:58:04" + "time": "2015-07-12 13:54:09" }, { "name": "psr/log", @@ -991,17 +993,17 @@ }, { "name": "sensio/distribution-bundle", - "version": "v2.3.16", + "version": "v2.3.22", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "df552307f1426f69ada59cfcae85c43b7c10a8cd" + "reference": "98bdda791e7c2dfb5fd55781e69a4b00e4f751a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/df552307f1426f69ada59cfcae85c43b7c10a8cd", - "reference": "df552307f1426f69ada59cfcae85c43b7c10a8cd", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/98bdda791e7c2dfb5fd55781e69a4b00e4f751a6", + "reference": "98bdda791e7c2dfb5fd55781e69a4b00e4f751a6", "shasum": "" }, "require": { @@ -1033,20 +1035,20 @@ "configuration", "distribution" ], - "time": "2015-05-02 16:01:47" + "time": "2015-06-05 22:32:08" }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.8", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "a30fc18bf147bc25faf6b1d54bf55cfad4b63cba" + "reference": "0616fd568da051adc19ca63006cc808531ba2da4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/a30fc18bf147bc25faf6b1d54bf55cfad4b63cba", - "reference": "a30fc18bf147bc25faf6b1d54bf55cfad4b63cba", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/0616fd568da051adc19ca63006cc808531ba2da4", + "reference": "0616fd568da051adc19ca63006cc808531ba2da4", "shasum": "" }, "require": { @@ -1088,7 +1090,7 @@ "annotations", "controllers" ], - "time": "2015-05-29 18:27:23" + "time": "2015-06-05 13:59:21" }, { "name": "sensio/generator-bundle", @@ -1140,23 +1142,23 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v5.4.0", + "version": "v5.4.1", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "31454f258f10329ae7c48763eb898a75c39e0a9f" + "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/31454f258f10329ae7c48763eb898a75c39e0a9f", - "reference": "31454f258f10329ae7c48763eb898a75c39e0a9f", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/0697e6aa65c83edf97bb0f23d8763f94e3f11421", + "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "mockery/mockery": "~0.9.1" + "mockery/mockery": "~0.9.1,<0.9.4" }, "type": "library", "extra": { @@ -1185,10 +1187,11 @@ "description": "Swiftmailer, free feature-rich PHP mailer", "homepage": "http://swiftmailer.org", "keywords": [ + "email", "mail", "mailer" ], - "time": "2015-03-14 06:06:39" + "time": "2015-06-06 14:19:39" }, { "name": "symfony/assetic-bundle", @@ -1373,16 +1376,16 @@ }, { "name": "symfony/symfony", - "version": "v2.3.30", + "version": "v2.3.31", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "6dfe5551b71d156739a0df1043ba81b326e36f4a" + "reference": "bd506a5e84fdce41966ef4986255fff1e31fc056" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/6dfe5551b71d156739a0df1043ba81b326e36f4a", - "reference": "6dfe5551b71d156739a0df1043ba81b326e36f4a", + "url": "https://api.github.com/repos/symfony/symfony/zipball/bd506a5e84fdce41966ef4986255fff1e31fc056", + "reference": "bd506a5e84fdce41966ef4986255fff1e31fc056", "shasum": "" }, "require": { @@ -1477,7 +1480,7 @@ "keywords": [ "framework" ], - "time": "2015-05-29 22:16:04" + "time": "2015-07-13 09:12:26" }, { "name": "twig/extensions", @@ -1528,16 +1531,16 @@ }, { "name": "twig/twig", - "version": "v1.18.1", + "version": "v1.18.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "9f70492f44398e276d1b81c1b43adfe6751c7b7f" + "reference": "e8e6575abf6102af53ec283f7f14b89e304fa602" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/9f70492f44398e276d1b81c1b43adfe6751c7b7f", - "reference": "9f70492f44398e276d1b81c1b43adfe6751c7b7f", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/e8e6575abf6102af53ec283f7f14b89e304fa602", + "reference": "e8e6575abf6102af53ec283f7f14b89e304fa602", "shasum": "" }, "require": { @@ -1581,7 +1584,7 @@ "keywords": [ "templating" ], - "time": "2015-04-19 08:30:27" + "time": "2015-06-06 23:31:24" } ], "packages-dev": [], From 750358c4b4fa6abfe562b27f6d47b0bf91e97f5b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 13 Jul 2015 11:44:52 +0200 Subject: [PATCH 45/98] updated VENDORS for 2.6.10 --- composer.lock | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/composer.lock b/composer.lock index 3e9a5d7035..abd7631a59 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "doctrine/annotations", - "version": "v1.2.4", + "version": "v1.2.6", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "b5202eb9e83f8db52e0e58867e0a46e63be8332e" + "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/b5202eb9e83f8db52e0e58867e0a46e63be8332e", - "reference": "b5202eb9e83f8db52e0e58867e0a46e63be8332e", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/f4a91702ca3cd2e568c3736aa031ed00c3752af4", + "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4", "shasum": "" }, "require": { @@ -72,7 +72,7 @@ "docblock", "parser" ], - "time": "2014-12-23 22:40:37" + "time": "2015-06-17 12:21:22" }, { "name": "doctrine/cache", @@ -879,16 +879,16 @@ }, { "name": "monolog/monolog", - "version": "1.13.1", + "version": "1.15.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "c31a2c4e8db5da8b46c74cf275d7f109c0f249ac" + "reference": "dc5150cc608f2334c72c3b6a553ec9668a4156b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c31a2c4e8db5da8b46c74cf275d7f109c0f249ac", - "reference": "c31a2c4e8db5da8b46c74cf275d7f109c0f249ac", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/dc5150cc608f2334c72c3b6a553ec9668a4156b0", + "reference": "dc5150cc608f2334c72c3b6a553ec9668a4156b0", "shasum": "" }, "require": { @@ -899,12 +899,14 @@ "psr/log-implementation": "1.0.0" }, "require-dev": { - "aws/aws-sdk-php": "~2.4, >2.4.8", + "aws/aws-sdk-php": "^2.4.9", "doctrine/couchdb": "~1.0@dev", "graylog2/gelf-php": "~1.0", - "phpunit/phpunit": "~4.0", - "raven/raven": "~0.5", - "ruflin/elastica": "0.90.*", + "php-console/php-console": "^3.1.3", + "phpunit/phpunit": "~4.5", + "phpunit/phpunit-mock-objects": "2.3.0", + "raven/raven": "~0.8", + "ruflin/elastica": ">=0.90 <3.0", "swiftmailer/swiftmailer": "~5.3", "videlalvaro/php-amqplib": "~2.4" }, @@ -914,6 +916,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", + "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", "ruflin/elastica": "Allow sending log messages to an Elastic Search server", @@ -922,7 +925,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13.x-dev" + "dev-master": "1.15.x-dev" } }, "autoload": { @@ -948,7 +951,7 @@ "logging", "psr-3" ], - "time": "2015-03-09 09:58:04" + "time": "2015-07-12 13:54:09" }, { "name": "psr/log", @@ -1384,16 +1387,16 @@ }, { "name": "symfony/symfony", - "version": "v2.6.9", + "version": "v2.6.10", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "b06539573ccf64dd3a62852685f052553d02c5ba" + "reference": "e246af5f3bdf64fa5a85936ee78e3574e094cf5f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/b06539573ccf64dd3a62852685f052553d02c5ba", - "reference": "b06539573ccf64dd3a62852685f052553d02c5ba", + "url": "https://api.github.com/repos/symfony/symfony/zipball/e246af5f3bdf64fa5a85936ee78e3574e094cf5f", + "reference": "e246af5f3bdf64fa5a85936ee78e3574e094cf5f", "shasum": "" }, "require": { @@ -1497,7 +1500,7 @@ "keywords": [ "framework" ], - "time": "2015-05-29 22:55:07" + "time": "2015-07-13 09:34:32" }, { "name": "twig/extensions", From aecfdea6e17fee847ffdf361bb5101c4175e5dd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Wed, 22 Jul 2015 22:44:27 +0200 Subject: [PATCH 46/98] Use HTTPS everywhere in README.md --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 8feff6ec5e..398a5fe516 100644 --- a/README.md +++ b/README.md @@ -58,12 +58,12 @@ released under the MIT or BSD license. Enjoy! -[1]: http://symfony.com/doc/2.3/book/installation.html -[6]: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html -[7]: http://symfony.com/doc/2.3/book/doctrine.html -[8]: http://symfony.com/doc/2.3/book/templating.html -[9]: http://symfony.com/doc/2.3/book/security.html -[10]: http://symfony.com/doc/2.3/cookbook/email.html -[11]: http://symfony.com/doc/2.3/cookbook/logging/monolog.html -[12]: http://symfony.com/doc/2.3/cookbook/assetic/asset_management.html -[13]: http://symfony.com/doc/current/bundles/SensioGeneratorBundle/index.html +[1]: https://symfony.com/doc/2.3/book/installation.html +[6]: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html +[7]: https://symfony.com/doc/2.3/book/doctrine.html +[8]: https://symfony.com/doc/2.3/book/templating.html +[9]: https://symfony.com/doc/2.3/book/security.html +[10]: https://symfony.com/doc/2.3/cookbook/email.html +[11]: https://symfony.com/doc/2.3/cookbook/logging/monolog.html +[12]: https://symfony.com/doc/2.3/cookbook/assetic/asset_management.html +[13]: https://symfony.com/doc/current/bundles/SensioGeneratorBundle/index.html From 0e4bb3eb237cb15ba574219a38c27cda041b14f3 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Wed, 22 Jul 2015 09:30:10 +0200 Subject: [PATCH 47/98] Added a "Welcome Page" for new Symfony apps --- app/Resources/views/default/index.html.twig | 73 ++++++++++++++++++- .../Controller/DefaultController.php | 9 ++- .../Controller/DefaultControllerTest.php | 3 +- 3 files changed, 80 insertions(+), 5 deletions(-) diff --git a/app/Resources/views/default/index.html.twig b/app/Resources/views/default/index.html.twig index ed261498cb..75842ebe18 100644 --- a/app/Resources/views/default/index.html.twig +++ b/app/Resources/views/default/index.html.twig @@ -1,5 +1,76 @@ {% extends 'base.html.twig' %} {% block body %} - Homepage. +
    +
    +
    +

    Welcome to Symfony {{ constant('Symfony\\Component\\HttpKernel\\Kernel::VERSION') }}

    +
    + +
    +

    + + + Your application is ready to start working on it at: + {{ base_dir }}/ +

    +
    + + + +
    +
    +{% endblock %} + +{% block stylesheets %} + {% endblock %} diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php index 8569811ee0..3bd767561a 100644 --- a/src/AppBundle/Controller/DefaultController.php +++ b/src/AppBundle/Controller/DefaultController.php @@ -9,10 +9,13 @@ class DefaultController extends Controller { /** - * @Route("/app/example", name="homepage") + * @Route("/", name="homepage") */ - public function indexAction() + public function indexAction(Request $request) { - return $this->render('default/index.html.twig'); + // replace this example code with whatever you need + return $this->render('default/index.html.twig', array( + 'base_dir' => realpath($this->container->getParameter('kernel.root_dir').'/..'), + )); } } diff --git a/src/AppBundle/Tests/Controller/DefaultControllerTest.php b/src/AppBundle/Tests/Controller/DefaultControllerTest.php index 66ca01878a..87989da90d 100644 --- a/src/AppBundle/Tests/Controller/DefaultControllerTest.php +++ b/src/AppBundle/Tests/Controller/DefaultControllerTest.php @@ -12,6 +12,7 @@ public function testIndex() $crawler = $client->request('GET', '/'); - $this->assertTrue($crawler->filter('html:contains("Homepage")')->count() > 0); + $this->assertEquals(200, $client->getResponse()->getStatusCode()); + $this->assertContains('Welcome to Symfony', $crawler->filter('#container h1')->text()); } } From a9f7ed4decd638c4b54b30043c71ec9a8d4d3685 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 31 Jul 2015 15:45:57 +0200 Subject: [PATCH 48/98] updated VENDORS for 2.7.3 --- composer.lock | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/composer.lock b/composer.lock index d69426966f..0968ae6668 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "doctrine/annotations", - "version": "v1.2.4", + "version": "v1.2.6", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "b5202eb9e83f8db52e0e58867e0a46e63be8332e" + "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/b5202eb9e83f8db52e0e58867e0a46e63be8332e", - "reference": "b5202eb9e83f8db52e0e58867e0a46e63be8332e", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/f4a91702ca3cd2e568c3736aa031ed00c3752af4", + "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4", "shasum": "" }, "require": { @@ -72,7 +72,7 @@ "docblock", "parser" ], - "time": "2014-12-23 22:40:37" + "time": "2015-06-17 12:21:22" }, { "name": "doctrine/cache", @@ -879,16 +879,16 @@ }, { "name": "monolog/monolog", - "version": "1.13.1", + "version": "1.15.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "c31a2c4e8db5da8b46c74cf275d7f109c0f249ac" + "reference": "dc5150cc608f2334c72c3b6a553ec9668a4156b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c31a2c4e8db5da8b46c74cf275d7f109c0f249ac", - "reference": "c31a2c4e8db5da8b46c74cf275d7f109c0f249ac", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/dc5150cc608f2334c72c3b6a553ec9668a4156b0", + "reference": "dc5150cc608f2334c72c3b6a553ec9668a4156b0", "shasum": "" }, "require": { @@ -899,12 +899,14 @@ "psr/log-implementation": "1.0.0" }, "require-dev": { - "aws/aws-sdk-php": "~2.4, >2.4.8", + "aws/aws-sdk-php": "^2.4.9", "doctrine/couchdb": "~1.0@dev", "graylog2/gelf-php": "~1.0", - "phpunit/phpunit": "~4.0", - "raven/raven": "~0.5", - "ruflin/elastica": "0.90.*", + "php-console/php-console": "^3.1.3", + "phpunit/phpunit": "~4.5", + "phpunit/phpunit-mock-objects": "2.3.0", + "raven/raven": "~0.8", + "ruflin/elastica": ">=0.90 <3.0", "swiftmailer/swiftmailer": "~5.3", "videlalvaro/php-amqplib": "~2.4" }, @@ -914,6 +916,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", + "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", "ruflin/elastica": "Allow sending log messages to an Elastic Search server", @@ -922,7 +925,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13.x-dev" + "dev-master": "1.15.x-dev" } }, "autoload": { @@ -948,7 +951,7 @@ "logging", "psr-3" ], - "time": "2015-03-09 09:58:04" + "time": "2015-07-12 13:54:09" }, { "name": "psr/log", @@ -1384,16 +1387,16 @@ }, { "name": "symfony/symfony", - "version": "v2.7.1", + "version": "v2.7.3", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "932b6e7499c670f4db6d0b871477a4a3ca161e74" + "reference": "a9af4708b4bb650c4897e9b8dfbfbdb2ea5f0486" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/932b6e7499c670f4db6d0b871477a4a3ca161e74", - "reference": "932b6e7499c670f4db6d0b871477a4a3ca161e74", + "url": "https://api.github.com/repos/symfony/symfony/zipball/a9af4708b4bb650c4897e9b8dfbfbdb2ea5f0486", + "reference": "a9af4708b4bb650c4897e9b8dfbfbdb2ea5f0486", "shasum": "" }, "require": { @@ -1502,7 +1505,7 @@ "keywords": [ "framework" ], - "time": "2015-06-11 21:15:28" + "time": "2015-07-31 13:24:45" }, { "name": "twig/twig", From d35ee1720ce28ab77bb1c7e401e6ec5da48585ac Mon Sep 17 00:00:00 2001 From: Richard van Laak Date: Tue, 1 Sep 2015 10:58:20 +0200 Subject: [PATCH 49/98] Documentation link changed --- web/app_dev.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/app_dev.php b/web/app_dev.php index 872a882835..9f02ccbb0e 100644 --- a/web/app_dev.php +++ b/web/app_dev.php @@ -4,7 +4,8 @@ use Symfony\Component\Debug\Debug; // If you don't want to setup permissions the proper way, just uncomment the following PHP line -// read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information +// read http://symfony.com/doc/current/book/installation.html#checking-symfony-application-configuration-and-setup +// for more information //umask(0000); // This check prevents access to debug front controllers that are deployed by accident to production servers. From a522d9de5d5d0eb10b4121d9c1d18f35c2ddbe46 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 1 Sep 2015 18:00:50 +0200 Subject: [PATCH 50/98] updated VENDORS for 2.3.32 --- composer.lock | 210 ++++++++++++++++++++++++++++---------------------- 1 file changed, 118 insertions(+), 92 deletions(-) diff --git a/composer.lock b/composer.lock index 9fab14cce8..403c45d897 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "8b02bb324925eec9e704367ae521a85a", + "hash": "9d3480dd93412d49aa920ae45e26acbf", "packages": [ { "name": "doctrine/annotations", - "version": "v1.2.6", + "version": "v1.2.7", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4" + "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/f4a91702ca3cd2e568c3736aa031ed00c3752af4", - "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535", + "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535", "shasum": "" }, "require": { @@ -72,20 +72,20 @@ "docblock", "parser" ], - "time": "2015-06-17 12:21:22" + "time": "2015-08-31 12:32:49" }, { "name": "doctrine/cache", - "version": "v1.4.1", + "version": "v1.4.2", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "c9eadeb743ac6199f7eec423cb9426bc518b7b03" + "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/c9eadeb743ac6199f7eec423cb9426bc518b7b03", - "reference": "c9eadeb743ac6199f7eec423cb9426bc518b7b03", + "url": "https://api.github.com/repos/doctrine/cache/zipball/8c434000f420ade76a07c64cbe08ca47e5c101ca", + "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca", "shasum": "" }, "require": { @@ -142,7 +142,7 @@ "cache", "caching" ], - "time": "2015-04-15 00:11:59" + "time": "2015-08-31 12:36:41" }, { "name": "doctrine/collections", @@ -212,16 +212,16 @@ }, { "name": "doctrine/common", - "version": "v2.5.0", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "cd8daf2501e10c63dced7b8b9b905844316ae9d3" + "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/cd8daf2501e10c63dced7b8b9b905844316ae9d3", - "reference": "cd8daf2501e10c63dced7b8b9b905844316ae9d3", + "url": "https://api.github.com/repos/doctrine/common/zipball/0009b8f0d4a917aabc971fb089eba80e872f83f9", + "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9", "shasum": "" }, "require": { @@ -281,34 +281,42 @@ "persistence", "spl" ], - "time": "2015-04-02 19:55:44" + "time": "2015-08-31 13:00:22" }, { "name": "doctrine/dbal", - "version": "v2.4.4", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "a370e5b95e509a7809d11f3d280acfc9310d464b" + "reference": "628c2256b646ae2417d44e063bce8aec5199d48d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/a370e5b95e509a7809d11f3d280acfc9310d464b", - "reference": "a370e5b95e509a7809d11f3d280acfc9310d464b", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/628c2256b646ae2417d44e063bce8aec5199d48d", + "reference": "628c2256b646ae2417d44e063bce8aec5199d48d", "shasum": "" }, "require": { - "doctrine/common": "~2.4", + "doctrine/common": ">=2.4,<2.6-dev", "php": ">=5.3.2" }, "require-dev": { - "phpunit/phpunit": "3.7.*", - "symfony/console": "~2.0" + "phpunit/phpunit": "4.*", + "symfony/console": "2.*" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." }, + "bin": [ + "bin/doctrine-dbal" + ], "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5.x-dev" + } + }, "autoload": { "psr-0": { "Doctrine\\DBAL\\": "lib/" @@ -344,20 +352,20 @@ "persistence", "queryobject" ], - "time": "2015-01-12 21:57:01" + "time": "2015-01-12 21:52:47" }, { "name": "doctrine/doctrine-bundle", - "version": "v1.5.0", + "version": "v1.5.1", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "0b9e27037c4fdbad515ee5ec89842e9091a6480f" + "reference": "8c5cedb4f2f7ebb66a963ae46ad9daa1e31cee01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/0b9e27037c4fdbad515ee5ec89842e9091a6480f", - "reference": "0b9e27037c4fdbad515ee5ec89842e9091a6480f", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/8c5cedb4f2f7ebb66a963ae46ad9daa1e31cee01", + "reference": "8c5cedb4f2f7ebb66a963ae46ad9daa1e31cee01", "shasum": "" }, "require": { @@ -365,16 +373,16 @@ "doctrine/doctrine-cache-bundle": "~1.0", "jdorn/sql-formatter": "~1.1", "php": ">=5.3.2", - "symfony/console": "~2.3", - "symfony/doctrine-bridge": "~2.2", - "symfony/framework-bundle": "~2.3" + "symfony/console": "~2.3|~3.0", + "symfony/doctrine-bridge": "~2.2|~3.0", + "symfony/framework-bundle": "~2.3|~3.0" }, "require-dev": { "doctrine/orm": "~2.3", "phpunit/phpunit": "~4", "satooshi/php-coveralls": "~0.6.1", - "symfony/validator": "~2.2", - "symfony/yaml": "~2.2", + "symfony/validator": "~2.2|~3.0", + "symfony/yaml": "~2.2|~3.0", "twig/twig": "~1.10" }, "suggest": { @@ -422,7 +430,7 @@ "orm", "persistence" ], - "time": "2015-05-28 12:27:15" + "time": "2015-08-12 15:52:00" }, { "name": "doctrine/doctrine-cache-bundle", @@ -631,16 +639,16 @@ }, { "name": "doctrine/orm", - "version": "v2.4.7", + "version": "v2.4.8", "source": { "type": "git", "url": "https://github.com/doctrine/doctrine2.git", - "reference": "2bc4ff3cab2ae297bcd05f2e619d42e6a7ca9e68" + "reference": "5aedac1e5c5caaeac14798822c70325dc242d467" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/2bc4ff3cab2ae297bcd05f2e619d42e6a7ca9e68", - "reference": "2bc4ff3cab2ae297bcd05f2e619d42e6a7ca9e68", + "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/5aedac1e5c5caaeac14798822c70325dc242d467", + "reference": "5aedac1e5c5caaeac14798822c70325dc242d467", "shasum": "" }, "require": { @@ -700,7 +708,7 @@ "database", "orm" ], - "time": "2014-12-16 13:45:01" + "time": "2015-08-31 13:19:01" }, { "name": "incenteev/composer-parameter-handler", @@ -805,35 +813,39 @@ }, { "name": "kriswallsmith/assetic", - "version": "v1.2.1", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/kriswallsmith/assetic.git", - "reference": "b20efe38845d20458702f97f3ff625d80805897b" + "reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/b20efe38845d20458702f97f3ff625d80805897b", - "reference": "b20efe38845d20458702f97f3ff625d80805897b", + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/56cb5d6dec9e7a68a4da2fa89844f39d41092f31", + "reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31", "shasum": "" }, "require": { "php": ">=5.3.1", "symfony/process": "~2.1" }, + "conflict": { + "twig/twig": "<1.12" + }, "require-dev": { "cssmin/cssmin": "*", "joliclic/javascript-packer": "*", "kamicane/packager": "*", - "leafo/lessphp": "*", - "leafo/scssphp": "*", - "leafo/scssphp-compass": "*", + "leafo/lessphp": "^0.3.7", + "leafo/scssphp": "*@dev", + "leafo/scssphp-compass": "*@dev", "mrclay/minify": "*", - "patchwork/jsqueeze": "~1.0", - "phpunit/phpunit": "~4", + "patchwork/jsqueeze": "~1.0|~2.0", + "phpunit/phpunit": "~4.8", "psr/log": "~1.0", "ptachoire/cssembed": "*", - "twig/twig": "~1.6" + "symfony/phpunit-bridge": "~2.7", + "twig/twig": "~1.8|~2.0" }, "suggest": { "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", @@ -846,7 +858,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -875,20 +887,20 @@ "compression", "minification" ], - "time": "2014-12-12 05:04:05" + "time": "2015-08-31 19:07:16" }, { "name": "monolog/monolog", - "version": "1.15.0", + "version": "1.17.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "dc5150cc608f2334c72c3b6a553ec9668a4156b0" + "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/dc5150cc608f2334c72c3b6a553ec9668a4156b0", - "reference": "dc5150cc608f2334c72c3b6a553ec9668a4156b0", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/0524c87587ab85bc4c2d6f5b41253ccb930a5422", + "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422", "shasum": "" }, "require": { @@ -905,7 +917,7 @@ "php-console/php-console": "^3.1.3", "phpunit/phpunit": "~4.5", "phpunit/phpunit-mock-objects": "2.3.0", - "raven/raven": "~0.8", + "raven/raven": "~0.11", "ruflin/elastica": ">=0.90 <3.0", "swiftmailer/swiftmailer": "~5.3", "videlalvaro/php-amqplib": "~2.4" @@ -925,7 +937,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15.x-dev" + "dev-master": "1.16.x-dev" } }, "autoload": { @@ -951,7 +963,7 @@ "logging", "psr-3" ], - "time": "2015-07-12 13:54:09" + "time": "2015-08-31 09:17:37" }, { "name": "psr/log", @@ -1039,16 +1051,16 @@ }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.9", + "version": "v3.0.10", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "0616fd568da051adc19ca63006cc808531ba2da4" + "reference": "18fc2063c4d6569cdca47a39fbac32342eb65f3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/0616fd568da051adc19ca63006cc808531ba2da4", - "reference": "0616fd568da051adc19ca63006cc808531ba2da4", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/18fc2063c4d6569cdca47a39fbac32342eb65f3c", + "reference": "18fc2063c4d6569cdca47a39fbac32342eb65f3c", "shasum": "" }, "require": { @@ -1090,7 +1102,7 @@ "annotations", "controllers" ], - "time": "2015-06-05 13:59:21" + "time": "2015-08-03 11:59:27" }, { "name": "sensio/generator-bundle", @@ -1195,32 +1207,37 @@ }, { "name": "symfony/assetic-bundle", - "version": "v2.6.1", + "version": "v2.7.0", "source": { "type": "git", "url": "https://github.com/symfony/AsseticBundle.git", - "reference": "422b0add2110f0cf9bc7a873a386ea053f4a89f0" + "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/422b0add2110f0cf9bc7a873a386ea053f4a89f0", - "reference": "422b0add2110f0cf9bc7a873a386ea053f4a89f0", + "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", + "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", "shasum": "" }, "require": { - "kriswallsmith/assetic": "~1.2", + "kriswallsmith/assetic": "~1.3", "php": ">=5.3.0", "symfony/console": "~2.3", "symfony/dependency-injection": "~2.3", "symfony/framework-bundle": "~2.3", "symfony/yaml": "~2.3" }, + "conflict": { + "kriswallsmith/spork": "<=0.2", + "twig/twig": "<1.20" + }, "require-dev": { - "kriswallsmith/spork": "~0.2", + "kriswallsmith/spork": "~0.3", "patchwork/jsqueeze": "~1.0", "symfony/class-loader": "~2.3", "symfony/css-selector": "~2.3", "symfony/dom-crawler": "~2.3", + "symfony/phpunit-bridge": "~2.7", "symfony/twig-bundle": "~2.3" }, "suggest": { @@ -1230,7 +1247,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.7-dev" } }, "autoload": { @@ -1256,7 +1273,7 @@ "compression", "minification" ], - "time": "2015-01-27 12:45:16" + "time": "2015-09-01 00:05:29" }, { "name": "symfony/monolog-bundle", @@ -1376,23 +1393,23 @@ }, { "name": "symfony/symfony", - "version": "v2.3.31", + "version": "v2.3.32", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "bd506a5e84fdce41966ef4986255fff1e31fc056" + "reference": "221da6edaf6514eca8efd728c74bf3dbf133a6fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/bd506a5e84fdce41966ef4986255fff1e31fc056", - "reference": "bd506a5e84fdce41966ef4986255fff1e31fc056", + "url": "https://api.github.com/repos/symfony/symfony/zipball/221da6edaf6514eca8efd728c74bf3dbf133a6fd", + "reference": "221da6edaf6514eca8efd728c74bf3dbf133a6fd", "shasum": "" }, "require": { "doctrine/common": "~2.3", "php": ">=5.3.3", "psr/log": "~1.0", - "twig/twig": "~1.12,>=1.12.3" + "twig/twig": "~1.20|~2.0" }, "replace": { "symfony/browser-kit": "self.version", @@ -1480,29 +1497,35 @@ "keywords": [ "framework" ], - "time": "2015-07-13 09:12:26" + "time": "2015-09-01 15:40:52" }, { "name": "twig/extensions", - "version": "v1.0.1", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig-extensions.git", - "reference": "f91a82ec225e5bb108e01a0f93c9be04f84dcfa0" + "reference": "449e3c8a9ffad7c2479c7864557275a32b037499" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/f91a82ec225e5bb108e01a0f93c9be04f84dcfa0", - "reference": "f91a82ec225e5bb108e01a0f93c9be04f84dcfa0", + "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/449e3c8a9ffad7c2479c7864557275a32b037499", + "reference": "449e3c8a9ffad7c2479c7864557275a32b037499", "shasum": "" }, "require": { - "twig/twig": "~1.0" + "twig/twig": "~1.20|~2.0" + }, + "require-dev": { + "symfony/translation": "~2.3" + }, + "suggest": { + "symfony/translation": "Allow the time_diff output to be translated" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -1521,35 +1544,38 @@ } ], "description": "Common additional features for Twig that do not directly belong in core", - "homepage": "https://github.com/fabpot/Twig-extensions", + "homepage": "http://twig.sensiolabs.org/doc/extensions/index.html", "keywords": [ - "debug", "i18n", "text" ], - "time": "2013-10-18 19:37:15" + "time": "2015-08-22 16:38:35" }, { "name": "twig/twig", - "version": "v1.18.2", + "version": "v1.21.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "e8e6575abf6102af53ec283f7f14b89e304fa602" + "reference": "ca8d3aa90b6a01c82e07909fe815d6b443e75a23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/e8e6575abf6102af53ec283f7f14b89e304fa602", - "reference": "e8e6575abf6102af53ec283f7f14b89e304fa602", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/ca8d3aa90b6a01c82e07909fe815d6b443e75a23", + "reference": "ca8d3aa90b6a01c82e07909fe815d6b443e75a23", "shasum": "" }, "require": { "php": ">=5.2.7" }, + "require-dev": { + "symfony/debug": "~2.7", + "symfony/phpunit-bridge": "~2.7" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-master": "1.21-dev" } }, "autoload": { @@ -1584,7 +1610,7 @@ "keywords": [ "templating" ], - "time": "2015-06-06 23:31:24" + "time": "2015-08-26 08:58:31" } ], "packages-dev": [], From dfc89454293c76626cd749cedefd2ac05551bebb Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 8 Sep 2015 20:06:33 +0200 Subject: [PATCH 51/98] updated VENDORS for 2.7.4 --- app/SymfonyRequirements.php | 2 +- app/check.php | 10 +- composer.lock | 280 +++++++++++++++++++++++------------- 3 files changed, 185 insertions(+), 107 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index b9d62f724b..abaf0c179c 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -638,7 +638,7 @@ function_exists('posix_isatty'), } $this->addRecommendation( - class_exists('Locale'), + extension_loaded('intl'), 'intl extension should be available', 'Install and enable the intl extension (used for validators).' ); diff --git a/app/check.php b/app/check.php index 90bad4a718..282507f703 100644 --- a/app/check.php +++ b/app/check.php @@ -42,9 +42,9 @@ } if ($checkPassed) { - echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects', true); + echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects'); } else { - echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects', true); + echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects'); echo_title('Fix the following mandatory requirements', 'red'); @@ -80,7 +80,7 @@ function get_error_message(Requirement $requirement, $lineSize) return; } - $errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.' ').PHP_EOL; + $errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.' ').PHP_EOL; $errorMessage .= ' > '.wordwrap($requirement->getHelpText(), $lineSize - 5, PHP_EOL.' > ').PHP_EOL; return $errorMessage; @@ -121,8 +121,8 @@ function echo_block($style, $title, $message) echo PHP_EOL.PHP_EOL; echo_style($style, str_repeat(' ', $width).PHP_EOL); - echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL); - echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL); + echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL); + echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL); echo_style($style, str_repeat(' ', $width).PHP_EOL); } diff --git a/composer.lock b/composer.lock index 0968ae6668..9b3a047d73 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "da966dd2ac924fbd6a3e9c5d87fa2144", + "hash": "7fcda12cddb5e463abd88f8573b5b90a", "packages": [ { "name": "doctrine/annotations", - "version": "v1.2.6", + "version": "v1.2.7", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4" + "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/f4a91702ca3cd2e568c3736aa031ed00c3752af4", - "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535", + "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535", "shasum": "" }, "require": { @@ -72,20 +72,20 @@ "docblock", "parser" ], - "time": "2015-06-17 12:21:22" + "time": "2015-08-31 12:32:49" }, { "name": "doctrine/cache", - "version": "v1.4.1", + "version": "v1.4.2", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "c9eadeb743ac6199f7eec423cb9426bc518b7b03" + "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/c9eadeb743ac6199f7eec423cb9426bc518b7b03", - "reference": "c9eadeb743ac6199f7eec423cb9426bc518b7b03", + "url": "https://api.github.com/repos/doctrine/cache/zipball/8c434000f420ade76a07c64cbe08ca47e5c101ca", + "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca", "shasum": "" }, "require": { @@ -142,7 +142,7 @@ "cache", "caching" ], - "time": "2015-04-15 00:11:59" + "time": "2015-08-31 12:36:41" }, { "name": "doctrine/collections", @@ -212,16 +212,16 @@ }, { "name": "doctrine/common", - "version": "v2.5.0", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "cd8daf2501e10c63dced7b8b9b905844316ae9d3" + "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/cd8daf2501e10c63dced7b8b9b905844316ae9d3", - "reference": "cd8daf2501e10c63dced7b8b9b905844316ae9d3", + "url": "https://api.github.com/repos/doctrine/common/zipball/0009b8f0d4a917aabc971fb089eba80e872f83f9", + "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9", "shasum": "" }, "require": { @@ -281,34 +281,42 @@ "persistence", "spl" ], - "time": "2015-04-02 19:55:44" + "time": "2015-08-31 13:00:22" }, { "name": "doctrine/dbal", - "version": "v2.4.4", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "a370e5b95e509a7809d11f3d280acfc9310d464b" + "reference": "628c2256b646ae2417d44e063bce8aec5199d48d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/a370e5b95e509a7809d11f3d280acfc9310d464b", - "reference": "a370e5b95e509a7809d11f3d280acfc9310d464b", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/628c2256b646ae2417d44e063bce8aec5199d48d", + "reference": "628c2256b646ae2417d44e063bce8aec5199d48d", "shasum": "" }, "require": { - "doctrine/common": "~2.4", + "doctrine/common": ">=2.4,<2.6-dev", "php": ">=5.3.2" }, "require-dev": { - "phpunit/phpunit": "3.7.*", - "symfony/console": "~2.0" + "phpunit/phpunit": "4.*", + "symfony/console": "2.*" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." }, + "bin": [ + "bin/doctrine-dbal" + ], "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5.x-dev" + } + }, "autoload": { "psr-0": { "Doctrine\\DBAL\\": "lib/" @@ -344,20 +352,20 @@ "persistence", "queryobject" ], - "time": "2015-01-12 21:57:01" + "time": "2015-01-12 21:52:47" }, { "name": "doctrine/doctrine-bundle", - "version": "v1.5.0", + "version": "v1.5.1", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "0b9e27037c4fdbad515ee5ec89842e9091a6480f" + "reference": "8c5cedb4f2f7ebb66a963ae46ad9daa1e31cee01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/0b9e27037c4fdbad515ee5ec89842e9091a6480f", - "reference": "0b9e27037c4fdbad515ee5ec89842e9091a6480f", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/8c5cedb4f2f7ebb66a963ae46ad9daa1e31cee01", + "reference": "8c5cedb4f2f7ebb66a963ae46ad9daa1e31cee01", "shasum": "" }, "require": { @@ -365,16 +373,16 @@ "doctrine/doctrine-cache-bundle": "~1.0", "jdorn/sql-formatter": "~1.1", "php": ">=5.3.2", - "symfony/console": "~2.3", - "symfony/doctrine-bridge": "~2.2", - "symfony/framework-bundle": "~2.3" + "symfony/console": "~2.3|~3.0", + "symfony/doctrine-bridge": "~2.2|~3.0", + "symfony/framework-bundle": "~2.3|~3.0" }, "require-dev": { "doctrine/orm": "~2.3", "phpunit/phpunit": "~4", "satooshi/php-coveralls": "~0.6.1", - "symfony/validator": "~2.2", - "symfony/yaml": "~2.2", + "symfony/validator": "~2.2|~3.0", + "symfony/yaml": "~2.2|~3.0", "twig/twig": "~1.10" }, "suggest": { @@ -422,7 +430,7 @@ "orm", "persistence" ], - "time": "2015-05-28 12:27:15" + "time": "2015-08-12 15:52:00" }, { "name": "doctrine/doctrine-cache-bundle", @@ -575,6 +583,60 @@ ], "time": "2014-12-20 21:24:13" }, + { + "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", @@ -631,26 +693,30 @@ }, { "name": "doctrine/orm", - "version": "v2.4.7", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/doctrine/doctrine2.git", - "reference": "2bc4ff3cab2ae297bcd05f2e619d42e6a7ca9e68" + "reference": "e6a83bedbe67579cb0bfb688e982e617943a2945" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/2bc4ff3cab2ae297bcd05f2e619d42e6a7ca9e68", - "reference": "2bc4ff3cab2ae297bcd05f2e619d42e6a7ca9e68", + "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/e6a83bedbe67579cb0bfb688e982e617943a2945", + "reference": "e6a83bedbe67579cb0bfb688e982e617943a2945", "shasum": "" }, "require": { - "doctrine/collections": "~1.1", - "doctrine/dbal": "~2.4", + "doctrine/cache": "~1.4", + "doctrine/collections": "~1.2", + "doctrine/common": ">=2.5-dev,<2.6-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" }, "require-dev": { + "phpunit/phpunit": "~4.0", "satooshi/php-coveralls": "dev-master", "symfony/yaml": "~2.1" }, @@ -664,7 +730,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4.x-dev" + "dev-master": "2.6.x-dev" } }, "autoload": { @@ -700,7 +766,7 @@ "database", "orm" ], - "time": "2014-12-16 13:45:01" + "time": "2015-08-31 12:59:39" }, { "name": "incenteev/composer-parameter-handler", @@ -805,35 +871,39 @@ }, { "name": "kriswallsmith/assetic", - "version": "v1.2.1", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/kriswallsmith/assetic.git", - "reference": "b20efe38845d20458702f97f3ff625d80805897b" + "reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/b20efe38845d20458702f97f3ff625d80805897b", - "reference": "b20efe38845d20458702f97f3ff625d80805897b", + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/56cb5d6dec9e7a68a4da2fa89844f39d41092f31", + "reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31", "shasum": "" }, "require": { "php": ">=5.3.1", "symfony/process": "~2.1" }, + "conflict": { + "twig/twig": "<1.12" + }, "require-dev": { "cssmin/cssmin": "*", "joliclic/javascript-packer": "*", "kamicane/packager": "*", - "leafo/lessphp": "*", - "leafo/scssphp": "*", - "leafo/scssphp-compass": "*", + "leafo/lessphp": "^0.3.7", + "leafo/scssphp": "*@dev", + "leafo/scssphp-compass": "*@dev", "mrclay/minify": "*", - "patchwork/jsqueeze": "~1.0", - "phpunit/phpunit": "~4", + "patchwork/jsqueeze": "~1.0|~2.0", + "phpunit/phpunit": "~4.8", "psr/log": "~1.0", "ptachoire/cssembed": "*", - "twig/twig": "~1.6" + "symfony/phpunit-bridge": "~2.7", + "twig/twig": "~1.8|~2.0" }, "suggest": { "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", @@ -846,7 +916,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -875,20 +945,20 @@ "compression", "minification" ], - "time": "2014-12-12 05:04:05" + "time": "2015-08-31 19:07:16" }, { "name": "monolog/monolog", - "version": "1.15.0", + "version": "1.17.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "dc5150cc608f2334c72c3b6a553ec9668a4156b0" + "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/dc5150cc608f2334c72c3b6a553ec9668a4156b0", - "reference": "dc5150cc608f2334c72c3b6a553ec9668a4156b0", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/0524c87587ab85bc4c2d6f5b41253ccb930a5422", + "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422", "shasum": "" }, "require": { @@ -905,7 +975,7 @@ "php-console/php-console": "^3.1.3", "phpunit/phpunit": "~4.5", "phpunit/phpunit-mock-objects": "2.3.0", - "raven/raven": "~0.8", + "raven/raven": "~0.11", "ruflin/elastica": ">=0.90 <3.0", "swiftmailer/swiftmailer": "~5.3", "videlalvaro/php-amqplib": "~2.4" @@ -925,7 +995,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15.x-dev" + "dev-master": "1.16.x-dev" } }, "autoload": { @@ -951,7 +1021,7 @@ "logging", "psr-3" ], - "time": "2015-07-12 13:54:09" + "time": "2015-08-31 09:17:37" }, { "name": "psr/log", @@ -993,22 +1063,22 @@ }, { "name": "sensio/distribution-bundle", - "version": "v4.0.0", + "version": "v4.0.1", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "97929c0a642977acead3d911b2c5c1a944739d40" + "reference": "62d99ba41144e704300e40f755346553702b27c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/97929c0a642977acead3d911b2c5c1a944739d40", - "reference": "97929c0a642977acead3d911b2c5c1a944739d40", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/62d99ba41144e704300e40f755346553702b27c9", + "reference": "62d99ba41144e704300e40f755346553702b27c9", "shasum": "" }, "require": { "php": ">=5.3.9", - "sensiolabs/security-checker": "~2.0", + "sensiolabs/security-checker": "~3.0", "symfony/class-loader": "~2.2", "symfony/framework-bundle": "~2.3", "symfony/process": "~2.2" @@ -1049,20 +1119,20 @@ "configuration", "distribution" ], - "time": "2015-06-11 20:55:01" + "time": "2015-08-03 10:07:56" }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.9", + "version": "v3.0.10", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "0616fd568da051adc19ca63006cc808531ba2da4" + "reference": "18fc2063c4d6569cdca47a39fbac32342eb65f3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/0616fd568da051adc19ca63006cc808531ba2da4", - "reference": "0616fd568da051adc19ca63006cc808531ba2da4", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/18fc2063c4d6569cdca47a39fbac32342eb65f3c", + "reference": "18fc2063c4d6569cdca47a39fbac32342eb65f3c", "shasum": "" }, "require": { @@ -1104,24 +1174,23 @@ "annotations", "controllers" ], - "time": "2015-06-05 13:59:21" + "time": "2015-08-03 11:59:27" }, { "name": "sensiolabs/security-checker", - "version": "v2.0.5", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/sensiolabs/security-checker.git", - "reference": "2c2a71f1c77d9765c12638c4724d9ca23658a810" + "reference": "7735fd97ff7303d9df776b8dbc970f949399abc9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/2c2a71f1c77d9765c12638c4724d9ca23658a810", - "reference": "2c2a71f1c77d9765c12638c4724d9ca23658a810", + "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/7735fd97ff7303d9df776b8dbc970f949399abc9", + "reference": "7735fd97ff7303d9df776b8dbc970f949399abc9", "shasum": "" }, "require": { - "ext-curl": "*", "symfony/console": "~2.0" }, "bin": [ @@ -1130,7 +1199,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -1149,7 +1218,7 @@ } ], "description": "A security checker for your composer.lock", - "time": "2015-05-28 14:22:40" + "time": "2015-08-11 12:11:25" }, { "name": "swiftmailer/swiftmailer", @@ -1206,32 +1275,37 @@ }, { "name": "symfony/assetic-bundle", - "version": "v2.6.1", + "version": "v2.7.0", "source": { "type": "git", "url": "https://github.com/symfony/AsseticBundle.git", - "reference": "422b0add2110f0cf9bc7a873a386ea053f4a89f0" + "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/422b0add2110f0cf9bc7a873a386ea053f4a89f0", - "reference": "422b0add2110f0cf9bc7a873a386ea053f4a89f0", + "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", + "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", "shasum": "" }, "require": { - "kriswallsmith/assetic": "~1.2", + "kriswallsmith/assetic": "~1.3", "php": ">=5.3.0", "symfony/console": "~2.3", "symfony/dependency-injection": "~2.3", "symfony/framework-bundle": "~2.3", "symfony/yaml": "~2.3" }, + "conflict": { + "kriswallsmith/spork": "<=0.2", + "twig/twig": "<1.20" + }, "require-dev": { - "kriswallsmith/spork": "~0.2", + "kriswallsmith/spork": "~0.3", "patchwork/jsqueeze": "~1.0", "symfony/class-loader": "~2.3", "symfony/css-selector": "~2.3", "symfony/dom-crawler": "~2.3", + "symfony/phpunit-bridge": "~2.7", "symfony/twig-bundle": "~2.3" }, "suggest": { @@ -1241,7 +1315,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.7-dev" } }, "autoload": { @@ -1267,7 +1341,7 @@ "compression", "minification" ], - "time": "2015-01-27 12:45:16" + "time": "2015-09-01 00:05:29" }, { "name": "symfony/monolog-bundle", @@ -1387,23 +1461,23 @@ }, { "name": "symfony/symfony", - "version": "v2.7.3", + "version": "v2.7.4", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "a9af4708b4bb650c4897e9b8dfbfbdb2ea5f0486" + "reference": "1fdf23fe28876844b887b0e1935c9adda43ee645" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/a9af4708b4bb650c4897e9b8dfbfbdb2ea5f0486", - "reference": "a9af4708b4bb650c4897e9b8dfbfbdb2ea5f0486", + "url": "https://api.github.com/repos/symfony/symfony/zipball/1fdf23fe28876844b887b0e1935c9adda43ee645", + "reference": "1fdf23fe28876844b887b0e1935c9adda43ee645", "shasum": "" }, "require": { "doctrine/common": "~2.3", "php": ">=5.3.9", "psr/log": "~1.0", - "twig/twig": "~1.18" + "twig/twig": "~1.20|~2.0" }, "replace": { "symfony/asset": "self.version", @@ -1505,29 +1579,33 @@ "keywords": [ "framework" ], - "time": "2015-07-31 13:24:45" + "time": "2015-09-08 14:26:39" }, { "name": "twig/twig", - "version": "v1.18.2", + "version": "v1.21.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "e8e6575abf6102af53ec283f7f14b89e304fa602" + "reference": "ca8d3aa90b6a01c82e07909fe815d6b443e75a23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/e8e6575abf6102af53ec283f7f14b89e304fa602", - "reference": "e8e6575abf6102af53ec283f7f14b89e304fa602", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/ca8d3aa90b6a01c82e07909fe815d6b443e75a23", + "reference": "ca8d3aa90b6a01c82e07909fe815d6b443e75a23", "shasum": "" }, "require": { "php": ">=5.2.7" }, + "require-dev": { + "symfony/debug": "~2.7", + "symfony/phpunit-bridge": "~2.7" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-master": "1.21-dev" } }, "autoload": { @@ -1562,7 +1640,7 @@ "keywords": [ "templating" ], - "time": "2015-06-06 23:31:24" + "time": "2015-08-26 08:58:31" } ], "packages-dev": [ From bc671aa6fa259f257965796e296d4decbe2d429f Mon Sep 17 00:00:00 2001 From: gerryvdm Date: Thu, 27 Nov 2014 16:15:32 +0100 Subject: [PATCH 52/98] Do strict check on environment name Enable strict in_array() checking for conditionally enabling development bundles. --- app/AppKernel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index a49f5f50f0..cfb2537d24 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -19,7 +19,7 @@ public function registerBundles() new AppBundle\AppBundle(), ); - if (in_array($this->getEnvironment(), array('dev', 'test'))) { + if (in_array($this->getEnvironment(), array('dev', 'test'), true)) { $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle(); From 02f6add5a954198ec092e803764cc16c37ed2594 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 16 Sep 2015 12:21:29 +0200 Subject: [PATCH 53/98] removed the code allowing to switch to the nex dir structure --- app/SymfonyStandard/Composer.php | 22 ------------ .../RootPackageInstallSubscriber.php | 34 ------------------- composer.json | 3 -- 3 files changed, 59 deletions(-) delete mode 100644 app/SymfonyStandard/Composer.php delete mode 100644 app/SymfonyStandard/RootPackageInstallSubscriber.php diff --git a/app/SymfonyStandard/Composer.php b/app/SymfonyStandard/Composer.php deleted file mode 100644 index f1c85f0e06..0000000000 --- a/app/SymfonyStandard/Composer.php +++ /dev/null @@ -1,22 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace SymfonyStandard; - -use Composer\Script\CommandEvent; - -class Composer -{ - public static function hookRootPackageInstall(CommandEvent $event) - { - $event->getComposer()->getEventDispatcher()->addSubscriber(new RootPackageInstallSubscriber()); - } -} diff --git a/app/SymfonyStandard/RootPackageInstallSubscriber.php b/app/SymfonyStandard/RootPackageInstallSubscriber.php deleted file mode 100644 index 2f88b61ac4..0000000000 --- a/app/SymfonyStandard/RootPackageInstallSubscriber.php +++ /dev/null @@ -1,34 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace SymfonyStandard; - -use Composer\EventDispatcher\EventSubscriberInterface; -use Composer\Script\ScriptEvents; -use Composer\Script\CommandEvent; -use Sensio\Bundle\DistributionBundle\Composer\ScriptHandler; - -class RootPackageInstallSubscriber implements EventSubscriberInterface -{ - public static function setupNewDirectoryStructure(CommandEvent $event) - { - ScriptHandler::defineDirectoryStructure($event); - } - - public static function getSubscribedEvents() - { - return array( - ScriptEvents::POST_INSTALL_CMD => array( - array('setupNewDirectoryStructure', 512), - ), - ); - } -} diff --git a/composer.json b/composer.json index d89b97e2f2..64491a6dde 100644 --- a/composer.json +++ b/composer.json @@ -22,9 +22,6 @@ "sensio/generator-bundle": "~2.3" }, "scripts": { - "post-root-package-install": [ - "SymfonyStandard\\Composer::hookRootPackageInstall" - ], "post-install-cmd": [ "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", From 8d0496077d170e29d1bd90c38b010906b63fddb8 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 16 Sep 2015 11:39:36 +0100 Subject: [PATCH 54/98] Use a proper version constraint --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9eb9e84d5e..9fdfa305e0 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ }, "require": { "php": ">=5.3.9", - "symfony/symfony": "2.8.x-dev", + "symfony/symfony": "2.8.*@dev", "doctrine/orm": "^2.4.8", "doctrine/doctrine-bundle": "~1.4", "symfony/assetic-bundle": "~2.3", From e6ff069eede428929727e7e840a7d58551ede174 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Wed, 16 Sep 2015 20:15:12 +0200 Subject: [PATCH 55/98] Remove ScriptHandler::removeSymfonyStandardFiles Missing from #851 --- composer.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 64491a6dde..074b3bc478 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "project", "description": "The \"Symfony Standard Edition\" distribution", "autoload": { - "psr-4": { "": "src/", "SymfonyStandard\\": "app/SymfonyStandard/" } + "psr-4": { "": "src/" } }, "require": { "php": ">=5.3.9", @@ -28,7 +28,6 @@ "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::removeSymfonyStandardFiles", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget" ], "post-update-cmd": [ @@ -37,7 +36,6 @@ "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::removeSymfonyStandardFiles", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget" ] }, From 96a34ab70d943fe02aa5d11ed0149556afbd9f1c Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Thu, 17 Sep 2015 15:48:28 +0200 Subject: [PATCH 56/98] remove configurator routing --- app/config/routing_dev.yml | 4 ---- composer.json | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml index 0f0afb615c..404f6a3bce 100644 --- a/app/config/routing_dev.yml +++ b/app/config/routing_dev.yml @@ -6,10 +6,6 @@ _profiler: resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml" prefix: /_profiler -_configurator: - resource: "@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml" - prefix: /_configurator - _errors: resource: "@TwigBundle/Resources/config/routing/errors.xml" prefix: /_error diff --git a/composer.json b/composer.json index 9eb9e84d5e..b2ed8fb523 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "symfony/assetic-bundle": "~2.3", "symfony/swiftmailer-bundle": "~2.3", "symfony/monolog-bundle": "~2.4", - "sensio/distribution-bundle": "~4.0", + "sensio/distribution-bundle": "~5.0@dev", "sensio/framework-extra-bundle": "^3.0.2", "incenteev/composer-parameter-handler": "~2.0" }, From 747a384401edf803e985c52089c882edaebe467a Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Wed, 16 Sep 2015 22:52:56 +0200 Subject: [PATCH 57/98] extract autoloading out from bootstrap --- app/autoload.php | 2 ++ app/console | 15 ++++++++++----- app/phpunit.xml.dist | 2 +- web/app.php | 9 ++++++--- web/app_dev.php | 5 ++++- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/app/autoload.php b/app/autoload.php index 70526bb5e4..b32da0f3a3 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -3,6 +3,8 @@ use Doctrine\Common\Annotations\AnnotationRegistry; use Composer\Autoload\ClassLoader; +error_reporting(error_reporting() & ~E_USER_DEPRECATED); + /** * @var ClassLoader $loader */ diff --git a/app/console b/app/console index fa6a36e249..11b7b1f728 100755 --- a/app/console +++ b/app/console @@ -1,25 +1,30 @@ #!/usr/bin/env php getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev'); $debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod'; if ($debug) { Debug::enable(); +} else { + include_once __DIR__.'/bootstrap.php.cache'; } $kernel = new AppKernel($env, $debug); diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist index 2b41503b75..dc1bf70bde 100644 --- a/app/phpunit.xml.dist +++ b/app/phpunit.xml.dist @@ -5,7 +5,7 @@ xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd" backupGlobals="false" colors="true" - bootstrap="bootstrap.php.cache" + bootstrap="autoload.php" > diff --git a/web/app.php b/web/app.php index c5c2640906..c66e897f3d 100644 --- a/web/app.php +++ b/web/app.php @@ -1,16 +1,19 @@ unregister(); $apcLoader->register(true); */ diff --git a/web/app_dev.php b/web/app_dev.php index dfafc80176..965bda8357 100644 --- a/web/app_dev.php +++ b/web/app_dev.php @@ -18,7 +18,10 @@ exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.'); } -$loader = require_once __DIR__.'/../app/bootstrap.php.cache'; +/** + * @var Composer\Autoload\ClassLoader $loader + */ +$loader = require __DIR__.'/../app/autoload.php'; Debug::enable(); require_once __DIR__.'/../app/AppKernel.php'; From 090dd87e30c88d14911defb634efaea9a919da50 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 23 Sep 2015 09:50:50 +0200 Subject: [PATCH 58/98] simplified code --- app/console | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/console b/app/console index 11b7b1f728..7c357dbd24 100755 --- a/app/console +++ b/app/console @@ -23,8 +23,6 @@ $debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('- if ($debug) { Debug::enable(); -} else { - include_once __DIR__.'/bootstrap.php.cache'; } $kernel = new AppKernel($env, $debug); From d06d44841d56d2237cccf61dcab4a634bb60759a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 23 Sep 2015 09:54:55 +0200 Subject: [PATCH 59/98] fixed typo --- web/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/app.php b/web/app.php index c66e897f3d..be2a081247 100644 --- a/web/app.php +++ b/web/app.php @@ -6,7 +6,7 @@ * @var Composer\Autoload\ClassLoader $loader */ $loader = require __DIR__.'/../app/autoload.php'; -include_once __DIR__.'/bootstrap.php.cache'; +include_once __DIR__.'/../app/bootstrap.php.cache'; // Enable APC for autoloading to improve performance. // You should change the ApcClassLoader first argument to a unique prefix From f73cd593ae020185e2a9aec29e7418ff715b964b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 23 Sep 2015 10:08:27 +0200 Subject: [PATCH 60/98] fixed CS --- web/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/app.php b/web/app.php index be2a081247..46e6b2f58b 100644 --- a/web/app.php +++ b/web/app.php @@ -3,7 +3,7 @@ use Symfony\Component\HttpFoundation\Request; /** - * @var Composer\Autoload\ClassLoader $loader + * @var Composer\Autoload\ClassLoader */ $loader = require __DIR__.'/../app/autoload.php'; include_once __DIR__.'/../app/bootstrap.php.cache'; From ddb06ddb46064eeee3b445ebf264f1ca766f29db Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 25 Sep 2015 12:20:58 +0200 Subject: [PATCH 61/98] updated VENDORS for 2.3.33 --- composer.lock | 63 ++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/composer.lock b/composer.lock index 403c45d897..e269689986 100644 --- a/composer.lock +++ b/composer.lock @@ -5,6 +5,7 @@ "This file is @generated automatically" ], "hash": "9d3480dd93412d49aa920ae45e26acbf", + "content-hash": "b3d1552f21f18fa97fd187f0289331b0", "packages": [ { "name": "doctrine/annotations", @@ -285,16 +286,16 @@ }, { "name": "doctrine/dbal", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "628c2256b646ae2417d44e063bce8aec5199d48d" + "reference": "01dbcbc5cd0a913d751418e635434a18a2f2a75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/628c2256b646ae2417d44e063bce8aec5199d48d", - "reference": "628c2256b646ae2417d44e063bce8aec5199d48d", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/01dbcbc5cd0a913d751418e635434a18a2f2a75c", + "reference": "01dbcbc5cd0a913d751418e635434a18a2f2a75c", "shasum": "" }, "require": { @@ -352,20 +353,20 @@ "persistence", "queryobject" ], - "time": "2015-01-12 21:52:47" + "time": "2015-09-16 16:29:33" }, { "name": "doctrine/doctrine-bundle", - "version": "v1.5.1", + "version": "v1.5.2", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "8c5cedb4f2f7ebb66a963ae46ad9daa1e31cee01" + "reference": "d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/8c5cedb4f2f7ebb66a963ae46ad9daa1e31cee01", - "reference": "8c5cedb4f2f7ebb66a963ae46ad9daa1e31cee01", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3", + "reference": "d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3", "shasum": "" }, "require": { @@ -392,7 +393,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.5.x-dev" + "dev-master": "1.6.x-dev" } }, "autoload": { @@ -430,7 +431,7 @@ "orm", "persistence" ], - "time": "2015-08-12 15:52:00" + "time": "2015-08-31 14:47:06" }, { "name": "doctrine/doctrine-cache-bundle", @@ -1210,12 +1211,12 @@ "version": "v2.7.0", "source": { "type": "git", - "url": "https://github.com/symfony/AsseticBundle.git", + "url": "https://github.com/symfony/assetic-bundle.git", "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", + "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", "shasum": "" }, @@ -1280,12 +1281,12 @@ "version": "v2.7.1", "source": { "type": "git", - "url": "https://github.com/symfony/MonologBundle.git", + "url": "https://github.com/symfony/monolog-bundle.git", "reference": "9320b6863404c70ebe111e9040dab96f251de7ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/9320b6863404c70ebe111e9040dab96f251de7ac", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/9320b6863404c70ebe111e9040dab96f251de7ac", "reference": "9320b6863404c70ebe111e9040dab96f251de7ac", "shasum": "" }, @@ -1339,12 +1340,12 @@ "version": "v2.3.8", "source": { "type": "git", - "url": "https://github.com/symfony/SwiftmailerBundle.git", + "url": "https://github.com/symfony/swiftmailer-bundle.git", "reference": "970b13d01871207e81d17b17ddda025e7e21e797" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/SwiftmailerBundle/zipball/970b13d01871207e81d17b17ddda025e7e21e797", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/970b13d01871207e81d17b17ddda025e7e21e797", "reference": "970b13d01871207e81d17b17ddda025e7e21e797", "shasum": "" }, @@ -1393,20 +1394,20 @@ }, { "name": "symfony/symfony", - "version": "v2.3.32", + "version": "v2.3.33", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "221da6edaf6514eca8efd728c74bf3dbf133a6fd" + "reference": "3b8a8ee48e8ad81cb5d9d85b909bbd28011423a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/221da6edaf6514eca8efd728c74bf3dbf133a6fd", - "reference": "221da6edaf6514eca8efd728c74bf3dbf133a6fd", + "url": "https://api.github.com/repos/symfony/symfony/zipball/3b8a8ee48e8ad81cb5d9d85b909bbd28011423a1", + "reference": "3b8a8ee48e8ad81cb5d9d85b909bbd28011423a1", "shasum": "" }, "require": { - "doctrine/common": "~2.3", + "doctrine/common": "~2.4", "php": ">=5.3.3", "psr/log": "~1.0", "twig/twig": "~1.20|~2.0" @@ -1452,8 +1453,8 @@ }, "require-dev": { "doctrine/data-fixtures": "1.0.*", - "doctrine/dbal": "~2.2", - "doctrine/orm": "~2.2,>=2.2.3", + "doctrine/dbal": "~2.4", + "doctrine/orm": "~2.4,>=2.4.5", "ircmaxell/password-compat": "~1.0", "monolog/monolog": "~1.3", "ocramius/proxy-manager": "~0.3.1", @@ -1497,7 +1498,7 @@ "keywords": [ "framework" ], - "time": "2015-09-01 15:40:52" + "time": "2015-09-25 09:08:49" }, { "name": "twig/extensions", @@ -1553,16 +1554,16 @@ }, { "name": "twig/twig", - "version": "v1.21.1", + "version": "v1.22.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "ca8d3aa90b6a01c82e07909fe815d6b443e75a23" + "reference": "79249fc8c9ff62e41e217e0c630e2e00bcadda6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/ca8d3aa90b6a01c82e07909fe815d6b443e75a23", - "reference": "ca8d3aa90b6a01c82e07909fe815d6b443e75a23", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/79249fc8c9ff62e41e217e0c630e2e00bcadda6a", + "reference": "79249fc8c9ff62e41e217e0c630e2e00bcadda6a", "shasum": "" }, "require": { @@ -1575,7 +1576,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.21-dev" + "dev-master": "1.22-dev" } }, "autoload": { @@ -1610,7 +1611,7 @@ "keywords": [ "templating" ], - "time": "2015-08-26 08:58:31" + "time": "2015-09-22 13:59:32" } ], "packages-dev": [], From 3c68236e598948749b87009faa999ca7b5469097 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 25 Sep 2015 13:37:13 +0200 Subject: [PATCH 62/98] updated VENDORS for 2.7.5 --- composer.lock | 65 ++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/composer.lock b/composer.lock index 9b3a047d73..5e2d86e72f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +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": "7fcda12cddb5e463abd88f8573b5b90a", + "hash": "a6a450a88a70ec0f62348f20c076177a", + "content-hash": "97a65ddfd75e56eb06298c9192afa45f", "packages": [ { "name": "doctrine/annotations", @@ -285,16 +286,16 @@ }, { "name": "doctrine/dbal", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "628c2256b646ae2417d44e063bce8aec5199d48d" + "reference": "01dbcbc5cd0a913d751418e635434a18a2f2a75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/628c2256b646ae2417d44e063bce8aec5199d48d", - "reference": "628c2256b646ae2417d44e063bce8aec5199d48d", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/01dbcbc5cd0a913d751418e635434a18a2f2a75c", + "reference": "01dbcbc5cd0a913d751418e635434a18a2f2a75c", "shasum": "" }, "require": { @@ -352,20 +353,20 @@ "persistence", "queryobject" ], - "time": "2015-01-12 21:52:47" + "time": "2015-09-16 16:29:33" }, { "name": "doctrine/doctrine-bundle", - "version": "v1.5.1", + "version": "v1.5.2", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "8c5cedb4f2f7ebb66a963ae46ad9daa1e31cee01" + "reference": "d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/8c5cedb4f2f7ebb66a963ae46ad9daa1e31cee01", - "reference": "8c5cedb4f2f7ebb66a963ae46ad9daa1e31cee01", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3", + "reference": "d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3", "shasum": "" }, "require": { @@ -392,7 +393,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.5.x-dev" + "dev-master": "1.6.x-dev" } }, "autoload": { @@ -430,7 +431,7 @@ "orm", "persistence" ], - "time": "2015-08-12 15:52:00" + "time": "2015-08-31 14:47:06" }, { "name": "doctrine/doctrine-cache-bundle", @@ -1278,12 +1279,12 @@ "version": "v2.7.0", "source": { "type": "git", - "url": "https://github.com/symfony/AsseticBundle.git", + "url": "https://github.com/symfony/assetic-bundle.git", "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", + "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", "shasum": "" }, @@ -1348,12 +1349,12 @@ "version": "v2.7.1", "source": { "type": "git", - "url": "https://github.com/symfony/MonologBundle.git", + "url": "https://github.com/symfony/monolog-bundle.git", "reference": "9320b6863404c70ebe111e9040dab96f251de7ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/9320b6863404c70ebe111e9040dab96f251de7ac", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/9320b6863404c70ebe111e9040dab96f251de7ac", "reference": "9320b6863404c70ebe111e9040dab96f251de7ac", "shasum": "" }, @@ -1407,12 +1408,12 @@ "version": "v2.3.8", "source": { "type": "git", - "url": "https://github.com/symfony/SwiftmailerBundle.git", + "url": "https://github.com/symfony/swiftmailer-bundle.git", "reference": "970b13d01871207e81d17b17ddda025e7e21e797" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/SwiftmailerBundle/zipball/970b13d01871207e81d17b17ddda025e7e21e797", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/970b13d01871207e81d17b17ddda025e7e21e797", "reference": "970b13d01871207e81d17b17ddda025e7e21e797", "shasum": "" }, @@ -1461,20 +1462,20 @@ }, { "name": "symfony/symfony", - "version": "v2.7.4", + "version": "v2.7.5", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "1fdf23fe28876844b887b0e1935c9adda43ee645" + "reference": "619528a274647cffc1792063c3ea04c4fa8266a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/1fdf23fe28876844b887b0e1935c9adda43ee645", - "reference": "1fdf23fe28876844b887b0e1935c9adda43ee645", + "url": "https://api.github.com/repos/symfony/symfony/zipball/619528a274647cffc1792063c3ea04c4fa8266a0", + "reference": "619528a274647cffc1792063c3ea04c4fa8266a0", "shasum": "" }, "require": { - "doctrine/common": "~2.3", + "doctrine/common": "~2.4", "php": ">=5.3.9", "psr/log": "~1.0", "twig/twig": "~1.20|~2.0" @@ -1527,9 +1528,9 @@ }, "require-dev": { "doctrine/data-fixtures": "1.0.*", - "doctrine/dbal": "~2.2", + "doctrine/dbal": "~2.4", "doctrine/doctrine-bundle": "~1.2", - "doctrine/orm": "~2.2,>=2.2.3", + "doctrine/orm": "~2.4,>=2.4.5", "egulias/email-validator": "~1.2", "ircmaxell/password-compat": "~1.0", "monolog/monolog": "~1.11", @@ -1579,20 +1580,20 @@ "keywords": [ "framework" ], - "time": "2015-09-08 14:26:39" + "time": "2015-09-25 11:16:52" }, { "name": "twig/twig", - "version": "v1.21.1", + "version": "v1.22.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "ca8d3aa90b6a01c82e07909fe815d6b443e75a23" + "reference": "79249fc8c9ff62e41e217e0c630e2e00bcadda6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/ca8d3aa90b6a01c82e07909fe815d6b443e75a23", - "reference": "ca8d3aa90b6a01c82e07909fe815d6b443e75a23", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/79249fc8c9ff62e41e217e0c630e2e00bcadda6a", + "reference": "79249fc8c9ff62e41e217e0c630e2e00bcadda6a", "shasum": "" }, "require": { @@ -1605,7 +1606,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.21-dev" + "dev-master": "1.22-dev" } }, "autoload": { @@ -1640,7 +1641,7 @@ "keywords": [ "templating" ], - "time": "2015-08-26 08:58:31" + "time": "2015-09-22 13:59:32" } ], "packages-dev": [ From 2bee277feb6c6a02e4828f772cd0945d841f6c51 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 28 Sep 2015 17:44:25 +0200 Subject: [PATCH 63/98] removed AsseticBundle --- README.md | 4 ---- app/AppKernel.php | 1 - app/config/config.yml | 13 ------------- app/config/config_dev.yml | 3 --- composer.json | 1 - 5 files changed, 22 deletions(-) diff --git a/README.md b/README.md index dfee62b2fc..dd1f8fff00 100644 --- a/README.md +++ b/README.md @@ -41,9 +41,6 @@ It comes pre-configured with the following bundles: * [**MonologBundle**][11] - Adds support for Monolog, a logging library - * [**AsseticBundle**][12] - Adds support for Assetic, an asset processing - library - * **WebProfilerBundle** (in dev/test env) - Adds profiling functionality and the web debug toolbar @@ -68,5 +65,4 @@ Enjoy! [9]: https://symfony.com/doc/2.8/book/security.html [10]: https://symfony.com/doc/2.8/cookbook/email.html [11]: https://symfony.com/doc/2.8/cookbook/logging/monolog.html -[12]: https://symfony.com/doc/2.8/cookbook/assetic/asset_management.html [13]: https://symfony.com/doc/2.8/bundles/SensioGeneratorBundle/index.html diff --git a/app/AppKernel.php b/app/AppKernel.php index 1e8325cd24..3a5758978b 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -13,7 +13,6 @@ public function registerBundles() new Symfony\Bundle\TwigBundle\TwigBundle(), new Symfony\Bundle\MonologBundle\MonologBundle(), new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(), - new Symfony\Bundle\AsseticBundle\AsseticBundle(), new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(), new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), new AppBundle\AppBundle(), diff --git a/app/config/config.yml b/app/config/config.yml index b4a2d0a4c2..1b315d77b3 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -36,19 +36,6 @@ twig: debug: "%kernel.debug%" strict_variables: "%kernel.debug%" -# Assetic Configuration -assetic: - debug: "%kernel.debug%" - use_controller: false - bundles: [ ] - #java: /usr/bin/java - filters: - cssrewrite: ~ - #closure: - # jar: "%kernel.root_dir%/Resources/java/compiler.jar" - #yui_css: - # jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar" - # Doctrine Configuration doctrine: dbal: diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index efaf396e93..2988f4f836 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -41,8 +41,5 @@ monolog: # type: chromephp # level: info -assetic: - use_controller: true - #swiftmailer: # delivery_address: me@example.com diff --git a/composer.json b/composer.json index 4793ab9145..a6a949da36 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,6 @@ "symfony/symfony": "2.8.x-dev", "doctrine/orm": "^2.4.8", "doctrine/doctrine-bundle": "~1.4", - "symfony/assetic-bundle": "~2.3", "symfony/swiftmailer-bundle": "~2.3", "symfony/monolog-bundle": "~2.4", "sensio/distribution-bundle": "~5.0@dev", From 4bbb548ab24e3aefbdedbd0e5bb86e143b32433b Mon Sep 17 00:00:00 2001 From: Antonio Mansilla Date: Fri, 9 Oct 2015 16:49:10 +0200 Subject: [PATCH 64/98] Update phpunit configuration Fix a problem since the bundle without vendor name directly inside the src directory are not going to be tested. --- app/phpunit.xml.dist | 1 + 1 file changed, 1 insertion(+) diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist index d1efeb812a..2b41503b75 100644 --- a/app/phpunit.xml.dist +++ b/app/phpunit.xml.dist @@ -11,6 +11,7 @@ ../src/*/*Bundle/Tests ../src/*/Bundle/*Bundle/Tests + ../src/*Bundle/Tests From ab358a4458b052fc80a3e99a93b125c1ef133a38 Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Tue, 13 Oct 2015 18:48:59 +0200 Subject: [PATCH 65/98] #868 Load the AppKernel class using Composer's autoloader It is possible to register single files to load every time in Composer. Using Composer to load the AppKernel means we don't have to manually include it in all the entry points of the application. --- app/AppCache.php | 2 -- app/console | 1 - composer.json | 3 ++- web/app.php | 1 - web/app_dev.php | 2 -- 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/app/AppCache.php b/app/AppCache.php index ddb51db058..639ec2cd7e 100644 --- a/app/AppCache.php +++ b/app/AppCache.php @@ -1,7 +1,5 @@ getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev'); diff --git a/composer.json b/composer.json index a6a949da36..7a8fbf29b3 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,8 @@ "type": "project", "description": "The \"Symfony Standard Edition\" distribution", "autoload": { - "psr-4": { "": "src/" } + "psr-4": { "": "src/" }, + "files": [ "app/AppKernel.php" ] }, "require": { "php": ">=5.3.9", diff --git a/web/app.php b/web/app.php index 46e6b2f58b..a88f0b5a04 100644 --- a/web/app.php +++ b/web/app.php @@ -18,7 +18,6 @@ $apcLoader->register(true); */ -require_once __DIR__.'/../app/AppKernel.php'; //require_once __DIR__.'/../app/AppCache.php'; $kernel = new AppKernel('prod', false); diff --git a/web/app_dev.php b/web/app_dev.php index 965bda8357..635bf7ac7b 100644 --- a/web/app_dev.php +++ b/web/app_dev.php @@ -24,8 +24,6 @@ $loader = require __DIR__.'/../app/autoload.php'; Debug::enable(); -require_once __DIR__.'/../app/AppKernel.php'; - $kernel = new AppKernel('dev', true); $kernel->loadClassCache(); $request = Request::createFromGlobals(); From 2210f6b8c4e91ba7a718c223825cfe70531416b0 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Thu, 22 Oct 2015 21:16:59 +0200 Subject: [PATCH 66/98] simplify a path name --- app/console | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/console b/app/console index ca74e93611..3b4c367c98 100755 --- a/app/console +++ b/app/console @@ -14,7 +14,7 @@ set_time_limit(0); /** * @var Composer\Autoload\ClassLoader $loader */ -$loader = require __DIR__.'/../app/autoload.php'; +$loader = require __DIR__.'/autoload.php'; $input = new ArgvInput(); $env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev'); From e159c845c14a4cbe82c2dea6f08c29218b1ef57c Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Fri, 23 Oct 2015 01:09:09 +0200 Subject: [PATCH 67/98] Make sure tests are run with full error reporting This is also done in all symfony components. It makes sure that tests report all errors and warnings including strict ones. Often this is not the case otherwise. The other advantage is that it makes tests more equal in PHP 5 and PHP 7. PHP 7 removed strict errors and changed them to warnings or notices. So in PHP 7 those errors might cause failures but they do not cause failures in PHP 5 when strict is ignored. --- app/phpunit.xml.dist | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist index 2b41503b75..0a09d52b13 100644 --- a/app/phpunit.xml.dist +++ b/app/phpunit.xml.dist @@ -7,6 +7,10 @@ colors="true" bootstrap="bootstrap.php.cache" > + + + + ../src/*/*Bundle/Tests From 5d033e2648ec8cd71e6af2147951e37d8e084877 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 27 Oct 2015 11:53:03 -0700 Subject: [PATCH 68/98] updated VENDORS for 2.3.34 --- composer.lock | 70 +++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/composer.lock b/composer.lock index e269689986..c84f87705b 100644 --- a/composer.lock +++ b/composer.lock @@ -814,16 +814,16 @@ }, { "name": "kriswallsmith/assetic", - "version": "v1.3.0", + "version": "v1.3.1", "source": { "type": "git", "url": "https://github.com/kriswallsmith/assetic.git", - "reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31" + "reference": "cb92b179dddfb8a3f341d53bd27e088f24d9c2e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/56cb5d6dec9e7a68a4da2fa89844f39d41092f31", - "reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31", + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/cb92b179dddfb8a3f341d53bd27e088f24d9c2e5", + "reference": "cb92b179dddfb8a3f341d53bd27e088f24d9c2e5", "shasum": "" }, "require": { @@ -859,7 +859,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -888,20 +888,20 @@ "compression", "minification" ], - "time": "2015-08-31 19:07:16" + "time": "2015-10-15 01:33:42" }, { "name": "monolog/monolog", - "version": "1.17.1", + "version": "1.17.2", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422" + "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/0524c87587ab85bc4c2d6f5b41253ccb930a5422", - "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bee7f0dc9c3e0b69a6039697533dca1e845c8c24", + "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24", "shasum": "" }, "require": { @@ -915,10 +915,11 @@ "aws/aws-sdk-php": "^2.4.9", "doctrine/couchdb": "~1.0@dev", "graylog2/gelf-php": "~1.0", + "jakub-onderka/php-parallel-lint": "0.9", "php-console/php-console": "^3.1.3", "phpunit/phpunit": "~4.5", "phpunit/phpunit-mock-objects": "2.3.0", - "raven/raven": "~0.11", + "raven/raven": "^0.13", "ruflin/elastica": ">=0.90 <3.0", "swiftmailer/swiftmailer": "~5.3", "videlalvaro/php-amqplib": "~2.4" @@ -964,7 +965,7 @@ "logging", "psr-3" ], - "time": "2015-08-31 09:17:37" + "time": "2015-10-14 12:51:02" }, { "name": "psr/log", @@ -1278,34 +1279,34 @@ }, { "name": "symfony/monolog-bundle", - "version": "v2.7.1", + "version": "2.8.1", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bundle.git", - "reference": "9320b6863404c70ebe111e9040dab96f251de7ac" + "reference": "7117b9a145722e3c5768db4585f6ad0643ed5c4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/9320b6863404c70ebe111e9040dab96f251de7ac", - "reference": "9320b6863404c70ebe111e9040dab96f251de7ac", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/7117b9a145722e3c5768db4585f6ad0643ed5c4a", + "reference": "7117b9a145722e3c5768db4585f6ad0643ed5c4a", "shasum": "" }, "require": { "monolog/monolog": "~1.8", "php": ">=5.3.2", - "symfony/config": "~2.3", - "symfony/dependency-injection": "~2.3", - "symfony/http-kernel": "~2.3", - "symfony/monolog-bridge": "~2.3" + "symfony/config": "~2.3|3.*", + "symfony/dependency-injection": "~2.3|3.*", + "symfony/http-kernel": "~2.3|3.*", + "symfony/monolog-bridge": "~2.3|3.*" }, "require-dev": { - "symfony/console": "~2.3", + "symfony/console": "~2.3|3.*", "symfony/yaml": "~2.3" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.7.x-dev" + "dev-master": "2.8.x-dev" } }, "autoload": { @@ -1333,7 +1334,7 @@ "log", "logging" ], - "time": "2015-01-04 20:21:17" + "time": "2015-10-02 11:51:59" }, { "name": "symfony/swiftmailer-bundle", @@ -1394,16 +1395,16 @@ }, { "name": "symfony/symfony", - "version": "v2.3.33", + "version": "v2.3.34", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "3b8a8ee48e8ad81cb5d9d85b909bbd28011423a1" + "reference": "d1d97bc91cc8733f55c1624351a109cf6be3c074" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/3b8a8ee48e8ad81cb5d9d85b909bbd28011423a1", - "reference": "3b8a8ee48e8ad81cb5d9d85b909bbd28011423a1", + "url": "https://api.github.com/repos/symfony/symfony/zipball/d1d97bc91cc8733f55c1624351a109cf6be3c074", + "reference": "d1d97bc91cc8733f55c1624351a109cf6be3c074", "shasum": "" }, "require": { @@ -1458,8 +1459,7 @@ "ircmaxell/password-compat": "~1.0", "monolog/monolog": "~1.3", "ocramius/proxy-manager": "~0.3.1", - "propel/propel1": "~1.6", - "symfony/phpunit-bridge": "~2.7" + "propel/propel1": "~1.6" }, "type": "library", "extra": { @@ -1498,7 +1498,7 @@ "keywords": [ "framework" ], - "time": "2015-09-25 09:08:49" + "time": "2015-10-27 17:11:03" }, { "name": "twig/extensions", @@ -1554,16 +1554,16 @@ }, { "name": "twig/twig", - "version": "v1.22.2", + "version": "v1.22.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "79249fc8c9ff62e41e217e0c630e2e00bcadda6a" + "reference": "ebfc36b7e77b0c1175afe30459cf943010245540" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/79249fc8c9ff62e41e217e0c630e2e00bcadda6a", - "reference": "79249fc8c9ff62e41e217e0c630e2e00bcadda6a", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/ebfc36b7e77b0c1175afe30459cf943010245540", + "reference": "ebfc36b7e77b0c1175afe30459cf943010245540", "shasum": "" }, "require": { @@ -1611,7 +1611,7 @@ "keywords": [ "templating" ], - "time": "2015-09-22 13:59:32" + "time": "2015-10-13 07:07:02" } ], "packages-dev": [], From 605196a22e8b8af31492f7c31960f56c86ba082e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 27 Oct 2015 12:58:49 -0700 Subject: [PATCH 69/98] updated VENDORS for 2.7.6 --- app/SymfonyRequirements.php | 10 ++++- composer.lock | 80 ++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 42 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index abaf0c179c..28b0dcdbfc 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -446,6 +446,12 @@ public function __construct() ); } + $this->addRequirement( + function_exists('iconv'), + 'iconv() must be available', + 'Install and enable the iconv extension.' + ); + $this->addRequirement( function_exists('json_encode'), 'json_encode() must be available', @@ -546,10 +552,10 @@ function_exists('simplexml_import_dom'), require_once __DIR__.'/../vendor/autoload.php'; try { - $r = new \ReflectionClass('Sensio\Bundle\DistributionBundle\SensioDistributionBundle'); + $r = new ReflectionClass('Sensio\Bundle\DistributionBundle\SensioDistributionBundle'); $contents = file_get_contents(dirname($r->getFileName()).'/Resources/skeleton/app/SymfonyRequirements.php'); - } catch (\ReflectionException $e) { + } catch (ReflectionException $e) { $contents = ''; } $this->addRecommendation( diff --git a/composer.lock b/composer.lock index 5e2d86e72f..80b2c5d72d 100644 --- a/composer.lock +++ b/composer.lock @@ -872,16 +872,16 @@ }, { "name": "kriswallsmith/assetic", - "version": "v1.3.0", + "version": "v1.3.1", "source": { "type": "git", "url": "https://github.com/kriswallsmith/assetic.git", - "reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31" + "reference": "cb92b179dddfb8a3f341d53bd27e088f24d9c2e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/56cb5d6dec9e7a68a4da2fa89844f39d41092f31", - "reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31", + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/cb92b179dddfb8a3f341d53bd27e088f24d9c2e5", + "reference": "cb92b179dddfb8a3f341d53bd27e088f24d9c2e5", "shasum": "" }, "require": { @@ -917,7 +917,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -946,20 +946,20 @@ "compression", "minification" ], - "time": "2015-08-31 19:07:16" + "time": "2015-10-15 01:33:42" }, { "name": "monolog/monolog", - "version": "1.17.1", + "version": "1.17.2", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422" + "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/0524c87587ab85bc4c2d6f5b41253ccb930a5422", - "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bee7f0dc9c3e0b69a6039697533dca1e845c8c24", + "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24", "shasum": "" }, "require": { @@ -973,10 +973,11 @@ "aws/aws-sdk-php": "^2.4.9", "doctrine/couchdb": "~1.0@dev", "graylog2/gelf-php": "~1.0", + "jakub-onderka/php-parallel-lint": "0.9", "php-console/php-console": "^3.1.3", "phpunit/phpunit": "~4.5", "phpunit/phpunit-mock-objects": "2.3.0", - "raven/raven": "~0.11", + "raven/raven": "^0.13", "ruflin/elastica": ">=0.90 <3.0", "swiftmailer/swiftmailer": "~5.3", "videlalvaro/php-amqplib": "~2.4" @@ -1022,7 +1023,7 @@ "logging", "psr-3" ], - "time": "2015-08-31 09:17:37" + "time": "2015-10-14 12:51:02" }, { "name": "psr/log", @@ -1064,17 +1065,17 @@ }, { "name": "sensio/distribution-bundle", - "version": "v4.0.1", + "version": "v4.0.3", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "62d99ba41144e704300e40f755346553702b27c9" + "reference": "2d061c01e708c83ede4720e2551d9449bf606c0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/62d99ba41144e704300e40f755346553702b27c9", - "reference": "62d99ba41144e704300e40f755346553702b27c9", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/2d061c01e708c83ede4720e2551d9449bf606c0a", + "reference": "2d061c01e708c83ede4720e2551d9449bf606c0a", "shasum": "" }, "require": { @@ -1120,7 +1121,7 @@ "configuration", "distribution" ], - "time": "2015-08-03 10:07:56" + "time": "2015-10-27 18:48:08" }, { "name": "sensio/framework-extra-bundle", @@ -1346,34 +1347,34 @@ }, { "name": "symfony/monolog-bundle", - "version": "v2.7.1", + "version": "2.8.1", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bundle.git", - "reference": "9320b6863404c70ebe111e9040dab96f251de7ac" + "reference": "7117b9a145722e3c5768db4585f6ad0643ed5c4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/9320b6863404c70ebe111e9040dab96f251de7ac", - "reference": "9320b6863404c70ebe111e9040dab96f251de7ac", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/7117b9a145722e3c5768db4585f6ad0643ed5c4a", + "reference": "7117b9a145722e3c5768db4585f6ad0643ed5c4a", "shasum": "" }, "require": { "monolog/monolog": "~1.8", "php": ">=5.3.2", - "symfony/config": "~2.3", - "symfony/dependency-injection": "~2.3", - "symfony/http-kernel": "~2.3", - "symfony/monolog-bridge": "~2.3" + "symfony/config": "~2.3|3.*", + "symfony/dependency-injection": "~2.3|3.*", + "symfony/http-kernel": "~2.3|3.*", + "symfony/monolog-bridge": "~2.3|3.*" }, "require-dev": { - "symfony/console": "~2.3", + "symfony/console": "~2.3|3.*", "symfony/yaml": "~2.3" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.7.x-dev" + "dev-master": "2.8.x-dev" } }, "autoload": { @@ -1401,7 +1402,7 @@ "log", "logging" ], - "time": "2015-01-04 20:21:17" + "time": "2015-10-02 11:51:59" }, { "name": "symfony/swiftmailer-bundle", @@ -1462,16 +1463,16 @@ }, { "name": "symfony/symfony", - "version": "v2.7.5", + "version": "v2.7.6", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "619528a274647cffc1792063c3ea04c4fa8266a0" + "reference": "66b2e9662c44d478b69e48278aa54079a006eb42" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/619528a274647cffc1792063c3ea04c4fa8266a0", - "reference": "619528a274647cffc1792063c3ea04c4fa8266a0", + "url": "https://api.github.com/repos/symfony/symfony/zipball/66b2e9662c44d478b69e48278aa54079a006eb42", + "reference": "66b2e9662c44d478b69e48278aa54079a006eb42", "shasum": "" }, "require": { @@ -1534,8 +1535,7 @@ "egulias/email-validator": "~1.2", "ircmaxell/password-compat": "~1.0", "monolog/monolog": "~1.11", - "ocramius/proxy-manager": "~0.4|~1.0", - "symfony/phpunit-bridge": "self.version" + "ocramius/proxy-manager": "~0.4|~1.0" }, "type": "library", "extra": { @@ -1580,20 +1580,20 @@ "keywords": [ "framework" ], - "time": "2015-09-25 11:16:52" + "time": "2015-10-27 19:07:24" }, { "name": "twig/twig", - "version": "v1.22.2", + "version": "v1.22.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "79249fc8c9ff62e41e217e0c630e2e00bcadda6a" + "reference": "ebfc36b7e77b0c1175afe30459cf943010245540" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/79249fc8c9ff62e41e217e0c630e2e00bcadda6a", - "reference": "79249fc8c9ff62e41e217e0c630e2e00bcadda6a", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/ebfc36b7e77b0c1175afe30459cf943010245540", + "reference": "ebfc36b7e77b0c1175afe30459cf943010245540", "shasum": "" }, "require": { @@ -1641,7 +1641,7 @@ "keywords": [ "templating" ], - "time": "2015-09-22 13:59:32" + "time": "2015-10-13 07:07:02" } ], "packages-dev": [ From 0daa8bc88301a145d8106d6bfec79d49219edb8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20L=C3=A9v=C3=AAque?= Date: Sun, 1 Nov 2015 15:15:57 +0100 Subject: [PATCH 70/98] csrf_protection is now under framework.form instead of framework Unrecognized option "csrf_protection" under "framework" was triggered when installing master version of this repository --- app/config/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index b4a2d0a4c2..69e4b4603a 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -15,8 +15,8 @@ framework: router: resource: "%kernel.root_dir%/config/routing.yml" strict_requirements: ~ - form: ~ - csrf_protection: ~ + form: + csrf_protection: ~ validation: { enable_annotations: true } #serializer: { enable_annotations: true } templating: From c460797e2d13e880d4098c50b4350828e350b661 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 10 Nov 2015 14:40:46 +0100 Subject: [PATCH 71/98] bumped generator bundle dep --- app/SymfonyRequirements.php | 10 +- composer.json | 2 +- composer.lock | 873 +++++++++++++++++++++++++----------- web/config.php | 103 ++++- 4 files changed, 709 insertions(+), 279 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index abaf0c179c..28b0dcdbfc 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -446,6 +446,12 @@ public function __construct() ); } + $this->addRequirement( + function_exists('iconv'), + 'iconv() must be available', + 'Install and enable the iconv extension.' + ); + $this->addRequirement( function_exists('json_encode'), 'json_encode() must be available', @@ -546,10 +552,10 @@ function_exists('simplexml_import_dom'), require_once __DIR__.'/../vendor/autoload.php'; try { - $r = new \ReflectionClass('Sensio\Bundle\DistributionBundle\SensioDistributionBundle'); + $r = new ReflectionClass('Sensio\Bundle\DistributionBundle\SensioDistributionBundle'); $contents = file_get_contents(dirname($r->getFileName()).'/Resources/skeleton/app/SymfonyRequirements.php'); - } catch (\ReflectionException $e) { + } catch (ReflectionException $e) { $contents = ''; } $this->addRecommendation( diff --git a/composer.json b/composer.json index e70ce48b72..249da911d5 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "incenteev/composer-parameter-handler": "~2.0" }, "require-dev": { - "sensio/generator-bundle": "~2.3" + "sensio/generator-bundle": "~3.0" }, "scripts": { "post-install-cmd": [ diff --git a/composer.lock b/composer.lock index 817d8e4862..e44d47375d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +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": "b5c7100f9bcbed9bf742002000d1cd84", + "hash": "6042d527f9c4f34bce8812788002488b", + "content-hash": "833596a0bb6251a99ba4a70bf74c552f", "packages": [ { "name": "doctrine/annotations", @@ -76,16 +77,16 @@ }, { "name": "doctrine/cache", - "version": "v1.4.2", + "version": "v1.5.1", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca" + "reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/8c434000f420ade76a07c64cbe08ca47e5c101ca", - "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca", + "url": "https://api.github.com/repos/doctrine/cache/zipball/2b9cec5a5e722010cbebc91713d4c11eaa064d5e", + "reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e", "shasum": "" }, "require": { @@ -106,8 +107,8 @@ } }, "autoload": { - "psr-0": { - "Doctrine\\Common\\Cache\\": "lib/" + "psr-4": { + "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" } }, "notification-url": "https://packagist.org/downloads/", @@ -142,7 +143,7 @@ "cache", "caching" ], - "time": "2015-08-31 12:36:41" + "time": "2015-11-02 18:35:48" }, { "name": "doctrine/collections", @@ -285,16 +286,16 @@ }, { "name": "doctrine/dbal", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "628c2256b646ae2417d44e063bce8aec5199d48d" + "reference": "01dbcbc5cd0a913d751418e635434a18a2f2a75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/628c2256b646ae2417d44e063bce8aec5199d48d", - "reference": "628c2256b646ae2417d44e063bce8aec5199d48d", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/01dbcbc5cd0a913d751418e635434a18a2f2a75c", + "reference": "01dbcbc5cd0a913d751418e635434a18a2f2a75c", "shasum": "" }, "require": { @@ -352,20 +353,20 @@ "persistence", "queryobject" ], - "time": "2015-01-12 21:52:47" + "time": "2015-09-16 16:29:33" }, { "name": "doctrine/doctrine-bundle", - "version": "v1.5.1", + "version": "1.6.0", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "8c5cedb4f2f7ebb66a963ae46ad9daa1e31cee01" + "reference": "a5b3ba908ba68f3e14e42762a7b940fde65ed7da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/8c5cedb4f2f7ebb66a963ae46ad9daa1e31cee01", - "reference": "8c5cedb4f2f7ebb66a963ae46ad9daa1e31cee01", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/a5b3ba908ba68f3e14e42762a7b940fde65ed7da", + "reference": "a5b3ba908ba68f3e14e42762a7b940fde65ed7da", "shasum": "" }, "require": { @@ -392,7 +393,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.5.x-dev" + "dev-master": "1.6.x-dev" } }, "autoload": { @@ -430,42 +431,42 @@ "orm", "persistence" ], - "time": "2015-08-12 15:52:00" + "time": "2015-11-04 21:33:02" }, { "name": "doctrine/doctrine-cache-bundle", - "version": "v1.0.1", - "target-dir": "Doctrine/Bundle/DoctrineCacheBundle", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineCacheBundle.git", - "reference": "e4b6f810aa047f9cbfe41c3d6a3d7e83d7477a9d" + "reference": "3233bc78e222d528ca89a6a47d48d6f37888e95e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/e4b6f810aa047f9cbfe41c3d6a3d7e83d7477a9d", - "reference": "e4b6f810aa047f9cbfe41c3d6a3d7e83d7477a9d", + "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/3233bc78e222d528ca89a6a47d48d6f37888e95e", + "reference": "3233bc78e222d528ca89a6a47d48d6f37888e95e", "shasum": "" }, "require": { - "doctrine/cache": "~1.3", + "doctrine/cache": "^1.4.2", "doctrine/inflector": "~1.0", "php": ">=5.3.2", - "symfony/doctrine-bridge": "~2.2", - "symfony/framework-bundle": "~2.2", - "symfony/security": "~2.2" + "symfony/doctrine-bridge": "~2.2|~3.0", + "symfony/security-acl": "~2.3|~3.0" }, "require-dev": { "instaclick/coding-standard": "~1.1", "instaclick/object-calisthenics-sniffs": "dev-master", "instaclick/symfony2-coding-standard": "dev-remaster", - "phpunit/phpunit": "~3.7", + "phpunit/phpunit": "~4", "satooshi/php-coveralls": "~0.6.1", - "squizlabs/php_codesniffer": "dev-master", - "symfony/console": "~2.2", - "symfony/finder": "~2.2", - "symfony/validator": "~2.2", - "symfony/yaml": "~2.2" + "squizlabs/php_codesniffer": "~1.5", + "symfony/console": "~2.2|~3.0", + "symfony/finder": "~2.2|~3.0", + "symfony/framework-bundle": "~2.2|~3.0", + "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/validator": "~2.2|~3.0", + "symfony/yaml": "~2.2|~3.0" }, "type": "symfony-bundle", "extra": { @@ -474,8 +475,8 @@ } }, "autoload": { - "psr-0": { - "Doctrine\\Bundle\\DoctrineCacheBundle": "" + "psr-4": { + "Doctrine\\Bundle\\DoctrineCacheBundle\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -508,26 +509,26 @@ "email": "fabien@symfony.com" } ], - "description": "Symfony2 Bundle for Doctrine Cache", + "description": "Symfony Bundle for Doctrine Cache", "homepage": "http://www.doctrine-project.org", "keywords": [ "cache", "caching" ], - "time": "2014-11-28 09:43:36" + "time": "2015-11-05 13:48:27" }, { "name": "doctrine/inflector", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "0bcb2e79d8571787f18b7eb036ed3d004908e604" + "reference": "90b2128806bfde671b6952ab8bea493942c1fdae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/0bcb2e79d8571787f18b7eb036ed3d004908e604", - "reference": "0bcb2e79d8571787f18b7eb036ed3d004908e604", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae", + "reference": "90b2128806bfde671b6952ab8bea493942c1fdae", "shasum": "" }, "require": { @@ -539,7 +540,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -581,7 +582,7 @@ "singularize", "string" ], - "time": "2014-12-20 21:24:13" + "time": "2015-11-06 14:35:42" }, { "name": "doctrine/instantiator", @@ -820,34 +821,26 @@ "time": "2015-06-03 08:27:03" }, { - "name": "jdorn/sql-formatter", - "version": "v1.2.17", + "name": "ircmaxell/password-compat", + "version": "v1.0.4", "source": { "type": "git", - "url": "https://github.com/jdorn/sql-formatter.git", - "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc" + "url": "https://github.com/ircmaxell/password_compat.git", + "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/64990d96e0959dff8e059dfcdc1af130728d92bc", - "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc", + "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c", + "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c", "shasum": "" }, - "require": { - "php": ">=5.2.4" - }, "require-dev": { - "phpunit/phpunit": "3.7.*" + "phpunit/phpunit": "4.*" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, "autoload": { - "classmap": [ - "lib" + "files": [ + "lib/password.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -856,75 +849,48 @@ ], "authors": [ { - "name": "Jeremy Dorn", - "email": "jeremy@jeremydorn.com", - "homepage": "http://jeremydorn.com/" + "name": "Anthony Ferrara", + "email": "ircmaxell@php.net", + "homepage": "http://blog.ircmaxell.com" } ], - "description": "a PHP SQL highlighting library", - "homepage": "https://github.com/jdorn/sql-formatter/", + "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash", + "homepage": "https://github.com/ircmaxell/password_compat", "keywords": [ - "highlight", - "sql" + "hashing", + "password" ], - "time": "2014-01-12 16:20:24" + "time": "2014-11-20 16:49:30" }, { - "name": "kriswallsmith/assetic", - "version": "v1.3.0", + "name": "jdorn/sql-formatter", + "version": "v1.2.17", "source": { "type": "git", - "url": "https://github.com/kriswallsmith/assetic.git", - "reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31" + "url": "https://github.com/jdorn/sql-formatter.git", + "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/56cb5d6dec9e7a68a4da2fa89844f39d41092f31", - "reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31", + "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/64990d96e0959dff8e059dfcdc1af130728d92bc", + "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc", "shasum": "" }, "require": { - "php": ">=5.3.1", - "symfony/process": "~2.1" - }, - "conflict": { - "twig/twig": "<1.12" + "php": ">=5.2.4" }, "require-dev": { - "cssmin/cssmin": "*", - "joliclic/javascript-packer": "*", - "kamicane/packager": "*", - "leafo/lessphp": "^0.3.7", - "leafo/scssphp": "*@dev", - "leafo/scssphp-compass": "*@dev", - "mrclay/minify": "*", - "patchwork/jsqueeze": "~1.0|~2.0", - "phpunit/phpunit": "~4.8", - "psr/log": "~1.0", - "ptachoire/cssembed": "*", - "symfony/phpunit-bridge": "~2.7", - "twig/twig": "~1.8|~2.0" - }, - "suggest": { - "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", - "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler", - "leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin", - "patchwork/jsqueeze": "Assetic provides the integration with the JSqueeze JavaScript compressor", - "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris", - "twig/twig": "Assetic provides the integration with the Twig templating engine" + "phpunit/phpunit": "3.7.*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { - "psr-0": { - "Assetic": "src/" - }, - "files": [ - "src/functions.php" + "classmap": [ + "lib" ] }, "notification-url": "https://packagist.org/downloads/", @@ -933,32 +899,31 @@ ], "authors": [ { - "name": "Kris Wallsmith", - "email": "kris.wallsmith@gmail.com", - "homepage": "http://kriswallsmith.net/" + "name": "Jeremy Dorn", + "email": "jeremy@jeremydorn.com", + "homepage": "http://jeremydorn.com/" } ], - "description": "Asset Management for PHP", - "homepage": "https://github.com/kriswallsmith/assetic", + "description": "a PHP SQL highlighting library", + "homepage": "https://github.com/jdorn/sql-formatter/", "keywords": [ - "assets", - "compression", - "minification" + "highlight", + "sql" ], - "time": "2015-08-31 19:07:16" + "time": "2014-01-12 16:20:24" }, { "name": "monolog/monolog", - "version": "1.17.1", + "version": "1.17.2", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422" + "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/0524c87587ab85bc4c2d6f5b41253ccb930a5422", - "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bee7f0dc9c3e0b69a6039697533dca1e845c8c24", + "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24", "shasum": "" }, "require": { @@ -972,10 +937,11 @@ "aws/aws-sdk-php": "^2.4.9", "doctrine/couchdb": "~1.0@dev", "graylog2/gelf-php": "~1.0", + "jakub-onderka/php-parallel-lint": "0.9", "php-console/php-console": "^3.1.3", "phpunit/phpunit": "~4.5", "phpunit/phpunit-mock-objects": "2.3.0", - "raven/raven": "~0.11", + "raven/raven": "^0.13", "ruflin/elastica": ">=0.90 <3.0", "swiftmailer/swiftmailer": "~5.3", "videlalvaro/php-amqplib": "~2.4" @@ -1021,7 +987,55 @@ "logging", "psr-3" ], - "time": "2015-08-31 09:17:37" + "time": "2015-10-14 12:51:02" + }, + { + "name": "paragonie/random_compat", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/paragonie/random_compat.git", + "reference": "19f765b66c6fbb56ee3b11bc16d52e38eebdc295" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/19f765b66c6fbb56ee3b11bc16d52e38eebdc295", + "reference": "19f765b66c6fbb56ee3b11bc16d52e38eebdc295", + "shasum": "" + }, + "require": { + "php": ">=5.2.0" + }, + "require-dev": { + "phpunit/phpunit": "4.*|5.*" + }, + "suggest": { + "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." + }, + "type": "library", + "autoload": { + "files": [ + "lib/random.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com" + } + ], + "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", + "keywords": [ + "csprng", + "pseudorandom", + "random" + ], + "time": "2015-11-10 00:45:41" }, { "name": "psr/log", @@ -1063,45 +1077,37 @@ }, { "name": "sensio/distribution-bundle", - "version": "v4.0.1", - "target-dir": "Sensio/Bundle/DistributionBundle", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "62d99ba41144e704300e40f755346553702b27c9" + "reference": "1045b31102f9d6017725ada4d4b5d0fce085fc9f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/62d99ba41144e704300e40f755346553702b27c9", - "reference": "62d99ba41144e704300e40f755346553702b27c9", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/1045b31102f9d6017725ada4d4b5d0fce085fc9f", + "reference": "1045b31102f9d6017725ada4d4b5d0fce085fc9f", "shasum": "" }, "require": { "php": ">=5.3.9", "sensiolabs/security-checker": "~3.0", - "symfony/class-loader": "~2.2", - "symfony/framework-bundle": "~2.3", - "symfony/process": "~2.2" - }, - "require-dev": { - "symfony/form": "~2.2", - "symfony/validator": "~2.2", - "symfony/yaml": "~2.2" - }, - "suggest": { - "symfony/form": "If you want to use the configurator", - "symfony/validator": "If you want to use the configurator", - "symfony/yaml": "If you want to use the configurator" + "symfony/class-loader": "~2.3|~3.0", + "symfony/config": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/filesystem": "~2.3|~3.0", + "symfony/http-kernel": "~2.3|~3.0", + "symfony/process": "~2.3|~3.0" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "4.0.x-dev" + "dev-master": "5.0.x-dev" } }, "autoload": { - "psr-0": { - "Sensio\\Bundle\\DistributionBundle": "" + "psr-4": { + "Sensio\\Bundle\\DistributionBundle\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -1119,29 +1125,29 @@ "configuration", "distribution" ], - "time": "2015-08-03 10:07:56" + "time": "2015-10-27 18:48:37" }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.10", + "version": "v3.0.11", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "18fc2063c4d6569cdca47a39fbac32342eb65f3c" + "reference": "a79e205737b58d557c05caef6dfa8f94d8084bca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/18fc2063c4d6569cdca47a39fbac32342eb65f3c", - "reference": "18fc2063c4d6569cdca47a39fbac32342eb65f3c", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/a79e205737b58d557c05caef6dfa8f94d8084bca", + "reference": "a79e205737b58d557c05caef6dfa8f94d8084bca", "shasum": "" }, "require": { "doctrine/common": "~2.2", - "symfony/framework-bundle": "~2.3" + "symfony/framework-bundle": "~2.3|~3.0" }, "require-dev": { - "symfony/expression-language": "~2.4", - "symfony/security-bundle": "~2.4" + "symfony/expression-language": "~2.4|~3.0", + "symfony/security-bundle": "~2.4|~3.0" }, "suggest": { "symfony/expression-language": "", @@ -1174,24 +1180,24 @@ "annotations", "controllers" ], - "time": "2015-08-03 11:59:27" + "time": "2015-10-28 15:47:04" }, { "name": "sensiolabs/security-checker", - "version": "v3.0.1", + "version": "v3.0.2", "source": { "type": "git", "url": "https://github.com/sensiolabs/security-checker.git", - "reference": "7735fd97ff7303d9df776b8dbc970f949399abc9" + "reference": "21696b0daa731064c23cfb694c60a2584a7b6e93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/7735fd97ff7303d9df776b8dbc970f949399abc9", - "reference": "7735fd97ff7303d9df776b8dbc970f949399abc9", + "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/21696b0daa731064c23cfb694c60a2584a7b6e93", + "reference": "21696b0daa731064c23cfb694c60a2584a7b6e93", "shasum": "" }, "require": { - "symfony/console": "~2.0" + "symfony/console": "~2.0|~3.0" }, "bin": [ "security-checker" @@ -1218,7 +1224,7 @@ } ], "description": "A security checker for your composer.lock", - "time": "2015-08-11 12:11:25" + "time": "2015-11-07 08:07:40" }, { "name": "swiftmailer/swiftmailer", @@ -1274,54 +1280,208 @@ "time": "2015-06-06 14:19:39" }, { - "name": "symfony/assetic-bundle", - "version": "v2.7.0", + "name": "symfony/monolog-bundle", + "version": "2.8.1", "source": { "type": "git", - "url": "https://github.com/symfony/AsseticBundle.git", - "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5" + "url": "https://github.com/symfony/monolog-bundle.git", + "reference": "7117b9a145722e3c5768db4585f6ad0643ed5c4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", - "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/7117b9a145722e3c5768db4585f6ad0643ed5c4a", + "reference": "7117b9a145722e3c5768db4585f6ad0643ed5c4a", "shasum": "" }, "require": { - "kriswallsmith/assetic": "~1.3", - "php": ">=5.3.0", - "symfony/console": "~2.3", - "symfony/dependency-injection": "~2.3", - "symfony/framework-bundle": "~2.3", + "monolog/monolog": "~1.8", + "php": ">=5.3.2", + "symfony/config": "~2.3|3.*", + "symfony/dependency-injection": "~2.3|3.*", + "symfony/http-kernel": "~2.3|3.*", + "symfony/monolog-bridge": "~2.3|3.*" + }, + "require-dev": { + "symfony/console": "~2.3|3.*", "symfony/yaml": "~2.3" }, - "conflict": { - "kriswallsmith/spork": "<=0.2", - "twig/twig": "<1.20" + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.8.x-dev" + } }, - "require-dev": { - "kriswallsmith/spork": "~0.3", - "patchwork/jsqueeze": "~1.0", - "symfony/class-loader": "~2.3", - "symfony/css-selector": "~2.3", - "symfony/dom-crawler": "~2.3", - "symfony/phpunit-bridge": "~2.7", - "symfony/twig-bundle": "~2.3" + "autoload": { + "psr-4": { + "Symfony\\Bundle\\MonologBundle\\": "" + } }, - "suggest": { - "kriswallsmith/spork": "to be able to dump assets in parallel", - "symfony/twig-bundle": "to use the Twig integration" + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony MonologBundle", + "homepage": "http://symfony.com", + "keywords": [ + "log", + "logging" + ], + "time": "2015-10-02 11:51:59" + }, + { + "name": "symfony/polyfill-intl-icu", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-icu.git", + "reference": "2deb44160e1c886241c06602b12b98779f728177" }, - "type": "symfony-bundle", + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/2deb44160e1c886241c06602b12b98779f728177", + "reference": "2deb44160e1c886241c06602b12b98779f728177", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/intl": "~2.3|~3.0" + }, + "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "1.0-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 for intl's ICU-related data and classes", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "icu", + "intl", + "polyfill", + "portable", + "shim" + ], + "time": "2015-11-04 20:28:58" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "0b6a8940385311a24e060ec1fe35680e17c74497" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0b6a8940385311a24e060ec1fe35680e17c74497", + "reference": "0b6a8940385311a24e060ec1fe35680e17c74497", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" } }, "autoload": { "psr-4": { - "Symfony\\Bundle\\AsseticBundle\\": "" + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "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 for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "time": "2015-11-04 20:28:58" + }, + { + "name": "symfony/polyfill-php54", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php54.git", + "reference": "2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc", + "reference": "2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php54\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1329,91 +1489,259 @@ ], "authors": [ { - "name": "Kris Wallsmith", - "email": "kris.wallsmith@gmail.com", - "homepage": "http://kriswallsmith.net/" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Integrates Assetic into Symfony2", - "homepage": "https://github.com/symfony/AsseticBundle", + "description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions", + "homepage": "https://symfony.com", "keywords": [ - "assets", - "compression", - "minification" + "compatibility", + "polyfill", + "portable", + "shim" ], - "time": "2015-09-01 00:05:29" + "time": "2015-11-04 20:28:58" }, { - "name": "symfony/monolog-bundle", - "version": "v2.7.1", + "name": "symfony/polyfill-php55", + "version": "v1.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/MonologBundle.git", - "reference": "9320b6863404c70ebe111e9040dab96f251de7ac" + "url": "https://github.com/symfony/polyfill-php55.git", + "reference": "3adc962a6250c02adb508e85ecfa6fcfee9eec47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/9320b6863404c70ebe111e9040dab96f251de7ac", - "reference": "9320b6863404c70ebe111e9040dab96f251de7ac", + "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/3adc962a6250c02adb508e85ecfa6fcfee9eec47", + "reference": "3adc962a6250c02adb508e85ecfa6fcfee9eec47", "shasum": "" }, "require": { - "monolog/monolog": "~1.8", - "php": ">=5.3.2", - "symfony/config": "~2.3", - "symfony/dependency-injection": "~2.3", - "symfony/http-kernel": "~2.3", - "symfony/monolog-bridge": "~2.3" + "ircmaxell/password-compat": "~1.0", + "php": ">=5.3.3" }, - "require-dev": { - "symfony/console": "~2.3", - "symfony/yaml": "~2.3" + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } }, - "type": "symfony-bundle", + "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": "2015-11-04 20:28:58" + }, + { + "name": "symfony/polyfill-php56", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php56.git", + "reference": "a6bd4770a6967517e6610529e14afaa3111094a3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/a6bd4770a6967517e6610529e14afaa3111094a3", + "reference": "a6bd4770a6967517e6610529e14afaa3111094a3", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/polyfill-util": "~1.0" + }, + "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7.x-dev" + "dev-master": "1.0-dev" } }, "autoload": { "psr-4": { - "Symfony\\Bundle\\MonologBundle\\": "" + "Symfony\\Polyfill\\Php56\\": "" + }, + "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.6+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2015-11-04 20:28:58" + }, + { + "name": "symfony/polyfill-php70", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php70.git", + "reference": "7f7f3c9c2b9f17722e0cd64fdb4f957330c53146" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/7f7f3c9c2b9f17722e0cd64fdb4f957330c53146", + "reference": "7f7f3c9c2b9f17722e0cd64fdb4f957330c53146", + "shasum": "" + }, + "require": { + "paragonie/random_compat": "~1.0", + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php70\\": "" + }, + "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": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2015-11-04 20:28:58" + }, + { + "name": "symfony/polyfill-util", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-util.git", + "reference": "4271c55cbc0a77b2641f861b978123e46b3da969" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4271c55cbc0a77b2641f861b978123e46b3da969", + "reference": "4271c55cbc0a77b2641f861b978123e46b3da969", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Util\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony MonologBundle", - "homepage": "http://symfony.com", + "description": "Symfony utilities for portability of PHP codes", + "homepage": "https://symfony.com", "keywords": [ - "log", - "logging" + "compat", + "compatibility", + "polyfill", + "shim" ], - "time": "2015-01-04 20:21:17" + "time": "2015-11-04 20:28:58" }, { "name": "symfony/security-acl", - "version": "v2.7.4", + "version": "v2.7.6", "source": { "type": "git", "url": "https://github.com/symfony/security-acl.git", - "reference": "ba1f9cea95fcf17f2f9549590a26bd0ca07cd06e" + "reference": "8cfb6072e9a4715ec3cedd06a018e6a60cade201" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-acl/zipball/ba1f9cea95fcf17f2f9549590a26bd0ca07cd06e", - "reference": "ba1f9cea95fcf17f2f9549590a26bd0ca07cd06e", + "url": "https://api.github.com/repos/symfony/security-acl/zipball/8cfb6072e9a4715ec3cedd06a018e6a60cade201", + "reference": "8cfb6072e9a4715ec3cedd06a018e6a60cade201", "shasum": "" }, "require": { @@ -1423,8 +1751,7 @@ "require-dev": { "doctrine/common": "~2.2", "doctrine/dbal": "~2.2", - "psr/log": "~1.0", - "symfony/phpunit-bridge": "~2.7" + "psr/log": "~1.0" }, "suggest": { "doctrine/dbal": "For using the built-in ACL implementation", @@ -1458,19 +1785,19 @@ ], "description": "Symfony Security Component - ACL (Access Control List)", "homepage": "https://symfony.com", - "time": "2015-08-24 07:13:45" + "time": "2015-10-12 09:20:33" }, { "name": "symfony/swiftmailer-bundle", "version": "v2.3.8", "source": { "type": "git", - "url": "https://github.com/symfony/SwiftmailerBundle.git", + "url": "https://github.com/symfony/swiftmailer-bundle.git", "reference": "970b13d01871207e81d17b17ddda025e7e21e797" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/SwiftmailerBundle/zipball/970b13d01871207e81d17b17ddda025e7e21e797", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/970b13d01871207e81d17b17ddda025e7e21e797", "reference": "970b13d01871207e81d17b17ddda025e7e21e797", "shasum": "" }, @@ -1523,20 +1850,30 @@ "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "fbba5d95ccb49439a6cce38e22b26511f4d81c81" + "reference": "775129fcd2982362552540bdab939807e495b0c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/fbba5d95ccb49439a6cce38e22b26511f4d81c81", - "reference": "fbba5d95ccb49439a6cce38e22b26511f4d81c81", + "url": "https://api.github.com/repos/symfony/symfony/zipball/775129fcd2982362552540bdab939807e495b0c3", + "reference": "775129fcd2982362552540bdab939807e495b0c3", "shasum": "" }, "require": { - "doctrine/common": "~2.3", + "doctrine/common": "~2.4", "php": ">=5.3.9", "psr/log": "~1.0", + "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.20|~2.0" + "twig/twig": "~1.23|~2.0" + }, + "conflict": { + "phpdocumentor/reflection": "<1.0.7" }, "replace": { "symfony/asset": "self.version", @@ -1559,17 +1896,20 @@ "symfony/http-foundation": "self.version", "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", "symfony/property-access": "self.version", + "symfony/property-info": "self.version", "symfony/proxy-manager-bridge": "self.version", "symfony/routing": "self.version", "symfony/security": "self.version", "symfony/security-bundle": "self.version", "symfony/security-core": "self.version", "symfony/security-csrf": "self.version", + "symfony/security-guard": "self.version", "symfony/security-http": "self.version", "symfony/serializer": "self.version", "symfony/stopwatch": "self.version", @@ -1585,14 +1925,13 @@ }, "require-dev": { "doctrine/data-fixtures": "1.0.*", - "doctrine/dbal": "~2.2", + "doctrine/dbal": "~2.4", "doctrine/doctrine-bundle": "~1.2", - "doctrine/orm": "~2.2,>=2.2.3", + "doctrine/orm": "~2.4,>=2.4.5", "egulias/email-validator": "~1.2", - "ircmaxell/password-compat": "~1.0", "monolog/monolog": "~1.11", "ocramius/proxy-manager": "~0.4|~1.0", - "symfony/phpunit-bridge": "self.version" + "phpdocumentor/reflection": "^1.0.7" }, "type": "library", "extra": { @@ -1611,11 +1950,10 @@ "Symfony\\Component\\": "src/Symfony/Component/" }, "classmap": [ - "src/Symfony/Component/HttpFoundation/Resources/stubs", "src/Symfony/Component/Intl/Resources/stubs" ], - "files": [ - "src/Symfony/Component/Intl/Resources/stubs/functions.php" + "exclude-from-classmap": [ + "**/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -1637,20 +1975,20 @@ "keywords": [ "framework" ], - "time": "2015-09-13 11:29:07" + "time": "2015-11-10 12:35:38" }, { "name": "twig/twig", - "version": "v1.21.2", + "version": "v1.23.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "ddce1136beb8db29b9cd7dffa8ab518b978c9db3" + "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/ddce1136beb8db29b9cd7dffa8ab518b978c9db3", - "reference": "ddce1136beb8db29b9cd7dffa8ab518b978c9db3", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/d9b6333ae8dd2c8e3fd256e127548def0bc614c6", + "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6", "shasum": "" }, "require": { @@ -1663,7 +2001,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.21-dev" + "dev-master": "1.23-dev" } }, "autoload": { @@ -1698,44 +2036,48 @@ "keywords": [ "templating" ], - "time": "2015-09-09 05:28:51" + "time": "2015-11-05 12:49:06" } ], "packages-dev": [ { "name": "sensio/generator-bundle", - "version": "v2.5.3", - "target-dir": "Sensio/Bundle/GeneratorBundle", + "version": "v3.0.0", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", - "reference": "e50108c2133ee5c9c484555faed50c17a61221d3" + "reference": "f5f60fc84fdef91333c67f29b00a271cfbcf1ccb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/e50108c2133ee5c9c484555faed50c17a61221d3", - "reference": "e50108c2133ee5c9c484555faed50c17a61221d3", + "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/f5f60fc84fdef91333c67f29b00a271cfbcf1ccb", + "reference": "f5f60fc84fdef91333c67f29b00a271cfbcf1ccb", "shasum": "" }, "require": { - "symfony/console": "~2.5", - "symfony/framework-bundle": "~2.2" + "symfony/console": "~2.7|~3.0", + "symfony/framework-bundle": "~2.7|~3.0", + "symfony/process": "~2.7|~3.0", + "symfony/yaml": "~2.7|~3.0" }, "require-dev": { - "doctrine/orm": "~2.2,>=2.2.3", - "symfony/doctrine-bridge": "~2.2", - "twig/twig": "~1.11" + "doctrine/orm": "~2.4", + "symfony/doctrine-bridge": "~2.7|~3.0", + "twig/twig": "~1.18" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.5.x-dev" + "dev-master": "3.0.x-dev" } }, "autoload": { - "psr-0": { - "Sensio\\Bundle\\GeneratorBundle": "" - } + "psr-4": { + "Sensio\\Bundle\\GeneratorBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1748,13 +2090,14 @@ } ], "description": "This bundle generates code for you", - "time": "2015-03-17 06:36:52" + "time": "2015-11-10 13:25:32" } ], "aliases": [], "minimum-stability": "stable", "stability-flags": { - "symfony/symfony": 20 + "symfony/symfony": 20, + "sensio/distribution-bundle": 20 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/web/config.php b/web/config.php index 162acfc7b2..2e153097b1 100644 --- a/web/config.php +++ b/web/config.php @@ -1,5 +1,15 @@ - Symfony Configuration + Symfony Configuration Checker - +
    @@ -62,11 +148,10 @@
    -

    Welcome!

    -

    Welcome to your new Symfony project.

    +

    Configuration Checker

    - This script will guide you through the basic configuration of your project. - You can also do the same by editing the ‘app/config/parameters.yml’ file directly. + This script analyzes your system to check whether is + ready to run Symfony applications.

    @@ -103,14 +188,10 @@ -

    Your configuration looks good to run Symfony.

    +

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

      - -
    • Configure your Symfony Application online
      • -
    • Bypass configuration and go to the Welcome page
      • -
    • Re-check configuration
      • From 21564cee65d519bf90e2fd4f22f57d9d8a0d9def Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 11 Nov 2015 15:12:04 +0100 Subject: [PATCH 72/98] Revert "bug #879 csrf_protection is now under framework.form instead of framework (BenoitLeveque)" This reverts commit ebb517380b9c63dc7a4b1e37291c42ec4b912063, reversing changes made to 605196a22e8b8af31492f7c31960f56c86ba082e. --- app/config/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index 69e4b4603a..b4a2d0a4c2 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -15,8 +15,8 @@ framework: router: resource: "%kernel.root_dir%/config/routing.yml" strict_requirements: ~ - form: - csrf_protection: ~ + form: ~ + csrf_protection: ~ validation: { enable_annotations: true } #serializer: { enable_annotations: true } templating: From b9d86e081e3f1db4f995875178a49777f689f1d5 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 11 Nov 2015 15:13:03 +0100 Subject: [PATCH 73/98] updated deps --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index e44d47375d..4d35551465 100644 --- a/composer.lock +++ b/composer.lock @@ -771,21 +771,21 @@ }, { "name": "incenteev/composer-parameter-handler", - "version": "v2.1.1", + "version": "v2.1.2", "source": { "type": "git", "url": "https://github.com/Incenteev/ParameterHandler.git", - "reference": "84a205fe80a46101607bafbc423019527893ddd0" + "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/84a205fe80a46101607bafbc423019527893ddd0", - "reference": "84a205fe80a46101607bafbc423019527893ddd0", + "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc", + "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony/yaml": "~2.0" + "symfony/yaml": "~2.3|~3.0" }, "require-dev": { "composer/composer": "1.0.*@dev", @@ -818,7 +818,7 @@ "keywords": [ "parameters management" ], - "time": "2015-06-03 08:27:03" + "time": "2015-11-10 17:04:01" }, { "name": "ircmaxell/password-compat", From c11fad07501b7354d8643e31e1a030288cf0e320 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Sat, 14 Nov 2015 01:10:04 +0100 Subject: [PATCH 74/98] Add phpunit-bridge to handle deprecations Even though the standard-edition itself doesn't/shouldn't trigger deprecations, the phpunit bridge should still be included by default as developers will have to deal with deprecations sooner or later anyway (and they could even come from outside of symfony). --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 074b3bc478..6f94bddf1d 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,8 @@ "incenteev/composer-parameter-handler": "~2.0" }, "require-dev": { - "sensio/generator-bundle": "~2.3" + "sensio/generator-bundle": "~2.3", + "symfony/phpunit-bridge": "~2.7" }, "scripts": { "post-install-cmd": [ From 200382555182bd218176243a2cd6dc6bcaf66edc Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 16 Nov 2015 13:15:03 +0100 Subject: [PATCH 75/98] updated VENDORS for 2.8.0-BETA1 --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index c5d82547f5..55792e2b63 100644 --- a/composer.lock +++ b/composer.lock @@ -1850,12 +1850,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "fef28b2fa143119161e421a5c8ecd558189d2938" + "reference": "3b99b3a6e71da0f7d3fb07cf5c728ad04a326416" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/fef28b2fa143119161e421a5c8ecd558189d2938", - "reference": "fef28b2fa143119161e421a5c8ecd558189d2938", + "url": "https://api.github.com/repos/symfony/symfony/zipball/3b99b3a6e71da0f7d3fb07cf5c728ad04a326416", + "reference": "3b99b3a6e71da0f7d3fb07cf5c728ad04a326416", "shasum": "" }, "require": { @@ -1975,7 +1975,7 @@ "keywords": [ "framework" ], - "time": "2015-11-12 01:14:48" + "time": "2015-11-16 09:09:38" }, { "name": "twig/twig", From c5709ddf217a47d773d61b1f49c07f485b1607a3 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 23 Nov 2015 12:17:56 +0100 Subject: [PATCH 76/98] updated VENDORS for 2.3.35 --- composer.lock | 211 ++++++++++++++++++++++++++------------------------ 1 file changed, 108 insertions(+), 103 deletions(-) diff --git a/composer.lock b/composer.lock index c84f87705b..4b1bd9be3d 100644 --- a/composer.lock +++ b/composer.lock @@ -77,16 +77,16 @@ }, { "name": "doctrine/cache", - "version": "v1.4.2", + "version": "v1.5.1", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca" + "reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/8c434000f420ade76a07c64cbe08ca47e5c101ca", - "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca", + "url": "https://api.github.com/repos/doctrine/cache/zipball/2b9cec5a5e722010cbebc91713d4c11eaa064d5e", + "reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e", "shasum": "" }, "require": { @@ -107,8 +107,8 @@ } }, "autoload": { - "psr-0": { - "Doctrine\\Common\\Cache\\": "lib/" + "psr-4": { + "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" } }, "notification-url": "https://packagist.org/downloads/", @@ -143,7 +143,7 @@ "cache", "caching" ], - "time": "2015-08-31 12:36:41" + "time": "2015-11-02 18:35:48" }, { "name": "doctrine/collections", @@ -357,16 +357,16 @@ }, { "name": "doctrine/doctrine-bundle", - "version": "v1.5.2", + "version": "1.6.0", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3" + "reference": "a5b3ba908ba68f3e14e42762a7b940fde65ed7da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3", - "reference": "d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/a5b3ba908ba68f3e14e42762a7b940fde65ed7da", + "reference": "a5b3ba908ba68f3e14e42762a7b940fde65ed7da", "shasum": "" }, "require": { @@ -431,42 +431,42 @@ "orm", "persistence" ], - "time": "2015-08-31 14:47:06" + "time": "2015-11-04 21:33:02" }, { "name": "doctrine/doctrine-cache-bundle", - "version": "v1.0.1", - "target-dir": "Doctrine/Bundle/DoctrineCacheBundle", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineCacheBundle.git", - "reference": "e4b6f810aa047f9cbfe41c3d6a3d7e83d7477a9d" + "reference": "3233bc78e222d528ca89a6a47d48d6f37888e95e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/e4b6f810aa047f9cbfe41c3d6a3d7e83d7477a9d", - "reference": "e4b6f810aa047f9cbfe41c3d6a3d7e83d7477a9d", + "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/3233bc78e222d528ca89a6a47d48d6f37888e95e", + "reference": "3233bc78e222d528ca89a6a47d48d6f37888e95e", "shasum": "" }, "require": { - "doctrine/cache": "~1.3", + "doctrine/cache": "^1.4.2", "doctrine/inflector": "~1.0", "php": ">=5.3.2", - "symfony/doctrine-bridge": "~2.2", - "symfony/framework-bundle": "~2.2", - "symfony/security": "~2.2" + "symfony/doctrine-bridge": "~2.2|~3.0", + "symfony/security-acl": "~2.3|~3.0" }, "require-dev": { "instaclick/coding-standard": "~1.1", "instaclick/object-calisthenics-sniffs": "dev-master", "instaclick/symfony2-coding-standard": "dev-remaster", - "phpunit/phpunit": "~3.7", + "phpunit/phpunit": "~4", "satooshi/php-coveralls": "~0.6.1", - "squizlabs/php_codesniffer": "dev-master", - "symfony/console": "~2.2", - "symfony/finder": "~2.2", - "symfony/validator": "~2.2", - "symfony/yaml": "~2.2" + "squizlabs/php_codesniffer": "~1.5", + "symfony/console": "~2.2|~3.0", + "symfony/finder": "~2.2|~3.0", + "symfony/framework-bundle": "~2.2|~3.0", + "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/validator": "~2.2|~3.0", + "symfony/yaml": "~2.2|~3.0" }, "type": "symfony-bundle", "extra": { @@ -475,8 +475,8 @@ } }, "autoload": { - "psr-0": { - "Doctrine\\Bundle\\DoctrineCacheBundle": "" + "psr-4": { + "Doctrine\\Bundle\\DoctrineCacheBundle\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -509,26 +509,26 @@ "email": "fabien@symfony.com" } ], - "description": "Symfony2 Bundle for Doctrine Cache", + "description": "Symfony Bundle for Doctrine Cache", "homepage": "http://www.doctrine-project.org", "keywords": [ "cache", "caching" ], - "time": "2014-11-28 09:43:36" + "time": "2015-11-05 13:48:27" }, { "name": "doctrine/inflector", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "0bcb2e79d8571787f18b7eb036ed3d004908e604" + "reference": "90b2128806bfde671b6952ab8bea493942c1fdae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/0bcb2e79d8571787f18b7eb036ed3d004908e604", - "reference": "0bcb2e79d8571787f18b7eb036ed3d004908e604", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae", + "reference": "90b2128806bfde671b6952ab8bea493942c1fdae", "shasum": "" }, "require": { @@ -540,7 +540,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -582,7 +582,7 @@ "singularize", "string" ], - "time": "2014-12-20 21:24:13" + "time": "2015-11-06 14:35:42" }, { "name": "doctrine/lexer", @@ -713,21 +713,21 @@ }, { "name": "incenteev/composer-parameter-handler", - "version": "v2.1.1", + "version": "v2.1.2", "source": { "type": "git", "url": "https://github.com/Incenteev/ParameterHandler.git", - "reference": "84a205fe80a46101607bafbc423019527893ddd0" + "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/84a205fe80a46101607bafbc423019527893ddd0", - "reference": "84a205fe80a46101607bafbc423019527893ddd0", + "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc", + "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony/yaml": "~2.0" + "symfony/yaml": "~2.3|~3.0" }, "require-dev": { "composer/composer": "1.0.*@dev", @@ -760,7 +760,7 @@ "keywords": [ "parameters management" ], - "time": "2015-06-03 08:27:03" + "time": "2015-11-10 17:04:01" }, { "name": "jdorn/sql-formatter", @@ -814,38 +814,37 @@ }, { "name": "kriswallsmith/assetic", - "version": "v1.3.1", + "version": "v1.3.2", "source": { "type": "git", "url": "https://github.com/kriswallsmith/assetic.git", - "reference": "cb92b179dddfb8a3f341d53bd27e088f24d9c2e5" + "reference": "9928f7c4ad98b234e3559d1049abd13387f86db5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/cb92b179dddfb8a3f341d53bd27e088f24d9c2e5", - "reference": "cb92b179dddfb8a3f341d53bd27e088f24d9c2e5", + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/9928f7c4ad98b234e3559d1049abd13387f86db5", + "reference": "9928f7c4ad98b234e3559d1049abd13387f86db5", "shasum": "" }, "require": { "php": ">=5.3.1", - "symfony/process": "~2.1" + "symfony/process": "~2.1|~3.0" }, "conflict": { - "twig/twig": "<1.12" + "twig/twig": "<1.23" }, "require-dev": { - "cssmin/cssmin": "*", - "joliclic/javascript-packer": "*", - "kamicane/packager": "*", + "cssmin/cssmin": "3.0.1", + "joliclic/javascript-packer": "1.1", + "kamicane/packager": "1.0", "leafo/lessphp": "^0.3.7", - "leafo/scssphp": "*@dev", - "leafo/scssphp-compass": "*@dev", - "mrclay/minify": "*", + "leafo/scssphp": "~0.1", + "mrclay/minify": "~2.2", "patchwork/jsqueeze": "~1.0|~2.0", "phpunit/phpunit": "~4.8", "psr/log": "~1.0", - "ptachoire/cssembed": "*", - "symfony/phpunit-bridge": "~2.7", + "ptachoire/cssembed": "~1.0", + "symfony/phpunit-bridge": "~2.7|~3.0", "twig/twig": "~1.8|~2.0" }, "suggest": { @@ -888,7 +887,7 @@ "compression", "minification" ], - "time": "2015-10-15 01:33:42" + "time": "2015-11-12 13:51:40" }, { "name": "monolog/monolog", @@ -1053,25 +1052,25 @@ }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.10", + "version": "v3.0.11", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "18fc2063c4d6569cdca47a39fbac32342eb65f3c" + "reference": "a79e205737b58d557c05caef6dfa8f94d8084bca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/18fc2063c4d6569cdca47a39fbac32342eb65f3c", - "reference": "18fc2063c4d6569cdca47a39fbac32342eb65f3c", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/a79e205737b58d557c05caef6dfa8f94d8084bca", + "reference": "a79e205737b58d557c05caef6dfa8f94d8084bca", "shasum": "" }, "require": { "doctrine/common": "~2.2", - "symfony/framework-bundle": "~2.3" + "symfony/framework-bundle": "~2.3|~3.0" }, "require-dev": { - "symfony/expression-language": "~2.4", - "symfony/security-bundle": "~2.4" + "symfony/expression-language": "~2.4|~3.0", + "symfony/security-bundle": "~2.4|~3.0" }, "suggest": { "symfony/expression-language": "", @@ -1104,7 +1103,7 @@ "annotations", "controllers" ], - "time": "2015-08-03 11:59:27" + "time": "2015-10-28 15:47:04" }, { "name": "sensio/generator-bundle", @@ -1209,25 +1208,25 @@ }, { "name": "symfony/assetic-bundle", - "version": "v2.7.0", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/symfony/assetic-bundle.git", - "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5" + "reference": "d885ec8451d5a7b077bda81bb19ac9fbff9cdc76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", - "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", + "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/d885ec8451d5a7b077bda81bb19ac9fbff9cdc76", + "reference": "d885ec8451d5a7b077bda81bb19ac9fbff9cdc76", "shasum": "" }, "require": { "kriswallsmith/assetic": "~1.3", "php": ">=5.3.0", - "symfony/console": "~2.3", - "symfony/dependency-injection": "~2.3", - "symfony/framework-bundle": "~2.3", - "symfony/yaml": "~2.3" + "symfony/console": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/framework-bundle": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" }, "conflict": { "kriswallsmith/spork": "<=0.2", @@ -1236,11 +1235,11 @@ "require-dev": { "kriswallsmith/spork": "~0.3", "patchwork/jsqueeze": "~1.0", - "symfony/class-loader": "~2.3", - "symfony/css-selector": "~2.3", - "symfony/dom-crawler": "~2.3", - "symfony/phpunit-bridge": "~2.7", - "symfony/twig-bundle": "~2.3" + "symfony/class-loader": "~2.3|~3.0", + "symfony/css-selector": "~2.3|~3.0", + "symfony/dom-crawler": "~2.3|~3.0", + "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/twig-bundle": "~2.3|~3.0" }, "suggest": { "kriswallsmith/spork": "to be able to dump assets in parallel", @@ -1275,33 +1274,33 @@ "compression", "minification" ], - "time": "2015-09-01 00:05:29" + "time": "2015-11-17 09:45:47" }, { "name": "symfony/monolog-bundle", - "version": "2.8.1", + "version": "v2.8.2", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bundle.git", - "reference": "7117b9a145722e3c5768db4585f6ad0643ed5c4a" + "reference": "84785c4d44801c4dd82829fa2e1820cacfe2c46f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/7117b9a145722e3c5768db4585f6ad0643ed5c4a", - "reference": "7117b9a145722e3c5768db4585f6ad0643ed5c4a", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/84785c4d44801c4dd82829fa2e1820cacfe2c46f", + "reference": "84785c4d44801c4dd82829fa2e1820cacfe2c46f", "shasum": "" }, "require": { "monolog/monolog": "~1.8", "php": ">=5.3.2", - "symfony/config": "~2.3|3.*", - "symfony/dependency-injection": "~2.3|3.*", - "symfony/http-kernel": "~2.3|3.*", - "symfony/monolog-bridge": "~2.3|3.*" + "symfony/config": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/http-kernel": "~2.3|~3.0", + "symfony/monolog-bridge": "~2.3|~3.0" }, "require-dev": { - "symfony/console": "~2.3|3.*", - "symfony/yaml": "~2.3" + "symfony/console": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" }, "type": "symfony-bundle", "extra": { @@ -1334,7 +1333,7 @@ "log", "logging" ], - "time": "2015-10-02 11:51:59" + "time": "2015-11-17 10:02:29" }, { "name": "symfony/swiftmailer-bundle", @@ -1395,23 +1394,23 @@ }, { "name": "symfony/symfony", - "version": "v2.3.34", + "version": "v2.3.35", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "d1d97bc91cc8733f55c1624351a109cf6be3c074" + "reference": "8f52c651e45aa3c0afd80725df40b021ffda9c04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/d1d97bc91cc8733f55c1624351a109cf6be3c074", - "reference": "d1d97bc91cc8733f55c1624351a109cf6be3c074", + "url": "https://api.github.com/repos/symfony/symfony/zipball/8f52c651e45aa3c0afd80725df40b021ffda9c04", + "reference": "8f52c651e45aa3c0afd80725df40b021ffda9c04", "shasum": "" }, "require": { "doctrine/common": "~2.4", "php": ">=5.3.3", "psr/log": "~1.0", - "twig/twig": "~1.20|~2.0" + "twig/twig": "~1.23|~2.0" }, "replace": { "symfony/browser-kit": "self.version", @@ -1440,7 +1439,10 @@ "symfony/proxy-manager-bridge": "self.version", "symfony/routing": "self.version", "symfony/security": "self.version", + "symfony/security-acl": "self.version", "symfony/security-bundle": "self.version", + "symfony/security-core": "self.version", + "symfony/security-http": "self.version", "symfony/serializer": "self.version", "symfony/stopwatch": "self.version", "symfony/swiftmailer-bridge": "self.version", @@ -1477,6 +1479,9 @@ ], "files": [ "src/Symfony/Component/Intl/Resources/stubs/functions.php" + ], + "exclude-from-classmap": [ + "**/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -1498,7 +1503,7 @@ "keywords": [ "framework" ], - "time": "2015-10-27 17:11:03" + "time": "2015-11-23 10:44:17" }, { "name": "twig/extensions", @@ -1554,16 +1559,16 @@ }, { "name": "twig/twig", - "version": "v1.22.3", + "version": "v1.23.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "ebfc36b7e77b0c1175afe30459cf943010245540" + "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/ebfc36b7e77b0c1175afe30459cf943010245540", - "reference": "ebfc36b7e77b0c1175afe30459cf943010245540", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/d9b6333ae8dd2c8e3fd256e127548def0bc614c6", + "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6", "shasum": "" }, "require": { @@ -1576,7 +1581,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.22-dev" + "dev-master": "1.23-dev" } }, "autoload": { @@ -1611,7 +1616,7 @@ "keywords": [ "templating" ], - "time": "2015-10-13 07:07:02" + "time": "2015-11-05 12:49:06" } ], "packages-dev": [], From 7ecb00e2c3d2bef50fe4830e52702568670c6d5a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 23 Nov 2015 13:18:29 +0100 Subject: [PATCH 77/98] updated VENDORS for 2.7.7 --- composer.lock | 111 ++++++++++++++++++++++++++------------------------ 1 file changed, 58 insertions(+), 53 deletions(-) diff --git a/composer.lock b/composer.lock index 73e9a6288b..f5dca4e1a4 100644 --- a/composer.lock +++ b/composer.lock @@ -872,38 +872,37 @@ }, { "name": "kriswallsmith/assetic", - "version": "v1.3.1", + "version": "v1.3.2", "source": { "type": "git", "url": "https://github.com/kriswallsmith/assetic.git", - "reference": "cb92b179dddfb8a3f341d53bd27e088f24d9c2e5" + "reference": "9928f7c4ad98b234e3559d1049abd13387f86db5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/cb92b179dddfb8a3f341d53bd27e088f24d9c2e5", - "reference": "cb92b179dddfb8a3f341d53bd27e088f24d9c2e5", + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/9928f7c4ad98b234e3559d1049abd13387f86db5", + "reference": "9928f7c4ad98b234e3559d1049abd13387f86db5", "shasum": "" }, "require": { "php": ">=5.3.1", - "symfony/process": "~2.1" + "symfony/process": "~2.1|~3.0" }, "conflict": { - "twig/twig": "<1.12" + "twig/twig": "<1.23" }, "require-dev": { - "cssmin/cssmin": "*", - "joliclic/javascript-packer": "*", - "kamicane/packager": "*", + "cssmin/cssmin": "3.0.1", + "joliclic/javascript-packer": "1.1", + "kamicane/packager": "1.0", "leafo/lessphp": "^0.3.7", - "leafo/scssphp": "*@dev", - "leafo/scssphp-compass": "*@dev", - "mrclay/minify": "*", + "leafo/scssphp": "~0.1", + "mrclay/minify": "~2.2", "patchwork/jsqueeze": "~1.0|~2.0", "phpunit/phpunit": "~4.8", "psr/log": "~1.0", - "ptachoire/cssembed": "*", - "symfony/phpunit-bridge": "~2.7", + "ptachoire/cssembed": "~1.0", + "symfony/phpunit-bridge": "~2.7|~3.0", "twig/twig": "~1.8|~2.0" }, "suggest": { @@ -946,7 +945,7 @@ "compression", "minification" ], - "time": "2015-10-15 01:33:42" + "time": "2015-11-12 13:51:40" }, { "name": "monolog/monolog", @@ -1277,25 +1276,25 @@ }, { "name": "symfony/assetic-bundle", - "version": "v2.7.0", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/symfony/assetic-bundle.git", - "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5" + "reference": "d885ec8451d5a7b077bda81bb19ac9fbff9cdc76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", - "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", + "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/d885ec8451d5a7b077bda81bb19ac9fbff9cdc76", + "reference": "d885ec8451d5a7b077bda81bb19ac9fbff9cdc76", "shasum": "" }, "require": { "kriswallsmith/assetic": "~1.3", "php": ">=5.3.0", - "symfony/console": "~2.3", - "symfony/dependency-injection": "~2.3", - "symfony/framework-bundle": "~2.3", - "symfony/yaml": "~2.3" + "symfony/console": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/framework-bundle": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" }, "conflict": { "kriswallsmith/spork": "<=0.2", @@ -1304,11 +1303,11 @@ "require-dev": { "kriswallsmith/spork": "~0.3", "patchwork/jsqueeze": "~1.0", - "symfony/class-loader": "~2.3", - "symfony/css-selector": "~2.3", - "symfony/dom-crawler": "~2.3", - "symfony/phpunit-bridge": "~2.7", - "symfony/twig-bundle": "~2.3" + "symfony/class-loader": "~2.3|~3.0", + "symfony/css-selector": "~2.3|~3.0", + "symfony/dom-crawler": "~2.3|~3.0", + "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/twig-bundle": "~2.3|~3.0" }, "suggest": { "kriswallsmith/spork": "to be able to dump assets in parallel", @@ -1343,33 +1342,33 @@ "compression", "minification" ], - "time": "2015-09-01 00:05:29" + "time": "2015-11-17 09:45:47" }, { "name": "symfony/monolog-bundle", - "version": "2.8.1", + "version": "v2.8.2", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bundle.git", - "reference": "7117b9a145722e3c5768db4585f6ad0643ed5c4a" + "reference": "84785c4d44801c4dd82829fa2e1820cacfe2c46f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/7117b9a145722e3c5768db4585f6ad0643ed5c4a", - "reference": "7117b9a145722e3c5768db4585f6ad0643ed5c4a", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/84785c4d44801c4dd82829fa2e1820cacfe2c46f", + "reference": "84785c4d44801c4dd82829fa2e1820cacfe2c46f", "shasum": "" }, "require": { "monolog/monolog": "~1.8", "php": ">=5.3.2", - "symfony/config": "~2.3|3.*", - "symfony/dependency-injection": "~2.3|3.*", - "symfony/http-kernel": "~2.3|3.*", - "symfony/monolog-bridge": "~2.3|3.*" + "symfony/config": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/http-kernel": "~2.3|~3.0", + "symfony/monolog-bridge": "~2.3|~3.0" }, "require-dev": { - "symfony/console": "~2.3|3.*", - "symfony/yaml": "~2.3" + "symfony/console": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" }, "type": "symfony-bundle", "extra": { @@ -1402,7 +1401,7 @@ "log", "logging" ], - "time": "2015-10-02 11:51:59" + "time": "2015-11-17 10:02:29" }, { "name": "symfony/swiftmailer-bundle", @@ -1463,23 +1462,23 @@ }, { "name": "symfony/symfony", - "version": "v2.7.6", + "version": "v2.7.7", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "66b2e9662c44d478b69e48278aa54079a006eb42" + "reference": "cc69dbd24b4b2e6de60b2414ef95da2794f459a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/66b2e9662c44d478b69e48278aa54079a006eb42", - "reference": "66b2e9662c44d478b69e48278aa54079a006eb42", + "url": "https://api.github.com/repos/symfony/symfony/zipball/cc69dbd24b4b2e6de60b2414ef95da2794f459a2", + "reference": "cc69dbd24b4b2e6de60b2414ef95da2794f459a2", "shasum": "" }, "require": { "doctrine/common": "~2.4", "php": ">=5.3.9", "psr/log": "~1.0", - "twig/twig": "~1.20|~2.0" + "twig/twig": "~1.23|~2.0" }, "replace": { "symfony/asset": "self.version", @@ -1559,6 +1558,9 @@ ], "files": [ "src/Symfony/Component/Intl/Resources/stubs/functions.php" + ], + "exclude-from-classmap": [ + "**/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -1580,7 +1582,7 @@ "keywords": [ "framework" ], - "time": "2015-10-27 19:07:24" + "time": "2015-11-23 11:58:08" }, { "name": "twig/twig", @@ -1695,20 +1697,20 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v2.7.6", + "version": "v2.7.7", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "896bbd1742a6ecd2f7904167bdb6bf88eb6cfbe4" + "reference": "e960e64acbed50e49818eb78840486c8d7fe1bed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/896bbd1742a6ecd2f7904167bdb6bf88eb6cfbe4", - "reference": "896bbd1742a6ecd2f7904167bdb6bf88eb6cfbe4", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/e960e64acbed50e49818eb78840486c8d7fe1bed", + "reference": "e960e64acbed50e49818eb78840486c8d7fe1bed", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.9" }, "suggest": { "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader" @@ -1725,7 +1727,10 @@ ], "psr-4": { "Symfony\\Bridge\\PhpUnit\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1743,7 +1748,7 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2015-09-27 10:08:51" + "time": "2015-11-06 10:15:01" } ], "aliases": [], From f6a3312c8d35a2258f471b5741573a886068d121 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 24 Nov 2015 21:19:53 +0100 Subject: [PATCH 78/98] updated deps to stable versions when possible --- composer.json | 2 +- composer.lock | 93 +++++++++++++++++++++++++++------------------------ 2 files changed, 50 insertions(+), 45 deletions(-) diff --git a/composer.json b/composer.json index b8f2908e0a..a7510681e0 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "doctrine/doctrine-bundle": "~1.4", "symfony/swiftmailer-bundle": "~2.3", "symfony/monolog-bundle": "~2.4", - "sensio/distribution-bundle": "~5.0@dev", + "sensio/distribution-bundle": "~5.0", "sensio/framework-extra-bundle": "^3.0.2", "incenteev/composer-parameter-handler": "~2.0" }, diff --git a/composer.lock b/composer.lock index 55792e2b63..9f3ee26e40 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": "32378fd3ef30487df1eacf75030e6926", - "content-hash": "f7c9c8a4647bd0801e25231a1fdc8a1f", + "hash": "dc4fcd3a94fb66a7b40a44aed8227496", + "content-hash": "9051675cbe39217612bf6d43ef7bd3ce", "packages": [ { "name": "doctrine/annotations", @@ -694,16 +694,16 @@ }, { "name": "doctrine/orm", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/doctrine/doctrine2.git", - "reference": "e6a83bedbe67579cb0bfb688e982e617943a2945" + "reference": "464b5fdbfbbeb4a65465ac173c4c5d90960f41ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/e6a83bedbe67579cb0bfb688e982e617943a2945", - "reference": "e6a83bedbe67579cb0bfb688e982e617943a2945", + "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/464b5fdbfbbeb4a65465ac173c4c5d90960f41ff", + "reference": "464b5fdbfbbeb4a65465ac173c4c5d90960f41ff", "shasum": "" }, "require": { @@ -714,12 +714,12 @@ "doctrine/instantiator": "~1.0.1", "ext-pdo": "*", "php": ">=5.4", - "symfony/console": "~2.5" + "symfony/console": "~2.5|~3.0" }, "require-dev": { "phpunit/phpunit": "~4.0", "satooshi/php-coveralls": "dev-master", - "symfony/yaml": "~2.1" + "symfony/yaml": "~2.3|~3.0" }, "suggest": { "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" @@ -767,7 +767,7 @@ "database", "orm" ], - "time": "2015-08-31 12:59:39" + "time": "2015-11-23 12:44:25" }, { "name": "incenteev/composer-parameter-handler", @@ -1077,16 +1077,16 @@ }, { "name": "sensio/distribution-bundle", - "version": "dev-master", + "version": "v5.0.0", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "1045b31102f9d6017725ada4d4b5d0fce085fc9f" + "reference": "a84f4c0fa9ce9791e408a6a013b71e69a6e89282" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/1045b31102f9d6017725ada4d4b5d0fce085fc9f", - "reference": "1045b31102f9d6017725ada4d4b5d0fce085fc9f", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/a84f4c0fa9ce9791e408a6a013b71e69a6e89282", + "reference": "a84f4c0fa9ce9791e408a6a013b71e69a6e89282", "shasum": "" }, "require": { @@ -1125,7 +1125,7 @@ "configuration", "distribution" ], - "time": "2015-10-27 18:48:37" + "time": "2015-11-24 20:13:56" }, { "name": "sensio/framework-extra-bundle", @@ -1281,29 +1281,29 @@ }, { "name": "symfony/monolog-bundle", - "version": "2.8.1", + "version": "v2.8.2", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bundle.git", - "reference": "7117b9a145722e3c5768db4585f6ad0643ed5c4a" + "reference": "84785c4d44801c4dd82829fa2e1820cacfe2c46f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/7117b9a145722e3c5768db4585f6ad0643ed5c4a", - "reference": "7117b9a145722e3c5768db4585f6ad0643ed5c4a", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/84785c4d44801c4dd82829fa2e1820cacfe2c46f", + "reference": "84785c4d44801c4dd82829fa2e1820cacfe2c46f", "shasum": "" }, "require": { "monolog/monolog": "~1.8", "php": ">=5.3.2", - "symfony/config": "~2.3|3.*", - "symfony/dependency-injection": "~2.3|3.*", - "symfony/http-kernel": "~2.3|3.*", - "symfony/monolog-bridge": "~2.3|3.*" + "symfony/config": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/http-kernel": "~2.3|~3.0", + "symfony/monolog-bridge": "~2.3|~3.0" }, "require-dev": { - "symfony/console": "~2.3|3.*", - "symfony/yaml": "~2.3" + "symfony/console": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" }, "type": "symfony-bundle", "extra": { @@ -1336,7 +1336,7 @@ "log", "logging" ], - "time": "2015-10-02 11:51:59" + "time": "2015-11-17 10:02:29" }, { "name": "symfony/polyfill-intl-icu", @@ -1732,16 +1732,16 @@ }, { "name": "symfony/security-acl", - "version": "v2.7.6", + "version": "v2.7.7", "source": { "type": "git", "url": "https://github.com/symfony/security-acl.git", - "reference": "8cfb6072e9a4715ec3cedd06a018e6a60cade201" + "reference": "9aec8062e33fca5e08d2a78669b2222252e8c3b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-acl/zipball/8cfb6072e9a4715ec3cedd06a018e6a60cade201", - "reference": "8cfb6072e9a4715ec3cedd06a018e6a60cade201", + "url": "https://api.github.com/repos/symfony/security-acl/zipball/9aec8062e33fca5e08d2a78669b2222252e8c3b6", + "reference": "9aec8062e33fca5e08d2a78669b2222252e8c3b6", "shasum": "" }, "require": { @@ -1767,7 +1767,10 @@ "autoload": { "psr-4": { "Symfony\\Component\\Security\\Acl\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1785,7 +1788,7 @@ ], "description": "Symfony Security Component - ACL (Access Control List)", "homepage": "https://symfony.com", - "time": "2015-10-12 09:20:33" + "time": "2015-11-18 13:41:01" }, { "name": "symfony/swiftmailer-bundle", @@ -1850,12 +1853,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "3b99b3a6e71da0f7d3fb07cf5c728ad04a326416" + "reference": "e0f5ffc30458c4407fa480e03570e7e72aa58caa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/3b99b3a6e71da0f7d3fb07cf5c728ad04a326416", - "reference": "3b99b3a6e71da0f7d3fb07cf5c728ad04a326416", + "url": "https://api.github.com/repos/symfony/symfony/zipball/e0f5ffc30458c4407fa480e03570e7e72aa58caa", + "reference": "e0f5ffc30458c4407fa480e03570e7e72aa58caa", "shasum": "" }, "require": { @@ -1975,7 +1978,7 @@ "keywords": [ "framework" ], - "time": "2015-11-16 09:09:38" + "time": "2015-11-24 07:33:26" }, { "name": "twig/twig", @@ -2094,20 +2097,20 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v2.7.6", + "version": "v2.7.7", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "896bbd1742a6ecd2f7904167bdb6bf88eb6cfbe4" + "reference": "e960e64acbed50e49818eb78840486c8d7fe1bed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/896bbd1742a6ecd2f7904167bdb6bf88eb6cfbe4", - "reference": "896bbd1742a6ecd2f7904167bdb6bf88eb6cfbe4", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/e960e64acbed50e49818eb78840486c8d7fe1bed", + "reference": "e960e64acbed50e49818eb78840486c8d7fe1bed", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.9" }, "suggest": { "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader" @@ -2124,7 +2127,10 @@ ], "psr-4": { "Symfony\\Bridge\\PhpUnit\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2142,14 +2148,13 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2015-09-27 10:08:51" + "time": "2015-11-06 10:15:01" } ], "aliases": [], "minimum-stability": "stable", "stability-flags": { - "symfony/symfony": 20, - "sensio/distribution-bundle": 20 + "symfony/symfony": 20 }, "prefer-stable": false, "prefer-lowest": false, From 5d0525302a4ac5c77c28a957c0defc3e895662c1 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Sun, 29 Nov 2015 16:33:29 +0100 Subject: [PATCH 79/98] add upgrade instructions for 2.8 --- UPGRADE-2.8.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 UPGRADE-2.8.md diff --git a/UPGRADE-2.8.md b/UPGRADE-2.8.md new file mode 100644 index 0000000000..061c3db8b2 --- /dev/null +++ b/UPGRADE-2.8.md @@ -0,0 +1,29 @@ +UPGRADE FROM 2.7 to 2.8 +======================= + +When upgrading Symfony from 2.7 to 2.8, beware of the following changes in the +Standard Edition: + + * Assetic is not included by default anymore. + * It comes with a new major version of `sensio/distribution-bundle`. If you are + updating the bundle in your project as well, the following changes are required: + - The web configurator got removed. So you need to remove the `_configurator` + routing entry from `app/config/routing_dev.yml`. + - The generated `app/bootstrap.php.cache` does not include autoloading anymore. + So you need to add the autoloading code in your front controllers `web/app.php`, + `web/app_dev.php`, `app/console` and `app/phpunit.xml.dist` (bootstrap config). + - If have been using the Symfony 3 directory structure already, you need to + overwrite the cache and log directory in your `AppKernel` as it is also done + in Symfony 3 now (see + [`app/AppKernel.php`](https://github.com/symfony/symfony-standard/blob/master/app/AppKernel.php#L31-L44)). + * The `app/AppKernel.php` is now autoloaded via composer. + +You can have a look at the +[diff](https://github.com/symfony/symfony-standard/compare/2.7...2.8) +between the 2.7 version of the Standard Edition and the 2.8 version that +should help you to apply the changes in your project. + +Additionally, we recommend to +[add phpunit-bridge to handle deprecations](https://github.com/symfony/symfony-standard/pull/884) +in your test suite and to ensure tests are +[run with full error reporting](https://github.com/symfony/symfony-standard/pull/875). From c6274db182f3e48d92d050edf651d0dd274ed2bb Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Mon, 30 Nov 2015 10:10:05 +0100 Subject: [PATCH 80/98] fix typos --- UPGRADE-2.8.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UPGRADE-2.8.md b/UPGRADE-2.8.md index 061c3db8b2..a7c425b5c5 100644 --- a/UPGRADE-2.8.md +++ b/UPGRADE-2.8.md @@ -12,8 +12,8 @@ Standard Edition: - The generated `app/bootstrap.php.cache` does not include autoloading anymore. So you need to add the autoloading code in your front controllers `web/app.php`, `web/app_dev.php`, `app/console` and `app/phpunit.xml.dist` (bootstrap config). - - If have been using the Symfony 3 directory structure already, you need to - overwrite the cache and log directory in your `AppKernel` as it is also done + - If you have been using the Symfony 3 directory structure already, you need to + overwrite the cache and log directories in your `AppKernel` as it is also done in Symfony 3 now (see [`app/AppKernel.php`](https://github.com/symfony/symfony-standard/blob/master/app/AppKernel.php#L31-L44)). * The `app/AppKernel.php` is now autoloaded via composer. From 6c7c87518341040e7de9a2c95c394492e23028ce Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 30 Nov 2015 21:20:51 +0100 Subject: [PATCH 81/98] switched to stable version of Symfony 2.8 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a7510681e0..c5cd89f88d 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ }, "require": { "php": ">=5.3.9", - "symfony/symfony": "2.8.*@dev", + "symfony/symfony": "2.8.*", "doctrine/orm": "^2.4.8", "doctrine/doctrine-bundle": "~1.4", "symfony/swiftmailer-bundle": "~2.3", From 6525f7cbb3b061be31488236b933d9da34042902 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 30 Nov 2015 21:30:21 +0100 Subject: [PATCH 82/98] updated VENDORS for 2.8.0 --- composer.lock | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/composer.lock b/composer.lock index 9f3ee26e40..a95e359c9f 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": "dc4fcd3a94fb66a7b40a44aed8227496", - "content-hash": "9051675cbe39217612bf6d43ef7bd3ce", + "hash": "221784eec1127cfb6fc20baceb064db0", + "content-hash": "0dd0360953b0a9f443504d177f8ad1b9", "packages": [ { "name": "doctrine/annotations", @@ -435,24 +435,23 @@ }, { "name": "doctrine/doctrine-cache-bundle", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineCacheBundle.git", - "reference": "3233bc78e222d528ca89a6a47d48d6f37888e95e" + "reference": "030ff41ef1db66370b36467086bfb817a661fe6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/3233bc78e222d528ca89a6a47d48d6f37888e95e", - "reference": "3233bc78e222d528ca89a6a47d48d6f37888e95e", + "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/030ff41ef1db66370b36467086bfb817a661fe6a", + "reference": "030ff41ef1db66370b36467086bfb817a661fe6a", "shasum": "" }, "require": { "doctrine/cache": "^1.4.2", "doctrine/inflector": "~1.0", "php": ">=5.3.2", - "symfony/doctrine-bridge": "~2.2|~3.0", - "symfony/security-acl": "~2.3|~3.0" + "symfony/doctrine-bridge": "~2.2|~3.0" }, "require-dev": { "instaclick/coding-standard": "~1.1", @@ -465,13 +464,17 @@ "symfony/finder": "~2.2|~3.0", "symfony/framework-bundle": "~2.2|~3.0", "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/security-acl": "~2.3|~3.0", "symfony/validator": "~2.2|~3.0", "symfony/yaml": "~2.2|~3.0" }, + "suggest": { + "symfony/security-acl": "For using this bundle to cache ACLs" + }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -515,7 +518,7 @@ "cache", "caching" ], - "time": "2015-11-05 13:48:27" + "time": "2015-11-27 04:59:07" }, { "name": "doctrine/inflector", @@ -1849,16 +1852,16 @@ }, { "name": "symfony/symfony", - "version": "2.8.x-dev", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "e0f5ffc30458c4407fa480e03570e7e72aa58caa" + "reference": "5615b92cd452cd54f1433a3f53de87c096a1107f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/e0f5ffc30458c4407fa480e03570e7e72aa58caa", - "reference": "e0f5ffc30458c4407fa480e03570e7e72aa58caa", + "url": "https://api.github.com/repos/symfony/symfony/zipball/5615b92cd452cd54f1433a3f53de87c096a1107f", + "reference": "5615b92cd452cd54f1433a3f53de87c096a1107f", "shasum": "" }, "require": { @@ -1978,7 +1981,7 @@ "keywords": [ "framework" ], - "time": "2015-11-24 07:33:26" + "time": "2015-11-30 17:26:10" }, { "name": "twig/twig", @@ -2153,9 +2156,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "symfony/symfony": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { From 2c4577772fd00612261bebbb22d3534efe8cca77 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Tue, 1 Dec 2015 09:46:03 +0100 Subject: [PATCH 83/98] Use proper autoloading for the kernel rather than file inclusion This allows to register the autoloading for AppCache too, making the diff smaller when wanting to use it. --- composer.json | 2 +- web/app.php | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/composer.json b/composer.json index c5cd89f88d..ec7ec72346 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "description": "The \"Symfony Standard Edition\" distribution", "autoload": { "psr-4": { "": "src/" }, - "files": [ "app/AppKernel.php" ] + "classmap": [ "app/AppKernel.php", "app/AppCache.php" ] }, "require": { "php": ">=5.3.9", diff --git a/web/app.php b/web/app.php index a88f0b5a04..cc2fefb556 100644 --- a/web/app.php +++ b/web/app.php @@ -18,8 +18,6 @@ $apcLoader->register(true); */ -//require_once __DIR__.'/../app/AppCache.php'; - $kernel = new AppKernel('prod', false); $kernel->loadClassCache(); //$kernel = new AppCache($kernel); From e9a1fce78ad97a56a527f0996c99c9805359c25d Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Thu, 10 Dec 2015 15:07:52 +0100 Subject: [PATCH 84/98] Remove special care for E_USER_DEPRECATED --- app/autoload.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/autoload.php b/app/autoload.php index b32da0f3a3..70526bb5e4 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -3,8 +3,6 @@ use Doctrine\Common\Annotations\AnnotationRegistry; use Composer\Autoload\ClassLoader; -error_reporting(error_reporting() & ~E_USER_DEPRECATED); - /** * @var ClassLoader $loader */ From a5d635cbdc871d86e9c6ffb6b57f002764e5c8e1 Mon Sep 17 00:00:00 2001 From: Victor Bocharsky Date: Mon, 14 Dec 2015 23:30:53 +0200 Subject: [PATCH 85/98] Add notice about autoloading AppCache via Composer According to https://github.com/symfony/symfony-standard/pull/897 --- UPGRADE-2.8.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPGRADE-2.8.md b/UPGRADE-2.8.md index a7c425b5c5..b15988290d 100644 --- a/UPGRADE-2.8.md +++ b/UPGRADE-2.8.md @@ -16,7 +16,7 @@ Standard Edition: overwrite the cache and log directories in your `AppKernel` as it is also done in Symfony 3 now (see [`app/AppKernel.php`](https://github.com/symfony/symfony-standard/blob/master/app/AppKernel.php#L31-L44)). - * The `app/AppKernel.php` is now autoloaded via composer. + * The `app/AppKernel.php` and `app/AppCache.php` files are now autoloaded via Composer. You can have a look at the [diff](https://github.com/symfony/symfony-standard/compare/2.7...2.8) From de6ecbb2d3e9c904cd12bbe94a5b3535fb122d97 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Mon, 14 Dec 2015 15:11:13 +0100 Subject: [PATCH 86/98] Simplify the log files by ignoring the "event" channel by default --- app/config/config_dev.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index a371b9f54c..be0cf774ee 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -14,9 +14,10 @@ web_profiler: monolog: handlers: main: - type: stream - path: "%kernel.logs_dir%/%kernel.environment%.log" + type: stream + path: "%kernel.logs_dir%/%kernel.environment%.log" level: debug + channels: [!event] firephp: type: firephp level: info From 7f7098136920181647dcdfbd3f113aa8bd4cd9b4 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Tue, 15 Dec 2015 18:01:46 +0100 Subject: [PATCH 87/98] Changed Symfony2 occurrences to Symfony --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 398a5fe516..22274ceeb0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Symfony Standard Edition ======================== -Welcome to the Symfony Standard Edition - a fully-functional Symfony2 +Welcome to the Symfony Standard Edition - a fully-functional Symfony application that you can use as the skeleton for your new applications. For details on how to download and get started with Symfony, see the From 827ec90023dbfe59b14041873fbb98581412dcd0 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Tue, 15 Dec 2015 18:37:07 +0100 Subject: [PATCH 88/98] ignore event and doctrine logs in console --- app/config/config_dev.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index e302c8d739..1d09908a70 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -21,18 +21,7 @@ monolog: console: type: console bubble: false - verbosity_levels: - VERBOSITY_VERBOSE: INFO - VERBOSITY_VERY_VERBOSE: DEBUG - channels: ["!doctrine"] - console_very_verbose: - type: console - bubble: false - verbosity_levels: - VERBOSITY_VERBOSE: NOTICE - VERBOSITY_VERY_VERBOSE: NOTICE - VERBOSITY_DEBUG: DEBUG - channels: ["doctrine"] + channels: [!event, !doctrine] # uncomment to get logging in your browser # you may have to allow bigger header sizes in your Web server configuration #firephp: From 28bda72b518768bd97c281f9ef9bb41d95f95199 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 26 Dec 2015 15:50:23 +0100 Subject: [PATCH 89/98] updated VENDORS for 2.3.36 --- composer.lock | 111 ++++++++++++++++++++++++++------------------------ 1 file changed, 57 insertions(+), 54 deletions(-) diff --git a/composer.lock b/composer.lock index 4b1bd9be3d..ef8891e2a6 100644 --- a/composer.lock +++ b/composer.lock @@ -77,16 +77,16 @@ }, { "name": "doctrine/cache", - "version": "v1.5.1", + "version": "v1.5.4", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e" + "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/2b9cec5a5e722010cbebc91713d4c11eaa064d5e", - "reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e", + "url": "https://api.github.com/repos/doctrine/cache/zipball/47cdc76ceb95cc591d9c79a36dc3794975b5d136", + "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136", "shasum": "" }, "require": { @@ -143,7 +143,7 @@ "cache", "caching" ], - "time": "2015-11-02 18:35:48" + "time": "2015-12-19 05:03:47" }, { "name": "doctrine/collections", @@ -213,16 +213,16 @@ }, { "name": "doctrine/common", - "version": "v2.5.1", + "version": "v2.6.1", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9" + "reference": "a579557bc689580c19fee4e27487a67fe60defc0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/0009b8f0d4a917aabc971fb089eba80e872f83f9", - "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9", + "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.6.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,24 +282,24 @@ "persistence", "spl" ], - "time": "2015-08-31 13:00:22" + "time": "2015-12-25 13:18:31" }, { "name": "doctrine/dbal", - "version": "v2.5.2", + "version": "v2.5.3", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "01dbcbc5cd0a913d751418e635434a18a2f2a75c" + "reference": "2fbcea96eae34a53183377cdbb0b9bec33974648" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/01dbcbc5cd0a913d751418e635434a18a2f2a75c", - "reference": "01dbcbc5cd0a913d751418e635434a18a2f2a75c", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/2fbcea96eae34a53183377cdbb0b9bec33974648", + "reference": "2fbcea96eae34a53183377cdbb0b9bec33974648", "shasum": "" }, "require": { - "doctrine/common": ">=2.4,<2.6-dev", + "doctrine/common": ">=2.4,<2.7-dev", "php": ">=5.3.2" }, "require-dev": { @@ -353,20 +353,20 @@ "persistence", "queryobject" ], - "time": "2015-09-16 16:29:33" + "time": "2015-12-25 16:28:24" }, { "name": "doctrine/doctrine-bundle", - "version": "1.6.0", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "a5b3ba908ba68f3e14e42762a7b940fde65ed7da" + "reference": "c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/a5b3ba908ba68f3e14e42762a7b940fde65ed7da", - "reference": "a5b3ba908ba68f3e14e42762a7b940fde65ed7da", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b", + "reference": "c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b", "shasum": "" }, "require": { @@ -431,28 +431,27 @@ "orm", "persistence" ], - "time": "2015-11-04 21:33:02" + "time": "2015-11-16 17:11:46" }, { "name": "doctrine/doctrine-cache-bundle", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineCacheBundle.git", - "reference": "3233bc78e222d528ca89a6a47d48d6f37888e95e" + "reference": "030ff41ef1db66370b36467086bfb817a661fe6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/3233bc78e222d528ca89a6a47d48d6f37888e95e", - "reference": "3233bc78e222d528ca89a6a47d48d6f37888e95e", + "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/030ff41ef1db66370b36467086bfb817a661fe6a", + "reference": "030ff41ef1db66370b36467086bfb817a661fe6a", "shasum": "" }, "require": { "doctrine/cache": "^1.4.2", "doctrine/inflector": "~1.0", "php": ">=5.3.2", - "symfony/doctrine-bridge": "~2.2|~3.0", - "symfony/security-acl": "~2.3|~3.0" + "symfony/doctrine-bridge": "~2.2|~3.0" }, "require-dev": { "instaclick/coding-standard": "~1.1", @@ -465,13 +464,17 @@ "symfony/finder": "~2.2|~3.0", "symfony/framework-bundle": "~2.2|~3.0", "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/security-acl": "~2.3|~3.0", "symfony/validator": "~2.2|~3.0", "symfony/yaml": "~2.2|~3.0" }, + "suggest": { + "symfony/security-acl": "For using this bundle to cache ACLs" + }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -515,7 +518,7 @@ "cache", "caching" ], - "time": "2015-11-05 13:48:27" + "time": "2015-11-27 04:59:07" }, { "name": "doctrine/inflector", @@ -1052,16 +1055,16 @@ }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.11", + "version": "v3.0.12", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "a79e205737b58d557c05caef6dfa8f94d8084bca" + "reference": "3e8936fe13aa4086644977d334d8fcd275f50357" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/a79e205737b58d557c05caef6dfa8f94d8084bca", - "reference": "a79e205737b58d557c05caef6dfa8f94d8084bca", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/3e8936fe13aa4086644977d334d8fcd275f50357", + "reference": "3e8936fe13aa4086644977d334d8fcd275f50357", "shasum": "" }, "require": { @@ -1103,7 +1106,7 @@ "annotations", "controllers" ], - "time": "2015-10-28 15:47:04" + "time": "2015-12-18 17:39:27" }, { "name": "sensio/generator-bundle", @@ -1337,28 +1340,28 @@ }, { "name": "symfony/swiftmailer-bundle", - "version": "v2.3.8", + "version": "v2.3.9", "source": { "type": "git", "url": "https://github.com/symfony/swiftmailer-bundle.git", - "reference": "970b13d01871207e81d17b17ddda025e7e21e797" + "reference": "3d21ada19f23631f558ad6df653b168e35362e78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/970b13d01871207e81d17b17ddda025e7e21e797", - "reference": "970b13d01871207e81d17b17ddda025e7e21e797", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/3d21ada19f23631f558ad6df653b168e35362e78", + "reference": "3d21ada19f23631f558ad6df653b168e35362e78", "shasum": "" }, "require": { "php": ">=5.3.2", "swiftmailer/swiftmailer": ">=4.2.0,~5.0", - "symfony/swiftmailer-bridge": "~2.1" + "symfony/config": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/http-kernel": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" }, "require-dev": { - "symfony/config": "~2.1", - "symfony/dependency-injection": "~2.1", - "symfony/http-kernel": "~2.1", - "symfony/yaml": "~2.1" + "symfony/phpunit-bridge": "~2.7|~3.0" }, "suggest": { "psr/log": "Allows logging" @@ -1390,20 +1393,20 @@ ], "description": "Symfony SwiftmailerBundle", "homepage": "http://symfony.com", - "time": "2014-12-01 17:44:50" + "time": "2015-11-28 10:59:29" }, { "name": "symfony/symfony", - "version": "v2.3.35", + "version": "v2.3.36", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "8f52c651e45aa3c0afd80725df40b021ffda9c04" + "reference": "b72ca4bdc77a7fd00478fd6822f11c116e20a0b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/8f52c651e45aa3c0afd80725df40b021ffda9c04", - "reference": "8f52c651e45aa3c0afd80725df40b021ffda9c04", + "url": "https://api.github.com/repos/symfony/symfony/zipball/b72ca4bdc77a7fd00478fd6822f11c116e20a0b2", + "reference": "b72ca4bdc77a7fd00478fd6822f11c116e20a0b2", "shasum": "" }, "require": { @@ -1503,7 +1506,7 @@ "keywords": [ "framework" ], - "time": "2015-11-23 10:44:17" + "time": "2015-12-26 14:08:08" }, { "name": "twig/extensions", From 9feb33363326edbf947c1fcfce10e32e7c247b00 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 26 Dec 2015 16:39:44 +0100 Subject: [PATCH 90/98] updated VENDORS for 2.7.8 --- composer.lock | 151 +++++++++++++++++++++++++------------------------- 1 file changed, 77 insertions(+), 74 deletions(-) diff --git a/composer.lock b/composer.lock index f5dca4e1a4..ea709af673 100644 --- a/composer.lock +++ b/composer.lock @@ -77,16 +77,16 @@ }, { "name": "doctrine/cache", - "version": "v1.5.1", + "version": "v1.5.4", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e" + "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/2b9cec5a5e722010cbebc91713d4c11eaa064d5e", - "reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e", + "url": "https://api.github.com/repos/doctrine/cache/zipball/47cdc76ceb95cc591d9c79a36dc3794975b5d136", + "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136", "shasum": "" }, "require": { @@ -143,7 +143,7 @@ "cache", "caching" ], - "time": "2015-11-02 18:35:48" + "time": "2015-12-19 05:03:47" }, { "name": "doctrine/collections", @@ -213,16 +213,16 @@ }, { "name": "doctrine/common", - "version": "v2.5.1", + "version": "v2.6.1", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9" + "reference": "a579557bc689580c19fee4e27487a67fe60defc0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/0009b8f0d4a917aabc971fb089eba80e872f83f9", - "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9", + "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.6.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,24 +282,24 @@ "persistence", "spl" ], - "time": "2015-08-31 13:00:22" + "time": "2015-12-25 13:18:31" }, { "name": "doctrine/dbal", - "version": "v2.5.2", + "version": "v2.5.3", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "01dbcbc5cd0a913d751418e635434a18a2f2a75c" + "reference": "2fbcea96eae34a53183377cdbb0b9bec33974648" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/01dbcbc5cd0a913d751418e635434a18a2f2a75c", - "reference": "01dbcbc5cd0a913d751418e635434a18a2f2a75c", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/2fbcea96eae34a53183377cdbb0b9bec33974648", + "reference": "2fbcea96eae34a53183377cdbb0b9bec33974648", "shasum": "" }, "require": { - "doctrine/common": ">=2.4,<2.6-dev", + "doctrine/common": ">=2.4,<2.7-dev", "php": ">=5.3.2" }, "require-dev": { @@ -353,20 +353,20 @@ "persistence", "queryobject" ], - "time": "2015-09-16 16:29:33" + "time": "2015-12-25 16:28:24" }, { "name": "doctrine/doctrine-bundle", - "version": "1.6.0", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "a5b3ba908ba68f3e14e42762a7b940fde65ed7da" + "reference": "c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/a5b3ba908ba68f3e14e42762a7b940fde65ed7da", - "reference": "a5b3ba908ba68f3e14e42762a7b940fde65ed7da", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b", + "reference": "c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b", "shasum": "" }, "require": { @@ -431,28 +431,27 @@ "orm", "persistence" ], - "time": "2015-11-04 21:33:02" + "time": "2015-11-16 17:11:46" }, { "name": "doctrine/doctrine-cache-bundle", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineCacheBundle.git", - "reference": "3233bc78e222d528ca89a6a47d48d6f37888e95e" + "reference": "030ff41ef1db66370b36467086bfb817a661fe6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/3233bc78e222d528ca89a6a47d48d6f37888e95e", - "reference": "3233bc78e222d528ca89a6a47d48d6f37888e95e", + "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/030ff41ef1db66370b36467086bfb817a661fe6a", + "reference": "030ff41ef1db66370b36467086bfb817a661fe6a", "shasum": "" }, "require": { "doctrine/cache": "^1.4.2", "doctrine/inflector": "~1.0", "php": ">=5.3.2", - "symfony/doctrine-bridge": "~2.2|~3.0", - "symfony/security-acl": "~2.3|~3.0" + "symfony/doctrine-bridge": "~2.2|~3.0" }, "require-dev": { "instaclick/coding-standard": "~1.1", @@ -465,13 +464,17 @@ "symfony/finder": "~2.2|~3.0", "symfony/framework-bundle": "~2.2|~3.0", "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/security-acl": "~2.3|~3.0", "symfony/validator": "~2.2|~3.0", "symfony/yaml": "~2.2|~3.0" }, + "suggest": { + "symfony/security-acl": "For using this bundle to cache ACLs" + }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -515,7 +518,7 @@ "cache", "caching" ], - "time": "2015-11-05 13:48:27" + "time": "2015-11-27 04:59:07" }, { "name": "doctrine/inflector", @@ -694,32 +697,32 @@ }, { "name": "doctrine/orm", - "version": "v2.5.1", + "version": "v2.5.3", "source": { "type": "git", "url": "https://github.com/doctrine/doctrine2.git", - "reference": "e6a83bedbe67579cb0bfb688e982e617943a2945" + "reference": "d9fc5388f1aa1751a0e148e76b4569bd207338e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/e6a83bedbe67579cb0bfb688e982e617943a2945", - "reference": "e6a83bedbe67579cb0bfb688e982e617943a2945", + "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/d9fc5388f1aa1751a0e148e76b4569bd207338e9", + "reference": "d9fc5388f1aa1751a0e148e76b4569bd207338e9", "shasum": "" }, "require": { "doctrine/cache": "~1.4", "doctrine/collections": "~1.2", - "doctrine/common": ">=2.5-dev,<2.6-dev", + "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.4", - "symfony/console": "~2.5" + "symfony/console": "~2.5|~3.0" }, "require-dev": { "phpunit/phpunit": "~4.0", "satooshi/php-coveralls": "dev-master", - "symfony/yaml": "~2.1" + "symfony/yaml": "~2.3|~3.0" }, "suggest": { "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" @@ -767,7 +770,7 @@ "database", "orm" ], - "time": "2015-08-31 12:59:39" + "time": "2015-12-25 15:50:05" }, { "name": "incenteev/composer-parameter-handler", @@ -1064,17 +1067,17 @@ }, { "name": "sensio/distribution-bundle", - "version": "v4.0.3", + "version": "v4.0.4", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "2d061c01e708c83ede4720e2551d9449bf606c0a" + "reference": "cc0c9478da84f051da4465cf3a67f537ae758b13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/2d061c01e708c83ede4720e2551d9449bf606c0a", - "reference": "2d061c01e708c83ede4720e2551d9449bf606c0a", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/cc0c9478da84f051da4465cf3a67f537ae758b13", + "reference": "cc0c9478da84f051da4465cf3a67f537ae758b13", "shasum": "" }, "require": { @@ -1120,20 +1123,20 @@ "configuration", "distribution" ], - "time": "2015-10-27 18:48:08" + "time": "2015-11-26 18:10:31" }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.11", + "version": "v3.0.12", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "a79e205737b58d557c05caef6dfa8f94d8084bca" + "reference": "3e8936fe13aa4086644977d334d8fcd275f50357" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/a79e205737b58d557c05caef6dfa8f94d8084bca", - "reference": "a79e205737b58d557c05caef6dfa8f94d8084bca", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/3e8936fe13aa4086644977d334d8fcd275f50357", + "reference": "3e8936fe13aa4086644977d334d8fcd275f50357", "shasum": "" }, "require": { @@ -1175,7 +1178,7 @@ "annotations", "controllers" ], - "time": "2015-10-28 15:47:04" + "time": "2015-12-18 17:39:27" }, { "name": "sensiolabs/security-checker", @@ -1405,28 +1408,28 @@ }, { "name": "symfony/swiftmailer-bundle", - "version": "v2.3.8", + "version": "v2.3.9", "source": { "type": "git", "url": "https://github.com/symfony/swiftmailer-bundle.git", - "reference": "970b13d01871207e81d17b17ddda025e7e21e797" + "reference": "3d21ada19f23631f558ad6df653b168e35362e78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/970b13d01871207e81d17b17ddda025e7e21e797", - "reference": "970b13d01871207e81d17b17ddda025e7e21e797", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/3d21ada19f23631f558ad6df653b168e35362e78", + "reference": "3d21ada19f23631f558ad6df653b168e35362e78", "shasum": "" }, "require": { "php": ">=5.3.2", "swiftmailer/swiftmailer": ">=4.2.0,~5.0", - "symfony/swiftmailer-bridge": "~2.1" + "symfony/config": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/http-kernel": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" }, "require-dev": { - "symfony/config": "~2.1", - "symfony/dependency-injection": "~2.1", - "symfony/http-kernel": "~2.1", - "symfony/yaml": "~2.1" + "symfony/phpunit-bridge": "~2.7|~3.0" }, "suggest": { "psr/log": "Allows logging" @@ -1458,20 +1461,20 @@ ], "description": "Symfony SwiftmailerBundle", "homepage": "http://symfony.com", - "time": "2014-12-01 17:44:50" + "time": "2015-11-28 10:59:29" }, { "name": "symfony/symfony", - "version": "v2.7.7", + "version": "v2.7.8", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "cc69dbd24b4b2e6de60b2414ef95da2794f459a2" + "reference": "ad264021e44a5aaa132f16aef69f92e56795683e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/cc69dbd24b4b2e6de60b2414ef95da2794f459a2", - "reference": "cc69dbd24b4b2e6de60b2414ef95da2794f459a2", + "url": "https://api.github.com/repos/symfony/symfony/zipball/ad264021e44a5aaa132f16aef69f92e56795683e", + "reference": "ad264021e44a5aaa132f16aef69f92e56795683e", "shasum": "" }, "require": { @@ -1582,7 +1585,7 @@ "keywords": [ "framework" ], - "time": "2015-11-23 11:58:08" + "time": "2015-12-26 15:02:06" }, { "name": "twig/twig", @@ -1697,20 +1700,20 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v2.7.7", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "e960e64acbed50e49818eb78840486c8d7fe1bed" + "reference": "fb79ac646c342fdff19864619943a6c58bb28893" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/e960e64acbed50e49818eb78840486c8d7fe1bed", - "reference": "e960e64acbed50e49818eb78840486c8d7fe1bed", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/fb79ac646c342fdff19864619943a6c58bb28893", + "reference": "fb79ac646c342fdff19864619943a6c58bb28893", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.3" }, "suggest": { "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader" @@ -1718,7 +1721,7 @@ "type": "symfony-bridge", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -1748,7 +1751,7 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2015-11-06 10:15:01" + "time": "2015-11-27 22:51:43" } ], "aliases": [], From feb36e83ee736db992c45566b932c03c4de3df84 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 26 Dec 2015 17:22:33 +0100 Subject: [PATCH 91/98] updated VENDORS for 2.8.1 --- composer.lock | 193 +++++++++++++++++++++++++------------------------- 1 file changed, 98 insertions(+), 95 deletions(-) diff --git a/composer.lock b/composer.lock index a95e359c9f..b849805253 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" ], - "hash": "221784eec1127cfb6fc20baceb064db0", + "hash": "88cfa41867ce01cd37d7da066c71909f", "content-hash": "0dd0360953b0a9f443504d177f8ad1b9", "packages": [ { @@ -77,16 +77,16 @@ }, { "name": "doctrine/cache", - "version": "v1.5.1", + "version": "v1.5.4", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e" + "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/2b9cec5a5e722010cbebc91713d4c11eaa064d5e", - "reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e", + "url": "https://api.github.com/repos/doctrine/cache/zipball/47cdc76ceb95cc591d9c79a36dc3794975b5d136", + "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136", "shasum": "" }, "require": { @@ -143,7 +143,7 @@ "cache", "caching" ], - "time": "2015-11-02 18:35:48" + "time": "2015-12-19 05:03:47" }, { "name": "doctrine/collections", @@ -213,16 +213,16 @@ }, { "name": "doctrine/common", - "version": "v2.5.1", + "version": "v2.6.1", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9" + "reference": "a579557bc689580c19fee4e27487a67fe60defc0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/0009b8f0d4a917aabc971fb089eba80e872f83f9", - "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9", + "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.6.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,24 +282,24 @@ "persistence", "spl" ], - "time": "2015-08-31 13:00:22" + "time": "2015-12-25 13:18:31" }, { "name": "doctrine/dbal", - "version": "v2.5.2", + "version": "v2.5.3", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "01dbcbc5cd0a913d751418e635434a18a2f2a75c" + "reference": "2fbcea96eae34a53183377cdbb0b9bec33974648" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/01dbcbc5cd0a913d751418e635434a18a2f2a75c", - "reference": "01dbcbc5cd0a913d751418e635434a18a2f2a75c", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/2fbcea96eae34a53183377cdbb0b9bec33974648", + "reference": "2fbcea96eae34a53183377cdbb0b9bec33974648", "shasum": "" }, "require": { - "doctrine/common": ">=2.4,<2.6-dev", + "doctrine/common": ">=2.4,<2.7-dev", "php": ">=5.3.2" }, "require-dev": { @@ -353,20 +353,20 @@ "persistence", "queryobject" ], - "time": "2015-09-16 16:29:33" + "time": "2015-12-25 16:28:24" }, { "name": "doctrine/doctrine-bundle", - "version": "1.6.0", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "a5b3ba908ba68f3e14e42762a7b940fde65ed7da" + "reference": "c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/a5b3ba908ba68f3e14e42762a7b940fde65ed7da", - "reference": "a5b3ba908ba68f3e14e42762a7b940fde65ed7da", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b", + "reference": "c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b", "shasum": "" }, "require": { @@ -431,7 +431,7 @@ "orm", "persistence" ], - "time": "2015-11-04 21:33:02" + "time": "2015-11-16 17:11:46" }, { "name": "doctrine/doctrine-cache-bundle", @@ -697,22 +697,22 @@ }, { "name": "doctrine/orm", - "version": "v2.5.2", + "version": "v2.5.3", "source": { "type": "git", "url": "https://github.com/doctrine/doctrine2.git", - "reference": "464b5fdbfbbeb4a65465ac173c4c5d90960f41ff" + "reference": "d9fc5388f1aa1751a0e148e76b4569bd207338e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/464b5fdbfbbeb4a65465ac173c4c5d90960f41ff", - "reference": "464b5fdbfbbeb4a65465ac173c4c5d90960f41ff", + "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/d9fc5388f1aa1751a0e148e76b4569bd207338e9", + "reference": "d9fc5388f1aa1751a0e148e76b4569bd207338e9", "shasum": "" }, "require": { "doctrine/cache": "~1.4", "doctrine/collections": "~1.2", - "doctrine/common": ">=2.5-dev,<2.6-dev", + "doctrine/common": ">=2.5-dev,<2.7-dev", "doctrine/dbal": ">=2.5-dev,<2.6-dev", "doctrine/instantiator": "~1.0.1", "ext-pdo": "*", @@ -770,7 +770,7 @@ "database", "orm" ], - "time": "2015-11-23 12:44:25" + "time": "2015-12-25 15:50:05" }, { "name": "incenteev/composer-parameter-handler", @@ -994,16 +994,16 @@ }, { "name": "paragonie/random_compat", - "version": "1.1.0", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "19f765b66c6fbb56ee3b11bc16d52e38eebdc295" + "reference": "d762ee5b099a29044603cd4649851e81aa66cb47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/19f765b66c6fbb56ee3b11bc16d52e38eebdc295", - "reference": "19f765b66c6fbb56ee3b11bc16d52e38eebdc295", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/d762ee5b099a29044603cd4649851e81aa66cb47", + "reference": "d762ee5b099a29044603cd4649851e81aa66cb47", "shasum": "" }, "require": { @@ -1038,7 +1038,7 @@ "pseudorandom", "random" ], - "time": "2015-11-10 00:45:41" + "time": "2015-12-10 14:48:13" }, { "name": "psr/log", @@ -1080,16 +1080,16 @@ }, { "name": "sensio/distribution-bundle", - "version": "v5.0.0", + "version": "v5.0.3", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "a84f4c0fa9ce9791e408a6a013b71e69a6e89282" + "reference": "419c1824af940e2be0f833aca2327e1181a6b503" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/a84f4c0fa9ce9791e408a6a013b71e69a6e89282", - "reference": "a84f4c0fa9ce9791e408a6a013b71e69a6e89282", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/419c1824af940e2be0f833aca2327e1181a6b503", + "reference": "419c1824af940e2be0f833aca2327e1181a6b503", "shasum": "" }, "require": { @@ -1128,20 +1128,20 @@ "configuration", "distribution" ], - "time": "2015-11-24 20:13:56" + "time": "2015-12-18 17:44:11" }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.11", + "version": "v3.0.12", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "a79e205737b58d557c05caef6dfa8f94d8084bca" + "reference": "3e8936fe13aa4086644977d334d8fcd275f50357" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/a79e205737b58d557c05caef6dfa8f94d8084bca", - "reference": "a79e205737b58d557c05caef6dfa8f94d8084bca", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/3e8936fe13aa4086644977d334d8fcd275f50357", + "reference": "3e8936fe13aa4086644977d334d8fcd275f50357", "shasum": "" }, "require": { @@ -1183,7 +1183,7 @@ "annotations", "controllers" ], - "time": "2015-10-28 15:47:04" + "time": "2015-12-18 17:39:27" }, { "name": "sensiolabs/security-checker", @@ -1343,7 +1343,7 @@ }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", @@ -1398,21 +1398,24 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "0b6a8940385311a24e060ec1fe35680e17c74497" + "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0b6a8940385311a24e060ec1fe35680e17c74497", - "reference": "0b6a8940385311a24e060ec1fe35680e17c74497", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/49ff736bd5d41f45240cec77b44967d76e0c3d25", + "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25", "shasum": "" }, "require": { "php": ">=5.3.3" }, + "suggest": { + "ext-mbstring": "For best performance" + }, "type": "library", "extra": { "branch-alias": { @@ -1450,11 +1453,11 @@ "portable", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2015-11-20 09:19:13" }, { "name": "symfony/polyfill-php54", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php54.git", @@ -1512,7 +1515,7 @@ }, { "name": "symfony/polyfill-php55", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php55.git", @@ -1568,16 +1571,16 @@ }, { "name": "symfony/polyfill-php56", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "a6bd4770a6967517e6610529e14afaa3111094a3" + "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/a6bd4770a6967517e6610529e14afaa3111094a3", - "reference": "a6bd4770a6967517e6610529e14afaa3111094a3", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/e2e77609a9e2328eb370fbb0e0d8b2000ebb488f", + "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f", "shasum": "" }, "require": { @@ -1620,11 +1623,11 @@ "portable", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2015-12-18 15:10:25" }, { "name": "symfony/polyfill-php70", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", @@ -1683,7 +1686,7 @@ }, { "name": "symfony/polyfill-util", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", @@ -1735,16 +1738,16 @@ }, { "name": "symfony/security-acl", - "version": "v2.7.7", + "version": "v2.7.8", "source": { "type": "git", "url": "https://github.com/symfony/security-acl.git", - "reference": "9aec8062e33fca5e08d2a78669b2222252e8c3b6" + "reference": "ef02d4606460c79836ba76f6495cf043e0eb9953" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-acl/zipball/9aec8062e33fca5e08d2a78669b2222252e8c3b6", - "reference": "9aec8062e33fca5e08d2a78669b2222252e8c3b6", + "url": "https://api.github.com/repos/symfony/security-acl/zipball/ef02d4606460c79836ba76f6495cf043e0eb9953", + "reference": "ef02d4606460c79836ba76f6495cf043e0eb9953", "shasum": "" }, "require": { @@ -1791,32 +1794,32 @@ ], "description": "Symfony Security Component - ACL (Access Control List)", "homepage": "https://symfony.com", - "time": "2015-11-18 13:41:01" + "time": "2015-12-05 17:37:09" }, { "name": "symfony/swiftmailer-bundle", - "version": "v2.3.8", + "version": "v2.3.9", "source": { "type": "git", "url": "https://github.com/symfony/swiftmailer-bundle.git", - "reference": "970b13d01871207e81d17b17ddda025e7e21e797" + "reference": "3d21ada19f23631f558ad6df653b168e35362e78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/970b13d01871207e81d17b17ddda025e7e21e797", - "reference": "970b13d01871207e81d17b17ddda025e7e21e797", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/3d21ada19f23631f558ad6df653b168e35362e78", + "reference": "3d21ada19f23631f558ad6df653b168e35362e78", "shasum": "" }, "require": { "php": ">=5.3.2", "swiftmailer/swiftmailer": ">=4.2.0,~5.0", - "symfony/swiftmailer-bridge": "~2.1" + "symfony/config": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/http-kernel": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" }, "require-dev": { - "symfony/config": "~2.1", - "symfony/dependency-injection": "~2.1", - "symfony/http-kernel": "~2.1", - "symfony/yaml": "~2.1" + "symfony/phpunit-bridge": "~2.7|~3.0" }, "suggest": { "psr/log": "Allows logging" @@ -1848,20 +1851,20 @@ ], "description": "Symfony SwiftmailerBundle", "homepage": "http://symfony.com", - "time": "2014-12-01 17:44:50" + "time": "2015-11-28 10:59:29" }, { "name": "symfony/symfony", - "version": "v2.8.0", + "version": "v2.8.1", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "5615b92cd452cd54f1433a3f53de87c096a1107f" + "reference": "8956ed50a44c5c4e02f2176c0773e24487477b09" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/5615b92cd452cd54f1433a3f53de87c096a1107f", - "reference": "5615b92cd452cd54f1433a3f53de87c096a1107f", + "url": "https://api.github.com/repos/symfony/symfony/zipball/8956ed50a44c5c4e02f2176c0773e24487477b09", + "reference": "8956ed50a44c5c4e02f2176c0773e24487477b09", "shasum": "" }, "require": { @@ -1981,7 +1984,7 @@ "keywords": [ "framework" ], - "time": "2015-11-30 17:26:10" + "time": "2015-12-26 15:56:52" }, { "name": "twig/twig", @@ -2048,16 +2051,16 @@ "packages-dev": [ { "name": "sensio/generator-bundle", - "version": "v3.0.0", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", - "reference": "f5f60fc84fdef91333c67f29b00a271cfbcf1ccb" + "reference": "525e078ff7d5e9f19b0ef912bb6d6753673b3c66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/f5f60fc84fdef91333c67f29b00a271cfbcf1ccb", - "reference": "f5f60fc84fdef91333c67f29b00a271cfbcf1ccb", + "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/525e078ff7d5e9f19b0ef912bb6d6753673b3c66", + "reference": "525e078ff7d5e9f19b0ef912bb6d6753673b3c66", "shasum": "" }, "require": { @@ -2096,24 +2099,24 @@ } ], "description": "This bundle generates code for you", - "time": "2015-11-10 13:25:32" + "time": "2015-12-20 20:01:41" }, { "name": "symfony/phpunit-bridge", - "version": "v2.7.7", + "version": "v2.8.1", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "e960e64acbed50e49818eb78840486c8d7fe1bed" + "reference": "2deb2ccbe184948ae4e85e7b99e962738d3d2d69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/e960e64acbed50e49818eb78840486c8d7fe1bed", - "reference": "e960e64acbed50e49818eb78840486c8d7fe1bed", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/2deb2ccbe184948ae4e85e7b99e962738d3d2d69", + "reference": "2deb2ccbe184948ae4e85e7b99e962738d3d2d69", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.3" }, "suggest": { "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader" @@ -2121,7 +2124,7 @@ "type": "symfony-bridge", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -2151,7 +2154,7 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2015-11-06 10:15:01" + "time": "2015-12-11 08:57:52" } ], "aliases": [], From cb29d236d126506a6185c82b02ea386ca4095b08 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 3 Jan 2016 16:39:33 +0100 Subject: [PATCH 92/98] updated license year --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 43028bc600..12a74531e4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2015 Fabien Potencier +Copyright (c) 2004-2016 Fabien Potencier Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 224cce520b772ebada0e504f7871541d2ac9478d Mon Sep 17 00:00:00 2001 From: WouterJ Date: Thu, 7 Jan 2016 17:17:39 +0100 Subject: [PATCH 93/98] Fix config files and parameters --- app/config/config.yml | 55 +++++++++++++++++----------------- app/config/config_dev.yml | 19 ++++-------- app/config/config_prod.yml | 2 +- app/config/parameters.yml.dist | 8 ++--- app/config/routing.yml | 6 ++-- app/config/routing_dev.yml | 6 ++-- app/config/security.yml | 14 ++++++++- app/config/services.yml | 2 +- 8 files changed, 56 insertions(+), 56 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index 42daa8b402..482ad4ce30 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -10,19 +10,21 @@ parameters: framework: #esi: ~ - #translator: { fallbacks: ["%locale%"] } - secret: "%secret%" + #translator: { fallbacks: ['%locale%'] } + secret: '%secret%' router: - resource: "%kernel.root_dir%/config/routing.yml" + resource: '%kernel.root_dir%/config/routing.yml' strict_requirements: ~ form: ~ csrf_protection: ~ validation: { enable_annotations: true } - #serializer: { enable_annotations: true } + serializer: + enabled: true + #enable_annotations: true templating: engines: ['twig'] #assets_version: SomeVersionScheme - default_locale: "%locale%" + default_locale: '%locale%' trusted_hosts: ~ trusted_proxies: ~ session: @@ -30,48 +32,47 @@ framework: handler_id: ~ fragments: ~ http_method_override: true - serializer: true # Twig Configuration twig: - debug: "%kernel.debug%" - strict_variables: "%kernel.debug%" + debug: '%kernel.debug%' + strict_variables: '%kernel.debug%' # Assetic Configuration assetic: - debug: "%kernel.debug%" + debug: '%kernel.debug%' use_controller: false bundles: [CmfCreateBundle] #java: /usr/bin/java filters: cssrewrite: ~ #closure: - # jar: "%kernel.root_dir%/Resources/java/compiler.jar" + # jar: '%kernel.root_dir%/Resources/java/compiler.jar' #yui_css: - # jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar" + # jar: '%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar' # Doctrine Configuration (needed for Jackalope Doctrine DBAL) doctrine: dbal: driver: pdo_sqlite - host: "%database_host%" - port: "%database_port%" - dbname: "%database_name%" - user: "%database_user%" - password: "%database_password%" + host: '%database_host%' + port: '%database_port%' + dbname: '%database_name%' + user: '%database_user%' + password: '%database_password%' charset: UTF8 - path: "%database_path%" + path: '%database_path%' # Doctrine PHPCR-ODM configuration doctrine_phpcr: session: - backend: "%phpcr_backend%" - workspace: "%phpcr_workspace%" - username: "%phpcr_user%" - password: "%phpcr_password%" + backend: '%phpcr_backend%' + workspace: '%phpcr_workspace%' + username: '%phpcr_user%' + password: '%phpcr_password%' odm: auto_mapping: true - auto_generate_proxy_classes: "%kernel.debug%" + auto_generate_proxy_classes: '%kernel.debug%' # Jackalope Metadata and Node Cache services doctrine_cache: @@ -93,7 +94,7 @@ cmf_core: cmf_routing: dynamic: templates_by_class: - Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page: AcmeDemoBundle:Page:index.html.twig + Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page: 'AcmeDemoBundle:Page:index.html.twig' # Menu Configuration knp_menu: @@ -110,8 +111,8 @@ fos_rest: # Swiftmailer Configuration swiftmailer: - transport: "%mailer_transport%" - host: "%mailer_host%" - username: "%mailer_user%" - password: "%mailer_password%" + transport: '%mailer_transport%' + host: '%mailer_host%' + username: '%mailer_user%' + password: '%mailer_password%' spool: { type: memory } diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index 83dde37940..77acd180ae 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -3,28 +3,19 @@ imports: framework: router: - resource: "%kernel.root_dir%/config/routing_dev.yml" + resource: '%kernel.root_dir%/config/routing_dev.yml' strict_requirements: true profiler: { only_exceptions: false } -security: - encoders: - # Don't use it in production - Symfony\Component\Security\Core\User\User: plaintext - providers: - in_memory: - memory: - users: %users% - web_profiler: - toolbar: "%debug_toolbar%" - intercept_redirects: "%debug_redirects%" + toolbar: '%debug_toolbar%' + intercept_redirects: '%debug_redirects%' monolog: handlers: main: type: stream - path: "%kernel.logs_dir%/%kernel.environment%.log" + path: '%kernel.logs_dir%/%kernel.environment%.log' level: debug channels: [!event] console: @@ -41,7 +32,7 @@ monolog: # level: info assetic: - use_controller: "%use_assetic_controller%" + use_controller: '%use_assetic_controller%' #swiftmailer: # delivery_address: me@example.com diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index 67b4febf89..49bfc52728 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml @@ -21,5 +21,5 @@ monolog: handler: nested nested: type: stream - path: "%kernel.logs_dir%/%kernel.environment%.log" + path: '%kernel.logs_dir%/%kernel.environment%.log' level: debug diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 484d08de7a..eccb6222c5 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -1,4 +1,4 @@ -# This file is a "template" of what your parameters.yml file should look like +# This file is a 'template' of what your parameters.yml file should look like # Set parameters here that may be different on each deployment target of the app, e.g. development, staging, production. # http://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration parameters: @@ -7,7 +7,7 @@ parameters: database_name: ~ database_user: ~ database_password: ~ - database_path: "%kernel.root_dir%/app.sqlite" + database_path: '%kernel.root_dir%/app.sqlite' phpcr_backend: # if you're using Jackalope Doctrine DBAL @@ -41,7 +41,3 @@ parameters: debug_toolbar: true debug_redirects: false use_assetic_controller: true - users: - admin: - password: admin - roles: ROLE_SUPER_ADMIN diff --git a/app/config/routing.yml b/app/config/routing.yml index 937defac4a..a9a599281f 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -1,11 +1,11 @@ # AcmeDemoBundle routes (to be removed) _demo: - resource: "@AcmeDemoBundle/Resources/config/routing.yml" + resource: '@AcmeDemoBundle/Resources/config/routing.yml' prefix: /demo _cmf_create: - resource: "@CmfCreateBundle/Resources/config/routing/rest.xml" + resource: '@CmfCreateBundle/Resources/config/routing/rest.xml' app: - resource: "@AppBundle/Controller/" + resource: '@AppBundle/Controller/' type: annotation diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml index 404f6a3bce..d4528251a2 100644 --- a/app/config/routing_dev.yml +++ b/app/config/routing_dev.yml @@ -1,13 +1,13 @@ _wdt: - resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml" + resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml' prefix: /_wdt _profiler: - resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml" + resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml' prefix: /_profiler _errors: - resource: "@TwigBundle/Resources/config/routing/errors.xml" + resource: '@TwigBundle/Resources/config/routing/errors.xml' prefix: /_error _main: diff --git a/app/config/security.yml b/app/config/security.yml index 10a0830d81..404e91df67 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -6,6 +6,18 @@ security: providers: in_memory: memory: ~ + users: + # Only for demo purposes. Of course, use a more + # secure password on production. + admin: + password: admin + roles: ROLE_SUPER_ADMIN + + # *NEVER* store passwords as plaintext in production, this is purely for + # demo purposes. + # http://symfony.com/doc/current/book/security#c-encoding-the-user-s-password + encoders: + Symfony\Component\Security\Core\User\User: plaintext firewalls: # disables authentication for assets and the profiler, adapt it according to your needs @@ -15,7 +27,7 @@ security: main: # activate different ways to authenticate - # + anonymous: ~ logout: diff --git a/app/config/services.yml b/app/config/services.yml index 5c76fc5988..6295103fb7 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -6,4 +6,4 @@ parameters: services: # service_name: # class: AppBundle\Directory\ClassName -# arguments: ["@another_service_name", "plain_value", "%parameter_name%"] +# arguments: ['@another_service_name', 'plain_value', '%parameter_name%'] From fd77eabe9338388f498fc47fc63afae324bd65a5 Mon Sep 17 00:00:00 2001 From: WouterJ Date: Thu, 7 Jan 2016 17:18:26 +0100 Subject: [PATCH 94/98] Remove core file --- UPGRADE-2.8.md | 29 ----------------------------- app/config/parameters.yml.dist | 2 +- app/config/security.yml | 2 +- 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 UPGRADE-2.8.md diff --git a/UPGRADE-2.8.md b/UPGRADE-2.8.md deleted file mode 100644 index b15988290d..0000000000 --- a/UPGRADE-2.8.md +++ /dev/null @@ -1,29 +0,0 @@ -UPGRADE FROM 2.7 to 2.8 -======================= - -When upgrading Symfony from 2.7 to 2.8, beware of the following changes in the -Standard Edition: - - * Assetic is not included by default anymore. - * It comes with a new major version of `sensio/distribution-bundle`. If you are - updating the bundle in your project as well, the following changes are required: - - The web configurator got removed. So you need to remove the `_configurator` - routing entry from `app/config/routing_dev.yml`. - - The generated `app/bootstrap.php.cache` does not include autoloading anymore. - So you need to add the autoloading code in your front controllers `web/app.php`, - `web/app_dev.php`, `app/console` and `app/phpunit.xml.dist` (bootstrap config). - - If you have been using the Symfony 3 directory structure already, you need to - overwrite the cache and log directories in your `AppKernel` as it is also done - in Symfony 3 now (see - [`app/AppKernel.php`](https://github.com/symfony/symfony-standard/blob/master/app/AppKernel.php#L31-L44)). - * The `app/AppKernel.php` and `app/AppCache.php` files are now autoloaded via Composer. - -You can have a look at the -[diff](https://github.com/symfony/symfony-standard/compare/2.7...2.8) -between the 2.7 version of the Standard Edition and the 2.8 version that -should help you to apply the changes in your project. - -Additionally, we recommend to -[add phpunit-bridge to handle deprecations](https://github.com/symfony/symfony-standard/pull/884) -in your test suite and to ensure tests are -[run with full error reporting](https://github.com/symfony/symfony-standard/pull/875). diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index eccb6222c5..67a86b52f2 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -36,7 +36,7 @@ parameters: mailer_password: ~ # A secret key that's used to generate certain security-related tokens - secret: ThisTokenIsNotSoSecretChangeIt + secret: ThisTokenIsNotSoSecretChangeIt debug_toolbar: true debug_redirects: false diff --git a/app/config/security.yml b/app/config/security.yml index 404e91df67..a41b08841d 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -5,7 +5,7 @@ security: # http://symfony.com/doc/current/book/security.html#where-do-users-come-from-user-providers providers: in_memory: - memory: ~ + memory: users: # Only for demo purposes. Of course, use a more # secure password on production. From f3f5486526ad488beddc7ba4dc708ac4913915f9 Mon Sep 17 00:00:00 2001 From: WouterJ Date: Thu, 7 Jan 2016 17:33:41 +0100 Subject: [PATCH 95/98] Remove AppBundle boilerplate code --- .../Controller/DefaultController.php | 21 ------------------- .../Controller/DefaultControllerTest.php | 18 ---------------- 2 files changed, 39 deletions(-) delete mode 100644 src/AppBundle/Controller/DefaultController.php delete mode 100644 src/AppBundle/Tests/Controller/DefaultControllerTest.php diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php deleted file mode 100644 index 3bd767561a..0000000000 --- a/src/AppBundle/Controller/DefaultController.php +++ /dev/null @@ -1,21 +0,0 @@ -render('default/index.html.twig', array( - 'base_dir' => realpath($this->container->getParameter('kernel.root_dir').'/..'), - )); - } -} diff --git a/src/AppBundle/Tests/Controller/DefaultControllerTest.php b/src/AppBundle/Tests/Controller/DefaultControllerTest.php deleted file mode 100644 index 87989da90d..0000000000 --- a/src/AppBundle/Tests/Controller/DefaultControllerTest.php +++ /dev/null @@ -1,18 +0,0 @@ -request('GET', '/'); - - $this->assertEquals(200, $client->getResponse()->getStatusCode()); - $this->assertContains('Welcome to Symfony', $crawler->filter('#container h1')->text()); - } -} From eac551adb793e5177f4a8840ff9b3dc6c82e6fa2 Mon Sep 17 00:00:00 2001 From: WouterJ Date: Thu, 7 Jan 2016 22:06:32 +0100 Subject: [PATCH 96/98] The configurator has been removed --- src/Acme/DemoBundle/Resources/data/blocks.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/Acme/DemoBundle/Resources/data/blocks.yml b/src/Acme/DemoBundle/Resources/data/blocks.yml index cf8aa927bf..54e86b92f4 100644 --- a/src/Acme/DemoBundle/Resources/data/blocks.yml +++ b/src/Acme/DemoBundle/Resources/data/blocks.yml @@ -9,12 +9,6 @@ Acme\DemoBundle\Document\UnitBlock: url: http://symfony.com/doc/current/cmf/quick_tour/the_big_picture.html image: bundles/acmedemo/images/welcome-quick-tour.gif - configure: - id: /cms/content/blocks/hero_unit/configure - text: Configure - route: _configurator_home - image: bundles/acmedemo/images/welcome-configure.gif - demo: id: /cms/content/blocks/hero_unit/demo text: View the demo From a7a7440e10d9d5859a01d2035ef258663b59e64b Mon Sep 17 00:00:00 2001 From: WouterJ Date: Thu, 4 Feb 2016 20:52:05 +0100 Subject: [PATCH 97/98] Debug... --- .travis.yml | 1 - .../DemoBundle/Tests/Functional/StaticPageTest.php | 2 +- src/AppBundle/Controller/DefaultController.php | 10 ++++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 src/AppBundle/Controller/DefaultController.php diff --git a/.travis.yml b/.travis.yml index 331b4794d5..b5fae90b87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,6 @@ install: if [ "$COMPOSER_CMD" = "install" ]; then composer install --prefer-dist before_script: - app/console doctrine:phpcr:init:dbal --force -e=test - - app/console doctrine:phpcr:workspace:create standard_test -e=test - app/console doctrine:phpcr:repository:init -e=test script: phpunit -c app diff --git a/src/Acme/DemoBundle/Tests/Functional/StaticPageTest.php b/src/Acme/DemoBundle/Tests/Functional/StaticPageTest.php index 7664a0876b..6683fc8e37 100644 --- a/src/Acme/DemoBundle/Tests/Functional/StaticPageTest.php +++ b/src/Acme/DemoBundle/Tests/Functional/StaticPageTest.php @@ -11,7 +11,7 @@ public function testHomePage() $client = $this->createClient(); $crawler = $client->request('GET', '/'); - $this->assertEquals(200, $client->getResponse()->getStatusCode()); + $this->assertEquals(200, $client->getResponse()->getStatusCode(), $crawler->html()); $title = 'Welcome!'; $this->assertCount(1, $crawler->filter(sprintf('h1:contains("%s")', $title)), 'Page does not contain an h1 tag with: '.$title); diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php new file mode 100644 index 0000000000..a37c53a819 --- /dev/null +++ b/src/AppBundle/Controller/DefaultController.php @@ -0,0 +1,10 @@ + Date: Thu, 4 Feb 2016 21:31:55 +0100 Subject: [PATCH 98/98] Fix deprecation notices --- .travis.yml | 4 + composer.json | 2 +- composer.lock | 320 +++++++++++------- .../Controller/SecurityController.php | 20 +- .../Resources/views/Menu/bootstrap.html.twig | 6 +- .../Resources/views/layout.html.twig | 4 +- 6 files changed, 206 insertions(+), 150 deletions(-) diff --git a/.travis.yml b/.travis.yml index b5fae90b87..d4c935355c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,10 @@ cache: directories: - $HOME/.composer/cache +env: + global: + - SYMFONY_DEPRECATIONS_HELPER=34 + matrix: finish_fast: true include: diff --git a/composer.json b/composer.json index 4d57a7bf39..cc03b49043 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "prefer-stable": true, "require": { "php": "^5.3.9|^7.0", - "symfony/symfony": "~2.6", + "symfony/symfony": "~2.8", "doctrine/orm": "^2.4.8", "doctrine/doctrine-bundle": "~1.4", "doctrine/data-fixtures": "~1.0", diff --git a/composer.lock b/composer.lock index c24e054511..a2cf486bbd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "185c42bec2924c4a2bb9f06babd4539e", - "content-hash": "8f4c383d2c78927466377e616cfaddad", + "hash": "0ebb640eac295c39663e6a06ba073df4", + "content-hash": "280eb0af5274047cb57823eba6991d9c", "packages": [ { "name": "cocur/slugify", @@ -555,16 +555,16 @@ }, { "name": "doctrine/doctrine-cache-bundle", - "version": "1.2.2", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineCacheBundle.git", - "reference": "030ff41ef1db66370b36467086bfb817a661fe6a" + "reference": "18c600a9b82f6454d2e81ca4957cdd56a1cf3504" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/030ff41ef1db66370b36467086bfb817a661fe6a", - "reference": "030ff41ef1db66370b36467086bfb817a661fe6a", + "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/18c600a9b82f6454d2e81ca4957cdd56a1cf3504", + "reference": "18c600a9b82f6454d2e81ca4957cdd56a1cf3504", "shasum": "" }, "require": { @@ -578,6 +578,7 @@ "instaclick/object-calisthenics-sniffs": "dev-master", "instaclick/symfony2-coding-standard": "dev-remaster", "phpunit/phpunit": "~4", + "predis/predis": "~0.8", "satooshi/php-coveralls": "~0.6.1", "squizlabs/php_codesniffer": "~1.5", "symfony/console": "~2.2|~3.0", @@ -638,7 +639,7 @@ "cache", "caching" ], - "time": "2015-11-27 04:59:07" + "time": "2016-01-26 17:28:51" }, { "name": "doctrine/inflector", @@ -1397,16 +1398,16 @@ }, { "name": "knplabs/knp-menu", - "version": "v2.1.0", + "version": "v2.1.1", "source": { "type": "git", "url": "https://github.com/KnpLabs/KnpMenu.git", - "reference": "c6ad49933babd06a27b2f962a3469601ec9038b8" + "reference": "9917b999a3c3d3901386d60c4888b07679291031" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KnpLabs/KnpMenu/zipball/c6ad49933babd06a27b2f962a3469601ec9038b8", - "reference": "c6ad49933babd06a27b2f962a3469601ec9038b8", + "url": "https://api.github.com/repos/KnpLabs/KnpMenu/zipball/9917b999a3c3d3901386d60c4888b07679291031", + "reference": "9917b999a3c3d3901386d60c4888b07679291031", "shasum": "" }, "require": { @@ -1415,7 +1416,8 @@ "require-dev": { "pimple/pimple": "~1.0", "silex/silex": "~1.0", - "symfony/phpunit-bridge": "~2.7", + "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/routing": "~2.3|~3.0", "twig/twig": "~1.16|~2.0" }, "suggest": { @@ -1458,7 +1460,7 @@ "menu", "tree" ], - "time": "2015-09-20 08:23:47" + "time": "2016-01-08 15:42:54" }, { "name": "knplabs/knp-menu-bundle", @@ -1777,16 +1779,16 @@ }, { "name": "paragonie/random_compat", - "version": "1.1.5", + "version": "1.1.6", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "dd8998b7c846f6909f4e7a5f67fabebfc412a4f7" + "reference": "e6f80ab77885151908d0ec743689ca700886e8b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/dd8998b7c846f6909f4e7a5f67fabebfc412a4f7", - "reference": "dd8998b7c846f6909f4e7a5f67fabebfc412a4f7", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/e6f80ab77885151908d0ec743689ca700886e8b0", + "reference": "e6f80ab77885151908d0ec743689ca700886e8b0", "shasum": "" }, "require": { @@ -1821,7 +1823,7 @@ "pseudorandom", "random" ], - "time": "2016-01-06 13:31:20" + "time": "2016-01-29 16:19:52" }, { "name": "phpcr/phpcr", @@ -2361,16 +2363,16 @@ }, { "name": "symfony-cmf/content-bundle", - "version": "dev-master", + "version": "1.3.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony-cmf/ContentBundle.git", - "reference": "68dd570ee098f35b8bfabcba3591099eab7d29e6" + "reference": "431b035c22a00b3d9610dc3a037691a78c2b9197" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/ContentBundle/zipball/68dd570ee098f35b8bfabcba3591099eab7d29e6", - "reference": "68dd570ee098f35b8bfabcba3591099eab7d29e6", + "url": "https://api.github.com/repos/symfony-cmf/ContentBundle/zipball/431b035c22a00b3d9610dc3a037691a78c2b9197", + "reference": "431b035c22a00b3d9610dc3a037691a78c2b9197", "shasum": "" }, "require": { @@ -2382,15 +2384,15 @@ }, "require-dev": { "sonata-project/doctrine-phpcr-admin-bundle": "^1.1", - "symfony-cmf/testing": "^1.3", + "symfony-cmf/testing": "^1.3@dev", "symfony-cmf/tree-browser-bundle": "^1.0.0-RC1", "symfony/monolog-bundle": "^2.3" }, "suggest": { "doctrine/phpcr-bundle": "To integrate PHPCR-ODM with Symfony", "doctrine/phpcr-odm": "To persist content with the PHP content repository", + "egeloen/ckeditor-bundle": "to provide a CKEditor in the admin interface", "friendsofsymfony/rest-bundle": "Improved handling for different output formats", - "ivory/ckeditor-bundle": "to provide a CKEditor in the admin interface", "sonata-project/doctrine-phpcr-admin-bundle": "To provide admin interfaces for the content (^1.1)" }, "type": "symfony-bundle", @@ -2419,42 +2421,44 @@ "keywords": [ "Symfony CMF" ], - "time": "2016-01-05 07:39:42" + "time": "2016-01-24 17:20:14" }, { "name": "symfony-cmf/core-bundle", - "version": "dev-master", + "version": "1.3.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony-cmf/CoreBundle.git", - "reference": "b1c6d6bfe6ef51b087fa489fa1d63c5e8e3d4e69" + "reference": "6d608febc5f37df61fa155b5d54a555d01fa5119" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/CoreBundle/zipball/b1c6d6bfe6ef51b087fa489fa1d63c5e8e3d4e69", - "reference": "b1c6d6bfe6ef51b087fa489fa1d63c5e8e3d4e69", + "url": "https://api.github.com/repos/symfony-cmf/CoreBundle/zipball/6d608febc5f37df61fa155b5d54a555d01fa5119", + "reference": "6d608febc5f37df61fa155b5d54a555d01fa5119", "shasum": "" }, "require": { "php": "^5.3.9|^7.0", - "symfony/framework-bundle": "~2.3" + "symfony-cmf/slugifier-api": "^1.0@dev", + "symfony/framework-bundle": "^2.3" }, "require-dev": { "doctrine/dbal": "2.5.*", - "mockery/mockery": "~0.9.4", - "sonata-project/admin-bundle": "~2.2", - "symfony-cmf/routing-bundle": "~1.2,>=1.2.0-RC3", - "symfony-cmf/testing": "~1.2,>=1.2.6", - "symfony/security-bundle": "~2.1" + "mockery/mockery": "^0.9.4", + "sonata-project/admin-bundle": "^2.2", + "symfony-cmf/routing-bundle": "^1.2.0-RC3", + "symfony-cmf/testing": "^1.3@dev", + "symfony/security-bundle": "^2.1" }, "suggest": { - "doctrine/phpcr-bundle": "To be able to use the CMF twig extension, ~1.0", - "doctrine/phpcr-odm": "To be able to use the CMF twig extension, ~1.0", - "sonata-project/admin-bundle": "To be able to enable the publish_workflow_listener extension, ~2.2", - "symfony-cmf/routing": "To be able to use the CMF twig extension functions cmf_prev_linkable/cmf_next_linkable, ~1.0", - "symfony-cmf/routing-bundle": "To be able to enable the publish_workflow_listener, ~1.0", - "symfony/security-bundle": "To be able to use the publish workflow system, ~2.1", - "symfony/twig-bundle": "To get access to the CMF twig extension, ~2.1" + "doctrine/phpcr-bundle": "To be able to use the CMF twig extension (^1.0)", + "doctrine/phpcr-odm": "To be able to use the CMF twig extension (^1.0)", + "sonata-project/admin-bundle": "To be able to enable the publish_workflow_listener extension (^2.2)", + "sonata-project/translation-bundle": "To be able to edit translatable documents (^1.0)", + "symfony-cmf/routing": "To be able to use the CMF twig extension functions cmf_prev_linkable/cmf_next_linkable (^1.2)", + "symfony-cmf/routing-bundle": "To be able to enable the publish_workflow_listener (^1.2)", + "symfony/security-bundle": "To be able to use the publish workflow system (^2.1)", + "symfony/twig-bundle": "To get access to the CMF twig extension (^2.1)" }, "type": "symfony-bundle", "extra": { @@ -2482,7 +2486,7 @@ "keywords": [ "Symfony CMF" ], - "time": "2016-01-05 07:38:41" + "time": "2016-02-01 12:09:30" }, { "name": "symfony-cmf/create-bundle", @@ -2548,12 +2552,12 @@ "source": { "type": "git", "url": "https://github.com/symfony-cmf/MediaBundle.git", - "reference": "c0700b90b47210cd4696c1d29232d444b4f89a43" + "reference": "7593e35baa26661a3230a7e13dbfb783f3df055c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/MediaBundle/zipball/c0700b90b47210cd4696c1d29232d444b4f89a43", - "reference": "c0700b90b47210cd4696c1d29232d444b4f89a43", + "url": "https://api.github.com/repos/symfony-cmf/MediaBundle/zipball/7593e35baa26661a3230a7e13dbfb783f3df055c", + "reference": "7593e35baa26661a3230a7e13dbfb783f3df055c", "shasum": "" }, "require": { @@ -2605,20 +2609,20 @@ "image", "media" ], - "time": "2016-01-05 07:43:01" + "time": "2016-02-03 12:37:12" }, { "name": "symfony-cmf/menu-bundle", - "version": "dev-master", + "version": "2.0.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony-cmf/MenuBundle.git", - "reference": "ee6ace86d753b346ff3526abde59a1f26f7c4ec6" + "reference": "c391535555e4a794501d14c5aa137a8e9a4f1aa4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/MenuBundle/zipball/ee6ace86d753b346ff3526abde59a1f26f7c4ec6", - "reference": "ee6ace86d753b346ff3526abde59a1f26f7c4ec6", + "url": "https://api.github.com/repos/symfony-cmf/MenuBundle/zipball/c391535555e4a794501d14c5aa137a8e9a4f1aa4", + "reference": "c391535555e4a794501d14c5aa137a8e9a4f1aa4", "shasum": "" }, "require": { @@ -2639,7 +2643,7 @@ "symfony-cmf/testing": "^1.3@dev", "symfony-cmf/tree-browser-bundle": "^1.0.0-RC1", "symfony/monolog-bundle": "^2.3", - "twig/twig": "^1.12.1" + "twig/twig": "^1.18" }, "suggest": { "burgov/key-value-form-bundle": "if you want to edit the advanced options on the node with the menu options extension", @@ -2672,7 +2676,7 @@ "Symfony CMF", "menu" ], - "time": "2016-01-03 16:34:28" + "time": "2016-01-23 15:44:42" }, { "name": "symfony-cmf/routing", @@ -2733,16 +2737,16 @@ }, { "name": "symfony-cmf/routing-bundle", - "version": "dev-master", + "version": "1.4.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony-cmf/RoutingBundle.git", - "reference": "9c746de8a4af393d418977d9b31fc0c0e2206ce1" + "reference": "827703c49b81dd34833aca8b493ab717a38e5afa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/9c746de8a4af393d418977d9b31fc0c0e2206ce1", - "reference": "9c746de8a4af393d418977d9b31fc0c0e2206ce1", + "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/827703c49b81dd34833aca8b493ab717a38e5afa", + "reference": "827703c49b81dd34833aca8b493ab717a38e5afa", "shasum": "" }, "require": { @@ -2797,7 +2801,7 @@ "database", "routing" ], - "time": "2015-12-29 19:47:17" + "time": "2016-01-21 16:20:40" }, { "name": "symfony-cmf/simple-cms-bundle", @@ -2870,6 +2874,52 @@ ], "time": "2016-01-05 07:41:39" }, + { + "name": "symfony-cmf/slugifier-api", + "version": "1.0.0-RC1", + "source": { + "type": "git", + "url": "https://github.com/symfony-cmf/slugifier-api.git", + "reference": "960f8d312e2fdff1bbb73f2b154989f0091b5596" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony-cmf/slugifier-api/zipball/960f8d312e2fdff1bbb73f2b154989f0091b5596", + "reference": "960f8d312e2fdff1bbb73f2b154989f0091b5596", + "shasum": "" + }, + "require": { + "php": "^5.3.9|^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Cmf\\Api\\Slugifier\\": "", + "Symfony\\Cmf\\Bundle\\CoreBundle\\Slugifier\\": "CoreBundle" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony CMF Community", + "homepage": "https://github.com/symfony-cmf/RoutingBundle/contributors" + } + ], + "description": "Provides a basic slugifier interface", + "homepage": "http://cmf.symfony.com", + "keywords": [ + "slugify" + ], + "time": "2016-02-01 11:26:43" + }, { "name": "symfony-cmf/symfony-cmf", "version": "dev-master", @@ -3061,16 +3111,16 @@ }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "2deb44160e1c886241c06602b12b98779f728177" + "reference": "66b0bb4abda229bc073eff6bbc8f2685bdaac165" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/2deb44160e1c886241c06602b12b98779f728177", - "reference": "2deb44160e1c886241c06602b12b98779f728177", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/66b0bb4abda229bc073eff6bbc8f2685bdaac165", + "reference": "66b0bb4abda229bc073eff6bbc8f2685bdaac165", "shasum": "" }, "require": { @@ -3080,7 +3130,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3112,20 +3162,20 @@ "portable", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25" + "reference": "1289d16209491b584839022f29257ad859b8532d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/49ff736bd5d41f45240cec77b44967d76e0c3d25", - "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d", + "reference": "1289d16209491b584839022f29257ad859b8532d", "shasum": "" }, "require": { @@ -3137,7 +3187,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3171,20 +3221,20 @@ "portable", "shim" ], - "time": "2015-11-20 09:19:13" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/polyfill-php54", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php54.git", - "reference": "2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc" + "reference": "74663d5a2ff3c530c1bc0571500e0feec9094054" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc", - "reference": "2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc", + "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/74663d5a2ff3c530c1bc0571500e0feec9094054", + "reference": "74663d5a2ff3c530c1bc0571500e0feec9094054", "shasum": "" }, "require": { @@ -3193,7 +3243,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3229,20 +3279,20 @@ "portable", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/polyfill-php55", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php55.git", - "reference": "3adc962a6250c02adb508e85ecfa6fcfee9eec47" + "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/3adc962a6250c02adb508e85ecfa6fcfee9eec47", - "reference": "3adc962a6250c02adb508e85ecfa6fcfee9eec47", + "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/b4f3f07d91702f8f926339fc4fcf81671d8c27e6", + "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6", "shasum": "" }, "require": { @@ -3252,7 +3302,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3285,20 +3335,20 @@ "portable", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/polyfill-php56", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f" + "reference": "4d891fff050101a53a4caabb03277284942d1ad9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/e2e77609a9e2328eb370fbb0e0d8b2000ebb488f", - "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/4d891fff050101a53a4caabb03277284942d1ad9", + "reference": "4d891fff050101a53a4caabb03277284942d1ad9", "shasum": "" }, "require": { @@ -3308,7 +3358,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3341,20 +3391,20 @@ "portable", "shim" ], - "time": "2015-12-18 15:10:25" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/polyfill-php70", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "7f7f3c9c2b9f17722e0cd64fdb4f957330c53146" + "reference": "8428ceddbbaf102f2906769a8ef2438220c5cb95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/7f7f3c9c2b9f17722e0cd64fdb4f957330c53146", - "reference": "7f7f3c9c2b9f17722e0cd64fdb4f957330c53146", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/8428ceddbbaf102f2906769a8ef2438220c5cb95", + "reference": "8428ceddbbaf102f2906769a8ef2438220c5cb95", "shasum": "" }, "require": { @@ -3364,7 +3414,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3400,20 +3450,20 @@ "portable", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2016-01-25 08:44:42" }, { "name": "symfony/polyfill-util", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "4271c55cbc0a77b2641f861b978123e46b3da969" + "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4271c55cbc0a77b2641f861b978123e46b3da969", - "reference": "4271c55cbc0a77b2641f861b978123e46b3da969", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4", + "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4", "shasum": "" }, "require": { @@ -3422,7 +3472,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3452,7 +3502,7 @@ "polyfill", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/security-acl", @@ -3517,16 +3567,16 @@ }, { "name": "symfony/swiftmailer-bundle", - "version": "v2.3.9", + "version": "v2.3.11", "source": { "type": "git", "url": "https://github.com/symfony/swiftmailer-bundle.git", - "reference": "3d21ada19f23631f558ad6df653b168e35362e78" + "reference": "5e1a90f28213231ceee19c953bbebc5b5b95c690" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/3d21ada19f23631f558ad6df653b168e35362e78", - "reference": "3d21ada19f23631f558ad6df653b168e35362e78", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/5e1a90f28213231ceee19c953bbebc5b5b95c690", + "reference": "5e1a90f28213231ceee19c953bbebc5b5b95c690", "shasum": "" }, "require": { @@ -3570,20 +3620,20 @@ ], "description": "Symfony SwiftmailerBundle", "homepage": "http://symfony.com", - "time": "2015-11-28 10:59:29" + "time": "2016-01-15 16:41:20" }, { "name": "symfony/symfony", - "version": "v2.8.1", + "version": "v2.8.2", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "8956ed50a44c5c4e02f2176c0773e24487477b09" + "reference": "f3e6a82bcbea4db3b56df08e491e20a1faae82b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/8956ed50a44c5c4e02f2176c0773e24487477b09", - "reference": "8956ed50a44c5c4e02f2176c0773e24487477b09", + "url": "https://api.github.com/repos/symfony/symfony/zipball/f3e6a82bcbea4db3b56df08e491e20a1faae82b5", + "reference": "f3e6a82bcbea4db3b56df08e491e20a1faae82b5", "shasum": "" }, "require": { @@ -3703,7 +3753,7 @@ "keywords": [ "framework" ], - "time": "2015-12-26 15:56:52" + "time": "2016-01-14 12:01:11" }, { "name": "twig/extensions", @@ -3759,16 +3809,16 @@ }, { "name": "twig/twig", - "version": "v1.23.1", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6" + "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/d9b6333ae8dd2c8e3fd256e127548def0bc614c6", - "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8", + "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8", "shasum": "" }, "require": { @@ -3781,7 +3831,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.23-dev" + "dev-master": "1.24-dev" } }, "autoload": { @@ -3816,7 +3866,7 @@ "keywords": [ "templating" ], - "time": "2015-11-05 12:49:06" + "time": "2016-01-25 21:22:18" }, { "name": "willdurand/jsonp-callback-validator", @@ -3962,35 +4012,45 @@ }, { "name": "liip/functional-test-bundle", - "version": "1.3.4", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/liip/LiipFunctionalTestBundle.git", - "reference": "0981fc0a18678b50a53410496239b602dc5a355b" + "reference": "1382ed3a04efa777084e6112c02a9ccd23901325" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/liip/LiipFunctionalTestBundle/zipball/0981fc0a18678b50a53410496239b602dc5a355b", - "reference": "0981fc0a18678b50a53410496239b602dc5a355b", + "url": "https://api.github.com/repos/liip/LiipFunctionalTestBundle/zipball/1382ed3a04efa777084e6112c02a9ccd23901325", + "reference": "1382ed3a04efa777084e6112c02a9ccd23901325", "shasum": "" }, "require": { "doctrine/common": "~2.0", "php": "^5.3.9|^7.0", "symfony/browser-kit": "~2.3|~3.0", - "symfony/framework-bundle": "~2.3|~3.0", - "symfony/validator": "~2.5|~3.0" + "symfony/framework-bundle": "2.3.*|~2.7|~3.0" + }, + "require-dev": { + "doctrine/doctrine-fixtures-bundle": "~2.3", + "doctrine/orm": "^2.4.8", + "nelmio/alice": "~1.7|~2.0", + "phpunit/phpunit": "4.8.*|5.1.*", + "symfony/assetic-bundle": "~2.3", + "symfony/monolog-bundle": "~2.4", + "symfony/symfony": "~2.3.1|~2.7|~3.0", + "twig/twig": "~1.12" }, "suggest": { "doctrine/dbal": "Required when using the fixture loading functionality with an ORM and SQLite", "doctrine/doctrine-fixtures-bundle": "Required when using the fixture loading functionality", "doctrine/orm": "Required when using the fixture loading functionality with an ORM and SQLite", - "nelmio/alice": "Required when using loadFixtureFiles functionality" + "nelmio/alice": "Required when using loadFixtureFiles functionality", + "symfony/framework-bundle": "To use assertStatusCode and assertValidationErrors ~2.5" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "1.4.x-dev" } }, "autoload": { @@ -4016,7 +4076,7 @@ "keywords": [ "Symfony2" ], - "time": "2015-12-28 19:04:56" + "time": "2016-02-02 21:30:21" }, { "name": "sensio/distribution-bundle", @@ -4168,16 +4228,16 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v2.8.1", + "version": "v2.8.2", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "2deb2ccbe184948ae4e85e7b99e962738d3d2d69" + "reference": "855dc0e829fad123966347612b4183e307338c11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/2deb2ccbe184948ae4e85e7b99e962738d3d2d69", - "reference": "2deb2ccbe184948ae4e85e7b99e962738d3d2d69", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/855dc0e829fad123966347612b4183e307338c11", + "reference": "855dc0e829fad123966347612b4183e307338c11", "shasum": "" }, "require": { @@ -4219,7 +4279,7 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2015-12-11 08:57:52" + "time": "2016-01-06 09:59:23" } ], "aliases": [], diff --git a/src/Acme/DemoBundle/Controller/SecurityController.php b/src/Acme/DemoBundle/Controller/SecurityController.php index a51d711521..54c607ed17 100644 --- a/src/Acme/DemoBundle/Controller/SecurityController.php +++ b/src/Acme/DemoBundle/Controller/SecurityController.php @@ -2,29 +2,21 @@ namespace Acme\DemoBundle\Controller; -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Security\Core\SecurityContext; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; class SecurityController extends Controller { /** * @Route("/login", name="_demo_login") - * @Template */ - public function loginAction(Request $request) + public function loginAction() { - if ($request->attributes->has(SecurityContext::AUTHENTICATION_ERROR)) { - $error = $request->attributes->get(SecurityContext::AUTHENTICATION_ERROR); - } else { - $error = $request->getSession()->get(SecurityContext::AUTHENTICATION_ERROR); - } + $authenticationUtils = $this->get('security.authentication_utils'); - return array( - 'last_username' => $request->getSession()->get(SecurityContext::LAST_USERNAME), - 'error' => $error, - ); + return $this->render('AppBundle:Security:login.html.twig', array( + 'last_username' => $authenticationUtils->getLastUsername(), + 'error' => $authenticationUtils->getLastAuthenticationError(), + )); } } diff --git a/src/Acme/DemoBundle/Resources/views/Menu/bootstrap.html.twig b/src/Acme/DemoBundle/Resources/views/Menu/bootstrap.html.twig index 8c33909f7b..eb9d8ce79d 100644 --- a/src/Acme/DemoBundle/Resources/views/Menu/bootstrap.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Menu/bootstrap.html.twig @@ -2,14 +2,14 @@ {% macro attributes(attributes) %} {% for name, value in attributes %} - {%- if value is not none and value is not sameas(false) -%} - {{- ' %s="%s"'|format(name, value is sameas(true) ? name|e : value|e)|raw -}} + {%- if value is not none and value is not same as(false) -%} + {{- ' %s="%s"'|format(name, value is same as(true) ? name|e : value|e)|raw -}} {%- endif -%} {%- endfor -%} {% endmacro %} {% block list %} - {% if item.hasChildren and options.depth is not sameas(0) and item.displayChildren %} + {% if item.hasChildren and options.depth is not same as(0) and item.displayChildren %} {{ block('children') }}
    diff --git a/src/Acme/DemoBundle/Resources/views/layout.html.twig b/src/Acme/DemoBundle/Resources/views/layout.html.twig index 1b26f22388..7aa955a779 100644 --- a/src/Acme/DemoBundle/Resources/views/layout.html.twig +++ b/src/Acme/DemoBundle/Resources/views/layout.html.twig @@ -11,7 +11,7 @@ {% endblock %} {# CreateJS is only available for admins by default #} - {% if app.security is not null and is_granted('ROLE_ADMIN') %} + {% if app.user and is_granted('ROLE_ADMIN') %} {% include "CmfCreateBundle::includecssfiles.html.twig" %} {% endif %} @@ -34,6 +34,6 @@ {% block main %}{% endblock %}
    - {% render(controller("cmf_create.jsloader.controller:includeJSFilesAction")) %} + {{ render(controller("cmf_create.jsloader.controller:includeJSFilesAction")) }}