zendframework · michalbundyra · Aug 16, 2019 · Aug 16, 2019 · Aug 16, 2019 · Aug 16, 2019
diff --git a/src/AbstractDateDropdown.php b/src/AbstractDateDropdown.php
@@ -105,13 +105,13 @@ public function filter($value)
         if ($this->isNullOnEmpty()
             && array_reduce($value, __CLASS__ . '::reduce', false)
         ) {
-            return;
+            return null;
         }
 
         if ($this->isNullOnAllEmpty()
             && array_reduce($value, __CLASS__ . '::reduce', true)
         ) {
-            return;
+            return null;
         }
 
         $this->filterable($value);

diff --git a/src/AbstractUnicode.php b/src/AbstractUnicode.php
@@ -31,7 +31,7 @@ public function setEncoding($encoding = null)
 
             $encoding    = strtolower($encoding);
             $mbEncodings = array_map('strtolower', mb_list_encodings());
-            if (! in_array($encoding, $mbEncodings)) {
+            if (! in_array($encoding, $mbEncodings, true)) {
                 throw new Exception\InvalidArgumentException(sprintf(
                     "Encoding '%s' is not supported by mbstring extension",
                     $encoding

diff --git a/src/Boolean.php b/src/Boolean.php
@@ -14,17 +14,17 @@
 
 class Boolean extends AbstractFilter
 {
-    const TYPE_BOOLEAN        = 1;
-    const TYPE_INTEGER        = 2;
-    const TYPE_FLOAT          = 4;
-    const TYPE_STRING         = 8;
-    const TYPE_ZERO_STRING    = 16;
-    const TYPE_EMPTY_ARRAY    = 32;
-    const TYPE_NULL           = 64;
-    const TYPE_PHP            = 127;
-    const TYPE_FALSE_STRING   = 128;
-    const TYPE_LOCALIZED      = 256;
-    const TYPE_ALL            = 511;
+    const TYPE_BOOLEAN      = 1;
+    const TYPE_INTEGER      = 2;
+    const TYPE_FLOAT        = 4;
+    const TYPE_STRING       = 8;
+    const TYPE_ZERO_STRING  = 16;
+    const TYPE_EMPTY_ARRAY  = 32;
+    const TYPE_NULL         = 64;
+    const TYPE_PHP          = 127;
+    const TYPE_FALSE_STRING = 128;
+    const TYPE_LOCALIZED    = 256;
+    const TYPE_ALL          = 511;
 
     /**
      * @var array
@@ -99,14 +99,14 @@ public function setType($type = null)
             foreach ($type as $value) {
                 if (is_int($value)) {
                     $detected |= $value;
-                } elseif (in_array($value, $this->constants)) {
-                    $detected |= array_search($value, $this->constants);
+                } elseif (($found = array_search($value, $this->constants, true)) !== false) {
+                    $detected |= $found;
                 }
             }
 
             $type = $detected;
-        } elseif (is_string($type) && in_array($type, $this->constants)) {
-            $type = array_search($type, $this->constants);
+        } elseif (is_string($type) && ($found = array_search($type, $this->constants, true)) !== false) {
+            $type = $found;
         }
 
         if (! is_int($type) || ($type < 0) || ($type > self::TYPE_ALL)) {
@@ -190,8 +190,8 @@ public function getTranslations()
      *
      * Returns a boolean representation of $value
      *
-     * @param  string $value
-     * @return string
+     * @param  null|array|bool|float|int|string $value
+     * @return bool|mixed
      */
     public function filter($value)
     {
@@ -209,11 +209,11 @@ public function filter($value)
 
         // FALSE_STRING ('false')
         if ($type & self::TYPE_FALSE_STRING) {
-            if (is_string($value) && (strtolower($value) == 'false')) {
+            if (is_string($value) && strtolower($value) === 'false') {
                 return false;
             }
 
-            if (! $casting && is_string($value) && (strtolower($value) == 'true')) {
+            if (! $casting && is_string($value) && strtolower($value) === 'true') {
                 return true;
             }
         }
@@ -227,47 +227,47 @@ public function filter($value)
 
         // EMPTY_ARRAY (array())
         if ($type & self::TYPE_EMPTY_ARRAY) {
-            if (is_array($value) && ($value == [])) {
+            if (is_array($value) && $value === []) {
                 return false;
             }
         }
 
         // ZERO_STRING ('0')
         if ($type & self::TYPE_ZERO_STRING) {
-            if (is_string($value) && ($value == '0')) {
+            if (is_string($value) && $value === '0') {
                 return false;
             }
 
-            if (! $casting && (is_string($value)) && ($value == '1')) {
+            if (! $casting && is_string($value) && $value === '1') {
                 return true;
             }
         }
 
         // STRING ('')
         if ($type & self::TYPE_STRING) {
-            if (is_string($value) && ($value == '')) {
+            if (is_string($value) && $value === '') {
                 return false;
             }
         }
 
         // FLOAT (0.0)
         if ($type & self::TYPE_FLOAT) {
-            if (is_float($value) && ($value == 0.0)) {
+            if (is_float($value) && $value === 0.0) {
                 return false;
             }
 
-            if (! $casting && is_float($value) && ($value == 1.0)) {
+            if (! $casting && is_float($value) && $value === 1.0) {
                 return true;
             }
         }
 
         // INTEGER (0)
         if ($type & self::TYPE_INTEGER) {
-            if (is_int($value) && ($value == 0)) {
+            if (is_int($value) && $value === 0) {
                 return false;
             }
 
-            if (! $casting && is_int($value) && ($value == 1)) {
+            if (! $casting && is_int($value) && $value === 1) {
                 return true;
             }
         }

diff --git a/src/Callback.php b/src/Callback.php
@@ -22,7 +22,7 @@ class Callback extends AbstractFilter
     ];
 
     /**
-     * @param callable|array|Traversable $callbackOrOptions
+     * @param callable|array|string|Traversable $callbackOrOptions
      * @param array $callbackParams
      */
     public function __construct($callbackOrOptions = [], $callbackParams = [])

diff --git a/src/Compress.php b/src/Compress.php
@@ -64,7 +64,7 @@ public function setOptions($options)
         }
 
         foreach ($options as $key => $value) {
-            if ($key == 'options') {
+            if ($key === 'options') {
                 $key = 'adapterOptions';
             }
             $method = 'set' . ucfirst($key);

diff --git a/src/Compress/AbstractCompressionAlgorithm.php b/src/Compress/AbstractCompressionAlgorithm.php
@@ -41,7 +41,7 @@ public function __construct($options = null)
     /**
      * Returns one or all set options
      *
-     * @param  string $option (Optional) Option to return
+     * @param  string|null $option Option to return
      * @return mixed
      */
     public function getOptions($option = null)
@@ -50,8 +50,8 @@ public function getOptions($option = null)
             return $this->options;
         }
 
-        if (! array_key_exists($option, $this->options)) {
-            return;
+        if (! isset($this->options[$option])) {
+            return null;
         }
 
         return $this->options[$option];

diff --git a/src/Compress/Gz.php b/src/Compress/Gz.php
@@ -92,7 +92,7 @@ public function getMode()
      */
     public function setMode($mode)
     {
-        if (($mode != 'compress') && ($mode != 'deflate')) {
+        if ($mode !== 'compress' && $mode !== 'deflate') {
             throw new Exception\InvalidArgumentException('Given compression mode not supported');
         }
 
@@ -141,7 +141,7 @@ public function compress($content)
             gzwrite($file, $content);
             gzclose($file);
             $compressed = true;
-        } elseif ($this->options['mode'] == 'deflate') {
+        } elseif ($this->options['mode'] === 'deflate') {
             $compressed = gzdeflate($content, $this->getLevel());
         } else {
             $compressed = gzcompress($content, $this->getLevel());
@@ -172,21 +172,21 @@ public function decompress($content)
         }
 
         if (file_exists($archive)) {
-            $handler = fopen($archive, "rb");
+            $handler = fopen($archive, 'rb');
             if (! $handler) {
                 throw new Exception\RuntimeException("Error opening the archive '" . $archive . "'");
             }
 
             fseek($handler, -4, SEEK_END);
             $packet = fread($handler, 4);
-            $bytes  = unpack("V", $packet);
+            $bytes  = unpack('V', $packet);
             $size   = end($bytes);
             fclose($handler);
 
             $file       = gzopen($archive, 'r');
             $compressed = gzread($file, $size);
             gzclose($file);
-        } elseif ($mode == 'deflate') {
+        } elseif ($mode === 'deflate') {
             $compressed = gzinflate($content);
         } else {
             $compressed = gzuncompress($content);

diff --git a/src/Compress/Rar.php b/src/Compress/Rar.php
@@ -166,7 +166,7 @@ public function compress($content)
         $options = $this->getOptions();
         unset($options['callback']);
 
-        $result = call_user_func($callback, $options, $content);
+        $result = $callback($options, $content);
         if ($result !== true) {
             throw new Exception\RuntimeException('Error compressing the RAR Archive');
         }
@@ -197,7 +197,7 @@ public function decompress($content)
         }
 
         if (! $archive) {
-            throw new Exception\RuntimeException("Error opening the RAR Archive");
+            throw new Exception\RuntimeException('Error opening the RAR Archive');
         }
 
         $target = $this->getTarget();

diff --git a/src/Compress/Tar.php b/src/Compress/Tar.php
@@ -22,16 +22,16 @@ class Tar extends AbstractCompressionAlgorithm
     /**
      * Compression Options
      * array(
-     *     'archive'  => Archive to use
-     *     'target'   => Target to write the files to
+     *     'archive' => Archive to use
+     *     'target'  => Target to write the files to
      * )
      *
      * @var array
      */
     protected $options = [
-        'archive'  => null,
-        'target'   => '.',
-        'mode'     => null,
+        'archive' => null,
+        'target'  => '.',
+        'mode'    => null,
     ];
 
     /**
@@ -128,15 +128,15 @@ public function getMode()
     public function setMode($mode)
     {
         $mode = strtolower($mode);
-        if (($mode != 'bz2') && ($mode != 'gz')) {
+        if ($mode !== 'bz2' && $mode !== 'gz') {
             throw new Exception\InvalidArgumentException("The mode '$mode' is unknown");
         }
 
-        if (($mode == 'bz2') && (! extension_loaded('bz2'))) {
+        if ($mode === 'bz2' && ! extension_loaded('bz2')) {
             throw new Exception\ExtensionNotLoadedException('This mode needs the bz2 extension');
         }
 
-        if (($mode == 'gz') && (! extension_loaded('zlib'))) {
+        if ($mode === 'gz' && ! extension_loaded('zlib')) {
             throw new Exception\ExtensionNotLoadedException('This mode needs the zlib extension');
         }
 
@@ -158,7 +158,7 @@ public function compress($content)
         if (! file_exists($content)) {
             $file = $this->getTarget();
             if (is_dir($file)) {
-                $file .= DIRECTORY_SEPARATOR . "tar.tmp";
+                $file .= DIRECTORY_SEPARATOR . 'tar.tmp';
             }
 
             $result = file_put_contents($file, $content);

diff --git a/src/Compress/Zip.php b/src/Compress/Zip.php
@@ -127,12 +127,12 @@ public function compress($content)
 
                     $dir = dir($current);
                     while (false !== ($node = $dir->read())) {
-                        if (($node == '.') || ($node == '..')) {
+                        if ($node === '.' || $node === '..') {
                             continue;
                         }
 
                         if (is_dir($current . $node)) {
-                            array_push($stack, $current . $node . DIRECTORY_SEPARATOR);
+                            $stack[] = $current . $node . DIRECTORY_SEPARATOR;
                         }
 
                         if (is_file($current . $node)) {
@@ -161,7 +161,7 @@ public function compress($content)
             if (! is_dir($file)) {
                 $file = basename($file);
             } else {
-                $file = "zip.tmp";
+                $file = 'zip.tmp';
             }
 
             $res = $zip->addFromString($file, $content);

diff --git a/src/DataUnitFormatter.php b/src/DataUnitFormatter.php
@@ -48,10 +48,10 @@ final class DataUnitFormatter extends AbstractFilter
      * @var array
      */
     protected $options = [
-        'mode'         => self::MODE_DECIMAL,
-        'unit'         => '',
-        'precision'    => 2,
-        'prefixes'     => [],
+        'mode'      => self::MODE_DECIMAL,
+        'unit'      => '',
+        'precision' => 2,
+        'prefixes'  => [],
     ];
 
     /**
@@ -80,7 +80,7 @@ public function __construct($options = [])
     protected function setMode($mode)
     {
         $mode = strtolower($mode);
-        if (! in_array($mode, self::$modes)) {
+        if (! in_array($mode, self::$modes, true)) {
             throw new InvalidArgumentException(sprintf('Invalid binary mode: %s', $mode));
         }
         $this->options['mode'] = $mode;
@@ -103,7 +103,7 @@ protected function getMode()
      */
     protected function isDecimalMode()
     {
-        return $this->getMode() == self::MODE_DECIMAL;
+        return $this->getMode() === self::MODE_DECIMAL;
     }
 
     /**
@@ -113,7 +113,7 @@ protected function isDecimalMode()
      */
     protected function isBinaryMode()
     {
-        return $this->getMode() == self::MODE_BINARY;
+        return $this->getMode() === self::MODE_BINARY;
     }
 
     /**
@@ -212,7 +212,7 @@ public function filter($value)
 
         // Parse to float and check if value is not zero
         $amount = (float) $value;
-        if ($amount == 0) {
+        if ($amount === 0.0) {
             return $this->formatAmount($amount);
         }
 
@@ -222,7 +222,7 @@ public function filter($value)
         $prefix = $this->getPrefixAt((int)$power);
 
         // When the amount is too big, no prefix can be found:
-        if (is_null($prefix)) {
+        if ($prefix === null) {
             return $this->formatAmount($amount);
         }
 

diff --git a/src/Digits.php b/src/Digits.php
@@ -28,7 +28,7 @@ public function filter($value)
         if (is_int($value)) {
             return (string) $value;
         }
-        if (! (is_float($value) || is_string($value))) {
+        if (! is_float($value) && ! is_string($value)) {
             return $value;
         }
         $value = (string) $value;