From 589a8b38d45d74df96e3426d0008e89fb7c2d80e Mon Sep 17 00:00:00 2001 From: Bilal Amarni Date: Wed, 19 Sep 2012 16:29:32 +0200 Subject: [PATCH 1/5] composer is available in travis workers --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 53537d5f183d..9137d4c48919 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ php: - 5.4 before_script: - - curl -s http://getcomposer.org/installer | php - - COMPOSER_ROOT_VERSION=dev-master php composer.phar --dev install + - COMPOSER_ROOT_VERSION=2.1.x-dev composer --dev install - php src/Symfony/Component/Locale/Resources/data/build-data.php - export USE_INTL_ICU_DATA_VERSION=1 \ No newline at end of file From bb0e4c309069f16954875a644f751ea3191e0d73 Mon Sep 17 00:00:00 2001 From: Kevin McBride Date: Wed, 19 Sep 2012 13:40:59 -0700 Subject: [PATCH 2/5] Fixed FlashBagInterface phpdoc, clarified UPGRADE docs --- UPGRADE-2.1.md | 3 +-- .../Session/Flash/FlashBagInterface.php | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/UPGRADE-2.1.md b/UPGRADE-2.1.md index e172cf071a14..623bc5ca5d48 100644 --- a/UPGRADE-2.1.md +++ b/UPGRADE-2.1.md @@ -1332,8 +1332,7 @@ ### Session - * Flash messages now return an array based on their type. The old method is - still available but is now deprecated. + * Using `get` to retrieve flash messages now returns an array. ##### Retrieving the flash messages from a Twig template diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php index 9ae5a3dd63ac..a68dcfddda84 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php +++ b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php @@ -31,18 +31,18 @@ public function add($type, $message); /** * Registers a message for a given type. * - * @param string $type - * @param string $message + * @param string $type + * @param string|array $message */ public function set($type, $message); /** - * Gets flash message for a given type. + * Gets flash messages for a given type. * * @param string $type Message category type. - * @param array $default Default value if $type doee not exist. + * @param array $default Default value if $type does not exist. * - * @return string + * @return array */ public function peek($type, array $default = array()); @@ -57,9 +57,9 @@ public function peekAll(); * Gets and clears flash from the stack. * * @param string $type - * @param array $default Default value if $type doee not exist. + * @param array $default Default value if $type does not exist. * - * @return string + * @return array */ public function get($type, array $default = array()); From 756f9a408b7a254e8e22719b48cc75e1be1bf656 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 20 Sep 2012 09:12:35 +0200 Subject: [PATCH 3/5] updated CHANGELOG for 2.1.2 --- CHANGELOG-2.1.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG-2.1.md b/CHANGELOG-2.1.md index 297617502da5..7468324591a1 100644 --- a/CHANGELOG-2.1.md +++ b/CHANGELOG-2.1.md @@ -7,6 +7,13 @@ in 2.1 minor versions. To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.1.0...v2.1.1 +* 2.1.2 (2012-09-20) + + * 7bafc69: Add a Sigchild compatibility mode (set to false by default) + * 8dd19d8: fix Fatal error: Cannot access private property + * 3269014: Added Bulgarian translation + * de6658b: [Profiler]Use the abstract method to get client IP + * 2.1.1 (2012-09-11) * fix Composer configuration From 80ff285ae2ee514d07bb350857bd86bd147d0d7d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 20 Sep 2012 09:13:00 +0200 Subject: [PATCH 4/5] updated VERSION for 2.1.2 --- src/Symfony/Component/HttpKernel/Kernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 4be75cc16781..de5fc9be9fe7 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -58,12 +58,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface protected $classes; protected $errorReportingLevel; - const VERSION = '2.1.2-DEV'; + const VERSION = '2.1.2'; const VERSION_ID = '20100'; const MAJOR_VERSION = '2'; const MINOR_VERSION = '1'; const RELEASE_VERSION = '2'; - const EXTRA_VERSION = 'DEV'; + const EXTRA_VERSION = ''; /** * Constructor. From 5db89bd9b85b548b259efd9ab63138a0e0117910 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 20 Sep 2012 10:29:15 +0200 Subject: [PATCH 5/5] bumped Symfony version to 2.1.3-DEV --- src/Symfony/Component/HttpKernel/Kernel.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index de5fc9be9fe7..2514ada2262d 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -58,12 +58,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface protected $classes; protected $errorReportingLevel; - const VERSION = '2.1.2'; + const VERSION = '2.1.3-DEV'; const VERSION_ID = '20100'; const MAJOR_VERSION = '2'; const MINOR_VERSION = '1'; - const RELEASE_VERSION = '2'; - const EXTRA_VERSION = ''; + const RELEASE_VERSION = '3'; + const EXTRA_VERSION = 'DEV'; /** * Constructor.