symfony · fabpot · Apr 18, 2014 · Apr 16, 2014
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -291,8 +291,6 @@ protected function detectMetadataDriver($dir, ContainerBuilder $container)
         if (is_dir($dir.'/'.$this->getMappingObjectDefaultName())) {
             return 'annotation';
         }
-
-        return null;
     }
 
     /**

diff --git a/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php b/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php
@@ -88,7 +88,7 @@ public function guessRequired($class, $property)
         $classMetadatas = $this->getMetadata($class);
 
         if (!$classMetadatas) {
-            return null;
+            return;
         }
 
         /* @var ClassMetadataInfo $classMetadata */
@@ -116,8 +116,6 @@ public function guessRequired($class, $property)
 
             return new ValueGuess(!$mapping['joinColumns'][0]['nullable'], Guess::HIGH_CONFIDENCE);
         }
-
-        return null;
     }
 
     /**

diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -69,8 +69,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             if (null !== $options['query_builder']) {
                 return $type->getLoader($options['em'], $options['query_builder'], $options['class']);
             }
-
-            return null;
         };
 
         $choiceList = function (Options $options) use (&$choiceListCache, $propertyAccessor) {

diff --git a/src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php b/src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php
@@ -66,8 +66,6 @@ public function getColumn($column)
         if ($this->hasColumn($column)) {
             return new Column($column, $this->map[$column]);
         }
-
-        return null;
     }
 
     /**

diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
@@ -111,7 +111,7 @@ private function getReadDomainFromArguments(\Twig_Node $arguments, $index)
         } elseif ($arguments->hasNode($index)) {
             $argument = $arguments->getNode($index);
         } else {
-            return null;
+            return;
         }
 
         return $this->getReadDomainFromNode($argument);
@@ -125,7 +125,7 @@ private function getReadDomainFromArguments(\Twig_Node $arguments, $index)
     private function getReadDomainFromNode(\Twig_Node $node = null)
     {
         if (null === $node) {
-            return null;
+            return;
         }
 
         if ($node instanceof \Twig_Node_Expression_Constant) {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
@@ -218,11 +218,11 @@ public function getUser()
         }
 
         if (null === $token = $this->container->get('security.context')->getToken()) {
-            return null;
+            return;
         }
 
         if (!is_object($user = $token->getUser())) {
-            return null;
+            return;
         }
 
         return $user;

diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php
@@ -441,7 +441,7 @@ protected function filterResponse($response)
     protected function createCrawlerFromContent($uri, $content, $type)
     {
         if (!class_exists('Symfony\Component\DomCrawler\Crawler')) {
-            return null;
+            return;
         }
 
         $crawler = new Crawler(null, $uri);

diff --git a/src/Symfony/Component/BrowserKit/CookieJar.php b/src/Symfony/Component/BrowserKit/CookieJar.php
@@ -73,7 +73,7 @@ public function get($name, $path = '/', $domain = null)
                 }
             }
 
-            return null;
+            return;
         }
 
         // avoid relying on this behavior that is mainly here for BC reasons
@@ -82,8 +82,6 @@ public function get($name, $path = '/', $domain = null)
                 return $cookies[$path][$name];
             }
         }
-
-        return null;
     }
 
     /**

diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php
@@ -186,7 +186,7 @@ public static function phpize($value)
 
         switch (true) {
             case 'null' === $lowercaseValue:
-                return null;
+                return;
             case ctype_digit($value):
                 $raw = $value;
                 $cast = intval($value);

diff --git a/src/Symfony/Component/CssSelector/Parser/TokenStream.php b/src/Symfony/Component/CssSelector/Parser/TokenStream.php
@@ -162,7 +162,7 @@ public function getNextIdentifierOrStar()
         }
 
         if ($next->isDelimiter(array('*'))) {
-            return null;
+            return;
         }
 
         throw SyntaxErrorException::unexpectedToken('identifier or "*"', $next);

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
@@ -132,7 +132,7 @@ private function getDefinitionId($id)
         }
 
         if (!$this->container->hasDefinition($id)) {
-            return null;
+            return;
         }
 
         return $id;

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php
@@ -159,7 +159,7 @@ private function validateScope(Reference $reference, Definition $definition = nu
     private function getDefinition($id)
     {
         if (!$this->container->hasDefinition($id)) {
-            return null;
+            return;
         }
 
         return $this->container->getDefinition($id);

diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -310,7 +310,7 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
                 throw new ServiceNotFoundException($id, null, null, $alternatives);
             }
 
-            return null;
+            return;
         }
 
         $this->loading[$id] = true;
@@ -325,7 +325,7 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
             }
 
             if ($e instanceof InactiveScopeException && self::EXCEPTION_ON_INVALID_REFERENCE !== $invalidBehavior) {
-                return null;
+                return;
             }
 
             throw $e;

diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -478,7 +478,7 @@ public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INV
             $definition = $this->getDefinition($id);
         } catch (InvalidArgumentException $e) {
             if (ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $invalidBehavior) {
-                return null;
+                return;
             }
 
             throw $e;
@@ -492,7 +492,7 @@ public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INV
             unset($this->loading[$id]);
 
             if ($e instanceof InactiveScopeException && self::EXCEPTION_ON_INVALID_REFERENCE !== $invalidBehavior) {
-                return null;
+                return;
             }
 
             throw $e;

diff --git a/src/Symfony/Component/DependencyInjection/Extension/Extension.php b/src/Symfony/Component/DependencyInjection/Extension/Extension.php
@@ -96,8 +96,6 @@ public function getConfiguration(array $config, ContainerBuilder $container)
                 return $configuration;
             }
         }
-
-        return null;
     }
 
     final protected function processConfiguration(ConfigurationInterface $configuration, array $configs)

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectExtension.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectExtension.php
@@ -36,6 +36,5 @@ public function getAlias()
 
     public function getConfiguration(array $config, ContainerBuilder $container)
     {
-        return null;
     }
 }
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -97,7 +97,7 @@ public function addContent($content, $type = null)
 
         // DOM only for HTML/XML content
         if (!preg_match('/(x|ht)ml/i', $type, $xmlMatches)) {
-            return null;
+            return;
         }
 
         $charset = null;
@@ -784,8 +784,6 @@ protected function getNode($position)
             }
         // @codeCoverageIgnoreStart
         }
-
-        return null;
         // @codeCoverageIgnoreEnd
     }
 

diff --git a/src/Symfony/Component/Form/AbstractExtension.php b/src/Symfony/Component/Form/AbstractExtension.php
@@ -136,7 +136,6 @@ protected function loadTypeExtensions()
      */
     protected function loadTypeGuesser()
     {
-        return null;
     }
 
     /**

diff --git a/src/Symfony/Component/Form/Button.php b/src/Symfony/Component/Form/Button.php
@@ -211,7 +211,6 @@ public function setData($modelData)
      */
     public function getData()
     {
-        return null;
     }
 
     /**
@@ -221,7 +220,6 @@ public function getData()
      */
     public function getNormData()
     {
-        return null;
     }
 
     /**
@@ -231,7 +229,6 @@ public function getNormData()
      */
     public function getViewData()
     {
-        return null;
     }
 
     /**
@@ -281,7 +278,6 @@ public function getName()
      */
     public function getPropertyPath()
     {
-        return null;
     }
 
     /**

diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
@@ -549,7 +549,6 @@ public function getFormConfig()
      */
     public function getEventDispatcher()
     {
-        return null;
     }
 
     /**
@@ -567,7 +566,6 @@ public function getName()
      */
     public function getPropertyPath()
     {
-        return null;
     }
 
     /**
@@ -647,7 +645,6 @@ public function getModelTransformers()
      */
     public function getDataMapper()
     {
-        return null;
     }
 
     /**
@@ -687,7 +684,6 @@ public function getErrorBubbling()
      */
     public function getEmptyData()
     {
-        return null;
     }
 
     /**
@@ -732,7 +728,6 @@ public function getAttribute($name, $default = null)
      */
     public function getData()
     {
-        return null;
     }
 
     /**
@@ -742,7 +737,6 @@ public function getData()
      */
     public function getDataClass()
     {
-        return null;
     }
 
     /**
@@ -762,7 +756,6 @@ public function getDataLocked()
      */
     public function getFormFactory()
     {
-        return null;
     }
 
     /**
@@ -772,7 +765,6 @@ public function getFormFactory()
      */
     public function getAction()
     {
-        return null;
     }
 
     /**
@@ -782,7 +774,6 @@ public function getAction()
      */
     public function getMethod()
     {
-        return null;
     }
 
     /**
@@ -792,7 +783,6 @@ public function getMethod()
      */
     public function getRequestHandler()
     {
-        return null;
     }
 
     /**

diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToPartsTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToPartsTransformer.php
@@ -73,7 +73,7 @@ public function reverseTransform($array)
         if (count($emptyKeys) > 0) {
             if (count($emptyKeys) === count($this->partMapping)) {
                 // All parts empty
-                return null;
+                return;
             }
 
             throw new TransformationFailedException(

diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php
@@ -50,7 +50,7 @@ public function __construct($trueValue)
     public function transform($value)
     {
         if (null === $value) {
-            return null;
+            return;
         }
 
         if (!is_bool($value)) {

diff --git a/...Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php b/...Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
@@ -106,13 +106,11 @@ public function reverseTransform($values)
                 if (isset($choices[$i])) {
                     return $choices[$i] === '' ? null : $choices[$i];
                 } elseif ($this->placeholderPresent && 'placeholder' === $i) {
-                    return null;
+                    return;
                 } else {
                     throw new TransformationFailedException(sprintf('The choice "%s" does not exist', $i));
                 }
             }
         }
-
-        return null;
     }
 }
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php
@@ -46,7 +46,7 @@ public function reverseTransform($value)
         // These are now valid ChoiceList values, so we can return null
         // right away
         if ('' === $value || null === $value) {
-            return null;
+            return;
         }
 
         $choices = $this->choiceList->getChoicesForValues(array($value));

diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
@@ -119,15 +119,15 @@ public function transform($dateTime)
     public function reverseTransform($value)
     {
         if (null === $value) {
-            return null;
+            return;
         }
 
         if (!is_array($value)) {
             throw new TransformationFailedException('Expected an array.');
         }
 
         if ('' === implode('', $value)) {
-            return null;
+            return;
         }
 
         $emptyFields = array();

diff --git a/...ny/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/...ny/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
@@ -121,7 +121,7 @@ public function reverseTransform($value)
         }
 
         if ('' === $value) {
-            return null;
+            return;
         }
 
         $timestamp = $this->getIntlDateFormatter()->parse($value);
-Original file line number
+Diff line change
@@ Expand Up @@
             if (is_dir($dir.'/'.$this->getMappingObjectDefaultName())) {
                 return 'annotation';
             }
-            return null;
         }
         /**
@@ Expand Down @@