symfony · fabpot · Dec 16, 2014 · Jul 24, 2014 · Jul 26, 2014 · Jul 26, 2014
diff --git a/CHANGELOG-2.4.md b/CHANGELOG-2.4.md
diff --git a/CHANGELOG-2.5.md b/CHANGELOG-2.5.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,11 +1,20 @@
 Contributing
 ------------
 
-Symfony is an open source, community-driven project. If you'd like to contribute,
-please read the [Contributing Code][1] part of the documentation. If you're submitting
-a pull request, please follow the guidelines in the [Submitting a Patch][2] section
-and use the [Pull Request Template][3].
+Symfony2 is an open source, community-driven project.
+
+If you'd like to contribute, please read the following documents:
+
+* [Contributing Code][1]: The document index related to contributions;
+
+* [Submitting a Patch][2]: Guidelines for submitting a pull request;
+
+* [Pull Request Template][3]: Template header to use in your pull request
+  description;
+
+* [Backwards Compatibility][4]: Backward compatibility rules.
 
 [1]: http://symfony.com/doc/current/contributing/code/index.html
 [2]: http://symfony.com/doc/current/contributing/code/patches.html#check-list
 [3]: http://symfony.com/doc/current/contributing/code/patches.html#make-a-pull-request
+[4]: http://symfony.com/doc/current/contributing/code/bc.html#working-on-symfony-code
diff --git a/UPGRADE-2.2.md b/UPGRADE-2.2.md
@@ -23,7 +23,7 @@
 
 #### Deprecations
 
- * The `standalone` option is deprecated and will replaced with the `strategy` option in 2.3.
+ * The `standalone` option is deprecated and will be replaced with the `strategy` option in 2.3.
  * The values `true`, `false`, `js` for the `standalone` option were deprecated and replaced respectively with the `esi`, `inline`, `hinclude` in 2.3.
 
 

