From be04c5000c1bc7865530228a25b4c57276b550b5 Mon Sep 17 00:00:00 2001
From: WouterJ <waldio.webdesign@gmail.com>
Date: Sat, 26 Jul 2014 11:54:23 +0200
Subject: [PATCH] Unify null comparisons

---
 .../Doctrine/ContainerAwareEventManager.php      |  2 +-
 .../DependencyInjection/Configuration.php        |  2 +-
 .../views/Form/choice_widget_collapsed.html.php  |  2 +-
 .../Bundle/FrameworkBundle/Test/WebTestCase.php  |  4 ++--
 .../Resources/views/Collector/time.html.twig     |  2 +-
 .../Resources/views/Profiler/layout.html.twig    | 16 ++++++++--------
 .../Tests/Definition/Builder/ExprBuilderTest.php |  2 +-
 .../Finder/Tests/Iterator/MockSplFileInfo.php    |  6 +++---
 .../ViolationMapper/ViolationPathTest.php        |  2 +-
 .../RememberMe/AbstractRememberMeServices.php    |  2 +-
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
index ac21ece6e0..5f6902d4a4 100644
--- a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
+++ b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
@@ -49,7 +49,7 @@ class ContainerAwareEventManager extends EventManager
     public function dispatchEvent($eventName, EventArgs $eventArgs = null)
     {
         if (isset($this->listeners[$eventName])) {
-            $eventArgs = $eventArgs === null ? EventArgs::getEmptyInstance() : $eventArgs;
+            $eventArgs = null === $eventArgs ? EventArgs::getEmptyInstance() : $eventArgs;
 
             $initialized = isset($this->initialized[$eventName]);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 852f8ba424..fc6a6ade56 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -41,7 +41,7 @@ class Configuration implements ConfigurationInterface
                 ->end()
                 ->arrayNode('trusted_proxies')
                     ->beforeNormalization()
-                        ->ifTrue(function ($v) { return !is_array($v) && !is_null($v); })
+                        ->ifTrue(function ($v) { return !is_array($v) && null !== $v; })
                         ->then(function ($v) { return is_bool($v) ? array() : preg_split('/\s*,\s*/', $v); })
                     ->end()
                     ->prototype('scalar')
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
index 345be23b03..be78e46e8c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
@@ -1,5 +1,5 @@
 <select
-    <?php if ($required && $empty_value === null && $empty_value_in_choices === false && $multiple === false):
+    <?php if ($required && null === $empty_value && $empty_value_in_choices === false && $multiple === false):
         $required = false;
     endif; ?>
     <?php echo $view['form']->block($form, 'widget_attributes', array(
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
index fcaf935a54..e282711a5b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
@@ -69,14 +69,14 @@ abstract class WebTestCase extends \PHPUnit_Framework_TestCase
         }
 
         $dir = static::getPhpUnitCliConfigArgument();
-        if ($dir === null &&
+        if (null === $dir &&
             (is_file(getcwd().DIRECTORY_SEPARATOR.'phpunit.xml') ||
             is_file(getcwd().DIRECTORY_SEPARATOR.'phpunit.xml.dist'))) {
             $dir = getcwd();
         }
 
         // Can't continue
-        if ($dir === null) {
+        if (null === $dir) {
             throw new \RuntimeException('Unable to guess the Kernel directory.');
         }
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
index 3de0473774..01850b380c 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
@@ -370,7 +370,7 @@
             this.getThreshold = function() {
                 var threshold = Sfjs.getPreference(_storagePrefix + 'threshold');
 
-                if (threshold === null) {
+                if (null === threshold) {
                     return _threshold;
                 }
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
index 4cbecc0499..2933564de8 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
@@ -68,20 +68,20 @@
                 menu = document.getElementById('navigation'), savedState = Sfjs.getPreference('menu/displayState'),
                 displayState, elem, className;
 
-            if (savedState == null) {
+            if (null === savedState) {
                 savedState = 'block';
             }
 
-            displayState = state || (savedState == 'block' ? 'none' : 'block');
+            displayState = state || ('block' === savedState ? 'none' : 'block');
 
-            if (typeof doSave === 'undefined') {
+            if ('undefined' === typeof doSave) {
                 doSave = true;
             }
 
             document.getElementById('searchBar').style.display = displayState;
             document.getElementById('adminBar').style.display = displayState;
 
-            if (displayState == 'block') {
+            if ('block' === displayState) {
                 Sfjs.removeClass(menu, 'collapsed-menu');
                 Sfjs.removeClass(menu.parentNode.parentNode, 'collapsed-menu-parents');
 
@@ -107,7 +107,7 @@
         }
 
         window.setTimeout(function() {
-            if (document.getElementById('menu-profiler') == null) {
+            if (null === document.getElementById('menu-profiler')) {
                 return;
             }
 
@@ -119,12 +119,12 @@
             }
 
             for (elem in menuItems) {
-                if (typeof(menuItems[elem].children) != 'undefined' &&
+                if (typeof(menuItems[elem].children) !== 'undefined' &&
                     menuItems[elem].children.length > 0) {
                     child = menuItems[elem].children[0]
 
-                    if (child.getAttribute('title') == '' ||
-                        child.getAttribute('title') == null) {
+                    if ('' === child.getAttribute('title') ||
+                        null === child.getAttribute('title')) {
                         value = child.text.replace(/^\s+/g, '').split('\n')[0].replace(/\s+$/g, '');
                         child.setAttribute('title', value);
                     }
diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php
index fa6fce5e6b..c18c696c45 100644
--- a/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php
@@ -182,7 +182,7 @@ class ExprBuilderTest extends \PHPUnit_Framework_TestCase
             ->end()
             ->end()
             ->buildTree()
-            ->finalize($config === null ? array('key'=>'value') : $config)
+            ->finalize(null === $config ? array('key'=>'value') : $config)
         ;
     }
 
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php b/src/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php
index a50e4c9fcc..c8608bf2d3 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php
@@ -50,7 +50,7 @@ class MockSplFileInfo extends \SplFileInfo
 
     public function isFile()
     {
-        if ($this->type === null) {
+        if (null === $this->type) {
             return preg_match('/file/', $this->getFilename());
         };
 
@@ -59,7 +59,7 @@ class MockSplFileInfo extends \SplFileInfo
 
     public function isDir()
     {
-        if ($this->type === null) {
+        if (null === $this->type) {
             return preg_match('/directory/', $this->getFilename());
         }
 
@@ -68,7 +68,7 @@ class MockSplFileInfo extends \SplFileInfo
 
     public function isReadable()
     {
-        if ($this->mode === null) {
+        if (null === $this->mode) {
             return preg_match('/r\+/', $this->getFilename());
         }
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationPathTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationPathTest.php
index 02df8f43eb..2dab4ffad7 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationPathTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationPathTest.php
@@ -126,7 +126,7 @@ class ViolationPathTest extends \PHPUnit_Framework_TestCase
     public function testGetParent($violationPath, $parentPath)
     {
         $path = new ViolationPath($violationPath);
-        $parent = $parentPath === null ? null : new ViolationPath($parentPath);
+        $parent = null === $parentPath ? null : new ViolationPath($parentPath);
 
         $this->assertEquals($parent, $path->getParent());
     }
diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
index be842088e9..b868dae9b7 100644
--- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
+++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
@@ -303,7 +303,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
 
         $parameter = $request->get($this->options['remember_me_parameter'], null, true);
 
-        if ($parameter === null && null !== $this->logger) {
+        if (null === $parameter && null !== $this->logger) {
             $this->logger->debug(sprintf('Did not send remember-me cookie (remember-me parameter "%s" was not sent).', $this->options['remember_me_parameter']));
         }