From e4913f8f044f1bffb2be462222f8acaeb48960ac Mon Sep 17 00:00:00 2001
From: Joseph Bielawski <stloyd@gmail.com>
Date: Mon, 6 May 2013 11:20:17 +0200
Subject: [PATCH 1/7] [Filesystem] Fix regression introduced in 10dea948

---
 src/Symfony/Component/Filesystem/Filesystem.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index c3050423c1..c4af84620b 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -35,7 +35,7 @@ class Filesystem
      */
     public function copy($originFile, $targetFile, $override = false)
     {
-        if (!is_file($originFile)) {
+        if (stream_is_local($originFile) && !is_file($originFile)) {
             throw new IOException(sprintf('Failed to copy %s because file not exists', $originFile));
         }
 

From 05b987f381e9f82f02130c50e278146e86462f8a Mon Sep 17 00:00:00 2001
From: Joseph Bielawski <stloyd@gmail.com>
Date: Mon, 6 May 2013 11:50:13 +0200
Subject: [PATCH 2/7] [Process] Cleanup tests & prevent assertion that kills
 randomly Travis-CI

---
 .../Process/Tests/AbstractProcessTest.php     | 13 ++++++------
 .../Process/Tests/PhpProcessTest.php          |  1 -
 .../Process/Tests/ProcessBuilderTest.php      | 20 ++++---------------
 .../Tests/ProcessFailedExceptionTest.php      |  3 ++-
 .../Tests/SigchildDisabledProcessTest.php     | 18 ++++++++---------
 .../Tests/SigchildEnabledProcessTest.php      |  8 ++++----
 6 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
index 3f71593b53..1bb94e932b 100644
--- a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
+++ b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
@@ -88,18 +88,21 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
      *
      * @dataProvider pipesCodeProvider
      */
-    public function testProcessPipes($expected, $code)
+    public function testProcessPipes($code, $size)
     {
         if (defined('PHP_WINDOWS_VERSION_BUILD')) {
             $this->markTestSkipped('Test hangs on Windows & PHP due to https://bugs.php.net/bug.php?id=60120 and https://bugs.php.net/bug.php?id=51800');
         }
 
+        $expected = str_repeat(str_repeat('*', 1024), $size) . '!';
+        $expectedLength = (1024 * $size) + 1;
+
         $p = $this->getProcess(sprintf('php -r %s', escapeshellarg($code)));
         $p->setStdin($expected);
         $p->run();
 
-        $this->assertSame($expected, $p->getOutput());
-        $this->assertSame($expected, $p->getErrorOutput());
+        $this->assertEquals($expectedLength, strlen($p->getOutput()));
+        $this->assertEquals($expectedLength, strlen($p->getErrorOutput()));
     }
 
     public function chainedCommandsOutputProvider()
@@ -338,13 +341,11 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
             'fwrite(STDOUT, $in = file_get_contents(\'php://stdin\')); fwrite(STDERR, $in);',
             'include \'' . __DIR__ . '/ProcessTestHelper.php\';',
         );
-        $baseData = str_repeat('*', 1024);
 
         $codes = array();
         foreach (array(1, 16, 64, 1024, 4096) as $size) {
-            $data = str_repeat($baseData, $size) . '!';
             foreach ($variations as $code) {
-                $codes[] = array($data, $code);
+                $codes[] = array($code, $size);
             }
         }
 
diff --git a/src/Symfony/Component/Process/Tests/PhpProcessTest.php b/src/Symfony/Component/Process/Tests/PhpProcessTest.php
index 02b629450b..df66ad624b 100644
--- a/src/Symfony/Component/Process/Tests/PhpProcessTest.php
+++ b/src/Symfony/Component/Process/Tests/PhpProcessTest.php
@@ -15,7 +15,6 @@ use Symfony\Component\Process\PhpProcess;
 
 class PhpProcessTest extends \PHPUnit_Framework_TestCase
 {
-
     public function testNonBlockingWorks()
     {
         $expected = 'hello world!';
diff --git a/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php b/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php
index 9ca45a80a7..e55efe0be5 100644
--- a/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php
+++ b/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php
@@ -15,10 +15,7 @@ use Symfony\Component\Process\ProcessBuilder;
 
 class ProcessBuilderTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @test
-     */
-    public function shouldInheritEnvironmentVars()
+    public function testInheritEnvironmentVars()
     {
         $snapshot = $_ENV;
         $_ENV = $expected = array('foo' => 'bar');
@@ -32,10 +29,7 @@ class ProcessBuilderTest extends \PHPUnit_Framework_TestCase
         $_ENV = $snapshot;
     }
 
-    /**
-     * @test
-     */
-    public function shouldInheritAndOverrideEnvironmentVars()
+    public function testProcessShouldInheritAndOverrideEnvironmentVars()
     {
         $snapshot = $_ENV;
         $_ENV = array('foo' => 'bar', 'bar' => 'baz');
@@ -51,10 +45,7 @@ class ProcessBuilderTest extends \PHPUnit_Framework_TestCase
         $_ENV = $snapshot;
     }
 
-    /**
-     * @test
-     */
-    public function shouldInheritEnvironmentVarsByDefault()
+    public function testInheritEnvironmentVarsByDefault()
     {
         $pb = new ProcessBuilder();
         $proc = $pb->add('foo')->getProcess();
@@ -62,10 +53,7 @@ class ProcessBuilderTest extends \PHPUnit_Framework_TestCase
         $this->assertNull($proc->getEnv());
     }
 
-    /**
-     * @test
-     */
-    public function shouldNotReplaceExplicitlySetVars()
+    public function testNotReplaceExplicitlySetVars()
     {
         $snapshot = $_ENV;
         $_ENV = array('foo' => 'bar');
diff --git a/src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php b/src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php
index 356c7debaa..c626ddd982 100644
--- a/src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php
+++ b/src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php
@@ -37,7 +37,8 @@ class ProcessFailedExceptionTest extends \PHPUnit_Framework_TestCase
             '\InvalidArgumentException',
             'Expected a failed process, but the given process was successful.'
         );
-        $exception = new ProcessFailedException($process);
+
+        new ProcessFailedException($process);
     }
 
     /**
diff --git a/src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php b/src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
index 67fc0025bd..1e4dc1d0a2 100644
--- a/src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
+++ b/src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\Process\Tests;
 class SigchildDisabledProcessTest extends AbstractProcessTest
 {
     /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
      */
     public function testGetExitCode()
     {
@@ -22,7 +22,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
     }
 
     /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
      */
     public function testExitCodeCommandFailed()
     {
@@ -30,7 +30,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
     }
 
     /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
      */
     public function testProcessIsSignaledIfStopped()
     {
@@ -38,7 +38,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
     }
 
     /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
      */
     public function testProcessWithTermSignal()
     {
@@ -46,7 +46,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
     }
 
     /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
      */
     public function testProcessIsNotSignaled()
     {
@@ -54,7 +54,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
     }
 
     /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
      */
     public function testProcessWithoutTermSignal()
     {
@@ -62,7 +62,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
     }
 
     /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
      */
     public function testExitCodeText()
     {
@@ -73,7 +73,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
     }
 
     /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
      */
     public function testIsSuccessful()
     {
@@ -81,7 +81,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
     }
 
     /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
      */
     public function testIsNotSuccessful()
     {
diff --git a/src/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php b/src/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php
index fb9b6f8cc8..5c664e2423 100644
--- a/src/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php
+++ b/src/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\Process\Tests;
 class SigchildEnabledProcessTest extends AbstractProcessTest
 {
     /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
      */
     public function testProcessIsSignaledIfStopped()
     {
@@ -22,7 +22,7 @@ class SigchildEnabledProcessTest extends AbstractProcessTest
     }
 
     /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
      */
     public function testProcessWithTermSignal()
     {
@@ -30,7 +30,7 @@ class SigchildEnabledProcessTest extends AbstractProcessTest
     }
 
     /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
      */
     public function testProcessIsNotSignaled()
     {
@@ -38,7 +38,7 @@ class SigchildEnabledProcessTest extends AbstractProcessTest
     }
 
     /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
      */
     public function testProcessWithoutTermSignal()
     {

From 9f522de0d50c6430d8981351c33d1fe87915c76f Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Mon, 6 May 2013 12:46:41 +0200
Subject: [PATCH 3/7] fixed CS

---
 .../Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php       | 2 +-
 .../Tests/Validator/Constraints/UniqueValidatorTest.php   | 1 +
 .../Component/ClassLoader/Tests/DebugClassLoaderTest.php  | 1 +
 src/Symfony/Component/Form/DataTransformerInterface.php   | 6 ++++--
 .../Core/DataTransformer/DataTransformerChain.php         | 5 +++--
 .../Core/DataTransformer/DateTimeToArrayTransformer.php   | 3 ++-
 .../Core/DataTransformer/DateTimeToStringTransformer.php  | 3 ++-
 .../DataTransformer/DateTimeToRfc3339TransformerTest.php  | 2 +-
 .../HttpKernel/Profiler/RedisProfilerStorage.php          | 2 +-
 .../HttpKernel/Tests/Profiler/Mock/RedisMock.php          | 8 ++++----
 .../Component/Routing/Tests/Loader/XmlFileLoaderTest.php  | 2 +-
 11 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php b/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
index ad47f339b9..dfc53cc2e9 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
@@ -118,7 +118,7 @@ class DbalLoggerTest extends \PHPUnit_Framework_TestCase
 
         $shortString = '';
         $longString = '';
-        for($i=1; $i<=DbalLogger::MAX_STRING_LENGTH; $i++) {
+        for ($i = 1; $i <= DbalLogger::MAX_STRING_LENGTH; $i++) {
             $shortString .= $testStringArray[$i % $testStringCount];
             $longString .= $testStringArray[$i % $testStringCount];
         }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php
index efedfd9244..ac0599a633 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php
@@ -308,6 +308,7 @@ class UniqueValidatorTest extends DoctrineOrmTestCase
                         $entity,
                     );
                     next($returnValue);
+
                     return $returnValue;
                 })
             )
diff --git a/src/Symfony/Component/ClassLoader/Tests/DebugClassLoaderTest.php b/src/Symfony/Component/ClassLoader/Tests/DebugClassLoaderTest.php
index ffbcafbd22..873515c336 100644
--- a/src/Symfony/Component/ClassLoader/Tests/DebugClassLoaderTest.php
+++ b/src/Symfony/Component/ClassLoader/Tests/DebugClassLoaderTest.php
@@ -42,6 +42,7 @@ class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
                 $reflProp->setAccessible(true);
 
                 $this->assertNotInstanceOf('Symfony\Component\ClassLoader\DebugClassLoader', $reflProp->getValue($function[0]));
+
                 return;
             }
         }