diff --git a/UPGRADE-2.4.md b/UPGRADE-2.4.md
@@ -0,0 +1,9 @@
+UPGRADE FROM 2.3 to 2.4
+=======================
+
+Form
+----
+
+ * The constructor parameter `$precision` in `IntegerToLocalizedStringTransformer`
+   is now ignored completely, because a precision does not make sense for
+   integers.
diff --git a/UPGRADE-2.5.md b/UPGRADE-2.5.md
@@ -0,0 +1,263 @@
+UPGRADE FROM 2.4 to 2.5
+=======================
+
+Routing
+-------
+
+ * Added a new optional parameter `$requiredSchemes` to `Symfony\Component\Routing\Generator\UrlGenerator::doGenerate()`
+
+Form
+----
+
+ * The method `FormInterface::getErrors()` now returns an instance of
+   `Symfony\Component\Form\FormErrorIterator` instead of an array. This object
+   is traversable, countable and supports array access. However, you can not
+   pass it to any of PHP's `array_*` functions anymore. You should use
+   `iterator_to_array()` in those cases where you did.
+
+   Before:
+
+   ```
+   $errors = array_map($callback, $form->getErrors());
+   ```
+
+   After:
+
+   ```
+   $errors = array_map($callback, iterator_to_array($form->getErrors()));
+   ```
+
+ * The method `FormInterface::getErrors()` now has two additional, optional
+   parameters. Make sure to add these parameters to the method signatures of
+   your implementations of that interface.
+
+   Before:
+
+   ```
+   public function getErrors()
+   {
+   ```
+
+   After:
+
+   ```
+   public function getErrors($deep = false, $flatten = true)
+   {
+   ```
+
+   Before:
+
+   ```
+   {% if form.vars.errors %}
+   ```
+
+   After:
+
+   ```
+   {% if form.vars.errors|length %}
+   ```
+
+PropertyAccess
+--------------
+
+ * The methods `isReadable()` and `isWritable()` were added to
+   `PropertyAccessorInterface`. If you implemented this interface in your own
+   code, you should add these two methods.
+
+ * The methods `getValue()` and `setValue()` now throw an
+   `NoSuchIndexException` instead of a `NoSuchPropertyException` when an index
+   is accessed on an object that does not implement `ArrayAccess`. If you catch
+   this exception in your code, you should adapt the catch statement:
+
+   Before:
+
+   ```php
+   $object = new \stdClass();
+
+   try {
+       $propertyAccessor->getValue($object, '[index]');
+       $propertyAccessor->setValue($object, '[index]', 'New value');
+   } catch (NoSuchPropertyException $e) {
+       // ...
+   }
+   ```
+
+   After:
+
+   ```php
+   $object = new \stdClass();
+
+   try {
+       $propertyAccessor->getValue($object, '[index]');
+       $propertyAccessor->setValue($object, '[index]', 'New value');
+   } catch (NoSuchIndexException $e) {
+       // ...
+   }
+   ```
+
+   A `NoSuchPropertyException` is still thrown when a non-existing property is
+   accessed on an object or an array.
+
+Validator
+---------
+
+ * EmailValidator has changed to allow `non-strict` and `strict` email validation
+
+   Before:
+
+   Email validation was done with php's `filter_var()`
+
+   After:
+
+   Default email validation is now done via a simple regex which may cause invalid emails (not RFC compilant) to be
+   valid. This is the default behaviour.
+
+   Strict email validation has to be explicitly activated in the configuration file by adding
+
+   ```
+   framework:
+      //...
+      validation:
+          strict_email: true
+      //...
+
+   ```
+
+   Also you have to add to your composer.json:
+
+   ```
+   "egulias/email-validator": "~1.2"
+   ```
+
+ * `ClassMetadata::getGroupSequence()` now returns `GroupSequence` instances
+   instead of an array. The sequence implements `\Traversable`, `\ArrayAccess`
+   and `\Countable`, so in most cases you should be fine. If you however use the
+   sequence with PHP's `array_*()` functions, you should cast it to an array
+   first using `iterator_to_array()`:
+
+   Before:
+
+   ```
+   $sequence = $metadata->getGroupSequence();
+   $result = array_map($callback, $sequence);
+   ```
+
+   After:
+
+   ```
+   $sequence = iterator_to_array($metadata->getGroupSequence());
+   $result = array_map($callback, $sequence);
+   ```
+
+ * The array type hint in `ClassMetadata::setGroupSequence()` was removed. If
+   you overwrite this method, make sure to remove the type hint as well. The
+   method should now accept `GroupSequence` instances just as well as arrays.
+
+   Before:
+
+   ```
+   public function setGroupSequence(array $groups)
+   {
+       // ...
+   }
+   ```
+
+   After:
+
+   ```
+   public function setGroupSequence($groupSequence)
+   {
+       // ...
+   }
+   ```
+
+ * The validation engine in `Symfony\Component\Validator\Validator` was replaced
+   by a new one in `Symfony\Component\Validator\Validator\RecursiveValidator`.
+   With that change, several classes were deprecated that will be removed in
+   Symfony 3.0. Also, the API of the validator was slightly changed. More
+   details about that can be found in UPGRADE-3.0.
+
+   You can choose the desired API via the new "api" entry in
+   app/config/config.yml:
+
+   ```
+   framework:
+       validation:
+           enabled: true
+           api: auto
+   ```
+
+   When running PHP 5.3.9 or higher, Symfony will then use an implementation
+   that supports both the old API and the new one:
+
+   ```
+   framework:
+       validation:
+           enabled: true
+           api: 2.5-bc
+   ```
+
+   When running PHP lower than 5.3.9, that compatibility layer is not supported.
+   On those versions, the old implementation will be used instead:
+
+   ```
+   framework:
+       validation:
+           enabled: true
+           api: 2.4
+   ```
+
+   If you develop a new application that doesn't rely on the old API, you can
+   also set the API to 2.5. In that case, the backwards compatibility layer
+   will not be activated:
+
+   ```
+   framework:
+       validation:
+           enabled: true
+           api: 2.5
+   ```
+
+   When using the validator outside of the Symfony full-stack framework, the
+   desired API can be selected using `setApiVersion()` on the validator builder:
+
+   ```
+   // Previous implementation
+   $validator = Validation::createValidatorBuilder()
+       ->setApiVersion(Validation::API_VERSION_2_4)
+       ->getValidator();
+
+   // New implementation with backwards compatibility support
+   $validator = Validation::createValidatorBuilder()
+       ->setApiVersion(Validation::API_VERSION_2_5_BC)
+       ->getValidator();
+
+   // New implementation without backwards compatibility support
+   $validator = Validation::createValidatorBuilder()
+       ->setApiVersion(Validation::API_VERSION_2_5)
+       ->getValidator();
+   ```
+
+
+Yaml Component
+--------------
+
+ * The way Yaml handles duplicate keys in an array was changed from `rewrite with the
+   last element` behavior to ignoring all the elements with the same key after the first one.
+
+   Example:
+
+   ```
+   parentElement:
+       firstChild: foo
+       secondChild: 123
+       firstChild: bar
+   ```
+
+   Before:
+
+   This would be parsed in an array like this: `["parentElement" => ["firstChild" => "bar", "secondChild" => 123]]`
+
+   After:
+
+   The first value is used: `["parentElement" => ["firstChild" => "foo", "secondChild" => 123]]`
diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
@@ -254,7 +254,7 @@ UPGRADE FROM 2.x to 3.0
    and all of its implementations were removed. Use the new interface
    `Symfony\Component\Security\Csrf\CsrfTokenManagerInterface` instead.
 
