[2.3] More cs fixes

Author: GrahamCampbell

src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php

@@ -361,7 +361,7 @@ public function testHandleClosureValidationGroups()
         $object = $this->getMock('\stdClass');
         $options = array('validation_groups' => function (FormInterface $form) {
             return array('group1', 'group2');
-        },);
+        });
         $form = $this->getBuilder('name', '\stdClass', $options)
             ->setData($object)
             ->getForm();

src/Symfony/Component/Intl/ResourceBundle/CurrencyBundle.php

@@ -52,7 +52,7 @@ public function getCurrencySymbol($currency, $displayLocale = null)
         try {
             return $this->getSymbol($currency, $displayLocale);
         } catch (MissingResourceException $e) {
-            return null;
+            return;
         }
     }
 
@@ -64,7 +64,7 @@ public function getCurrencyName($currency, $displayLocale = null)
         try {
             return $this->getName($currency, $displayLocale);
         } catch (MissingResourceException $e) {
-            return null;
+            return;
         }
     }
 
@@ -76,7 +76,7 @@ public function getCurrencyNames($displayLocale = null)
         try {
             return $this->getNames($displayLocale);
         } catch (MissingResourceException $e) {
-            return null;
+            return;
         }
     }
 
@@ -88,7 +88,7 @@ public function getFractionDigits($currency)
         try {
             return parent::getFractionDigits($currency);
         } catch (MissingResourceException $e) {
-            return null;
+            return;
         }
     }
 
@@ -100,7 +100,7 @@ public function getRoundingIncrement($currency)
         try {
             return parent::getRoundingIncrement($currency);
         } catch (MissingResourceException $e) {
-            return null;
+            return;
         }
     }
 
@@ -112,7 +112,7 @@ public function getLocales()
         try {
             return $this->localeProvider->getLocales();
         } catch (MissingResourceException $e) {
-            return null;
+            return;
         }
     }
 }

src/Symfony/Component/Intl/ResourceBundle/LanguageBundle.php

@@ -68,7 +68,7 @@ public function getLanguageName($language, $region = null, $displayLocale = null
         try {
             return $this->getName($language, $displayLocale);
         } catch (MissingResourceException $e) {
-            return null;
+            return;
         }
     }
 
@@ -80,7 +80,7 @@ public function getLanguageNames($displayLocale = null)
         try {
             return $this->getNames($displayLocale);
         } catch (MissingResourceException $e) {
-            return null;
+            return;
         }
     }
 
@@ -92,7 +92,7 @@ public function getScriptName($script, $language = null, $displayLocale = null)
         try {
             return $this->scriptProvider->getName($script, $displayLocale);
         } catch (MissingResourceException $e) {
-            return null;
+            return;
         }
     }
 
@@ -104,7 +104,7 @@ public function getScriptNames($displayLocale = null)
         try {
             return $this->scriptProvider->getNames($displayLocale);
         } catch (MissingResourceException $e) {
-            return null;
+            return;
         }
     }
 
@@ -116,7 +116,7 @@ public function getLocales()
         try {
             return $this->localeProvider->getLocales();
         } catch (MissingResourceException $e) {
-            return null;
+            return;
         }
     }
 }

src/Symfony/Component/Intl/ResourceBundle/LocaleBundle.php

@@ -31,7 +31,7 @@ public function getLocales()
         try {
             return parent::getLocales();
         } catch (MissingResourceException $e) {
-            return null;
+            return;
         }
     }
 
@@ -43,7 +43,7 @@ public function getLocaleName($locale, $displayLocale = null)
         try {
             return $this->getName($locale, $displayLocale);
         } catch (MissingResourceException $e) {
-            return null;
+            return;
         }
     }
 
@@ -55,7 +55,7 @@ public function getLocaleNames($displayLocale = null)
         try {
             return $this->getNames($displayLocale);
         } catch (MissingResourceException $e) {
-            return null;
+            return;
         }
     }
 }

src/Symfony/Component/Intl/ResourceBundle/RegionBundle.php

@@ -52,7 +52,7 @@ public function getCountryName($country, $displayLocale = null)
         try {
             return $this->getName($country, $displayLocale);
         } catch (MissingResourceException $e) {
-            return null;
+            return;
         }
     }
 
@@ -64,7 +64,7 @@ public function getCountryNames($displayLocale = null)
         try {
             return $this->getNames($displayLocale);
         } catch (MissingResourceException $e) {
-            return null;
+            return;
         }
     }
 
@@ -76,7 +76,7 @@ public function getLocales()
         try {
             return $this->localeProvider->getLocales();
         } catch (MissingResourceException $e) {
-            return null;
+            return;
         }
     }
 }

src/Symfony/Component/Intl/Resources/bin/update-data.php

@@ -76,7 +76,6 @@
         ? $urlVersion
         : $maxVersion;
 
-
     echo "  $urlVersion\n";
 }
 

src/Symfony/Component/Stopwatch/Tests/StopwatchTest.php

@@ -56,13 +56,13 @@ public function testIsNotStartedEvent()
 
         $events = new \ReflectionProperty('Symfony\Component\Stopwatch\Section', 'events');
         $events->setAccessible(true);
-        $events->setValue(
-            end($section),
-            array(
-                'foo' => $this->getMockBuilder('Symfony\Component\Stopwatch\StopwatchEvent')
-                    ->setConstructorArgs(array(microtime(true) * 1000))
-                    ->getMock())
-        );
+
+        $stopwatchMockEvent = $this->getMockBuilder('Symfony\Component\Stopwatch\StopwatchEvent')
+            ->setConstructorArgs(array(microtime(true) * 1000))
+            ->getMock()
+        ;
+
+        $events->setValue(end($section), array('foo' => $stopwatchMockEvent));
 
         $this->assertFalse($stopwatch->isStarted('foo'));
     }

src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php

@@ -89,7 +89,7 @@ public function testValidChoiceCallbackClosure()
     {
         $constraint = new Choice(array('callback' => function () {
             return array('foo', 'bar');
-        }, ));
+        }));
 
         $this->validator->validate('bar', $constraint);