From 5bfc25e6b38b6b4390630c7f74a71fce9f0ed82d Mon Sep 17 00:00:00 2001 From: parhs Date: Sat, 21 Jul 2012 00:54:17 +0300 Subject: [PATCH 1/4] Fixed buildViewBottomUp docs --- src/Symfony/Component/Form/AbstractType.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Form/AbstractType.php b/src/Symfony/Component/Form/AbstractType.php index 1fb873c94f..5f6f112912 100644 --- a/src/Symfony/Component/Form/AbstractType.php +++ b/src/Symfony/Component/Form/AbstractType.php @@ -57,7 +57,7 @@ abstract class AbstractType implements FormTypeInterface * Builds the form view. * * This method gets called for each type in the hierarchy starting from the - * top most type. + * bottommost type. * Type extensions can further modify the view. * * Children views have been built while this method gets called so you get From 37bbd0f60ae0de68a524547e4e98859cb7f7ef15 Mon Sep 17 00:00:00 2001 From: ddebree Date: Sat, 21 Jul 2012 13:17:54 +0300 Subject: [PATCH 2/4] Moved symfony/config from the "recommend" dependency to the "suggest" dependency. Cannot find "recommend" in composer documentation --- src/Symfony/Component/DependencyInjection/composer.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json index eb15152b84..6824a8f4fb 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -18,10 +18,8 @@ "require": { "php": ">=5.3.2" }, - "recommend": { - "symfony/config": "self.version" - }, "suggest": { + "symfony/config": "self.version" "symfony/yaml": "self.version" }, "autoload": { From e1f1d3a1f76defec107803161e7f75f56501cd49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= Date: Fri, 20 Jul 2012 18:52:29 +0300 Subject: [PATCH 3/4] Added missing property --- src/Symfony/Component/Security/Core/User/User.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Component/Security/Core/User/User.php b/src/Symfony/Component/Security/Core/User/User.php index d586511b65..0106a8a0c5 100644 --- a/src/Symfony/Component/Security/Core/User/User.php +++ b/src/Symfony/Component/Security/Core/User/User.php @@ -22,6 +22,7 @@ final class User implements AdvancedUserInterface { private $username; private $password; + private $enabled; private $accountNonExpired; private $credentialsNonExpired; private $accountNonLocked; From 76c1e26272930033b78702a02d01deee7b765f43 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 23 Jul 2012 16:23:01 +0200 Subject: [PATCH 4/4] moved deps in recommend to suggest --- src/Symfony/Bridge/Doctrine/composer.json | 6 ++---- src/Symfony/Bundle/FrameworkBundle/composer.json | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index de52336f77..10c9df4e96 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -1,4 +1,4 @@ -{ + { "name": "symfony/doctrine-bridge", "type": "symfony-bridge", "description": "Symfony Doctrine Bridge", @@ -19,11 +19,9 @@ "php": ">=5.3.2", "doctrine/common": ">=2.1,<2.3-dev" }, - "recommend": { + "suggest": { "doctrine/dbal": ">=2.1,<2.3", "doctrine/orm": ">=2.1,<2.3" - }, - "suggest": { "symfony/form": "self.version", "symfony/validator": "self.version" }, diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 1fd9689464..cfd77da458 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -26,7 +26,7 @@ "symfony/translation": "self.version", "doctrine/common": ">=2.1,<2.3-dev" }, - "recommend": { + "suggest": { "symfony/console": "self.version", "symfony/form": "self.version", "symfony/validator": "self.version"