- * The options "`csrf_provider`" and "`intention`" were renamed to "`csrf_token_generator`"
+ * The options "`csrf_provider`" and "`intention`" were renamed to  "`csrf_token_generator`"
    and "`csrf_token_id`".
 
  * The method `Form::getErrorsAsString()` was removed. Use `Form::getErrors()`
@@ -273,6 +273,10 @@ UPGRADE FROM 2.x to 3.0
    echo $form->getErrors(true, false);
    ```
 
+   ```php
+   echo $form->getErrors(true, false);
+   ```
+
 ### FrameworkBundle
 
  * The `getRequest` method of the base `Controller` class has been deprecated

diff --git a/composer.json b/composer.json
@@ -32,6 +32,7 @@
         "symfony/doctrine-bridge": "self.version",
         "symfony/dom-crawler": "self.version",
         "symfony/event-dispatcher": "self.version",
+        "symfony/expression-language": "self.version",
         "symfony/filesystem": "self.version",
         "symfony/finder": "self.version",
         "symfony/form": "self.version",
@@ -48,6 +49,10 @@
         "symfony/proxy-manager-bridge": "self.version",
         "symfony/routing": "self.version",
         "symfony/security": "self.version",
+        "symfony/security-acl": "self.version",
+        "symfony/security-core": "self.version",
+        "symfony/security-csrf": "self.version",
+        "symfony/security-http": "self.version",
         "symfony/security-bundle": "self.version",
         "symfony/serializer": "self.version",
         "symfony/stopwatch": "self.version",
@@ -67,7 +72,8 @@
         "monolog/monolog": "~1.3",
         "propel/propel1": "~1.6",
         "ircmaxell/password-compat": "~1.0",
-        "ocramius/proxy-manager": "~0.3.1"
+        "ocramius/proxy-manager": "~0.4|~1.0",
+        "egulias/email-validator": "~1.2"
     },
     "autoload": {
         "psr-0": { "Symfony\\": "src/" },
@@ -80,7 +86,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "2.3-dev"
+            "dev-master": "2.5-dev"
         }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -16,6 +16,7 @@
         <testsuite name="Symfony Test Suite">
             <directory>./src/Symfony/Bridge/*/Tests/</directory>
             <directory>./src/Symfony/Component/*/Tests/</directory>
+            <directory>./src/Symfony/Component/*/*/Tests/</directory>
             <directory>./src/Symfony/Bundle/*/Tests/</directory>
         </testsuite>
     </testsuites>
@@ -33,6 +34,7 @@
             <exclude>
                 <directory>./src/Symfony/Bridge/*/Tests</directory>
                 <directory>./src/Symfony/Component/*/Tests</directory>
+                <directory>./src/Symfony/Component/*/*/Tests</directory>
                 <directory>./src/Symfony/Bundle/*/Tests</directory>
                 <directory>./src/Symfony/Bundle/*/Resources</directory>
                 <directory>./src/Symfony/Component/*/Resources</directory>