Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch '2.1'

* 2.1:
  bumped Symfony version to 2.1.3-DEV
  updated VERSION for 2.1.2
  updated CHANGELOG for 2.1.2
  Fixed FlashBagInterface phpdoc, clarified UPGRADE docs
  composer is available in travis workers

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
  • Loading branch information...
commit ad91b3b464e134dbc7d363220b926ef051b1fe68 2 parents a7b7314 + 9fd2baa
@fabpot fabpot authored
View
3  .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=dev-master composer --dev install
- php src/Symfony/Component/Locale/Resources/data/build-data.php
- export USE_INTL_ICU_DATA_VERSION=1
View
7 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
View
3  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
View
14 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());
Please sign in to comment.
Something went wrong with that request. Please try again.