Merge branch '2.3' into 2.5

fabpot · fabpot · commit 94d4e28490ea · 2014-12-04T09:55:19.000+01:00
* 2.3:
  [2.3] More cs fixes
  Removed unused imports
  CS fixes
  bumped Symfony version to 2.3.24
  updated VERSION for 2.3.23
  update CONTRIBUTORS for 2.3.23
  updated CHANGELOG for 2.3.23

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php
	src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
	src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
diff --git a/Tests/Constraints/ChoiceValidatorTest.php b/Tests/Constraints/ChoiceValidatorTest.php
@@ -95,7 +95,7 @@ public function testValidChoiceCallbackClosure()
     {
         $constraint = new Choice(array('callback' => function () {
             return array('foo', 'bar');
-        }, ));
+        }));
 
         $this->validator->validate('bar', $constraint);
 

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function testValidChoiceCallbackClosure()`
`95`	`95`	`{`
`96`	`96`	`$constraint = new Choice(array('callback' => function () {`
`97`	`97`	`return array('foo', 'bar');`
`98`		`- }, ));`
	`98`	`+ }));`
`99`	`99`
`100`	`100`	`$this->validator->validate('bar', $constraint);`
`101`	`101`