Sorry, Yoda

elesh90 · Nov 19, 2017 · 3329815 · 3329815
1 parent ec8792c
commit 3329815
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git a/src/Form/Validator/Constraints/ExistingEntity.php b/src/Form/Validator/Constraints/ExistingEntity.php
@@ -31,7 +31,7 @@ class ExistingEntity extends Constraint
      */
     public function __construct($options = null)
     {
-        if (null !== $options && !is_array($options)) {
+        if ($options !== null && !is_array($options)) {
             $options = [
                 'className'  => $options,
                 'fieldNames' => $options,

diff --git a/src/Helpers/Html.php b/src/Helpers/Html.php
@@ -30,7 +30,7 @@ public static function trimText($str, $desiredLength, $hellip = true, $cutOffCap
             $nextChar = mb_substr($str, $newLength, 1);
             $str = mb_substr($str, 0, $newLength);
             if ($nextChar != ' ') {
-                if (false !== ($lastSpace = mb_strrpos($str, ' '))) {
+                if (($lastSpace = mb_strrpos($str, ' ')) !== false) {
                     // Check for to long cutoff
                     if (mb_strlen($str) - $lastSpace >= $cutOffCap) {
                         // Trim the ellipse, as we do not want a space now

diff --git a/src/Logger/Handler/RecordChangeHandler.php b/src/Logger/Handler/RecordChangeHandler.php
@@ -60,7 +60,7 @@ public function handle(array $record)
             // Nothing.
         }
 
-        return false === $this->bubble;
+        return $this->bubble === false;
     }
 
     protected function write(array $record)

diff --git a/src/Logger/Handler/SystemHandler.php b/src/Logger/Handler/SystemHandler.php
@@ -59,7 +59,7 @@ public function handle(array $record)
             // Nothing.
         }
 
-        return false === $this->bubble;
+        return $this->bubble === false;
     }
 
     protected function write(array $record)

diff --git a/src/Nut/Helper/QuestionHelper.php b/src/Nut/Helper/QuestionHelper.php
@@ -133,7 +133,7 @@ protected function onRead($data)
      */
     private function hasSttyAvailable()
     {
-        if (null !== self::$stty) {
+        if (self::$stty !== null) {
             return self::$stty;
         }
 

diff --git a/src/Nut/Style/NutStyle.php b/src/Nut/Style/NutStyle.php
@@ -117,7 +117,7 @@ public function confirmThenRemove($question, $default = true)
      */
     public function choiceThenRemove($question, array $choices, $default = null)
     {
-        if (null !== $default) {
+        if ($default !== null) {
             $values = array_flip($choices);
             $default = $values[$default];
         }
@@ -166,7 +166,7 @@ public function captureUserInput($input)
      */
     public function isQuiet()
     {
-        return self::VERBOSITY_QUIET === $this->getVerbosity();
+        return $this->getVerbosity() === self::VERBOSITY_QUIET;
     }
 
     /**

diff --git a/src/Storage/Field/Type/FieldTypeBase.php b/src/Storage/Field/Type/FieldTypeBase.php
@@ -102,7 +102,7 @@ public function persist(QuerySet $queries, $entity)
 
         $type = $this->getStorageTypeObject();
 
-        if (null !== $value) {
+        if ($value !== null) {
             $value = $type->convertToDatabaseValue($value, $this->getPlatform());
         } elseif (isset($this->mapping['default'])) {
             $value = $this->mapping['default'];

diff --git a/src/Storage/Field/Type/TemplateFieldsType.php b/src/Storage/Field/Type/TemplateFieldsType.php
@@ -84,7 +84,7 @@ public function persist(QuerySet $queries, $entity)
 
         $type = $this->getStorageType();
 
-        if (null !== $value) {
+        if ($value !== null) {
             $metadata = $this->buildMetadata($entity);
             $value = $this->serialize($value, $metadata);
             $value = $type->convertToDatabaseValue($value, $this->getPlatform());

diff --git a/src/Storage/Mapping/MetadataDriver.php b/src/Storage/Mapping/MetadataDriver.php
@@ -539,7 +539,7 @@ public function setContentFields($contentKey, $className, $table)
     public function loadMetadataForClass($className, ClassMetadata $metadata = null)
     {
         $fullClassName = null;
-        if (null === $metadata) {
+        if ($metadata === null) {
             $fullClassName = $this->resolveClassName($className);
             $metadata = new BoltClassMetadata($fullClassName, $this->namingStrategy);
         }

diff --git a/src/Storage/Repository.php b/src/Storage/Repository.php
@@ -74,7 +74,7 @@ public function create($params = [], ClassMetadata $metadata = null)
      */
     public function createQueryBuilder($alias = null)
     {
-        if (null === $alias) {
+        if ($alias === null) {
             $alias = $this->getAlias();
         }
 

diff --git a/src/Twig/SwitchNode.php b/src/Twig/SwitchNode.php
@@ -55,7 +55,7 @@ public function compile(Compiler $compiler)
             ;
         }
 
-        if ($this->hasNode('default') && null !== $this->getNode('default')) {
+        if ($this->hasNode('default') && $this->getNode('default') !== null) {
             $compiler
                 ->write("default:\n")
                 ->indent()

diff --git a/tests/phpunit/unit/BoltUnitTest.php b/tests/phpunit/unit/BoltUnitTest.php
@@ -140,7 +140,7 @@ protected function addDefaultUser(Application $app)
     {
         // Check if default user exists before adding
         $existingUser = $app['users']->getUser('admin');
-        if (false !== $existingUser) {
+        if ($existingUser !== false) {
             return $existingUser;
         }
 

diff --git a/tests/phpunit/unit/Menu/MenuBuilderTest.php b/tests/phpunit/unit/Menu/MenuBuilderTest.php
@@ -198,7 +198,7 @@ public function testpopulateItemFromRecord($expected, $content, $item, $link)
         $app['request'] = Request::createFromGlobals();
 
         $contentMock = null;
-        if (false !== $content) {
+        if ($content !== false) {
             $contentMock = $this->getMockBuilder(Content::class)
                 ->setMethods(['getContent', 'link'])
                 ->setConstructorArgs([$app])