diff --git a/src/Symfony/Component/Form/DataTransformerInterface.php b/src/Symfony/Component/Form/DataTransformerInterface.php
index 432dd36295..04db5c192f 100644
--- a/src/Symfony/Component/Form/DataTransformerInterface.php
+++ b/src/Symfony/Component/Form/DataTransformerInterface.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Form;
 
+use Symfony\Component\Form\Exception\TransformationFailedException;
+
 /**
  * Transforms a value between different representations.
  *
@@ -43,7 +45,7 @@ interface DataTransformerInterface
      *
      * @return mixed The value in the transformed representation
      *
-     * @throws \Symfony\Component\Form\Exception\TransformationFailedException When the transformation fails.
+     * @throws TransformationFailedException When the transformation fails.
      */
     public function transform($value);
 
@@ -69,7 +71,7 @@ interface DataTransformerInterface
      *
      * @return mixed The value in the original representation
      *
-     * @throws \Symfony\Component\Form\Exception\TransformationFailedException When the transformation fails.
+     * @throws TransformationFailedException When the transformation fails.
      */
     public function reverseTransform($value);
 }
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php
index ec466e1f94..9cc185e1ab 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Extension\Core\DataTransformer;
 
 use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\Form\Exception\TransformationFailedException;
 
 /**
  * Passes a value through multiple value transformers
@@ -48,7 +49,7 @@ class DataTransformerChain implements DataTransformerInterface
      *
      * @return mixed The transformed value
      *
-     * @throws \Symfony\Component\Form\Exception\TransformationFailedException
+     * @throws TransformationFailedException
      */
     public function transform($value)
     {
@@ -72,7 +73,7 @@ class DataTransformerChain implements DataTransformerInterface
      *
      * @return mixed The reverse-transformed value
      *
-     * @throws \Symfony\Component\Form\Exception\TransformationFailedException
+     * @throws TransformationFailedException
      */
     public function reverseTransform($value)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
index eb4ebec9cd..34af282057 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Extension\Core\DataTransformer;
 
 use Symfony\Component\Form\Exception\TransformationFailedException;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
 /**
  * Transforms between a normalized time and a localized time string/array.
@@ -33,7 +34,7 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer
      * @param array   $fields         The date fields
      * @param Boolean $pad            Whether to use padding
      *
-     * @throws \Symfony\Component\Form\Exception\UnexpectedTypeException if a timezone is not a string
+     * @throws UnexpectedTypeException if a timezone is not a string
      */
     public function __construct($inputTimezone = null, $outputTimezone = null, array $fields = null, $pad = false)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php
index 730d54ef63..8e4c0cbe10 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Extension\Core\DataTransformer;
 
 use Symfony\Component\Form\Exception\TransformationFailedException;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
 /**
  * Transforms between a date string and a DateTime object
@@ -57,7 +58,7 @@ class DateTimeToStringTransformer extends BaseDateTimeTransformer
      * @param string  $format         The date format
      * @param Boolean $parseUsingPipe Whether to parse by appending a pipe "|" to the parse format
      *
-     * @throws \Symfony\Component\Form\Exception\UnexpectedTypeException if a timezone is not a string
+     * @throws UnexpectedTypeException if a timezone is not a string
      */
     public function __construct($inputTimezone = null, $outputTimezone = null, $format = 'Y-m-d H:i:s', $parseUsingPipe = null)
     {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
index f550d4bd20..98aeb77292 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
@@ -124,7 +124,7 @@ class DateTimeToRfc3339TransformerTest extends DateTimeTestCase
      * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
      */
     public function testReverseTransformExpectsValidDateString()
-    {        
+    {
         $transformer = new DateTimeToRfc3339Transformer('UTC', 'UTC');
 
         $transformer->reverseTransform('2010-2010-2010');
diff --git a/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
index d601653bb8..28028311a0 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
@@ -207,7 +207,7 @@ class RedisProfilerStorage implements ProfilerStorageInterface
 
             $redis = new Redis;
             $redis->connect($host, $port);
-            
+
             // if a valid dbnumber is given select the redis index
             if (-1 < $dbnum) {
                 $redis->select($dbnum);
diff --git a/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php b/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php
index 122479b922..ca2980edde 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php
@@ -238,17 +238,17 @@ class RedisMock
 
         return true;
     }
-    
+
     public function select($dbnum)
     {
         if (!$this->connected) {
             return false;
         }
-        
+
         if (0 > $dbnum) {
             return false;
         }
-        
-        return true;   
+
+        return true;
     }
 }
diff --git a/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
index 147b6e70a7..9c2bb77b14 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
@@ -47,7 +47,7 @@ class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase
 
         $this->assertEquals(1, count($routes), 'One route is loaded');
         $this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);
-        
+
         $route = $routes['blog_show'];
         $this->assertSame(null, $route->getDefault('slug'));
         $this->assertEquals('RouteCompiler', $route->getOption('compiler_class'));

From 4db4e6243d0e3b7f50a0e3557fc2592797cc8a7e Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Mon, 6 May 2013 13:00:54 +0200
Subject: [PATCH 4/7] updated CHANGELOG for 2.1.10

---
 CHANGELOG-2.1.md | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/CHANGELOG-2.1.md b/CHANGELOG-2.1.md
index bccfd09742..9560f76139 100644
--- a/CHANGELOG-2.1.md
+++ b/CHANGELOG-2.1.md
@@ -7,6 +7,41 @@ 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.10 (2013-05-06)
+
+ * 5b7e1e6: added a missing check for the provider key
+ * bcb5400: [Form] Fixed transform()/reverseTransform() to always throw TransformationFailedExceptions
+ * 7b2ebbf: [Form] Fixed: String validation groups are never interpreted as callbacks
+ * 0610750: if the repository method returns an array ensure that it's internal poin...
+ * 2b554d7: remove validation related headers when needed
+ * 2a531d7: Fix getPort() returning 80 instead of 443 when X-FORWARDED-PROTO is set to https
+ * 10dea94: [Filesystem] copy() is not working when open_basedir is set
+ * 8757ad4: [Process] Fix #5594 : `termsig` must be used instead of `stopsig` in exceptions when a process is signaled
+ * 06e21ff: Filesystem::touch() not working with different owners (utime/atime issue)
+ * 36d057b: [HttpFoundation][BrowserKit] fixed path when converting a cookie to a string
+ * 495d0e3: [HttpFoundation] fixed empty domain= in Cookie::__toString()
+ * c2bc707: fixed detection of secure cookies received over https
+ * 54bcf5c: [Translator] added additional conversion for encodings other than utf-8
+ * 8a434ed: fix a DI circular reference recognition bug
+ * 5abf887: Fix default value handling for multi-value options
+ * da156d3: fix overwriting of request's locale if attribute _locale is missing
+ * d552e4c: [HttpFoundation] do not use server variable PATH_INFO because it is already decoded and thus symfony is fragile to double encoding of the path
+ * 047212a: [Yaml] fixed handling an empty value
+ * 94a9cdc: [Routing][XML Loader] Add a possibility to set a default value to null
+ * 0f0c29c: [HttpFoundation] Fixed bug in key searching for NamespacedAttributeBag
+ * 7fc429f: [Form] DateTimeToRfc3339Transformer use proper transformation exteption in reverse transformation
+ * 9fcd2f6: [HttpFoundation] fixed the creation of sub-requests under some circumstances for IIS
+ * a3826ab: #7531: [HttpKernel][Config] FileLocator adds NULL as global resource path
+ * 9d71ebe: Fix autocompletion of command names when namespaces conflict
+ * bec8ff1: Fix timeout in Process::stop method
+ * bf4a9b0: Round stream_select fifth argument up.
+ * 3780fdb: Fix Process timeout
+ * 375ded4: [FrameworkBundle] fixed the discovery of the PHPUnit configuration file when using aggregate options like in -vc app/ (closes #7562)
+ * 673fd9b: idAsIndex should be true with a smallint or bigint id field.
+ * 64a1d39: Fixed long multibyte parameter logging in DbalLogger:startQuery
+ * 4cf06c1: Keep the file extension in the temporary copy and test that it exists (closes #7482)
+ * c4da2d9: [HttpFoundation] getClientIp is fixed.
+
 * 2.1.9 (2013-03-26)
 
  * 9875c4b: Added '@@' escaping strategy for YamlFileLoader and YamlDumper

From 1b036810451a69f69c349553130200ccefedb629 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Mon, 6 May 2013 13:01:36 +0200
Subject: [PATCH 5/7] update CONTRIBUTORS for 2.1.10

---
 CONTRIBUTORS.md | 144 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 98 insertions(+), 46 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 9171ad5d0b..669f5e458c 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -14,10 +14,10 @@ Symfony2 is the result of the work of many people who made the code better
  - Christophe Coevoet (stof)
  - Pascal Borreli (pborreli)
  - Karma Dordrak (drak)
- - Ryan Weaver
  - Lukas Kahwe Smith (lsmith)
- - Jeremy Mikola (jmikola)
+ - Ryan Weaver
  - Joseph Bielawski (stloyd)
+ - Jeremy Mikola (jmikola)
  - Igor Wiedler (igorw)
  - Benjamin Eberlei (beberlei)
  - Jean-François Simon (jfsimon)
@@ -26,40 +26,42 @@ Symfony2 is the result of the work of many people who made the code better
  - Martin Hasoň (hason)
  - Jonathan Wage (jwage)
  - William Durand (couac)
+ - Jakub Zalas (jakubzalas)
  - Alexandre Salomé (alexandresalome)
  - ornicar
  - stealth35 ‏ (stealth35)
  - Alexander Mols (asm89)
- - Jakub Zalas (jakubzalas)
  - Bulat Shakirzyanov (avalanche123)
  - Francis Besset (francisbesset)
  - Henrik Bjørnskov (henrikbjorn)
  - Miha Vrhovnik
- - Konstantin Kudryashov (everzet)
- - Саша Стаменковић (umpirsky)
- - Arnaud Le Blanc (arnaud-lb)
- - Florin Patan (florinpatan)
- - Eric Clemmons (ericclemmons)
- - Bilal Amarni (bamarni)
- - Henrik Westphal (snc)
  - Romain Neutron (romain)
- - Deni
+ - Konstantin Kudryashov (everzet)
+ - Saša Stamenković (umpirsky)
+ - Florin Patan (florinpatan)
+ - Bilal Amarni (bamarni)
+ - Arnaud Le Blanc (arnaud-lb)
+ - Eric Clemmons (ericclemmons)
  - Dariusz Górecki (canni)
+ - Henrik Westphal (snc)
+ - Deni
  - Marc Weistroff (futurecat)
  - Jordan Alliot (jalliot)
  - Arnout Boks (aboks)
  - Hidenori Goto (hidenorigoto)
+ - Fran Moreno (franmomu)
  - Lee McDermott
  - Brandon Turner
  - Andrej Hudec (pulzarraider)
+ - Daniel Holmes (dholmes)
  - Brikou Carré (brikou)
  - John Wards (johnwards)
- - Fran Moreno (franmomu)
+ - Grégoire Pineau (lyrixx)
  - Antoine Hérault (herzult)
- - Daniel Holmes (dholmes)
+ - Bart van den Burg (burgov)
  - Tim Nagel (merk)
  - Włodzimierz Gajda (gajdaw)
- - Bart van den Burg (burgov)
+ - Michel Weimerskirch (mweimerskirch)
  - Christian Raue
  - Michal Piotrowski (eventhorizon)
  - Toni Uebernickel (havvg)
@@ -68,8 +70,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Fabien Pennequin (fabienpennequin)
  - excelwebzone
  - woodspire
- - Michel Weimerskirch (mweimerskirch)
- - Grégoire Pineau (lyrixx)
  - Mario A. Alvarez Garcia (nomack84)
  - Douglas Greenshields (shieldo)
  - Kevin Bond (kbond)
@@ -77,20 +77,21 @@ Symfony2 is the result of the work of many people who made the code better
  - Jacob Dreesen (jdreesen)
  - Richard Shank (iampersistent)
  - Sebastian Hörl (blogsh)
+ - Gábor Egyed (1ed)
+ - David Buchmann (dbu)
  - Juti Noppornpitak
  - Robert Schönthal (digitalkaoz)
  - Felix Labrecque
  - Michał Pipa (michal.pipa)
  - Gordon Franke (gimler)
  - Daniel Gomes (danielcsgomes)
- - Gábor Egyed (1ed)
  - Tigran Azatyan (tigranazatyan)
  - Pierre Minnieur (pminnieur)
  - Larry Garfield (crell)
  - Arnaud Kleinpeter (nanocom)
- - David Buchmann (dbu)
  - Jonathan Ingram (jonathaningram)
  - Sebastiaan Stok (sstok)
+ - Jérémie Augustin (jaugustin)
  - Javier Eguiluz (javier.eguiluz)
  - Matthieu Ouellette-Vachon (maoueh)
  - Amal Raghav (kertz)
@@ -103,16 +104,19 @@ Symfony2 is the result of the work of many people who made the code better
  - Benjamin Dulau (dbenjamin)
  - Andreas Hucks (meandmymonkey)
  - Noel Guilbert (noel)
- - Jérémie Augustin (jaugustin)
+ - Hiromi Hishida (77web)
+ - Guilherme Blanco (guilhermeblanco)
  - Martin Schuhfuß (usefulthink)
  - Thomas Rabaix (rande)
  - Dennis Benkert (denderello)
  - Marcel Beerta (mazen)
+ - Albert Casademont (acasademont)
  - Matthieu Bontemps (mbontemps)
  - fivestar
  - Dominique Bongiraud
  - Leszek Prabucki (l3l0)
  - Danny Berger (dpb587)
+ - Eric GELOEN (gelo)
  - Dustin Whittle (dustinwhittle)
  - jeff
  - Clemens Tolboom
@@ -120,15 +124,17 @@ Symfony2 is the result of the work of many people who made the code better
  - Sven Paulus (subsven)
  - Xavier Perez
  - Rui Marinho (ruimarinho)
+ - Dorian Villet (gnutix)
  - Ray
  - Joseph Rouff (rouffj)
- - Albert Casademont (acasademont)
- - Guilherme Blanco (guilhermeblanco)
  - Francois Zaninotto
+ - Alexander Kotynia (olden)
  - François Zaninotto (fzaninotto)
  - Xavier Montaña Carreras (xmontana)
  - Katsuhiro OGAWA
+ - Andréia Bohner (andreia)
  - Peter Kokot (maastermedia)
+ - Terje Bråten
  - Alif Rachmawadi
  - boombatower
  - Florian Klein (docteurklein)
@@ -138,6 +144,7 @@ Symfony2 is the result of the work of many people who made the code better
  - jdhoek
  - geoffrey
  - Wodor Wodorski
+ - Elnur Abdurrakhimov (elnur)
  - Matthew Lewinski (lewinski)
  - Kim Hemsø Rasmussen
  - Dirk Pahl (dirkaholic)
@@ -145,8 +152,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Gyula Sallai (salla)
  - Michael Holm (hollo)
  - Yaroslav Kiliba
- - Andréia Bohner (andreia)
- - Eric GELOEN (gelo)
  - Sebastian Bergmann
  - arjen
  - sun (sun)
@@ -158,7 +163,9 @@ Symfony2 is the result of the work of many people who made the code better
  - Tamas Szijarto
  - Thomas Adam
  - Grégoire Passault (gregwar)
+ - Uwe Jäger (uwej711)
  - Aurelijus Valeiša (aurelijus)
+ - Ait Boudad Abdellatif (aitboudad)
  - Gustavo Piltcher
  - Stepan Tanasiychuk (stfalcon)
  - Albert Jessurum (ajessu)
@@ -170,18 +177,25 @@ Symfony2 is the result of the work of many people who made the code better
  - Michel Salib (michelsalib)
  - Jeanmonod David (jeanmonod)
  - Thomas Lallement (raziel057)
+ - Ricard Clau (ricardclau)
  - Niklas Fiekas
+ - Konstantin Myakshin (koc)
+ - Wouter De Jong (wouterj)
+ - Manuel Reinhard (sprain)
  - Francesco Levorato
+ - Michele Orselli (orso)
  - Tom Van Looy (tvlooy)
  - Brouznouf
  - Peter Kruithof (pkruithof)
+ - Dmitrii Chekaliuk
+ - Matthias Pigulla (mpdude)
  - Greg Thornton (xdissent)
  - Lars Strojny
- - Terje Bråten
  - Costin Bereveanu (schniper)
  - Markus Lanthaler (lanthaler)
  - Jérôme Vieilledent (lolautruche)
  - realmfoo
+ - Pavel Volokitin (pvolok)
  - Tobias Naumann
  - Ismael Ambrosi (iambrosi)
  - Shein Alexey
@@ -192,19 +206,20 @@ Symfony2 is the result of the work of many people who made the code better
  - Laszlo Korte
  - Alessandro Desantis (alessandro1997)
  - hubert lecorche (hlecorche)
+ - Eugene Leonovich (rybakit)
  - Oscar Cubo Medina (ocubom)
+ - Karel Souffriau
  - Christophe L. (christophelau)
  - Michael Ridgway
  - Pavel Campr (pcampr)
+ - janschoenherr
  - Emanuele Gaspari (inmarelibero)
  - Brian King
- - Ricard Clau (ricardclau)
  - Jan Schumann
  - Erin Millard
+ - Antonio J. García Lagar (ajgarlag)
  - Olivier Dolbeau (odolbeau)
- - Konstantin Myakshin (koc)
- - Elnur Abdurrakhimov (elnur)
- - Michele Orselli (orso)
+ - Robert Kiss (kepten)
  - Asier Illarramendi (doup)
  - Javier López (loalf)
  - Chris Heng (gigablah)
@@ -214,12 +229,12 @@ Symfony2 is the result of the work of many people who made the code better
  - Marcin Sikoń (marphi)
  - Miquel Rodríguez Telep (mrtorrent)
  - Filippo Tessarotto
+ - Kristen Gilden (kgilden)
  - Adam Harvey
  - Laurent Bachelier (laurentb)
  - Fabian Lange (codingfabian)
  - Yoshio HANAWA
  - Tiago Brito (blackmx)
- - Hiromi Hishida (77web)
  - hossein zolfi (ocean)
  - Kevin McBride
  - Pablo Díez (pablodip)
@@ -234,20 +249,19 @@ Symfony2 is the result of the work of many people who made the code better
  - Vicent Soria Durá (vicentgodella)
  - Erik Trapman (eriktrapman)
  - De Cock Xavier (xdecock)
- - Manuel Reinhard (sprain)
  - Matthijs van den Bos
  - Joel Wurtz
- - Uwe Jäger (uwej711)
  - Nils Adermann (naderman)
+ - Gábor Fási
  - Leevi Graham
  - Michaël Perrin (michael.perrin)
  - sasezaki
  - Loïc Chardonnet (gnusat)
+ - Xavier HAUSHERR
  - Steven Surowiec
  - Marek Kalnik (marekkalnik)
  - Chris Smith
  - Anthon Pang
- - Eugene Leonovich
  - Ryan
  - Alexander Deruwe (aderuwe)
  - Ivan Rey (ivanrey)
@@ -259,9 +273,9 @@ Symfony2 is the result of the work of many people who made the code better
  - Zach Badgett (zachbadgett)
  - Aurélien Fredouelle
  - Karoly Negyesi (chx)
- - janschoenherr
  - Thomas Tourlourat (armetiz)
  - jamogon
+ - Miha Vrhovnik
  - Geoffrey Tran (geoff)
  - Florian Rey (nervo)
  - Maks
@@ -282,6 +296,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Chris Boden (cboden)
  - Roumen Damianoff (roumen)
  - Pierre du Plessis (pierredup)
+ - Josip Kruslin
  - Åsmund Garfors
  - Jeremy David (jeremy.david)
  - Tobias Sjösten (tobiassjosten)
@@ -295,7 +310,7 @@ Symfony2 is the result of the work of many people who made the code better
  - yktd26
  - Jakub Kucharovic
  - umpirski
- - Dmitrii Chekaliuk
+ - Antoine Corcy
  - cedric lombardot (cedriclombardot)
  - John Kary (johnkary)
  - Hossein Bukhamsin
@@ -327,16 +342,20 @@ Symfony2 is the result of the work of many people who made the code better
  - Josiah (josiah)
  - John Bohn (jbohn)
  - Nicolas Schwartz (nicoschwartz)
+ - Andrew Hilobok
  - Christian Soronellas Vallespí (theunic)
  - Benjamin Grandfond (benjamin)
  - Degory Valentine
  - Krzysiek Łabuś
+ - Andrew Udvare
  - Xavier Lacot (xavier)
  - Olivier Maisonneuve
  - Iwan van Staveren (istaveren)
  - cgonzalez
  - matt foster
  - Evan S Kaufman (evanskaufman)
+ - Iker Ibarguren (ikerib)
+ - Ricardo Oliveira (ricardolotr)
  - Jayson Xu (superjavason)
  - Jan Prieser
  - James Michael DuPont
@@ -346,6 +365,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Paul Kamer (pkamer)
  - Pierre Vanliefland (pvanliefland)
  - Martin Parsiegla (spea)
+ - Luis Cordova (cordoval)
  - Philipp Kräutli (pkraeutli)
  - Stefano Sala (stefano.sala)
  - frost-nzcr4
@@ -373,10 +393,12 @@ Symfony2 is the result of the work of many people who made the code better
  - Alexander Miehe (engerim)
  - Titouan Galopin (tgalopin)
  - Don Pinkster
+ - Maksim Muruev
  - Emil Einarsson
  - Thibault Duplessis
  - Marc Abramowitz
  - Martijn Evers
+ - alexpods
  - Mathias Rohnstock (drmonty)
  - Harry Walter (haswalt)
  - Michael Roterman (wtfzdotnet)
@@ -384,7 +406,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Adán Lobato (adanlobato)
  - Mikhail Yurasov
  - Sam Williams
- - Miha Vrhovnik
  - Moritz Borgmann
  - Daniel Cestari
  - Magnus Nordlander (magnusnordlander)
@@ -392,38 +413,47 @@ Symfony2 is the result of the work of many people who made the code better
  - LOUARDI Abdeltif (ouardisoft)
  - Robert Gruendler (pulse00)
  - ragtek (ragtek)
+ - Simon Terrien (sterrien)
  - Benoît Merlet (trompette)
  - Jan Behrens
  - Raul Fraile (raulfraile)
  - sensio
  - Théophile Helleboid - chtitux
+ - The Whole Life to Learn
  - xaav
  - Mahmoud Mostafa (mahmoud)
  - Juti Noppornpitak
  - Mei Gwilym
  - ttomor
  - Sander Coolen
- - Josip Kruslin
+ - Nicolas Le Goff (nlegoff)
  - Manuele Menozzi
  - Anton Babenko (antonbabenko)
  - Irmantas Šiupšinskas (irmantas)
  - dantleech
  - Tero Alén (tero)
  - Artem (digi)
+ - dantleech
  - Vadim Tyukov (vatson)
  - Sortex
  - arjenjb
  - chispita
  - Wojciech Sznapka
+ - Máximo Cuadros (mcuadros)
  - Alex Bogomazov
  - julien.galenski
  - Sébastien Lavoie
  - Per Sandström (per)
+ - Troy McCabe
  - Ville Mattila
+ - Sescandell (sescandell)
+ - Ben Davies
+ - Max Beutel
  - Marcos Quesada (marcos_quesada)
- - Robert Kiss (kepten)
+ - Dan Finnie
  - Vitaliy Tverdokhlib (vitaliytv)
  - Martijn Evers
+ - Benjamin Paap (benjaminpaap)
  - Sergii Smertin (nfx)
  - Eddie Jaoude
  - Nerijus Arlauskas
@@ -431,7 +461,6 @@ Symfony2 is the result of the work of many people who made the code better
  - SPolischook
  - Diego Sapriza
  - Joan Cruz
- - Antoine Corcy
  - inspiran
  - Cristobal Dabed
  - matteo giachino
@@ -441,17 +470,22 @@ Symfony2 is the result of the work of many people who made the code better
  - Vincent AUBERT (vincent)
  - Benoit Garret
  - DerManoMann
+ - Roland Franssen (ro0)
  - Jochen Bayer (jocl)
  - Jeremy Bush
  - Evan Villemez
+ - Péter Buri (burci)
  - Davide Borsatto (davide.borsatto)
  - kaiwa
  - Albert Ganiev (helios-ag)
  - Neil Katin
  - Gustavo Adrian
+ - Brooks Boyd
  - Roger Webb
  - Nicolas Fabre (nfabre)
+ - Felicitus
  - Paul Matthews
+ - Philipp Strube
  - Clement Herreman (clemherreman)
  - Marco
  - Alberto Aldegheri
@@ -460,22 +494,27 @@ Symfony2 is the result of the work of many people who made the code better
  - modi
  - Sergey Yuferev
  - Richard van den Brand (ricbra)
+ - Quique Porta
  - Aharon Perkel
  - Malaney J. Hill
  - Andy Cox (ringo)
  - Sebastian Göttschkes (sgoettschkes)
+ - erikaheidi
  - Pierre Tachoire
  - Ludek Stepan
  - Balázs Benyó (duplabe)
+ - Marc Morera (mmoreram)
  - Sebastian Utz
  - Keri Henare (kerihenare)
  - Cédric Lahouste (rapotor)
  - Anthony Ferrara
  - Janusz Jablonski
  - George Giannoulopoulos
+ - Chris Wilkinson (thewilkybarkid)
  - Ilya Biryukov
  - Lance McNearney
  - Alberto Pirovano (geezmo)
+ - Gabor Toth (tgabi333)
  - Xavier Briand (xavierbriand)
  - Evan Kaufman
  - Romain Geissler
@@ -484,6 +523,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Jay Severson
  - René Kerner
  - Adrien Samson (adriensamson)
+ - Samuel Gordalina (gordalina)
  - Martin Eckhardt
  - Michael Dowling (mtdowling)
  - Robert Queck
@@ -492,18 +532,23 @@ Symfony2 is the result of the work of many people who made the code better
  - Thomas Chmielowiec (chmielot)
  - Jānis Lukss
  - fdgdfg (psampaz)
+ - Maxwell Vandervelde
  - kaywalker
  - Sebastian Ionescu
  - Simon Neidhold
  - Kevin Dew
  - James Cowgill
+ - Patrik Gmitter (patie)
  - Thomas Ploch (tploch)
  - Benjamin Bender
  - Konrad Mohrfeldt
  - Benoit Lévêque (benoit_leveque)
+ - jskvara
  - Mephistofeles
  - pscheit
+ - Ramon Kleiss (akathos)
  - Nicolas Badey (nico-b)
+ - Vitaliy Zakharov (zakharovvi)
  - Gunnar Lium
  - povilas
  - Lars Strojny
@@ -511,6 +556,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Harm van Tilborg
  - Martin Eckhardt
  - Leonid Terentyev
+ - Przemysław Piechota (kibao)
  - Tom Adam (tomadam)
  - Francisco Facioni (fran6co)
  - Paweł Wacławczyk (pwc)
@@ -518,17 +564,16 @@ Symfony2 is the result of the work of many people who made the code better
  - 2manypeople
  - Thomas Bibb
  - Josef Cech
- - Ait Boudad Abdellatif (aitboudad)
  - Andrey Esaulov (andremaha)
  - hicham ELGUAROUANI (hiiimoo)
  - Stefan Koopmanschap (skoop)
  - Ivan Kurnosov
  - stloyd
+ - Andrew Coulton
  - Chris Tickner (tickner)
  - Luis Muñoz
  - Thomas Chmielowiec
  - Christoph Nissle (derstoffel)
- - Xavier HAUSHERR
  - Benjamin Zikarsky
  - Romain Dorgueil
  - Patrick Allaert
@@ -536,6 +581,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Andy Stanberry
  - alefranz
  - alsar
+ - Mike Meier
  - efeen
  - Bob den Otter (bopp)
  - Simone Fumagalli (hpatoio)
@@ -544,18 +590,24 @@ Symfony2 is the result of the work of many people who made the code better
  - Jordi Llonch (jordillonch)
  - Cédric Dugat (ph3nol)
  - Philip Dahlstrøm (phidah)
+ - Rénald Casagraude (rcasagraude)
  - Robin Duval (robin-duval)
  - Artem Lopata (bumz)
+ - Iltar van der Berg
  - Alexey Popkov
  - Artyom Protaskin
  - Nathanael d. Noblet
  - helmer
+ - Bram Van der Sype (brammm)
+ - Diego Saint Esteben (dii3g0)
  - Julien Moulin (lizjulien)
+ - dened
  - devel
  - gedrox
  - hirocaster
  - Andrey Chernykh
  - François Pluchino
+ - Alexey Prilipko
  - Jörn Lang (j.lang)
  - Jan Marek (janmarek)
  - Dan Patrick (mdpatrick)
@@ -579,6 +631,9 @@ Symfony2 is the result of the work of many people who made the code better
  - Robert Campbell
  - Matt Lehner
  - cyrillej
+ - Alex Pods
+ - timaschew
+ - Christian Morgan
  - Haritz
  - Grummfy
  - Rowan Manning
@@ -598,10 +653,10 @@ Symfony2 is the result of the work of many people who made the code better
  - ddebree
  - Alex
  - Klaas Naaijkens
- - Alexander Kotynia
  - Rafał
  - Masao Maeda (brtriver)
  - Dave Marshall (davedevelopment)
+ - David Marín Carreño (davefx)
  - Denis Klementjev (dklementjev)
  - Kévin Dunglas (dunglas)
  - Vincent Composieux (eko)
@@ -610,7 +665,6 @@ Symfony2 is the result of the work of many people who made the code better
  - giulio de donato (liuggio)
  - Matthew Davis (mdavis1982)
  - Muriel Lusseau (metalmumu)
- - Matthias Pigulla (mpdude)
  - Pablo Monterde Perez (plebs)
  - Jimmy Leger (redpanda)
  - Baptiste Clavié (talus)
@@ -637,7 +691,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Christian Eikermann
  - Vladimir Sazhin
  - Vyacheslav Slinko
- - Maksim Muruev
  - Johannes
  - Jörg Rühl
  - patrick-mcdougle
@@ -667,7 +720,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Sergiy Sokolenko
  - dinitrol
  - Penny Leach
- - Gábor Fási
  - oscartv
  - Philipp Rieber
  - DanSync
@@ -678,6 +730,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Christian Stocker
  - dorkitude
  - tirnanog06
+ - phc
  - Besnik Br
  - sualko
  - Nicolas Roudaire
@@ -686,7 +739,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Bernd Matzner (bmatzner)
  - Chris Sedlmayr (catchamonkey)
  - Kousuke Ebihara (co3k)
- - Luis Cordova (cordoval)
  - Christoph Schaefer (cvschaefer)
  - Damien Alexandre (damienalexandre)
  - Damon Jones (damon__jones)
@@ -713,7 +765,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Ruud Kamphuis (ruudk)
  - Sarah Khalil (saro0h)
  - Sebastian Busch (sebu)
- - Simon Terrien (sterrien)
  - Markus Tacker (tacker)
  - Tyler Stroud (tystr)
  - Víctor Mateo (victormateo)
@@ -737,3 +788,4 @@ Symfony2 is the result of the work of many people who made the code better
  - Erik Saunier (snickers)
  - Tony Piper (tonypiper)
  - Vladislav Vlastovskiy (vlastv)
+ - Christian Flothmann (xabbuh)

From 7cced0a0e8b132d6e0c9830af55bdd024b0d20e7 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Mon, 6 May 2013 13:01:51 +0200
Subject: [PATCH 6/7] updated VERSION for 2.1.10

---
 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 81cd01a6a3..53fd7eedb1 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.10-DEV';
+    const VERSION         = '2.1.10';
     const VERSION_ID      = '20110';
     const MAJOR_VERSION   = '2';
     const MINOR_VERSION   = '1';
     const RELEASE_VERSION = '10';
-    const EXTRA_VERSION   = 'DEV';
+    const EXTRA_VERSION   = '';
 
     /**
      * Constructor.

From 17a214a1c78ac2d27f70c79d90effcaa3997eace Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Mon, 6 May 2013 21:45:53 +0200
Subject: [PATCH 7/7] bumped Symfony version to 2.1.11-DEV

---
 src/Symfony/Component/HttpKernel/Kernel.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 53fd7eedb1..6a2d796f62 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.10';
-    const VERSION_ID      = '20110';
+    const VERSION         = '2.1.11';
+    const VERSION_ID      = '20111';
     const MAJOR_VERSION   = '2';
     const MINOR_VERSION   = '1';
-    const RELEASE_VERSION = '10';
-    const EXTRA_VERSION   = '';
+    const RELEASE_VERSION = '11';
+    const EXTRA_VERSION   = 'DEV';
 
     /**
      * Constructor.