Get rid of lots of useless conditions (#41198)

laravel · Feb 23, 2022 · 91c60ea · 91c60ea
1 parent a8c3b35
commit 91c60ea
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 14 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php b/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php
@@ -288,7 +288,7 @@ protected function addCastAttributesToArray(array $attributes, array $mutatedAtt
                 $attributes[$key] = $attributes[$key]->format(explode(':', $value, 2)[1]);
             }
 
-            if ($attributes[$key] && $attributes[$key] instanceof DateTimeInterface &&
+            if ($attributes[$key] instanceof DateTimeInterface &&
                 $this->isClassCastable($key)) {
                 $attributes[$key] = $this->serializeDate($attributes[$key]);
             }
@@ -581,7 +581,7 @@ public function hasAttributeMutator($key)
 
         $returnType = (new ReflectionMethod($this, $method))->getReturnType();
 
-        return static::$attributeMutatorCache[get_class($this)][$key] = $returnType &&
+        return static::$attributeMutatorCache[get_class($this)][$key] =
                     $returnType instanceof ReflectionNamedType &&
                     $returnType->getName() === Attribute::class;
     }
@@ -979,7 +979,7 @@ public function hasAttributeSetMutator($key)
 
         $returnType = (new ReflectionMethod($this, $method))->getReturnType();
 
-        return static::$setAttributeMutatorCache[$class][$key] = $returnType &&
+        return static::$setAttributeMutatorCache[$class][$key] =
                     $returnType instanceof ReflectionNamedType &&
                     $returnType->getName() === Attribute::class &&
                     is_callable($this->{$method}()->set);
@@ -1942,7 +1942,7 @@ public function originalIsEquivalent($key)
             return $this->castAttribute($key, $attribute) ==
                 $this->castAttribute($key, $original);
         } elseif ($this->hasCast($key, ['real', 'float', 'double'])) {
-            if (($attribute === null && $original !== null) || ($attribute !== null && $original === null)) {
+            if ($original === null) {
                 return false;
             }
 
@@ -2096,8 +2096,7 @@ protected static function getAttributeMarkedMutatorMethods($class)
         return collect((new ReflectionClass($instance))->getMethods())->filter(function ($method) use ($instance) {
             $returnType = $method->getReturnType();
 
-            if ($returnType &&
-                $returnType instanceof ReflectionNamedType &&
+            if ($returnType instanceof ReflectionNamedType &&
                 $returnType->getName() === Attribute::class) {
                 $method->setAccessible(true);
 

diff --git a/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php b/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php
@@ -1150,7 +1150,7 @@ protected function modifyComment(Blueprint $blueprint, Fluent $column)
      */
     protected function modifySrid(Blueprint $blueprint, Fluent $column)
     {
-        if (! is_null($column->srid) && is_int($column->srid) && $column->srid > 0) {
+        if (is_int($column->srid) && $column->srid > 0) {
             return ' srid '.$column->srid;
         }
     }

diff --git a/src/Illuminate/Foundation/Http/Middleware/ConvertEmptyStringsToNull.php b/src/Illuminate/Foundation/Http/Middleware/ConvertEmptyStringsToNull.php
@@ -40,7 +40,7 @@ public function handle($request, Closure $next)
      */
     protected function transform($key, $value)
     {
-        return is_string($value) && $value === '' ? null : $value;
+        return $value === '' ? null : $value;
     }
 
     /**

diff --git a/src/Illuminate/Http/Request.php b/src/Illuminate/Http/Request.php
@@ -407,9 +407,7 @@ public static function createFrom(self $from, $to = null)
     {
         $request = $to ?: new static;
 
-        $files = $from->files->all();
-
-        $files = is_array($files) ? array_filter($files) : $files;
+        $files = array_filter($from->files->all());
 
         $request->initialize(
             $from->query->all(),

diff --git a/src/Illuminate/Pagination/Cursor.php b/src/Illuminate/Pagination/Cursor.php
@@ -113,7 +113,7 @@ public function encode()
      */
     public static function fromEncoded($encodedString)
     {
-        if (is_null($encodedString) || ! is_string($encodedString)) {
+        if (! is_string($encodedString)) {
             return null;
         }
 

diff --git a/src/Illuminate/Session/Store.php b/src/Illuminate/Session/Store.php
@@ -110,7 +110,7 @@ protected function readFromHandler()
                 $data = @unserialize($this->prepareForUnserialize($data));
             }
 
-            if ($data !== false && ! is_null($data) && is_array($data)) {
+            if ($data !== false && is_array($data)) {
                 return $data;
             }
         }

diff --git a/src/Illuminate/View/Compilers/Concerns/CompilesComponents.php b/src/Illuminate/View/Compilers/Concerns/CompilesComponents.php
@@ -185,7 +185,7 @@ protected function compileAware($expression)
      */
     public static function sanitizeComponentAttribute($value)
     {
-        if (is_object($value) && $value instanceof CanBeEscapedWhenCastToString) {
+        if ($value instanceof CanBeEscapedWhenCastToString) {
             return $value->escapeWhenCastingToString();
         }