symfony
diff --git a/‎CONTRIBUTING.md‎
Lines changed: 13 additions & 4 deletions b/‎CONTRIBUTING.md‎
Lines changed: 13 additions & 4 deletions
diff --git a/‎UPGRADE-2.5.md‎
Lines changed: 74 additions & 0 deletions b/‎UPGRADE-2.5.md‎
Lines changed: 74 additions & 0 deletions
diff --git a/‎UPGRADE-3.0.md‎
Lines changed: 122 additions & 0 deletions b/‎UPGRADE-3.0.md‎
Lines changed: 122 additions & 0 deletions
diff --git a/‎composer.json‎
Lines changed: 3 additions & 2 deletions b/‎composer.json‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php‎
Lines changed: 34 additions & 12 deletions b/‎src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php‎
Lines changed: 34 additions & 12 deletions
@@ -1,11 +1,20 @@
 Contributing
 ------------
 
-Symfony2 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
@@ -0,0 +1,74 @@
+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)
+   {
+   ```
+
+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.1.*"
+   ```
@@ -18,6 +18,77 @@ UPGRADE FROM 2.x to 3.0
    `DebugClassLoader`. The difference is that the constructor now takes a
    loader to wrap.
 
+### Console
+
+ * The methods `isQuiet`, `isVerbose`, `isVeryVerbose` and `isDebug` were added
+   to `Symfony\Component\Console\Output\OutputInterface`.
+
+ * `ProgressHelper` has been removed in favor of `ProgressBar`.
+
+   Before:
+
+   ```
+   $h = new ProgressHelper();
+   $h->start($output, 10);
+   for ($i = 1; $i < 5; $i++) {
+       usleep(200000);
+       $h->advance();
+   }
+   $h->finish();
+   ```
+
+   After:
+
+   ```
+   $bar = new ProgressBar($output, 10);
+   $bar->start();
+   for ($i = 1; $i < 5; $i++) {
+       $bar->advance();
+   }
+   ```
+
+ * `TableHelper` has been removed in favor of `Table`.
+
+   Before:
+
+   ```
+   $table = $app->getHelperSet()->get('table');
+   $table
+       ->setHeaders(array('ISBN', 'Title', 'Author'))
+       ->setRows(array(
+           array('99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'),
+           array('9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens'),
+           array('960-425-059-0', 'The Lord of the Rings', 'J. R. R. Tolkien'),
+           array('80-902734-1-6', 'And Then There Were None', 'Agatha Christie'),
+       ))
+   ;
+   $table->render($output);
+   ```
+
+   After:
+
+   ```
+   use Symfony\Component\Console\Helper\Table;
+
+   $table = new Table($output);
+   $table
+       ->setHeaders(array('ISBN', 'Title', 'Author'))
+       ->setRows(array(
+           array('99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'),
+           array('9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens'),
+           array('960-425-059-0', 'The Lord of the Rings', 'J. R. R. Tolkien'),
+           array('80-902734-1-6', 'And Then There Were None', 'Agatha Christie'),
+       ))
+   ;
+   $table->render();
+   ```
+
+### EventDispatcher
+
+ * The interface `Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcherInterface`
+   extends `Symfony\Component\EventDispatcher\EventDispatcherInterface`.
+
 ### Form
 
  * The methods `Form::bind()` and `Form::isBound()` were removed. You should
@@ -175,6 +246,22 @@ UPGRADE FROM 2.x to 3.0
  * 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()`
+   instead with the argument `$deep` set to true and `$flatten` set to false
+   and cast the returned iterator to a string (if not done implicitly by PHP).
+
+   Before:
+
+   ```
+   echo $form->getErrorsAsString();
+   ```
+
+   After:
+
+   ```
+   echo $form->getErrors(true, false);
+   ```
+
 
 ### FrameworkBundle
 
@@ -213,6 +300,9 @@ UPGRADE FROM 2.x to 3.0
    }
    ```
 
+ * The `request` service was removed. You must inject the `request_stack`
+   service instead.
+
  * The `enctype` method of the `form` helper was removed. You should use the
    new method `start` instead.
 
@@ -263,6 +353,8 @@ UPGRADE FROM 2.x to 3.0
    <?php echo $view['form']->end($form) ?>
    ```
 
+ * The `RouterApacheDumperCommand` was removed.
+
 ### HttpKernel
 
  * The `Symfony\Component\HttpKernel\Log\LoggerInterface` has been removed in
@@ -292,6 +384,9 @@ UPGRADE FROM 2.x to 3.0
  * The `Symfony\Component\HttpKernel\EventListener\ExceptionListener` now
    passes the Request format as the `_format` argument instead of `format`.
 
+ * The `Symfony\Component\HttpKernel\DependencyInjection\RegisterListenersPass` has been renamed to
+   `Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass` and moved to the EventDispatcher component.
+
 ### Locale
 
  * The Locale component was removed and replaced by the Intl component.
@@ -370,6 +465,10 @@ UPGRADE FROM 2.x to 3.0
    $route->setSchemes('https');
    ```
 
+ * The `ApacheMatcherDumper` and `ApacheUrlMatcher` were removed since
+   the performance gains were minimal and it's hard to replicate the behaviour
+   of PHP implementation.
+
 ### Security
 
  * The `Resources/` directory was moved to `Core/Resources/`
@@ -435,6 +534,29 @@ UPGRADE FROM 2.x to 3.0
 
 ### Validator
 
+ * The class `Symfony\Component\Validator\Mapping\Cache\ApcCache` has been removed in favor
+   of `Symfony\Component\Validator\Mapping\Cache\DoctrineCache`.
+
+   Before:
+
+   ```
+   use Symfony\Component\Validator\Mapping\Cache\ApcCache;
+
+   $cache = new ApcCache('symfony.validator');
+   ```
+
+   After:
+
+   ```
+   use Symfony\Component\Validator\Mapping\Cache\DoctrineCache;
+   use Doctrine\Common\Cache\ApcCache;
+
+   $apcCache = new ApcCache();
+   $apcCache->setNamespace('symfony.validator');
+
+   $cache = new DoctrineCache($apcCache);
+   ```
+
  * The constraints `Optional` and `Required` were moved to the
    `Symfony\Component\Validator\Constraints\` namespace. You should adapt
    the path wherever you used them.
 
@@ -73,7 +73,8 @@
         "monolog/monolog": "~1.3",
         "propel/propel1": "1.6.*",
         "ircmaxell/password-compat": "1.0.*",
-        "ocramius/proxy-manager": ">=0.3.1,<0.6-dev"
+        "ocramius/proxy-manager": ">=0.3.1,<0.6-dev",
+        "egulias/email-validator": "1.1.0"
     },
     "autoload": {
         "psr-0": { "Symfony\\": "src/" },
@@ -86,7 +87,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev"
+            "dev-master": "2.5-dev"
         }
     }
 }
@@ -306,14 +306,30 @@ protected function detectMetadataDriver($dir, ContainerBuilder $container)
      */
     protected function loadObjectManagerCacheDriver(array $objectManager, ContainerBuilder $container, $cacheName)
     {
-        $cacheDriver = $objectManager[$cacheName.'_driver'];
-        $cacheDriverService = $this->getObjectManagerElementName($objectManager['name'].'_'.$cacheName);
+        $this->loadCacheDriver($cacheName, $objectManager['name'], $objectManager[$cacheName.'_driver'], $container);
+    }
+
+    /**
+     * Loads a cache driver.
+     *
+     * @param string                                                    $cacheDriverServiceId   The cache driver name.
+     * @param string                                                    $objectManagerName      The object manager name.
+     * @param array                                                     $cacheDriver            The cache driver mapping.
+     * @param \Symfony\Component\DependencyInjection\ContainerBuilder   $container              The ContainerBuilder instance.
+     *
+     * @return string
+     *
+     * @throws \InvalidArgumentException
+     */
+    protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheDriver, ContainerBuilder $container)
+    {
+        $cacheDriverServiceId = $this->getObjectManagerElementName($objectManagerName . '_' . $cacheName);
 
         switch ($cacheDriver['type']) {
             case 'service':
-                $container->setAlias($cacheDriverService, new Alias($cacheDriver['id'], false));
+                $container->setAlias($cacheDriverServiceId, new Alias($cacheDriver['id'], false));
 
-                return;
+                return $cacheDriverServiceId;
             case 'memcache':
                 $memcacheClass = !empty($cacheDriver['class']) ? $cacheDriver['class'] : '%'.$this->getObjectManagerElementName('cache.memcache.class').'%';
                 $memcacheInstanceClass = !empty($cacheDriver['instance_class']) ? $cacheDriver['instance_class'] : '%'.$this->getObjectManagerElementName('cache.memcache_instance.class').'%';
@@ -324,8 +340,8 @@ protected function loadObjectManagerCacheDriver(array $objectManager, ContainerB
                 $memcacheInstance->addMethodCall('connect', array(
                     $memcacheHost, $memcachePort
                 ));
-                $container->setDefinition($this->getObjectManagerElementName(sprintf('%s_memcache_instance', $objectManager['name'])), $memcacheInstance);
-                $cacheDef->addMethodCall('setMemcache', array(new Reference($this->getObjectManagerElementName(sprintf('%s_memcache_instance', $objectManager['name'])))));
+                $container->setDefinition($this->getObjectManagerElementName(sprintf('%s_memcache_instance', $objectManagerName)), $memcacheInstance);
+                $cacheDef->addMethodCall('setMemcache', array(new Reference($this->getObjectManagerElementName(sprintf('%s_memcache_instance', $objectManagerName)))));
                 break;
             case 'memcached':
                 $memcachedClass = !empty($cacheDriver['class']) ? $cacheDriver['class'] : '%'.$this->getObjectManagerElementName('cache.memcached.class').'%';
@@ -337,8 +353,8 @@ protected function loadObjectManagerCacheDriver(array $objectManager, ContainerB
                 $memcachedInstance->addMethodCall('addServer', array(
                     $memcachedHost, $memcachedPort
                 ));
-                $container->setDefinition($this->getObjectManagerElementName(sprintf('%s_memcached_instance', $objectManager['name'])), $memcachedInstance);
-                $cacheDef->addMethodCall('setMemcached', array(new Reference($this->getObjectManagerElementName(sprintf('%s_memcached_instance', $objectManager['name'])))));
+                $container->setDefinition($this->getObjectManagerElementName(sprintf('%s_memcached_instance', $objectManagerName)), $memcachedInstance);
+                $cacheDef->addMethodCall('setMemcached', array(new Reference($this->getObjectManagerElementName(sprintf('%s_memcached_instance', $objectManagerName)))));
                 break;
              case 'redis':
                 $redisClass = !empty($cacheDriver['class']) ? $cacheDriver['class'] : '%'.$this->getObjectManagerElementName('cache.redis.class').'%';
@@ -350,8 +366,8 @@ protected function loadObjectManagerCacheDriver(array $objectManager, ContainerB
                 $redisInstance->addMethodCall
EF8C
('connect', array(
                     $redisHost, $redisPort
                 ));
-                $container->setDefinition($this->getObjectManagerElementName(sprintf('%s_redis_instance', $objectManager['name'])), $redisInstance);
-                $cacheDef->addMethodCall('setRedis', array(new Reference($this->getObjectManagerElementName(sprintf('%s_redis_instance', $objectManager['name'])))));
+                $container->setDefinition($this->getObjectManagerElementName(sprintf('%s_redis_instance', $objectManagerName)), $redisInstance);
+                $cacheDef->addMethodCall('setRedis', array(new Reference($this->getObjectManagerElementName(sprintf('%s_redis_instance', $objectManagerName)))));
                 break;
             case 'apc':
             case 'array':
@@ -368,12 +384,18 @@ protected function loadObjectManagerCacheDriver(array $objectManager, ContainerB
 
         if (!isset($cacheDriver['namespace'])) {
             // generate a unique namespace for the given application
-            $cacheDriver['namespace'] = 'sf2'.$this->getMappingResourceExtension().'_'.$objectManager['name'].'_'.hash('sha256',($container->getParameter('kernel.root_dir').$container->getParameter('kernel.environment')));
+            $env        = $container->getParameter('kernel.root_dir').$container->getParameter('kernel.environment');
+            $hash       = hash('sha256', $env);
+            $namespace  = 'sf2'.$this->getMappingResourceExtension().'_'.$objectManagerName.'_'.$hash;
+
+            $cacheDriver['namespace'] = $namespace;
         }
 
         $cacheDef->addMethodCall('setNamespace', array($cacheDriver['namespace']));
 
-        $container->setDefinition($cacheDriverService, $cacheDef);
+        $container->setDefinition($cacheDriverServiceId, $cacheDef);
+
+        return $cacheDriverServiceId;
     }
 
     /**
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,8 @@`
`73`	`73`	`"monolog/monolog": "~1.3",`
`74`	`74`	`"propel/propel1": "1.6.*",`
`75`	`75`	`"ircmaxell/password-compat": "1.0.*",`
`76`		`- "ocramius/proxy-manager": ">=0.3.1,<0.6-dev"`
	`76`	`+ "ocramius/proxy-manager": ">=0.3.1,<0.6-dev",`
	`77`	`+ "egulias/email-validator": "1.1.0"`
`77`	`78`	`},`
`78`	`79`	`"autoload": {`
`79`	`80`	`"psr-0": { "Symfony\\": "src/" },`
`@@ -86,7 +87,7 @@`
`86`	`87`	`"minimum-stability": "dev",`
`87`	`88`	`"extra": {`
`88`	`89`	`"branch-alias": {`
`89`		`- "dev-master": "2.4-dev"`
	`90`	`+ "dev-master": "2.5-dev"`
`90`	`91`	`}`
`91`	`92`	`}`
`92`	`93`	`}`