gravityview / GravityView

vendor/paragonie/sodium_compat/src/Core/Base64/Common.php

Spacing +66 added lines, -66 removed lines

@@ -21,9 +21,9 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function encode($src)
+    public static function encode( $src )
     {
-        return self::doEncode($src, true);
+        return self::doEncode( $src, true );
     }
 
     /**
@@ -35,9 +35,9 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function encodeUnpadded($src)
+    public static function encodeUnpadded( $src )
     {
-        return self::doEncode($src, false);
+        return self::doEncode( $src, false );
     }
 
     /**
@@ -46,43 +46,43 @@ 
      * @return string
      * @throws TypeError
      */
-    protected static function doEncode($src, $pad = true)
+    protected static function doEncode( $src, $pad = true )
     {
         $dest = '';
-        $srcLen = ParagonIE_Sodium_Core_Util::strlen($src);
+        $srcLen = ParagonIE_Sodium_Core_Util::strlen( $src );
         // Main loop (no padding):
-        for ($i = 0; $i + 3 <= $srcLen; $i += 3) {
+        for ( $i = 0; $i + 3 <= $srcLen; $i += 3 ) {
             /** @var array<int, int> $chunk */
-            $chunk = unpack('C*', ParagonIE_Sodium_Core_Util::substr($src, $i, 3));
-            $b0 = $chunk[1];
-            $b1 = $chunk[2];
-            $b2 = $chunk[3];
+            $chunk = unpack( 'C*', ParagonIE_Sodium_Core_Util::substr( $src, $i, 3 ) );
+            $b0 = $chunk[ 1 ];
+            $b1 = $chunk[ 2 ];
+            $b2 = $chunk[ 3 ];
 
             $dest .=
-                self::encode6Bits(               $b0 >> 2       ) .
-                self::encode6Bits((($b0 << 4) | ($b1 >> 4)) & 63) .
-                self::encode6Bits((($b1 << 2) | ($b2 >> 6)) & 63) .
-                self::encode6Bits(  $b2                     & 63);
+                self::encode6Bits( $b0 >> 2 ) .
+                self::encode6Bits( ( ( $b0 << 4 ) | ( $b1 >> 4 ) ) & 63 ) .
+                self::encode6Bits( ( ( $b1 << 2 ) | ( $b2 >> 6 ) ) & 63 ) .
+                self::encode6Bits( $b2                     & 63 );
         }
         // The last chunk, which may have padding:
-        if ($i < $srcLen) {
+        if ( $i < $srcLen ) {
             /** @var array<int, int> $chunk */
-            $chunk = unpack('C*', ParagonIE_Sodium_Core_Util::substr($src, $i, $srcLen - $i));
-            $b0 = $chunk[1];
-            if ($i + 1 < $srcLen) {
-                $b1 = $chunk[2];
+            $chunk = unpack( 'C*', ParagonIE_Sodium_Core_Util::substr( $src, $i, $srcLen - $i ) );
+            $b0 = $chunk[ 1 ];
+            if ( $i + 1 < $srcLen ) {
+                $b1 = $chunk[ 2 ];
                 $dest .=
-                    self::encode6Bits($b0 >> 2) .
-                    self::encode6Bits((($b0 << 4) | ($b1 >> 4)) & 63) .
-                    self::encode6Bits(($b1 << 2) & 63);
-                if ($pad) {
+                    self::encode6Bits( $b0 >> 2 ) .
+                    self::encode6Bits( ( ( $b0 << 4 ) | ( $b1 >> 4 ) ) & 63 ) .
+                    self::encode6Bits( ( $b1 << 2 ) & 63 );
+                if ( $pad ) {
                     $dest .= '=';
                 }
             } else {
                 $dest .=
-                    self::encode6Bits( $b0 >> 2) .
-                    self::encode6Bits(($b0 << 4) & 63);
-                if ($pad) {
+                    self::encode6Bits( $b0 >> 2 ) .
+                    self::encode6Bits( ( $b0 << 4 ) & 63 );
+                if ( $pad ) {
                     $dest .= '==';
                 }
             }
@@ -102,86 +102,86 @@ 
      * @throws TypeError
      * @psalm-suppress RedundantCondition
      */
-    public static function decode($src, $strictPadding = false)
+    public static function decode( $src, $strictPadding = false )
     {
         // Remove padding
-        $srcLen = ParagonIE_Sodium_Core_Util::strlen($src);
-        if ($srcLen === 0) {
+        $srcLen = ParagonIE_Sodium_Core_Util::strlen( $src );
+        if ( $srcLen === 0 ) {
             return '';
         }
 
-        if ($strictPadding) {
-            if (($srcLen & 3) === 0) {
-                if ($src[$srcLen - 1] === '=') {
+        if ( $strictPadding ) {
+            if ( ( $srcLen & 3 ) === 0 ) {
+                if ( $src[ $srcLen - 1 ] === '=' ) {
                     $srcLen--;
-                    if ($src[$srcLen - 1] === '=') {
+                    if ( $src[ $srcLen - 1 ] === '=' ) {
                         $srcLen--;
                     }
                 }
             }
-            if (($srcLen & 3) === 1) {
+            if ( ( $srcLen & 3 ) === 1 ) {
                 throw new RangeException(
                     'Incorrect padding'
                 );
             }
-            if ($src[$srcLen - 1] === '=') {
+            if ( $src[ $srcLen - 1 ] === '=' ) {
                 throw new RangeException(
                     'Incorrect padding'
                 );
             }
         } else {
-            $src = rtrim($src, '=');
-            $srcLen = ParagonIE_Sodium_Core_Util::strlen($src);
+            $src = rtrim( $src, '=' );
+            $srcLen = ParagonIE_Sodium_Core_Util::strlen( $src );
         }
 
         $err = 0;
         $dest = '';
         // Main loop (no padding):
-        for ($i = 0; $i + 4 <= $srcLen; $i += 4) {
+        for ( $i = 0; $i + 4 <= $srcLen; $i += 4 ) {
             /** @var array<int, int> $chunk */
-            $chunk = unpack('C*', ParagonIE_Sodium_Core_Util::substr($src, $i, 4));
-            $c0 = self::decode6Bits($chunk[1]);
-            $c1 = self::decode6Bits($chunk[2]);
-            $c2 = self::decode6Bits($chunk[3]);
-            $c3 = self::decode6Bits($chunk[4]);
+            $chunk = unpack( 'C*', ParagonIE_Sodium_Core_Util::substr( $src, $i, 4 ) );
+            $c0 = self::decode6Bits( $chunk[ 1 ] );
+            $c1 = self::decode6Bits( $chunk[ 2 ] );
+            $c2 = self::decode6Bits( $chunk[ 3 ] );
+            $c3 = self::decode6Bits( $chunk[ 4 ] );
 
             $dest .= pack(
                 'CCC',
-                ((($c0 << 2) | ($c1 >> 4)) & 0xff),
-                ((($c1 << 4) | ($c2 >> 2)) & 0xff),
-                ((($c2 << 6) |  $c3      ) & 0xff)
+                ( ( ( $c0 << 2 ) | ( $c1 >> 4 ) ) & 0xff ),
+                ( ( ( $c1 << 4 ) | ( $c2 >> 2 ) ) & 0xff ),
+                ( ( ( $c2 << 6 ) | $c3 ) & 0xff )
             );
-            $err |= ($c0 | $c1 | $c2 | $c3) >> 8;
+            $err |= ( $c0 | $c1 | $c2 | $c3 ) >> 8;
         }
         // The last chunk, which may have padding:
-        if ($i < $srcLen) {
+        if ( $i < $srcLen ) {
             /** @var array<int, int> $chunk */
-            $chunk = unpack('C*', ParagonIE_Sodium_Core_Util::substr($src, $i, $srcLen - $i));
-            $c0 = self::decode6Bits($chunk[1]);
+            $chunk = unpack( 'C*', ParagonIE_Sodium_Core_Util::substr( $src, $i, $srcLen - $i ) );
+            $c0 = self::decode6Bits( $chunk[ 1 ] );
 
-            if ($i + 2 < $srcLen) {
-                $c1 = self::decode6Bits($chunk[2]);
-                $c2 = self::decode6Bits($chunk[3]);
+            if ( $i + 2 < $srcLen ) {
+                $c1 = self::decode6Bits( $chunk[ 2 ] );
+                $c2 = self::decode6Bits( $chunk[ 3 ] );
                 $dest .= pack(
                     'CC',
-                    ((($c0 << 2) | ($c1 >> 4)) & 0xff),
-                    ((($c1 << 4) | ($c2 >> 2)) & 0xff)
+                    ( ( ( $c0 << 2 ) | ( $c1 >> 4 ) ) & 0xff ),
+                    ( ( ( $c1 << 4 ) | ( $c2 >> 2 ) ) & 0xff )
                 );
-                $err |= ($c0 | $c1 | $c2) >> 8;
-            } elseif ($i + 1 < $srcLen) {
-                $c1 = self::decode6Bits($chunk[2]);
+                $err |= ( $c0 | $c1 | $c2 ) >> 8;
+            } elseif ( $i + 1 < $srcLen ) {
+                $c1 = self::decode6Bits( $chunk[ 2 ] );
                 $dest .= pack(
                     'C',
-                    ((($c0 << 2) | ($c1 >> 4)) & 0xff)
+                    ( ( ( $c0 << 2 ) | ( $c1 >> 4 ) ) & 0xff )
                 );
-                $err |= ($c0 | $c1) >> 8;
-            } elseif ($i < $srcLen && $strictPadding) {
+                $err |= ( $c0 | $c1 ) >> 8;
+            } elseif ( $i < $srcLen && $strictPadding ) {
                 $err |= 1;
             }
         }
         /** @var bool $check */
-        $check = ($err === 0);
-        if (!$check) {
+        $check = ( $err === 0 );
+        if ( ! $check ) {
             throw new RangeException(
                 'Base64::decode() only expects characters in the correct base64 alphabet'
             );
@@ -200,7 +200,7 @@ 
      * @param int $src
      * @return int
      */
-    abstract protected static function decode6Bits($src);
+    abstract protected static function decode6Bits( $src );
 
     /**
      * Uses bitwise operators instead of table-lookups to turn 8-bit integers
@@ -209,5 +209,5 @@ 
      * @param int $src
      * @return string
      */
-    abstract protected static function encode6Bits($src);
+    abstract protected static function encode6Bits( $src );
 }

vendor/paragonie/sodium_compat/src/Core/Base64/UrlSafe.php

Spacing +76 added lines, -76 removed lines

@@ -18,9 +18,9 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function encode($src)
+    public static function encode( $src )
     {
-        return self::doEncode($src, true);
+        return self::doEncode( $src, true );
     }
 
     /**
@@ -32,9 +32,9 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function encodeUnpadded($src)
+    public static function encodeUnpadded( $src )
     {
-        return self::doEncode($src, false);
+        return self::doEncode( $src, false );
     }
 
     /**
@@ -43,43 +43,43 @@ 
      * @return string
      * @throws TypeError
      */
-    protected static function doEncode($src, $pad = true)
+    protected static function doEncode( $src, $pad = true )
     {
         $dest = '';
-        $srcLen = ParagonIE_Sodium_Core_Util::strlen($src);
+        $srcLen = ParagonIE_Sodium_Core_Util::strlen( $src );
         // Main loop (no padding):
-        for ($i = 0; $i + 3 <= $srcLen; $i += 3) {
+        for ( $i = 0; $i + 3 <= $srcLen; $i += 3 ) {
             /** @var array<int, int> $chunk */
-            $chunk = unpack('C*', ParagonIE_Sodium_Core_Util::substr($src, $i, 3));
-            $b0 = $chunk[1];
-            $b1 = $chunk[2];
-            $b2 = $chunk[3];
+            $chunk = unpack( 'C*', ParagonIE_Sodium_Core_Util::substr( $src, $i, 3 ) );
+            $b0 = $chunk[ 1 ];
+            $b1 = $chunk[ 2 ];
+            $b2 = $chunk[ 3 ];
 
             $dest .=
-                self::encode6Bits(               $b0 >> 2       ) .
-                self::encode6Bits((($b0 << 4) | ($b1 >> 4)) & 63) .
-                self::encode6Bits((($b1 << 2) | ($b2 >> 6)) & 63) .
-                self::encode6Bits(  $b2                     & 63);
+                self::encode6Bits( $b0 >> 2 ) .
+                self::encode6Bits( ( ( $b0 << 4 ) | ( $b1 >> 4 ) ) & 63 ) .
+                self::encode6Bits( ( ( $b1 << 2 ) | ( $b2 >> 6 ) ) & 63 ) .
+                self::encode6Bits( $b2                     & 63 );
         }
         // The last chunk, which may have padding:
-        if ($i < $srcLen) {
+        if ( $i < $srcLen ) {
             /** @var array<int, int> $chunk */
-            $chunk = unpack('C*', ParagonIE_Sodium_Core_Util::substr($src, $i, $srcLen - $i));
-            $b0 = $chunk[1];
-            if ($i + 1 < $srcLen) {
-                $b1 = $chunk[2];
+            $chunk = unpack( 'C*', ParagonIE_Sodium_Core_Util::substr( $src, $i, $srcLen - $i ) );
+            $b0 = $chunk[ 1 ];
+            if ( $i + 1 < $srcLen ) {
+                $b1 = $chunk[ 2 ];
                 $dest .=
-                    self::encode6Bits($b0 >> 2) .
-                    self::encode6Bits((($b0 << 4) | ($b1 >> 4)) & 63) .
-                    self::encode6Bits(($b1 << 2) & 63);
-                if ($pad) {
+                    self::encode6Bits( $b0 >> 2 ) .
+                    self::encode6Bits( ( ( $b0 << 4 ) | ( $b1 >> 4 ) ) & 63 ) .
+                    self::encode6Bits( ( $b1 << 2 ) & 63 );
+                if ( $pad ) {
                     $dest .= '=';
                 }
             } else {
                 $dest .=
-                    self::encode6Bits( $b0 >> 2) .
-                    self::encode6Bits(($b0 << 4) & 63);
-                if ($pad) {
+                    self::encode6Bits( $b0 >> 2 ) .
+                    self::encode6Bits( ( $b0 << 4 ) & 63 );
+                if ( $pad ) {
                     $dest .= '==';
                 }
             }
@@ -99,86 +99,86 @@ 
      * @throws TypeError
      * @psalm-suppress RedundantCondition
      */
-    public static function decode($src, $strictPadding = false)
+    public static function decode( $src, $strictPadding = false )
     {
         // Remove padding
-        $srcLen = ParagonIE_Sodium_Core_Util::strlen($src);
-        if ($srcLen === 0) {
+        $srcLen = ParagonIE_Sodium_Core_Util::strlen( $src );
+        if ( $srcLen === 0 ) {
             return '';
         }
 
-        if ($strictPadding) {
-            if (($srcLen & 3) === 0) {
-                if ($src[$srcLen - 1] === '=') {
+        if ( $strictPadding ) {
+            if ( ( $srcLen & 3 ) === 0 ) {
+                if ( $src[ $srcLen - 1 ] === '=' ) {
                     $srcLen--;
-                    if ($src[$srcLen - 1] === '=') {
+                    if ( $src[ $srcLen - 1 ] === '=' ) {
                         $srcLen--;
                     }
                 }
             }
-            if (($srcLen & 3) === 1) {
+            if ( ( $srcLen & 3 ) === 1 ) {
                 throw new RangeException(
                     'Incorrect padding'
                 );
             }
-            if ($src[$srcLen - 1] === '=') {
+            if ( $src[ $srcLen - 1 ] === '=' ) {
                 throw new RangeException(
                     'Incorrect padding'
                 );
             }
         } else {
-            $src = rtrim($src, '=');
-            $srcLen =  ParagonIE_Sodium_Core_Util::strlen($src);
+            $src = rtrim( $src, '=' );
+            $srcLen = ParagonIE_Sodium_Core_Util::strlen( $src );
         }
 
         $err = 0;
         $dest = '';
         // Main loop (no padding):
-        for ($i = 0; $i + 4 <= $srcLen; $i += 4) {
+        for ( $i = 0; $i + 4 <= $srcLen; $i += 4 ) {
             /** @var array<int, int> $chunk */
-            $chunk = unpack('C*', ParagonIE_Sodium_Core_Util::substr($src, $i, 4));
-            $c0 = self::decode6Bits($chunk[1]);
-            $c1 = self::decode6Bits($chunk[2]);
-            $c2 = self::decode6Bits($chunk[3]);
-            $c3 = self::decode6Bits($chunk[4]);
+            $chunk = unpack( 'C*', ParagonIE_Sodium_Core_Util::substr( $src, $i, 4 ) );
+            $c0 = self::decode6Bits( $chunk[ 1 ] );
+            $c1 = self::decode6Bits( $chunk[ 2 ] );
+            $c2 = self::decode6Bits( $chunk[ 3 ] );
+            $c3 = self::decode6Bits( $chunk[ 4 ] );
 
             $dest .= pack(
                 'CCC',
-                ((($c0 << 2) | ($c1 >> 4)) & 0xff),
-                ((($c1 << 4) | ($c2 >> 2)) & 0xff),
-                ((($c2 << 6) | $c3) & 0xff)
+                ( ( ( $c0 << 2 ) | ( $c1 >> 4 ) ) & 0xff ),
+                ( ( ( $c1 << 4 ) | ( $c2 >> 2 ) ) & 0xff ),
+                ( ( ( $c2 << 6 ) | $c3 ) & 0xff )
             );
-            $err |= ($c0 | $c1 | $c2 | $c3) >> 8;
+            $err |= ( $c0 | $c1 | $c2 | $c3 ) >> 8;
         }
         // The last chunk, which may have padding:
-        if ($i < $srcLen) {
+        if ( $i < $srcLen ) {
             /** @var array<int, int> $chunk */
-            $chunk = unpack('C*', ParagonIE_Sodium_Core_Util::substr($src, $i, $srcLen - $i));
-            $c0 = self::decode6Bits($chunk[1]);
+            $chunk = unpack( 'C*', ParagonIE_Sodium_Core_Util::substr( $src, $i, $srcLen - $i ) );
+            $c0 = self::decode6Bits( $chunk[ 1 ] );
 
-            if ($i + 2 < $srcLen) {
-                $c1 = self::decode6Bits($chunk[2]);
-                $c2 = self::decode6Bits($chunk[3]);
+            if ( $i + 2 < $srcLen ) {
+                $c1 = self::decode6Bits( $chunk[ 2 ] );
+                $c2 = self::decode6Bits( $chunk[ 3 ] );
                 $dest .= pack(
                     'CC',
-                    ((($c0 << 2) | ($c1 >> 4)) & 0xff),
-                    ((($c1 << 4) | ($c2 >> 2)) & 0xff)
+                    ( ( ( $c0 << 2 ) | ( $c1 >> 4 ) ) & 0xff ),
+                    ( ( ( $c1 << 4 ) | ( $c2 >> 2 ) ) & 0xff )
                 );
-                $err |= ($c0 | $c1 | $c2) >> 8;
-            } elseif ($i + 1 < $srcLen) {
-                $c1 = self::decode6Bits($chunk[2]);
+                $err |= ( $c0 | $c1 | $c2 ) >> 8;
+            } elseif ( $i + 1 < $srcLen ) {
+                $c1 = self::decode6Bits( $chunk[ 2 ] );
                 $dest .= pack(
                     'C',
-                    ((($c0 << 2) | ($c1 >> 4)) & 0xff)
+                    ( ( ( $c0 << 2 ) | ( $c1 >> 4 ) ) & 0xff )
                 );
-                $err |= ($c0 | $c1) >> 8;
-            } elseif ($i < $srcLen && $strictPadding) {
+                $err |= ( $c0 | $c1 ) >> 8;
+            } elseif ( $i < $srcLen && $strictPadding ) {
                 $err |= 1;
             }
         }
         /** @var bool $check */
-        $check = ($err === 0);
-        if (!$check) {
+        $check = ( $err === 0 );
+        if ( ! $check ) {
             throw new RangeException(
                 'Base64::decode() only expects characters in the correct base64 alphabet'
             );
@@ -197,24 +197,24 @@ 
      * @param int $src
      * @return int
      */
-    protected static function decode6Bits($src)
+    protected static function decode6Bits( $src )
     {
         $ret = -1;
 
         // if ($src > 0x40 && $src < 0x5b) $ret += $src - 0x41 + 1; // -64
-        $ret += (((0x40 - $src) & ($src - 0x5b)) >> 8) & ($src - 64);
+        $ret += ( ( ( 0x40 - $src ) & ( $src - 0x5b ) ) >> 8 ) & ( $src - 64 );
 
         // if ($src > 0x60 && $src < 0x7b) $ret += $src - 0x61 + 26 + 1; // -70
-        $ret += (((0x60 - $src) & ($src - 0x7b)) >> 8) & ($src - 70);
+        $ret += ( ( ( 0x60 - $src ) & ( $src - 0x7b ) ) >> 8 ) & ( $src - 70 );
 
         // if ($src > 0x2f && $src < 0x3a) $ret += $src - 0x30 + 52 + 1; // 5
-        $ret += (((0x2f - $src) & ($src - 0x3a)) >> 8) & ($src + 5);
+        $ret += ( ( ( 0x2f - $src ) & ( $src - 0x3a ) ) >> 8 ) & ( $src + 5 );
 
         // if ($src == 0x2c) $ret += 62 + 1;
-        $ret += (((0x2c - $src) & ($src - 0x2e)) >> 8) & 63;
+        $ret += ( ( ( 0x2c - $src ) & ( $src - 0x2e ) ) >> 8 ) & 63;
 
         // if ($src == 0x5f) ret += 63 + 1;
-        $ret += (((0x5e - $src) & ($src - 0x60)) >> 8) & 64;
+        $ret += ( ( ( 0x5e - $src ) & ( $src - 0x60 ) ) >> 8 ) & 64;
 
         return $ret;
     }
@@ -226,22 +226,22 @@ 
      * @param int $src
      * @return string
      */
-    protected static function encode6Bits($src)
+    protected static function encode6Bits( $src )
     {
         $diff = 0x41;
 
         // if ($src > 25) $diff += 0x61 - 0x41 - 26; // 6
-        $diff += ((25 - $src) >> 8) & 6;
+        $diff += ( ( 25 - $src ) >> 8 ) & 6;
 
         // if ($src > 51) $diff += 0x30 - 0x61 - 26; // -75
-        $diff -= ((51 - $src) >> 8) & 75;
+        $diff -= ( ( 51 - $src ) >> 8 ) & 75;
 
         // if ($src > 61) $diff += 0x2d - 0x30 - 10; // -13
-        $diff -= ((61 - $src) >> 8) & 13;
+        $diff -= ( ( 61 - $src ) >> 8 ) & 13;
 
         // if ($src > 62) $diff += 0x5f - 0x2b - 1; // 3
-        $diff += ((62 - $src) >> 8) & 49;
+        $diff += ( ( 62 - $src ) >> 8 ) & 49;
 
-        return pack('C', $src + $diff);
+        return pack( 'C', $src + $diff );
     }
 }

vendor/paragonie/sodium_compat/src/Core/Curve25519/Fe.php

Spacing +31 added lines, -31 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_Curve25519_Fe', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_Curve25519_Fe', false ) ) {
     return;
 }
 
@@ -28,25 +28,25 @@ 
      * @param bool $save_indexes
      * @return self
      */
-    public static function fromArray($array, $save_indexes = null)
+    public static function fromArray( $array, $save_indexes = null )
     {
-        $count = count($array);
-        if ($save_indexes) {
-            $keys = array_keys($array);
+        $count = count( $array );
+        if ( $save_indexes ) {
+            $keys = array_keys( $array );
         } else {
-            $keys = range(0, $count - 1);
+            $keys = range( 0, $count - 1 );
         }
-        $array = array_values($array);
+        $array = array_values( $array );
         /** @var array<int, int> $keys */
 
         $obj = new ParagonIE_Sodium_Core_Curve25519_Fe();
-        if ($save_indexes) {
-            for ($i = 0; $i < $count; ++$i) {
-                $obj->offsetSet($keys[$i], $array[$i]);
+        if ( $save_indexes ) {
+            for ( $i = 0; $i < $count; ++$i ) {
+                $obj->offsetSet( $keys[ $i ], $array[ $i ] );
             }
         } else {
-            for ($i = 0; $i < $count; ++$i) {
-                $obj->offsetSet($i, $array[$i]);
+            for ( $i = 0; $i < $count; ++$i ) {
+                $obj->offsetSet( $i, $array[ $i ] );
             }
         }
         return $obj;
@@ -60,16 +60,16 @@ 
      * @return void
      * @psalm-suppress MixedArrayOffset
      */
-    #[ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    #[ReturnTypeWillChange ]
+    public function offsetSet( $offset, $value )
     {
-        if (!is_int($value)) {
-            throw new InvalidArgumentException('Expected an integer');
+        if ( ! is_int( $value ) ) {
+            throw new InvalidArgumentException( 'Expected an integer' );
         }
-        if (is_null($offset)) {
-            $this->container[] = $value;
+        if ( is_null( $offset ) ) {
+            $this->container[ ] = $value;
         } else {
-            $this->container[$offset] = $value;
+            $this->container[ $offset ] = $value;
         }
     }
 
@@ -80,10 +80,10 @@ 
      * @return bool
      * @psalm-suppress MixedArrayOffset
      */
-    #[ReturnTypeWillChange]
-    public function offsetExists($offset)
+    #[ReturnTypeWillChange ]
+    public function offsetExists( $offset )
     {
-        return isset($this->container[$offset]);
+        return isset( $this->container[ $offset ] );
     }
 
     /**
@@ -93,10 +93,10 @@ 
      * @return void
      * @psalm-suppress MixedArrayOffset
      */
-    #[ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    #[ReturnTypeWillChange ]
+    public function offsetUnset( $offset )
     {
-        unset($this->container[$offset]);
+        unset( $this->container[ $offset ] );
     }
 
     /**
@@ -106,13 +106,13 @@ 
      * @return int
      * @psalm-suppress MixedArrayOffset
      */
-    #[ReturnTypeWillChange]
-    public function offsetGet($offset)
+    #[ReturnTypeWillChange ]
+    public function offsetGet( $offset )
     {
-        if (!isset($this->container[$offset])) {
-            $this->container[$offset] = 0;
+        if ( ! isset( $this->container[ $offset ] ) ) {
+            $this->container[ $offset ] = 0;
         }
-        return (int) ($this->container[$offset]);
+        return (int)( $this->container[ $offset ] );
     }
 
     /**
@@ -122,6 +122,6 @@ 
      */
     public function __debugInfo()
     {
-        return array(implode(', ', $this->container));
+        return array( implode( ', ', $this->container ) );
     }
 }

vendor/paragonie/sodium_compat/src/Core/HChaCha20.php

Spacing +58 added lines, -58 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_HChaCha20', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_HChaCha20', false ) ) {
     return;
 }
 
@@ -16,34 +16,34 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function hChaCha20($in = '', $key = '', $c = null)
+    public static function hChaCha20( $in = '', $key = '', $c = null )
     {
         $ctx = array();
 
-        if ($c === null) {
-            $ctx[0] = 0x61707865;
-            $ctx[1] = 0x3320646e;
-            $ctx[2] = 0x79622d32;
-            $ctx[3] = 0x6b206574;
+        if ( $c === null ) {
+            $ctx[ 0 ] = 0x61707865;
+            $ctx[ 1 ] = 0x3320646e;
+            $ctx[ 2 ] = 0x79622d32;
+            $ctx[ 3 ] = 0x6b206574;
         } else {
-            $ctx[0] = self::load_4(self::substr($c,  0, 4));
-            $ctx[1] = self::load_4(self::substr($c,  4, 4));
-            $ctx[2] = self::load_4(self::substr($c,  8, 4));
-            $ctx[3] = self::load_4(self::substr($c, 12, 4));
+            $ctx[ 0 ] = self::load_4( self::substr( $c, 0, 4 ) );
+            $ctx[ 1 ] = self::load_4( self::substr( $c, 4, 4 ) );
+            $ctx[ 2 ] = self::load_4( self::substr( $c, 8, 4 ) );
+            $ctx[ 3 ] = self::load_4( self::substr( $c, 12, 4 ) );
         }
-        $ctx[4]  = self::load_4(self::substr($key,  0, 4));
-        $ctx[5]  = self::load_4(self::substr($key,  4, 4));
-        $ctx[6]  = self::load_4(self::substr($key,  8, 4));
-        $ctx[7]  = self::load_4(self::substr($key, 12, 4));
-        $ctx[8]  = self::load_4(self::substr($key, 16, 4));
-        $ctx[9]  = self::load_4(self::substr($key, 20, 4));
-        $ctx[10] = self::load_4(self::substr($key, 24, 4));
-        $ctx[11] = self::load_4(self::substr($key, 28, 4));
-        $ctx[12] = self::load_4(self::substr($in,   0, 4));
-        $ctx[13] = self::load_4(self::substr($in,   4, 4));
-        $ctx[14] = self::load_4(self::substr($in,   8, 4));
-        $ctx[15] = self::load_4(self::substr($in,  12, 4));
-        return self::hChaCha20Bytes($ctx);
+        $ctx[ 4 ]  = self::load_4( self::substr( $key, 0, 4 ) );
+        $ctx[ 5 ]  = self::load_4( self::substr( $key, 4, 4 ) );
+        $ctx[ 6 ]  = self::load_4( self::substr( $key, 8, 4 ) );
+        $ctx[ 7 ]  = self::load_4( self::substr( $key, 12, 4 ) );
+        $ctx[ 8 ]  = self::load_4( self::substr( $key, 16, 4 ) );
+        $ctx[ 9 ]  = self::load_4( self::substr( $key, 20, 4 ) );
+        $ctx[ 10 ] = self::load_4( self::substr( $key, 24, 4 ) );
+        $ctx[ 11 ] = self::load_4( self::substr( $key, 28, 4 ) );
+        $ctx[ 12 ] = self::load_4( self::substr( $in, 0, 4 ) );
+        $ctx[ 13 ] = self::load_4( self::substr( $in, 4, 4 ) );
+        $ctx[ 14 ] = self::load_4( self::substr( $in, 8, 4 ) );
+        $ctx[ 15 ] = self::load_4( self::substr( $in, 12, 4 ) );
+        return self::hChaCha20Bytes( $ctx );
     }
 
     /**
@@ -51,58 +51,58 @@ 
      * @return string
      * @throws TypeError
      */
-    protected static function hChaCha20Bytes(array $ctx)
+    protected static function hChaCha20Bytes( array $ctx )
     {
-        $x0  = (int) $ctx[0];
-        $x1  = (int) $ctx[1];
-        $x2  = (int) $ctx[2];
-        $x3  = (int) $ctx[3];
-        $x4  = (int) $ctx[4];
-        $x5  = (int) $ctx[5];
-        $x6  = (int) $ctx[6];
-        $x7  = (int) $ctx[7];
-        $x8  = (int) $ctx[8];
-        $x9  = (int) $ctx[9];
-        $x10 = (int) $ctx[10];
-        $x11 = (int) $ctx[11];
-        $x12 = (int) $ctx[12];
-        $x13 = (int) $ctx[13];
-        $x14 = (int) $ctx[14];
-        $x15 = (int) $ctx[15];
+        $x0  = (int)$ctx[ 0 ];
+        $x1  = (int)$ctx[ 1 ];
+        $x2  = (int)$ctx[ 2 ];
+        $x3  = (int)$ctx[ 3 ];
+        $x4  = (int)$ctx[ 4 ];
+        $x5  = (int)$ctx[ 5 ];
+        $x6  = (int)$ctx[ 6 ];
+        $x7  = (int)$ctx[ 7 ];
+        $x8  = (int)$ctx[ 8 ];
+        $x9  = (int)$ctx[ 9 ];
+        $x10 = (int)$ctx[ 10 ];
+        $x11 = (int)$ctx[ 11 ];
+        $x12 = (int)$ctx[ 12 ];
+        $x13 = (int)$ctx[ 13 ];
+        $x14 = (int)$ctx[ 14 ];
+        $x15 = (int)$ctx[ 15 ];
 
-        for ($i = 0; $i < 10; ++$i) {
+        for ( $i = 0; $i < 10; ++$i ) {
             # QUARTERROUND( x0,  x4,  x8,  x12)
-            list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12);
+            list( $x0, $x4, $x8, $x12 ) = self::quarterRound( $x0, $x4, $x8, $x12 );
 
             # QUARTERROUND( x1,  x5,  x9,  x13)
-            list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13);
+            list( $x1, $x5, $x9, $x13 ) = self::quarterRound( $x1, $x5, $x9, $x13 );
 
             # QUARTERROUND( x2,  x6,  x10,  x14)
-            list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14);
+            list( $x2, $x6, $x10, $x14 ) = self::quarterRound( $x2, $x6, $x10, $x14 );
 
             # QUARTERROUND( x3,  x7,  x11,  x15)
-            list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15);
+            list( $x3, $x7, $x11, $x15 ) = self::quarterRound( $x3, $x7, $x11, $x15 );
 
             # QUARTERROUND( x0,  x5,  x10,  x15)
-            list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15);
+            list( $x0, $x5, $x10, $x15 ) = self::quarterRound( $x0, $x5, $x10, $x15 );
 
             # QUARTERROUND( x1,  x6,  x11,  x12)
-            list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12);
+            list( $x1, $x6, $x11, $x12 ) = self::quarterRound( $x1, $x6, $x11, $x12 );
 
             # QUARTERROUND( x2,  x7,  x8,  x13)
-            list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13);
+            list( $x2, $x7, $x8, $x13 ) = self::quarterRound( $x2, $x7, $x8, $x13 );
 
             # QUARTERROUND( x3,  x4,  x9,  x14)
-            list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14);
+            list( $x3, $x4, $x9, $x14 ) = self::quarterRound( $x3, $x4, $x9, $x14 );
         }
 
-        return self::store32_le((int) ($x0  & 0xffffffff)) .
-            self::store32_le((int) ($x1  & 0xffffffff)) .
-            self::store32_le((int) ($x2  & 0xffffffff)) .
-            self::store32_le((int) ($x3  & 0xffffffff)) .
-            self::store32_le((int) ($x12 & 0xffffffff)) .
-            self::store32_le((int) ($x13 & 0xffffffff)) .
-            self::store32_le((int) ($x14 & 0xffffffff)) .
-            self::store32_le((int) ($x15 & 0xffffffff));
+        return self::store32_le( (int)( $x0  & 0xffffffff ) ) .
+            self::store32_le( (int)( $x1  & 0xffffffff ) ) .
+            self::store32_le( (int)( $x2  & 0xffffffff ) ) .
+            self::store32_le( (int)( $x3  & 0xffffffff ) ) .
+            self::store32_le( (int)( $x12 & 0xffffffff ) ) .
+            self::store32_le( (int)( $x13 & 0xffffffff ) ) .
+            self::store32_le( (int)( $x14 & 0xffffffff ) ) .
+            self::store32_le( (int)( $x15 & 0xffffffff ) );
     }
 }

vendor/paragonie/sodium_compat/src/Core/Poly1305/State.php

Spacing +144 added lines, -144 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_Poly1305_State', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_Poly1305_State', false ) ) {
     return;
 }
 
@@ -48,31 +48,31 @@ 
      * @throws InvalidArgumentException
      * @throws TypeError
      */
-    public function __construct($key = '')
+    public function __construct( $key = '' )
     {
-        if (self::strlen($key) < 32) {
+        if ( self::strlen( $key ) < 32 ) {
             throw new InvalidArgumentException(
                 'Poly1305 requires a 32-byte key'
             );
         }
         /* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
         $this->r = array(
-            (int) ((self::load_4(self::substr($key, 0, 4))) & 0x3ffffff),
-            (int) ((self::load_4(self::substr($key, 3, 4)) >> 2) & 0x3ffff03),
-            (int) ((self::load_4(self::substr($key, 6, 4)) >> 4) & 0x3ffc0ff),
-            (int) ((self::load_4(self::substr($key, 9, 4)) >> 6) & 0x3f03fff),
-            (int) ((self::load_4(self::substr($key, 12, 4)) >> 8) & 0x00fffff)
+            (int)( ( self::load_4( self::substr( $key, 0, 4 ) ) ) & 0x3ffffff ),
+            (int)( ( self::load_4( self::substr( $key, 3, 4 ) ) >> 2 ) & 0x3ffff03 ),
+            (int)( ( self::load_4( self::substr( $key, 6, 4 ) ) >> 4 ) & 0x3ffc0ff ),
+            (int)( ( self::load_4( self::substr( $key, 9, 4 ) ) >> 6 ) & 0x3f03fff ),
+            (int)( ( self::load_4( self::substr( $key, 12, 4 ) ) >> 8 ) & 0x00fffff )
         );
 
         /* h = 0 */
-        $this->h = array(0, 0, 0, 0, 0);
+        $this->h = array( 0, 0, 0, 0, 0 );
 
         /* save pad for later */
         $this->pad = array(
-            self::load_4(self::substr($key, 16, 4)),
-            self::load_4(self::substr($key, 20, 4)),
-            self::load_4(self::substr($key, 24, 4)),
-            self::load_4(self::substr($key, 28, 4)),
+            self::load_4( self::substr( $key, 16, 4 ) ),
+            self::load_4( self::substr( $key, 20, 4 ) ),
+            self::load_4( self::substr( $key, 24, 4 ) ),
+            self::load_4( self::substr( $key, 28, 4 ) ),
         );
 
         $this->leftover = 0;
@@ -84,20 +84,20 @@ 
      */
     public function __destruct()
     {
-        $this->r[0] ^= $this->r[0];
-        $this->r[1] ^= $this->r[1];
-        $this->r[2] ^= $this->r[2];
-        $this->r[3] ^= $this->r[3];
-        $this->r[4] ^= $this->r[4];
-        $this->h[0] ^= $this->h[0];
-        $this->h[1] ^= $this->h[1];
-        $this->h[2] ^= $this->h[2];
-        $this->h[3] ^= $this->h[3];
-        $this->h[4] ^= $this->h[4];
-        $this->pad[0] ^= $this->pad[0];
-        $this->pad[1] ^= $this->pad[1];
-        $this->pad[2] ^= $this->pad[2];
-        $this->pad[3] ^= $this->pad[3];
+        $this->r[ 0 ] ^= $this->r[ 0 ];
+        $this->r[ 1 ] ^= $this->r[ 1 ];
+        $this->r[ 2 ] ^= $this->r[ 2 ];
+        $this->r[ 3 ] ^= $this->r[ 3 ];
+        $this->r[ 4 ] ^= $this->r[ 4 ];
+        $this->h[ 0 ] ^= $this->h[ 0 ];
+        $this->h[ 1 ] ^= $this->h[ 1 ];
+        $this->h[ 2 ] ^= $this->h[ 2 ];
+        $this->h[ 3 ] ^= $this->h[ 3 ];
+        $this->h[ 4 ] ^= $this->h[ 4 ];
+        $this->pad[ 0 ] ^= $this->pad[ 0 ];
+        $this->pad[ 1 ] ^= $this->pad[ 1 ];
+        $this->pad[ 2 ] ^= $this->pad[ 2 ];
+        $this->pad[ 3 ] ^= $this->pad[ 3 ];
         $this->leftover = 0;
         $this->final = true;
     }
@@ -110,60 +110,60 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public function update($message = '')
+    public function update( $message = '' )
     {
-        $bytes = self::strlen($message);
-        if ($bytes < 1) {
+        $bytes = self::strlen( $message );
+        if ( $bytes < 1 ) {
             return $this;
         }
 
         /* handle leftover */
-        if ($this->leftover) {
+        if ( $this->leftover ) {
             $want = ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE - $this->leftover;
-            if ($want > $bytes) {
+            if ( $want > $bytes ) {
                 $want = $bytes;
             }
-            for ($i = 0; $i < $want; ++$i) {
-                $mi = self::chrToInt($message[$i]);
-                $this->buffer[$this->leftover + $i] = $mi;
+            for ( $i = 0; $i < $want; ++$i ) {
+                $mi = self::chrToInt( $message[ $i ] );
+                $this->buffer[ $this->leftover + $i ] = $mi;
             }
             // We snip off the leftmost bytes.
-            $message = self::substr($message, $want);
-            $bytes = self::strlen($message);
+            $message = self::substr( $message, $want );
+            $bytes = self::strlen( $message );
             $this->leftover += $want;
-            if ($this->leftover < ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+            if ( $this->leftover < ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE ) {
                 // We still don't have enough to run $this->blocks()
                 return $this;
             }
 
             $this->blocks(
-                self::intArrayToString($this->buffer),
+                self::intArrayToString( $this->buffer ),
                 ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
             );
             $this->leftover = 0;
         }
 
         /* process full blocks */
-        if ($bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+        if ( $bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE ) {
             /** @var int $want */
-            $want = $bytes & ~(ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE - 1);
-            if ($want >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
-                $block = self::substr($message, 0, $want);
-                if (self::strlen($block) >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
-                    $this->blocks($block, $want);
-                    $message = self::substr($message, $want);
-                    $bytes = self::strlen($message);
+            $want = $bytes & ~( ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE - 1 );
+            if ( $want >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE ) {
+                $block = self::substr( $message, 0, $want );
+                if ( self::strlen( $block ) >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE ) {
+                    $this->blocks( $block, $want );
+                    $message = self::substr( $message, $want );
+                    $bytes = self::strlen( $message );
                 }
             }
         }
 
         /* store leftover */
-        if ($bytes) {
-            for ($i = 0; $i < $bytes; ++$i) {
-                $mi = self::chrToInt($message[$i]);
-                $this->buffer[$this->leftover + $i] = $mi;
+        if ( $bytes ) {
+            for ( $i = 0; $i < $bytes; ++$i ) {
+                $mi = self::chrToInt( $message[ $i ] );
+                $this->buffer[ $this->leftover + $i ] = $mi;
             }
-            $this->leftover = (int) $this->leftover + $bytes;
+            $this->leftover = (int)$this->leftover + $bytes;
         }
         return $this;
     }
@@ -176,77 +176,77 @@ 
      * @return self
      * @throws TypeError
      */
-    public function blocks($message, $bytes)
+    public function blocks( $message, $bytes )
     {
-        if (self::strlen($message) < 16) {
-            $message = str_pad($message, 16, "\x00", STR_PAD_RIGHT);
+        if ( self::strlen( $message ) < 16 ) {
+            $message = str_pad( $message, 16, "\x00", STR_PAD_RIGHT );
         }
         /** @var int $hibit */
         $hibit = $this->final ? 0 : 1 << 24; /* 1 << 128 */
-        $r0 = (int) $this->r[0];
-        $r1 = (int) $this->r[1];
-        $r2 = (int) $this->r[2];
-        $r3 = (int) $this->r[3];
-        $r4 = (int) $this->r[4];
-
-        $s1 = self::mul($r1, 5, 3);
-        $s2 = self::mul($r2, 5, 3);
-        $s3 = self::mul($r3, 5, 3);
-        $s4 = self::mul($r4, 5, 3);
-
-        $h0 = $this->h[0];
-        $h1 = $this->h[1];
-        $h2 = $this->h[2];
-        $h3 = $this->h[3];
-        $h4 = $this->h[4];
-
-        while ($bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+        $r0 = (int)$this->r[ 0 ];
+        $r1 = (int)$this->r[ 1 ];
+        $r2 = (int)$this->r[ 2 ];
+        $r3 = (int)$this->r[ 3 ];
+        $r4 = (int)$this->r[ 4 ];
+
+        $s1 = self::mul( $r1, 5, 3 );
+        $s2 = self::mul( $r2, 5, 3 );
+        $s3 = self::mul( $r3, 5, 3 );
+        $s4 = self::mul( $r4, 5, 3 );
+
+        $h0 = $this->h[ 0 ];
+        $h1 = $this->h[ 1 ];
+        $h2 = $this->h[ 2 ];
+        $h3 = $this->h[ 3 ];
+        $h4 = $this->h[ 4 ];
+
+        while ( $bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE ) {
             /* h += m[i] */
-            $h0 +=  self::load_4(self::substr($message, 0, 4))       & 0x3ffffff;
-            $h1 += (self::load_4(self::substr($message, 3, 4)) >> 2) & 0x3ffffff;
-            $h2 += (self::load_4(self::substr($message, 6, 4)) >> 4) & 0x3ffffff;
-            $h3 += (self::load_4(self::substr($message, 9, 4)) >> 6) & 0x3ffffff;
-            $h4 += (self::load_4(self::substr($message, 12, 4)) >> 8) | $hibit;
+            $h0 += self::load_4( self::substr( $message, 0, 4 ) )       & 0x3ffffff;
+            $h1 += ( self::load_4( self::substr( $message, 3, 4 ) ) >> 2 ) & 0x3ffffff;
+            $h2 += ( self::load_4( self::substr( $message, 6, 4 ) ) >> 4 ) & 0x3ffffff;
+            $h3 += ( self::load_4( self::substr( $message, 9, 4 ) ) >> 6 ) & 0x3ffffff;
+            $h4 += ( self::load_4( self::substr( $message, 12, 4 ) ) >> 8 ) | $hibit;
 
             /* h *= r */
             $d0 = (
-                self::mul($h0, $r0, 25) +
-                self::mul($s4, $h1, 26) +
-                self::mul($s3, $h2, 26) +
-                self::mul($s2, $h3, 26) +
-                self::mul($s1, $h4, 26)
+                self::mul( $h0, $r0, 25 ) +
+                self::mul( $s4, $h1, 26 ) +
+                self::mul( $s3, $h2, 26 ) +
+                self::mul( $s2, $h3, 26 ) +
+                self::mul( $s1, $h4, 26 )
             );
 
             $d1 = (
-                self::mul($h0, $r1, 25) +
-                self::mul($h1, $r0, 25) +
-                self::mul($s4, $h2, 26) +
-                self::mul($s3, $h3, 26) +
-                self::mul($s2, $h4, 26)
+                self::mul( $h0, $r1, 25 ) +
+                self::mul( $h1, $r0, 25 ) +
+                self::mul( $s4, $h2, 26 ) +
+                self::mul( $s3, $h3, 26 ) +
+                self::mul( $s2, $h4, 26 )
             );
 
             $d2 = (
-                self::mul($h0, $r2, 25) +
-                self::mul($h1, $r1, 25) +
-                self::mul($h2, $r0, 25) +
-                self::mul($s4, $h3, 26) +
-                self::mul($s3, $h4, 26)
+                self::mul( $h0, $r2, 25 ) +
+                self::mul( $h1, $r1, 25 ) +
+                self::mul( $h2, $r0, 25 ) +
+                self::mul( $s4, $h3, 26 ) +
+                self::mul( $s3, $h4, 26 )
             );
 
             $d3 = (
-                self::mul($h0, $r3, 25) +
-                self::mul($h1, $r2, 25) +
-                self::mul($h2, $r1, 25) +
-                self::mul($h3, $r0, 25) +
-                self::mul($s4, $h4, 26)
+                self::mul( $h0, $r3, 25 ) +
+                self::mul( $h1, $r2, 25 ) +
+                self::mul( $h2, $r1, 25 ) +
+                self::mul( $h3, $r0, 25 ) +
+                self::mul( $s4, $h4, 26 )
             );
 
             $d4 = (
-                self::mul($h0, $r4, 25) +
-                self::mul($h1, $r3, 25) +
-                self::mul($h2, $r2, 25) +
-                self::mul($h3, $r1, 25) +
-                self::mul($h4, $r0, 25)
+                self::mul( $h0, $r4, 25 ) +
+                self::mul( $h1, $r3, 25 ) +
+                self::mul( $h2, $r2, 25 ) +
+                self::mul( $h3, $r1, 25 ) +
+                self::mul( $h4, $r0, 25 )
             );
 
             /* (partial) h %= p */
@@ -278,7 +278,7 @@ 
             $c = $d4 >> 26;
             /** @var int $h4 */
             $h4 = $d4 & 0x3ffffff;
-            $h0 += (int) self::mul($c, 5, 3);
+            $h0 += (int)self::mul( $c, 5, 3 );
 
             /** @var int $c */
             $c = $h0 >> 26;
@@ -295,11 +295,11 @@ 
         }
 
         $this->h = array(
-            (int) ($h0 & 0xffffffff),
-            (int) ($h1 & 0xffffffff),
-            (int) ($h2 & 0xffffffff),
-            (int) ($h3 & 0xffffffff),
-            (int) ($h4 & 0xffffffff)
+            (int)( $h0 & 0xffffffff ),
+            (int)( $h1 & 0xffffffff ),
+            (int)( $h2 & 0xffffffff ),
+            (int)( $h3 & 0xffffffff ),
+            (int)( $h4 & 0xffffffff )
         );
         return $this;
     }
@@ -313,16 +313,16 @@ 
     public function finish()
     {
         /* process the remaining block */
-        if ($this->leftover) {
+        if ( $this->leftover ) {
             $i = $this->leftover;
-            $this->buffer[$i++] = 1;
-            for (; $i < ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE; ++$i) {
-                $this->buffer[$i] = 0;
+            $this->buffer[ $i++ ] = 1;
+            for ( ; $i < ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE; ++$i ) {
+                $this->buffer[ $i ] = 0;
             }
             $this->final = true;
             $this->blocks(
                 self::substr(
-                    self::intArrayToString($this->buffer),
+                    self::intArrayToString( $this->buffer ),
                     0,
                     ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
                 ),
@@ -330,11 +330,11 @@ 
             );
         }
 
-        $h0 = (int) $this->h[0];
-        $h1 = (int) $this->h[1];
-        $h2 = (int) $this->h[2];
-        $h3 = (int) $this->h[3];
-        $h4 = (int) $this->h[4];
+        $h0 = (int)$this->h[ 0 ];
+        $h1 = (int)$this->h[ 1 ];
+        $h2 = (int)$this->h[ 2 ];
+        $h3 = (int)$this->h[ 3 ];
+        $h4 = (int)$this->h[ 4 ];
 
         /** @var int $c */
         $c = $h1 >> 26;
@@ -355,7 +355,7 @@ 
         $c = $h4 >> 26;
         $h4 &= 0x3ffffff;
         /** @var int $h0 */
-        $h0 += self::mul($c, 5, 3);
+        $h0 += self::mul( $c, 5, 3 );
         /** @var int $c */
         $c = $h0 >> 26;
         /** @var int $h0 */
@@ -392,11 +392,11 @@ 
         $g3 &= 0x3ffffff;
 
         /** @var int $g4 */
-        $g4 = ($h4 + $c - (1 << 26)) & 0xffffffff;
+        $g4 = ( $h4 + $c - ( 1 << 26 ) ) & 0xffffffff;
 
         /* select h if h < p, or h + -p if h >= p */
         /** @var int $mask */
-        $mask = ($g4 >> 31) - 1;
+        $mask = ( $g4 >> 31 ) - 1;
 
         $g0 &= $mask;
         $g1 &= $mask;
@@ -407,39 +407,39 @@ 
         /** @var int $mask */
         $mask = ~$mask & 0xffffffff;
         /** @var int $h0 */
-        $h0 = ($h0 & $mask) | $g0;
+        $h0 = ( $h0 & $mask ) | $g0;
         /** @var int $h1 */
-        $h1 = ($h1 & $mask) | $g1;
+        $h1 = ( $h1 & $mask ) | $g1;
         /** @var int $h2 */
-        $h2 = ($h2 & $mask) | $g2;
+        $h2 = ( $h2 & $mask ) | $g2;
         /** @var int $h3 */
-        $h3 = ($h3 & $mask) | $g3;
+        $h3 = ( $h3 & $mask ) | $g3;
         /** @var int $h4 */
-        $h4 = ($h4 & $mask) | $g4;
+        $h4 = ( $h4 & $mask ) | $g4;
 
         /* h = h % (2^128) */
         /** @var int $h0 */
-        $h0 = (($h0) | ($h1 << 26)) & 0xffffffff;
+        $h0 = ( ( $h0 ) | ( $h1 << 26 ) ) & 0xffffffff;
         /** @var int $h1 */
-        $h1 = (($h1 >>  6) | ($h2 << 20)) & 0xffffffff;
+        $h1 = ( ( $h1 >> 6 ) | ( $h2 << 20 ) ) & 0xffffffff;
         /** @var int $h2 */
-        $h2 = (($h2 >> 12) | ($h3 << 14)) & 0xffffffff;
+        $h2 = ( ( $h2 >> 12 ) | ( $h3 << 14 ) ) & 0xffffffff;
         /** @var int $h3 */
-        $h3 = (($h3 >> 18) | ($h4 <<  8)) & 0xffffffff;
+        $h3 = ( ( $h3 >> 18 ) | ( $h4 << 8 ) ) & 0xffffffff;
 
         /* mac = (h + pad) % (2^128) */
-        $f = (int) ($h0 + $this->pad[0]);
-        $h0 = (int) $f;
-        $f = (int) ($h1 + $this->pad[1] + ($f >> 32));
-        $h1 = (int) $f;
-        $f = (int) ($h2 + $this->pad[2] + ($f >> 32));
-        $h2 = (int) $f;
-        $f = (int) ($h3 + $this->pad[3] + ($f >> 32));
-        $h3 = (int) $f;
-
-        return self::store32_le($h0 & 0xffffffff) .
-            self::store32_le($h1 & 0xffffffff) .
-            self::store32_le($h2 & 0xffffffff) .
-            self::store32_le($h3 & 0xffffffff);
+        $f = (int)( $h0 + $this->pad[ 0 ] );
+        $h0 = (int)$f;
+        $f = (int)( $h1 + $this->pad[ 1 ] + ( $f >> 32 ) );
+        $h1 = (int)$f;
+        $f = (int)( $h2 + $this->pad[ 2 ] + ( $f >> 32 ) );
+        $h2 = (int)$f;
+        $f = (int)( $h3 + $this->pad[ 3 ] + ( $f >> 32 ) );
+        $h3 = (int)$f;
+
+        return self::store32_le( $h0 & 0xffffffff ) .
+            self::store32_le( $h1 & 0xffffffff ) .
+            self::store32_le( $h2 & 0xffffffff ) .
+            self::store32_le( $h3 & 0xffffffff );
     }
 }

vendor/paragonie/sodium_compat/src/Core/ChaCha20.php

Spacing +126 added lines, -126 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_ChaCha20', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_ChaCha20', false ) ) {
     return;
 }
 
@@ -18,15 +18,15 @@ 
      * @param int $n
      * @return int
      */
-    public static function rotate($v, $n)
+    public static function rotate( $v, $n )
     {
         $v &= 0xffffffff;
         $n &= 31;
-        return (int) (
+        return (int)(
             0xffffffff & (
-                ($v << $n)
+                ( $v << $n )
                     |
-                ($v >> (32 - $n))
+                ( $v >> ( 32 - $n ) )
             )
         );
     }
@@ -42,28 +42,28 @@ 
      * @param int $d
      * @return array<int, int>
      */
-    protected static function quarterRound($a, $b, $c, $d)
+    protected static function quarterRound( $a, $b, $c, $d )
     {
         # a = PLUS(a,b); d = ROTATE(XOR(d,a),16);
         /** @var int $a */
-        $a = ($a + $b) & 0xffffffff;
-        $d = self::rotate($d ^ $a, 16);
+        $a = ( $a + $b ) & 0xffffffff;
+        $d = self::rotate( $d ^ $a, 16 );
 
         # c = PLUS(c,d); b = ROTATE(XOR(b,c),12);
         /** @var int $c */
-        $c = ($c + $d) & 0xffffffff;
-        $b = self::rotate($b ^ $c, 12);
+        $c = ( $c + $d ) & 0xffffffff;
+        $b = self::rotate( $b ^ $c, 12 );
 
         # a = PLUS(a,b); d = ROTATE(XOR(d,a), 8);
         /** @var int $a */
-        $a = ($a + $b) & 0xffffffff;
-        $d = self::rotate($d ^ $a, 8);
+        $a = ( $a + $b ) & 0xffffffff;
+        $d = self::rotate( $d ^ $a, 8 );
 
         # c = PLUS(c,d); b = ROTATE(XOR(b,c), 7);
         /** @var int $c */
-        $c = ($c + $d) & 0xffffffff;
-        $b = self::rotate($b ^ $c, 7);
-        return array((int) $a, (int) $b, (int) $c, (int) $d);
+        $c = ( $c + $d ) & 0xffffffff;
+        $b = self::rotate( $b ^ $c, 7 );
+        return array( (int)$a, (int)$b, (int)$c, (int)$d );
     }
 
     /**
@@ -80,7 +80,7 @@ 
         ParagonIE_Sodium_Core_ChaCha20_Ctx $ctx,
         $message = ''
     ) {
-        $bytes = self::strlen($message);
+        $bytes = self::strlen( $message );
 
         /*
         j0 = ctx->input[0];
@@ -100,71 +100,71 @@ 
         j14 = ctx->input[14];
         j15 = ctx->input[15];
         */
-        $j0  = (int) $ctx[0];
-        $j1  = (int) $ctx[1];
-        $j2  = (int) $ctx[2];
-        $j3  = (int) $ctx[3];
-        $j4  = (int) $ctx[4];
-        $j5  = (int) $ctx[5];
-        $j6  = (int) $ctx[6];
-        $j7  = (int) $ctx[7];
-        $j8  = (int) $ctx[8];
-        $j9  = (int) $ctx[9];
-        $j10 = (int) $ctx[10];
-        $j11 = (int) $ctx[11];
-        $j12 = (int) $ctx[12];
-        $j13 = (int) $ctx[13];
-        $j14 = (int) $ctx[14];
-        $j15 = (int) $ctx[15];
+        $j0  = (int)$ctx[ 0 ];
+        $j1  = (int)$ctx[ 1 ];
+        $j2  = (int)$ctx[ 2 ];
+        $j3  = (int)$ctx[ 3 ];
+        $j4  = (int)$ctx[ 4 ];
+        $j5  = (int)$ctx[ 5 ];
+        $j6  = (int)$ctx[ 6 ];
+        $j7  = (int)$ctx[ 7 ];
+        $j8  = (int)$ctx[ 8 ];
+        $j9  = (int)$ctx[ 9 ];
+        $j10 = (int)$ctx[ 10 ];
+        $j11 = (int)$ctx[ 11 ];
+        $j12 = (int)$ctx[ 12 ];
+        $j13 = (int)$ctx[ 13 ];
+        $j14 = (int)$ctx[ 14 ];
+        $j15 = (int)$ctx[ 15 ];
 
         $c = '';
-        for (;;) {
-            if ($bytes < 64) {
-                $message .= str_repeat("\x00", 64 - $bytes);
+        for ( ;; ) {
+            if ( $bytes < 64 ) {
+                $message .= str_repeat( "\x00", 64 - $bytes );
             }
 
-            $x0 =  (int) $j0;
-            $x1 =  (int) $j1;
-            $x2 =  (int) $j2;
-            $x3 =  (int) $j3;
-            $x4 =  (int) $j4;
-            $x5 =  (int) $j5;
-            $x6 =  (int) $j6;
-            $x7 =  (int) $j7;
-            $x8 =  (int) $j8;
-            $x9 =  (int) $j9;
-            $x10 = (int) $j10;
-            $x11 = (int) $j11;
-            $x12 = (int) $j12;
-            $x13 = (int) $j13;
-            $x14 = (int) $j14;
-            $x15 = (int) $j15;
+            $x0 = (int)$j0;
+            $x1 = (int)$j1;
+            $x2 = (int)$j2;
+            $x3 = (int)$j3;
+            $x4 = (int)$j4;
+            $x5 = (int)$j5;
+            $x6 = (int)$j6;
+            $x7 = (int)$j7;
+            $x8 = (int)$j8;
+            $x9 = (int)$j9;
+            $x10 = (int)$j10;
+            $x11 = (int)$j11;
+            $x12 = (int)$j12;
+            $x13 = (int)$j13;
+            $x14 = (int)$j14;
+            $x15 = (int)$j15;
 
             # for (i = 20; i > 0; i -= 2) {
-            for ($i = 20; $i > 0; $i -= 2) {
+            for ( $i = 20; $i > 0; $i -= 2 ) {
                 # QUARTERROUND( x0,  x4,  x8,  x12)
-                list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12);
+                list( $x0, $x4, $x8, $x12 ) = self::quarterRound( $x0, $x4, $x8, $x12 );
 
                 # QUARTERROUND( x1,  x5,  x9,  x13)
-                list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13);
+                list( $x1, $x5, $x9, $x13 ) = self::quarterRound( $x1, $x5, $x9, $x13 );
 
                 # QUARTERROUND( x2,  x6,  x10,  x14)
-                list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14);
+                list( $x2, $x6, $x10, $x14 ) = self::quarterRound( $x2, $x6, $x10, $x14 );
 
                 # QUARTERROUND( x3,  x7,  x11,  x15)
-                list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15);
+                list( $x3, $x7, $x11, $x15 ) = self::quarterRound( $x3, $x7, $x11, $x15 );
 
                 # QUARTERROUND( x0,  x5,  x10,  x15)
-                list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15);
+                list( $x0, $x5, $x10, $x15 ) = self::quarterRound( $x0, $x5, $x10, $x15 );
 
                 # QUARTERROUND( x1,  x6,  x11,  x12)
-                list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12);
+                list( $x1, $x6, $x11, $x12 ) = self::quarterRound( $x1, $x6, $x11, $x12 );
 
                 # QUARTERROUND( x2,  x7,  x8,  x13)
-                list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13);
+                list( $x2, $x7, $x8, $x13 ) = self::quarterRound( $x2, $x7, $x8, $x13 );
 
                 # QUARTERROUND( x3,  x4,  x9,  x14)
-                list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14);
+                list( $x3, $x4, $x9, $x14 ) = self::quarterRound( $x3, $x4, $x9, $x14 );
             }
             /*
             x0 = PLUS(x0, j0);
@@ -185,37 +185,37 @@ 
             x15 = PLUS(x15, j15);
             */
             /** @var int $x0 */
-            $x0  = ($x0 & 0xffffffff) + $j0;
+            $x0  = ( $x0 & 0xffffffff ) + $j0;
             /** @var int $x1 */
-            $x1  = ($x1 & 0xffffffff) + $j1;
+            $x1  = ( $x1 & 0xffffffff ) + $j1;
             /** @var int $x2 */
-            $x2  = ($x2 & 0xffffffff) + $j2;
+            $x2  = ( $x2 & 0xffffffff ) + $j2;
             /** @var int $x3 */
-            $x3  = ($x3 & 0xffffffff) + $j3;
+            $x3  = ( $x3 & 0xffffffff ) + $j3;
             /** @var int $x4 */
-            $x4  = ($x4 & 0xffffffff) + $j4;
+            $x4  = ( $x4 & 0xffffffff ) + $j4;
             /** @var int $x5 */
-            $x5  = ($x5 & 0xffffffff) + $j5;
+            $x5  = ( $x5 & 0xffffffff ) + $j5;
             /** @var int $x6 */
-            $x6  = ($x6 & 0xffffffff) + $j6;
+            $x6  = ( $x6 & 0xffffffff ) + $j6;
             /** @var int $x7 */
-            $x7  = ($x7 & 0xffffffff) + $j7;
+            $x7  = ( $x7 & 0xffffffff ) + $j7;
             /** @var int $x8 */
-            $x8  = ($x8 & 0xffffffff) + $j8;
+            $x8  = ( $x8 & 0xffffffff ) + $j8;
             /** @var int $x9 */
-            $x9  = ($x9 & 0xffffffff) + $j9;
+            $x9  = ( $x9 & 0xffffffff ) + $j9;
             /** @var int $x10 */
-            $x10 = ($x10 & 0xffffffff) + $j10;
+            $x10 = ( $x10 & 0xffffffff ) + $j10;
             /** @var int $x11 */
-            $x11 = ($x11 & 0xffffffff) + $j11;
+            $x11 = ( $x11 & 0xffffffff ) + $j11;
             /** @var int $x12 */
-            $x12 = ($x12 & 0xffffffff) + $j12;
+            $x12 = ( $x12 & 0xffffffff ) + $j12;
             /** @var int $x13 */
-            $x13 = ($x13 & 0xffffffff) + $j13;
+            $x13 = ( $x13 & 0xffffffff ) + $j13;
             /** @var int $x14 */
-            $x14 = ($x14 & 0xffffffff) + $j14;
+            $x14 = ( $x14 & 0xffffffff ) + $j14;
             /** @var int $x15 */
-            $x15 = ($x15 & 0xffffffff) + $j15;
+            $x15 = ( $x15 & 0xffffffff ) + $j15;
 
             /*
             x0 = XOR(x0, LOAD32_LE(m + 0));
@@ -235,22 +235,22 @@ 
             x14 = XOR(x14, LOAD32_LE(m + 56));
             x15 = XOR(x15, LOAD32_LE(m + 60));
             */
-            $x0  ^= self::load_4(self::substr($message, 0, 4));
-            $x1  ^= self::load_4(self::substr($message, 4, 4));
-            $x2  ^= self::load_4(self::substr($message, 8, 4));
-            $x3  ^= self::load_4(self::substr($message, 12, 4));
-            $x4  ^= self::load_4(self::substr($message, 16, 4));
-            $x5  ^= self::load_4(self::substr($message, 20, 4));
-            $x6  ^= self::load_4(self::substr($message, 24, 4));
-            $x7  ^= self::load_4(self::substr($message, 28, 4));
-            $x8  ^= self::load_4(self::substr($message, 32, 4));
-            $x9  ^= self::load_4(self::substr($message, 36, 4));
-            $x10 ^= self::load_4(self::substr($message, 40, 4));
-            $x11 ^= self::load_4(self::substr($message, 44, 4));
-            $x12 ^= self::load_4(self::substr($message, 48, 4));
-            $x13 ^= self::load_4(self::substr($message, 52, 4));
-            $x14 ^= self::load_4(self::substr($message, 56, 4));
-            $x15 ^= self::load_4(self::substr($message, 60, 4));
+            $x0  ^= self::load_4( self::substr( $message, 0, 4 ) );
+            $x1  ^= self::load_4( self::substr( $message, 4, 4 ) );
+            $x2  ^= self::load_4( self::substr( $message, 8, 4 ) );
+            $x3  ^= self::load_4( self::substr( $message, 12, 4 ) );
+            $x4  ^= self::load_4( self::substr( $message, 16, 4 ) );
+            $x5  ^= self::load_4( self::substr( $message, 20, 4 ) );
+            $x6  ^= self::load_4( self::substr( $message, 24, 4 ) );
+            $x7  ^= self::load_4( self::substr( $message, 28, 4 ) );
+            $x8  ^= self::load_4( self::substr( $message, 32, 4 ) );
+            $x9  ^= self::load_4( self::substr( $message, 36, 4 ) );
+            $x10 ^= self::load_4( self::substr( $message, 40, 4 ) );
+            $x11 ^= self::load_4( self::substr( $message, 44, 4 ) );
+            $x12 ^= self::load_4( self::substr( $message, 48, 4 ) );
+            $x13 ^= self::load_4( self::substr( $message, 52, 4 ) );
+            $x14 ^= self::load_4( self::substr( $message, 56, 4 ) );
+            $x15 ^= self::load_4( self::substr( $message, 60, 4 ) );
 
             /*
                 j12 = PLUSONE(j12);
@@ -259,8 +259,8 @@ 
                 }
              */
             ++$j12;
-            if ($j12 & 0xf0000000) {
-                throw new SodiumException('Overflow');
+            if ( $j12 & 0xf0000000 ) {
+                throw new SodiumException( 'Overflow' );
             }
 
             /*
@@ -281,41 +281,41 @@ 
             STORE32_LE(c + 56, x14);
             STORE32_LE(c + 60, x15);
             */
-            $block = self::store32_le((int) ($x0  & 0xffffffff)) .
-                 self::store32_le((int) ($x1  & 0xffffffff)) .
-                 self::store32_le((int) ($x2  & 0xffffffff)) .
-                 self::store32_le((int) ($x3  & 0xffffffff)) .
-                 self::store32_le((int) ($x4  & 0xffffffff)) .
-                 self::store32_le((int) ($x5  & 0xffffffff)) .
-                 self::store32_le((int) ($x6  & 0xffffffff)) .
-                 self::store32_le((int) ($x7  & 0xffffffff)) .
-                 self::store32_le((int) ($x8  & 0xffffffff)) .
-                 self::store32_le((int) ($x9  & 0xffffffff)) .
-                 self::store32_le((int) ($x10 & 0xffffffff)) .
-                 self::store32_le((int) ($x11 & 0xffffffff)) .
-                 self::store32_le((int) ($x12 & 0xffffffff)) .
-                 self::store32_le((int) ($x13 & 0xffffffff)) .
-                 self::store32_le((int) ($x14 & 0xffffffff)) .
-                 self::store32_le((int) ($x15 & 0xffffffff));
+            $block = self::store32_le( (int)( $x0  & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x1  & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x2  & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x3  & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x4  & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x5  & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x6  & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x7  & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x8  & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x9  & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x10 & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x11 & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x12 & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x13 & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x14 & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x15 & 0xffffffff ) );
 
             /* Partial block */
-            if ($bytes < 64) {
-                $c .= self::substr($block, 0, $bytes);
+            if ( $bytes < 64 ) {
+                $c .= self::substr( $block, 0, $bytes );
                 break;
             }
 
             /* Full block */
             $c .= $block;
             $bytes -= 64;
-            if ($bytes <= 0) {
+            if ( $bytes <= 0 ) {
                 break;
             }
-            $message = self::substr($message, 64);
+            $message = self::substr( $message, 64 );
         }
         /* end for(;;) loop */
 
-        $ctx[12] = $j12;
-        $ctx[13] = $j13;
+        $ctx[ 12 ] = $j12;
+        $ctx[ 13 ] = $j13;
         return $c;
     }
 
@@ -329,11 +329,11 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function stream($len = 64, $nonce = '', $key = '')
+    public static function stream( $len = 64, $nonce = '', $key = '' )
     {
         return self::encryptBytes(
-            new ParagonIE_Sodium_Core_ChaCha20_Ctx($key, $nonce),
-            str_repeat("\x00", $len)
+            new ParagonIE_Sodium_Core_ChaCha20_Ctx( $key, $nonce ),
+            str_repeat( "\x00", $len )
         );
     }
 
@@ -347,11 +347,11 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function ietfStream($len, $nonce = '', $key = '')
+    public static function ietfStream( $len, $nonce = '', $key = '' )
     {
         return self::encryptBytes(
-            new ParagonIE_Sodium_Core_ChaCha20_IetfCtx($key, $nonce),
-            str_repeat("\x00", $len)
+            new ParagonIE_Sodium_Core_ChaCha20_IetfCtx( $key, $nonce ),
+            str_repeat( "\x00", $len )
         );
     }
 
@@ -366,10 +366,10 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '')
+    public static function ietfStreamXorIc( $message, $nonce = '', $key = '', $ic = '' )
     {
         return self::encryptBytes(
-            new ParagonIE_Sodium_Core_ChaCha20_IetfCtx($key, $nonce, $ic),
+            new ParagonIE_Sodium_Core_ChaCha20_IetfCtx( $key, $nonce, $ic ),
             $message
         );
     }
@@ -385,10 +385,10 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
+    public static function streamXorIc( $message, $nonce = '', $key = '', $ic = '' )
     {
         return self::encryptBytes(
-            new ParagonIE_Sodium_Core_ChaCha20_Ctx($key, $nonce, $ic),
+            new ParagonIE_Sodium_Core_ChaCha20_Ctx( $key, $nonce, $ic ),
             $message
         );
     }

future/includes/class-gv-request.php

Spacing +10 added lines, -10 removed lines

@@ -69,7 +69,7 @@ 
 	 */
 	public static function is_add_oembed_preview() {
 		/** The preview request is a parse-embed AJAX call without a type set. */
-		return ( self::is_ajax() && ! empty( $_POST['action'] ) && $_POST['action'] == 'parse-embed' && ! isset( $_POST['type'] ) );
+		return ( self::is_ajax() && ! empty( $_POST[ 'action' ] ) && $_POST[ 'action' ] == 'parse-embed' && ! isset( $_POST[ 'type' ] ) );
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	 * @return boolean
 	 */
 	public static function is_rest() {
-		return ! empty( $GLOBALS['wp']->query_vars['rest_route'] );
+		return ! empty( $GLOBALS[ 'wp' ]->query_vars[ 'rest_route' ] );
 	}
 
 	/**
@@ -162,7 +162,7 @@ 
 					return false;
 				}
 
-				if ( ! in_array( $e['form_id'], $valid_forms ) ) {
+				if ( ! in_array( $e[ 'form_id' ], $valid_forms ) ) {
 					return false;
 				}
 
@@ -178,7 +178,7 @@ 
 			}
 
 			$entry = Multi_Entry::from_entries( array_filter( $multientry ) );
-		}  else {
+		} else {
 			/**
 			 * A regular one.
 			 */
@@ -236,15 +236,15 @@ 
 			$get = $_GET;
 		}
 
-		unset( $get['mode'] );
+		unset( $get[ 'mode' ] );
 
 		$get = array_filter( $get, 'gravityview_is_not_empty_string' );
 
-		if( $has_field_key = $this->_has_field_key( $get ) ) {
+		if ( $has_field_key = $this->_has_field_key( $get ) ) {
 			return true;
 		}
 
-		return isset( $get['gv_search'] ) || isset( $get['gv_start'] ) || isset( $get['gv_end'] ) || isset( $get['gv_by'] ) || isset( $get['gv_id'] );
+		return isset( $get[ 'gv_search' ] ) || isset( $get[ 'gv_start' ] ) || isset( $get[ 'gv_end' ] ) || isset( $get[ 'gv_by' ] ) || isset( $get[ 'gv_id' ] );
 	}
 
 	/**
@@ -267,13 +267,13 @@ 
 
 		$meta = array();
 		foreach ( $fields as $field ) {
-			if( empty( $field->_gf_field_class_name ) ) {
-				$meta[] = preg_quote( $field->name );
+			if ( empty( $field->_gf_field_class_name ) ) {
+				$meta[ ] = preg_quote( $field->name );
 			}
 		}
 
 		foreach ( $get as $key => $value ) {
-			if ( preg_match('/^(filter|input)_(([0-9_]+)|'. implode( '|', $meta ) .')$/sm', $key ) ) {
+			if ( preg_match( '/^(filter|input)_(([0-9_]+)|' . implode( '|', $meta ) . ')$/sm', $key ) ) {
 				$has_field_key = true;
 				break;
 			}

includes/widgets/search-widget/class-search-widget.php

Spacing +190 added lines, -190 removed lines

@@ -55,7 +55,7 @@ 
 			'search_clear' => array(
 				'type'  => 'checkbox',
 				'label' => __( 'Show Clear button', 'gravityview' ),
-				'desc'  => __( 'When a search is performed, display a button that removes all search values.', 'gravityview'),
+				'desc'  => __( 'When a search is performed, display a button that removes all search values.', 'gravityview' ),
 				'value' => true,
 			),
 			'search_fields' => array(
@@ -68,7 +68,7 @@ 
 				'type' => 'radio',
 				'full_width' => true,
 				'label' => esc_html__( 'Search Mode', 'gravityview' ),
-				'desc' => __('Should search results match all search fields, or any?', 'gravityview'),
+				'desc' => __( 'Should search results match all search fields, or any?', 'gravityview' ),
 				'value' => 'any',
 				'class' => 'hide-if-js',
 				'options' => array(
@@ -87,7 +87,7 @@ 
 
 			// admin - add scripts - run at 1100 to make sure GravityView_Admin_Views::add_scripts_and_styles() runs first at 999
 			add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 1100 );
-			add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') );
+			add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) );
 			add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
 
 			// ajax - get the searchable fields
@@ -123,19 +123,19 @@ 
 	 */
 	public function add_reserved_args( $args ) {
 
-		$args[] = 'gv_search';
-		$args[] = 'gv_start';
-		$args[] = 'gv_end';
-		$args[] = 'gv_id';
-		$args[] = 'gv_by';
-		$args[] = 'mode';
+		$args[ ] = 'gv_search';
+		$args[ ] = 'gv_start';
+		$args[ ] = 'gv_end';
+		$args[ ] = 'gv_id';
+		$args[ ] = 'gv_by';
+		$args[ ] = 'mode';
 
-		$get = (array) $_GET;
+		$get = (array)$_GET;
 
 		// If the fields being searched as reserved; not to be considered user-passed variables
 		foreach ( $get as $key => $value ) {
 			if ( $key !== $this->convert_request_key_to_filter_key( $key ) ) {
-				$args[] = $key;
+				$args[ ] = $key;
 			}
 		}
 
@@ -259,7 +259,7 @@ 
 		$script_min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 		$script_source = empty( $script_min ) ? '/source' : '';
 
-		wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js'.$script_source.'/admin-search-widget'.$script_min.'.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), \GV\Plugin::$version );
+		wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js' . $script_source . '/admin-search-widget' . $script_min . '.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), \GV\Plugin::$version );
 
 		wp_localize_script( 'gravityview_searchwidget_admin', 'gvSearchVar', array(
 			'nonce' => wp_create_nonce( 'gravityview_ajaxsearchwidget' ),
@@ -281,7 +281,7 @@ 
 	 * @return array Scripts allowed in no-conflict mode, plus the search widget script
 	 */
 	public function register_no_conflict( $allowed ) {
-		$allowed[] = 'gravityview_searchwidget_admin';
+		$allowed[ ] = 'gravityview_searchwidget_admin';
 		return $allowed;
 	}
 
@@ -293,24 +293,24 @@ 
 	 */
 	public static function get_searchable_fields() {
 
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxsearchwidget' ) ) {
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxsearchwidget' ) ) {
 			exit( '0' );
 		}
 
 		$form = '';
 
 		// Fetch the form for the current View
-		if ( ! empty( $_POST['view_id'] ) ) {
+		if ( ! empty( $_POST[ 'view_id' ] ) ) {
 
-			$form = gravityview_get_form_id( $_POST['view_id'] );
+			$form = gravityview_get_form_id( $_POST[ 'view_id' ] );
 
-		} elseif ( ! empty( $_POST['formid'] ) ) {
+		} elseif ( ! empty( $_POST[ 'formid' ] ) ) {
 
-			$form = (int) $_POST['formid'];
+			$form = (int)$_POST[ 'formid' ];
 
-		} elseif ( ! empty( $_POST['template_id'] ) && class_exists( 'GravityView_Ajax' ) ) {
+		} elseif ( ! empty( $_POST[ 'template_id' ] ) && class_exists( 'GravityView_Ajax' ) ) {
 
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
 
 		}
 
@@ -360,14 +360,14 @@ 
 		);
 
 		if ( gravityview()->plugin->supports( \GV\Plugin::FEATURE_GFQUERY ) ) {
-			$custom_fields['is_approved'] = array(
+			$custom_fields[ 'is_approved' ] = array(
 				'text' => esc_html__( 'Approval Status', 'gravityview' ),
 				'type' => 'multi',
 			);
 		}
 
-		foreach( $custom_fields as $custom_field_key => $custom_field ) {
-			$output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field['type'], self::get_field_label( array('field' => $custom_field_key ) ), $custom_field['text'] );
+		foreach ( $custom_fields as $custom_field_key => $custom_field ) {
+			$output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field[ 'type' ], self::get_field_label( array( 'field' => $custom_field_key ) ), $custom_field[ 'text' ] );
 		}
 
 		// Get fields with sub-inputs and no parent
@@ -389,13 +389,13 @@ 
 
 			foreach ( $fields as $id => $field ) {
 
-				if ( in_array( $field['type'], $blocklist_field_types ) ) {
+				if ( in_array( $field[ 'type' ], $blocklist_field_types ) ) {
 					continue;
 				}
 
-				$types = self::get_search_input_types( $id, $field['type'] );
+				$types = self::get_search_input_types( $id, $field[ 'type' ] );
 
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'data-inputtypes="'. esc_attr( $types ) .'">'. esc_html( $field['label'] ) .'</option>';
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . 'data-inputtypes="' . esc_attr( $types ) . '">' . esc_html( $field[ 'label' ] ) . '</option>';
 			}
 		}
 
@@ -418,7 +418,7 @@ 
 	public static function get_search_input_types( $field_id = '', $field_type = null ) {
 
 		// @todo - This needs to be improved - many fields have . including products and addresses
-		if ( false !== strpos( (string) $field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) {
+		if ( false !== strpos( (string)$field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) {
 			$input_type = 'boolean'; // on/off checkbox
 		} elseif ( in_array( $field_type, array( 'checkbox', 'post_category', 'multiselect' ) ) ) {
 			$input_type = 'multi'; //multiselect
@@ -464,19 +464,19 @@ 
 			$post_id = 0;
 
 			// We're in the WordPress Widget context, and an overriding post ID has been set.
-			if ( ! empty( $widget_args['post_id'] ) ) {
-				$post_id = absint( $widget_args['post_id'] );
+			if ( ! empty( $widget_args[ 'post_id' ] ) ) {
+				$post_id = absint( $widget_args[ 'post_id' ] );
 			}
 			// We're in the WordPress Widget context, and the base View ID should be used
-			else if ( ! empty( $widget_args['view_id'] ) ) {
-				$post_id = absint( $widget_args['view_id'] );
+			else if ( ! empty( $widget_args[ 'view_id' ] ) ) {
+				$post_id = absint( $widget_args[ 'view_id' ] );
 			}
 
 			$args = gravityview_get_permalink_query_args( $post_id );
 
 			// Add hidden fields to the search form
 			foreach ( $args as $key => $value ) {
-				$search_fields[] = array(
+				$search_fields[ ] = array(
 					'name'  => $key,
 					'input' => 'hidden',
 					'value' => $value,
@@ -515,28 +515,28 @@ 
 		/**
 		 * Include the sidebar Widgets.
 		 */
-		$widgets = (array) get_option( 'widget_gravityview_search', array() );
+		$widgets = (array)get_option( 'widget_gravityview_search', array() );
 
 		foreach ( $widgets as $widget ) {
-			if ( ! empty( $widget['view_id'] ) && $widget['view_id'] == $view->ID ) {
-				if( $_fields = json_decode( $widget['search_fields'], true ) ) {
+			if ( ! empty( $widget[ 'view_id' ] ) && $widget[ 'view_id' ] == $view->ID ) {
+				if ( $_fields = json_decode( $widget[ 'search_fields' ], true ) ) {
 					foreach ( $_fields as $field ) {
-						if ( empty( $field['form_id'] ) ) {
-							$field['form_id'] = $view->form ? $view->form->ID : 0;
+						if ( empty( $field[ 'form_id' ] ) ) {
+							$field[ 'form_id' ] = $view->form ? $view->form->ID : 0;
 						}
-						$searchable_fields[] = $with_full_field ? $field : $field['field'];
+						$searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ];
 					}
 				}
 			}
 		}
 
 		foreach ( $view->widgets->by_id( $this->get_widget_id() )->all() as $widget ) {
-			if( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) {
+			if ( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) {
 				foreach ( $_fields as $field ) {
-					if ( empty( $field['form_id'] ) ) {
-						$field['form_id'] = $view->form ? $view->form->ID : 0;
+					if ( empty( $field[ 'form_id' ] ) ) {
+						$field[ 'form_id' ] = $view->form ? $view->form->ID : 0;
 					}
-					$searchable_fields[] = $with_full_field ? $field : $field['field'];
+					$searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ];
 				}
 			}
 		}
@@ -582,7 +582,7 @@ 
 			return $search_criteria; // Return the original criteria, GF_Query modification kicks in later
 		}
 
-		if( 'post' === $this->search_method ) {
+		if ( 'post' === $this->search_method ) {
 			$get = $_POST;
 		} else {
 			$get = $_GET;
@@ -603,7 +603,7 @@ 
 		$get = gv_map_deep( $get, 'rawurldecode' );
 
 		// Make sure array key is set up
-		$search_criteria['field_filters'] = \GV\Utils::get( $search_criteria, 'field_filters', array() );
+		$search_criteria[ 'field_filters' ] = \GV\Utils::get( $search_criteria, 'field_filters', array() );
 
 		$searchable_fields = $this->get_view_searchable_fields( $view );
 		$searchable_field_objects = $this->get_view_searchable_fields( $view, true );
@@ -623,9 +623,9 @@ 
 		$trim_search_value = apply_filters( 'gravityview/search-trim-input', true );
 
 		// add free search
-		if ( isset( $get['gv_search'] ) && '' !== $get['gv_search'] && in_array( 'search_all', $searchable_fields ) ) {
+		if ( isset( $get[ 'gv_search' ] ) && '' !== $get[ 'gv_search' ] && in_array( 'search_all', $searchable_fields ) ) {
 
-			$search_all_value = $trim_search_value ? trim( $get['gv_search'] ) : $get['gv_search'];
+			$search_all_value = $trim_search_value ? trim( $get[ 'gv_search' ] ) : $get[ 'gv_search' ];
 
 			if ( $split_words ) {
 				// Search for a piece
@@ -641,7 +641,7 @@ 
 			}
 
 			foreach ( $words as $word ) {
-				$search_criteria['field_filters'][] = array(
+				$search_criteria[ 'field_filters' ][ ] = array(
 					'key' => null, // The field ID to search
 					'value' => $word, // The value to search
 					'operator' => 'contains', // What to search in. Options: `is` or `contains`
@@ -654,14 +654,14 @@ 
 			/**
 			 * Get and normalize the dates according to the input format.
 			 */
-			if ( $curr_start = ! empty( $get['gv_start'] ) ? $get['gv_start'] : '' ) {
-				if( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) {
+			if ( $curr_start = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_start' ] : '' ) {
+				if ( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) {
 					$curr_start = $curr_start_date->format( 'Y-m-d' );
 				}
 			}
 
-			if ( $curr_end = ! empty( $get['gv_start'] ) ? ( ! empty( $get['gv_end'] ) ? $get['gv_end'] : '' ) : '' ) {
-				if( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) {
+			if ( $curr_end = ! empty( $get[ 'gv_start' ] ) ? ( ! empty( $get[ 'gv_end' ] ) ? $get[ 'gv_end' ] : '' ) : '' ) {
+				if ( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) {
 					$curr_end = $curr_end_date->format( 'Y-m-d' );
 				}
 			}
@@ -697,22 +697,22 @@ 
 			 */
 			if ( ! empty( $curr_start ) ) {
 				$curr_start = date( 'Y-m-d H:i:s', strtotime( $curr_start ) );
-				$search_criteria['start_date'] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
+				$search_criteria[ 'start_date' ] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
 			}
 
 			if ( ! empty( $curr_end ) ) {
 				// Fast-forward 24 hour on the end time
 				$curr_end = date( 'Y-m-d H:i:s', strtotime( $curr_end ) + DAY_IN_SECONDS );
-				$search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
-				if ( strpos( $search_criteria['end_date'], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056
-					$search_criteria['end_date'] = date( 'Y-m-d H:i:s', strtotime( $search_criteria['end_date'] ) - 1 );
+				$search_criteria[ 'end_date' ] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
+				if ( strpos( $search_criteria[ 'end_date' ], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056
+					$search_criteria[ 'end_date' ] = date( 'Y-m-d H:i:s', strtotime( $search_criteria[ 'end_date' ] ) - 1 );
 				}
 			}
 		}
 
 		// search for a specific entry ID
 		if ( ! empty( $get[ 'gv_id' ] ) && in_array( 'entry_id', $searchable_fields ) ) {
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => 'id',
 				'value' => absint( $get[ 'gv_id' ] ),
 				'operator' => $this->get_operator( $get, 'gv_id', array( '=' ), '=' ),
@@ -721,15 +721,15 @@ 
 
 		// search for a specific Created_by ID
 		if ( ! empty( $get[ 'gv_by' ] ) && in_array( 'created_by', $searchable_fields ) ) {
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => 'created_by',
-				'value' => $get['gv_by'],
+				'value' => $get[ 'gv_by' ],
 				'operator' => $this->get_operator( $get, 'gv_by', array( '=' ), '=' ),
 			);
 		}
 
 		// Get search mode passed in URL
-		$mode = isset( $get['mode'] ) && in_array( $get['mode'], array( 'any', 'all' ) ) ?  $get['mode'] : 'any';
+		$mode = isset( $get[ 'mode' ] ) && in_array( $get[ 'mode' ], array( 'any', 'all' ) ) ? $get[ 'mode' ] : 'any';
 
 		// get the other search filters
 		foreach ( $get as $key => $value ) {
@@ -747,7 +747,7 @@ 
 				$value = is_array( $value ) ? array_map( 'trim', $value ) : trim( $value );
 			}
 
-			if ( gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[0], false, false ) ) ) {
+			if ( gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[ 0 ], false, false ) ) ) {
 				/**
 				 * @filter `gravityview/search/ignore-empty-values` Filter to control if empty field values should be ignored or strictly matched (default: true)
 				 * @since  2.14.2.1
@@ -778,21 +778,21 @@ 
 				continue;
 			}
 
-			if ( ! isset( $filter['operator'] ) ) {
-				$filter['operator'] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' );
+			if ( ! isset( $filter[ 'operator' ] ) ) {
+				$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' );
 			}
 
-			if ( isset( $filter[0]['value'] ) ) {
-				$filter[0]['value'] = $trim_search_value ? trim( $filter[0]['value'] ) : $filter[0]['value'];
+			if ( isset( $filter[ 0 ][ 'value' ] ) ) {
+				$filter[ 0 ][ 'value' ] = $trim_search_value ? trim( $filter[ 0 ][ 'value' ] ) : $filter[ 0 ][ 'value' ];
 
-				$search_criteria['field_filters'] = array_merge( $search_criteria['field_filters'], $filter );
+				$search_criteria[ 'field_filters' ] = array_merge( $search_criteria[ 'field_filters' ], $filter );
 
 				// if date range type, set search mode to ALL
-				if ( ! empty( $filter[0]['operator'] ) && in_array( $filter[0]['operator'], array( '>=', '<=', '>', '<' ) ) ) {
+				if ( ! empty( $filter[ 0 ][ 'operator' ] ) && in_array( $filter[ 0 ][ 'operator' ], array( '>=', '<=', '>', '<' ) ) ) {
 					$mode = 'all';
 				}
-			} elseif( !empty( $filter ) ) {
-				$search_criteria['field_filters'][] = $filter;
+			} elseif ( ! empty( $filter ) ) {
+				$search_criteria[ 'field_filters' ][ ] = $filter;
 			}
 		}
 
@@ -801,7 +801,7 @@ 
 		 * @since 1.5.1
 		 * @param[out,in] string $mode Search mode (`any` vs `all`)
 		 */
-		$search_criteria['field_filters']['mode'] = apply_filters( 'gravityview/search/mode', $mode );
+		$search_criteria[ 'field_filters' ][ 'mode' ] = apply_filters( 'gravityview/search/mode', $mode );
 
 		gravityview()->log->debug( 'Returned Search Criteria: ', array( 'data' => $search_criteria ) );
 
@@ -835,19 +835,19 @@ 
 
 		$query_class = $view->get_query_class();
 
-		if ( empty( $search_criteria['field_filters'] ) ) {
+		if ( empty( $search_criteria[ 'field_filters' ] ) ) {
 			return;
 		}
 
 		$widgets = $view->widgets->by_id( $this->widget_id );
 		if ( $widgets->count() ) {
 			$widgets = $widgets->all();
-			$widget  = $widgets[0];
+			$widget  = $widgets[ 0 ];
 
 			$search_fields = json_decode( $widget->configuration->get( 'search_fields' ), true );
 
-			foreach ( (array) $search_fields as $search_field ) {
-				if ( 'created_by' === $search_field['field'] && 'input_text' === $search_field['input'] ) {
+			foreach ( (array)$search_fields as $search_field ) {
+				if ( 'created_by' === $search_field[ 'field' ] && 'input_text' === $search_field[ 'input' ] ) {
 					$created_by_text_mode = true;
 				}
 			}
@@ -856,7 +856,7 @@ 
 		$extra_conditions = array();
 		$mode = 'any';
 
-		foreach ( $search_criteria['field_filters'] as $key => &$filter ) {
+		foreach ( $search_criteria[ 'field_filters' ] as $key => &$filter ) {
 			if ( ! is_array( $filter ) ) {
 				if ( in_array( strtolower( $filter ), array( 'any', 'all' ) ) ) {
 					$mode = $filter;
@@ -865,13 +865,13 @@ 
 			}
 
 			// Construct a manual query for unapproved statuses
-			if ( 'is_approved' === $filter['key'] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array) $filter['value'] ) ) {
-				$_tmp_query       = new $query_class( $view->form->ID, array(
+			if ( 'is_approved' === $filter[ 'key' ] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array)$filter[ 'value' ] ) ) {
+				$_tmp_query = new $query_class( $view->form->ID, array(
 					'field_filters' => array(
 						array(
 							'operator' => 'in',
 							'key'      => 'is_approved',
-							'value'    => (array) $filter['value'],
+							'value'    => (array)$filter[ 'value' ],
 						),
 						array(
 							'operator' => 'is',
@@ -883,30 +883,30 @@ 
 				) );
 				$_tmp_query_parts = $_tmp_query->_introspect();
 
-				$extra_conditions[] = $_tmp_query_parts['where'];
+				$extra_conditions[ ] = $_tmp_query_parts[ 'where' ];
 
 				$filter = false;
 				continue;
 			}
 
 			// Construct manual query for text mode creator search
-			if ( 'created_by' === $filter['key'] && ! empty( $created_by_text_mode ) ) {
-				$extra_conditions[] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view );
+			if ( 'created_by' === $filter[ 'key' ] && ! empty( $created_by_text_mode ) ) {
+				$extra_conditions[ ] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view );
 				$filter = false;
 				continue;
 			}
 
 			// By default, we want searches to be wildcard for each field.
-			$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
+			$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
 
 			// For multichoice, let's have an in (OR) search.
-			if ( is_array( $filter['value'] ) ) {
-				$filter['operator'] = 'in'; // @todo what about in contains (OR LIKE chains)?
+			if ( is_array( $filter[ 'value' ] ) ) {
+				$filter[ 'operator' ] = 'in'; // @todo what about in contains (OR LIKE chains)?
 			}
 
 			// Default form with joins functionality
-			if ( empty( $filter['form_id'] ) ) {
-				$filter['form_id'] = $view->form ? $view->form->ID : 0;
+			if ( empty( $filter[ 'form_id' ] ) ) {
+				$filter[ 'form_id' ] = $view->form ? $view->form->ID : 0;
 			}
 
 			/**
@@ -916,32 +916,32 @@ 
 			 * @param array $filter array with `key`, `value`, `operator`, `type` keys
 			 * @param \GV\View $view The View we're operating on.
 			 */
-			$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter, $view );
+			$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter, $view );
 
-			if ( 'is' !== $filter['operator'] && '' === $filter['value'] ) {
-				unset( $search_criteria['field_filters'][ $key ] );
+			if ( 'is' !== $filter[ 'operator' ] && '' === $filter[ 'value' ] ) {
+				unset( $search_criteria[ 'field_filters' ][ $key ] );
 			}
 		}
 
-		if ( ! empty( $search_criteria['start_date'] ) || ! empty( $search_criteria['end_date'] ) ) {
+		if ( ! empty( $search_criteria[ 'start_date' ] ) || ! empty( $search_criteria[ 'end_date' ] ) ) {
 			$date_criteria = array();
 
-			if ( isset( $search_criteria['start_date'] ) ) {
-				$date_criteria['start_date'] = $search_criteria['start_date'];
+			if ( isset( $search_criteria[ 'start_date' ] ) ) {
+				$date_criteria[ 'start_date' ] = $search_criteria[ 'start_date' ];
 			}
 
-			if ( isset( $search_criteria['end_date'] ) ) {
-				$date_criteria['end_date'] = $search_criteria['end_date'];
+			if ( isset( $search_criteria[ 'end_date' ] ) ) {
+				$date_criteria[ 'end_date' ] = $search_criteria[ 'end_date' ];
 			}
 
 			$_tmp_query         = new $query_class( $view->form->ID, $date_criteria );
 			$_tmp_query_parts   = $_tmp_query->_introspect();
-			$extra_conditions[] = $_tmp_query_parts['where'];
+			$extra_conditions[ ] = $_tmp_query_parts[ 'where' ];
 		}
 
 		$search_conditions = array();
 
-		if ( $filters = array_filter( $search_criteria['field_filters'] ) ) {
+		if ( $filters = array_filter( $search_criteria[ 'field_filters' ] ) ) {
 			foreach ( $filters as &$filter ) {
 				if ( ! is_array( $filter ) ) {
 					continue;
@@ -953,12 +953,12 @@ 
 				 * code by reusing what's inside GF_Query already as they
 				 * take care of many small things like forcing numeric, etc.
 				 */
-				$_tmp_query       = new $query_class( $filter['form_id'], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) );
+				$_tmp_query       = new $query_class( $filter[ 'form_id' ], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) );
 				$_tmp_query_parts = $_tmp_query->_introspect();
-				$search_condition = $_tmp_query_parts['where'];
+				$search_condition = $_tmp_query_parts[ 'where' ];
 
-				if ( empty( $filter['key'] ) && $search_condition->expressions ) {
-					$search_conditions[] = $search_condition;
+				if ( empty( $filter[ 'key' ] ) && $search_condition->expressions ) {
+					$search_conditions[ ] = $search_condition;
 				} else {
 					$left = $search_condition->left;
 
@@ -970,8 +970,8 @@ 
 
 							$value = $reflectionProperty->getValue( $left );
 
-							if ( ! empty( $value[0] ) && $value[0] instanceof GF_Query_Column ) {
-								$left = $value[0];
+							if ( ! empty( $value[ 0 ] ) && $value[ 0 ] instanceof GF_Query_Column ) {
+								$left = $value[ 0 ];
 							} else {
 								continue;
 							}
@@ -987,7 +987,7 @@ 
 							$on = $_join->join_on;
 							$join = $_join->join;
 
-							$search_conditions[] = GF_Query_Condition::_or(
+							$search_conditions[ ] = GF_Query_Condition::_or(
 								// Join
 								new GF_Query_Condition(
 									new GF_Query_Column( GF_Query_Column::META, $join->ID, $query->_alias( GF_Query_Column::META, $join->ID, 'm' ) ),
@@ -1003,7 +1003,7 @@ 
 							);
 						}
 					} else {
-						$search_conditions[] = new GF_Query_Condition(
+						$search_conditions[ ] = new GF_Query_Condition(
 							new GF_Query_Column( $left->field_id, $left->source, $alias ),
 							$search_condition->operator,
 							$search_condition->right
@@ -1025,7 +1025,7 @@ 
 		/**
 		 * Combine the parts as a new WHERE clause.
 		 */
-		$where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts['where'] ), $search_conditions, $extra_conditions ) );
+		$where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts[ 'where' ] ), $search_conditions, $extra_conditions ) );
 		$query->where( $where );
 	}
 
@@ -1048,7 +1048,7 @@ 
 		$field_id = str_replace( array( 'filter_', 'input_' ), '', $key );
 
 		// calculates field_id, removing 'filter_' and for '_' for advanced fields ( like name or checkbox )
-		if ( preg_match('/^[0-9_]+$/ism', $field_id ) ) {
+		if ( preg_match( '/^[0-9_]+$/ism', $field_id ) ) {
 			$field_id = str_replace( '_', '.', $field_id );
 		}
 
@@ -1105,7 +1105,7 @@ 
 			// form is in searchable fields
 			$found = false;
 			foreach ( $searchable_fields as $field ) {
-				if ( $field_id == $field['field'] && $form->ID == $field['form_id'] ) {
+				if ( $field_id == $field[ 'field' ] && $form->ID == $field[ 'form_id' ] ) {
 					$found = true;
 					break;
 				}
@@ -1145,7 +1145,7 @@ 
 
 			case 'select':
 			case 'radio':
-				$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
+				$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
 				break;
 
 			case 'post_category':
@@ -1159,7 +1159,7 @@ 
 
 				foreach ( $value as $val ) {
 					$cat = get_term( $val, 'category' );
-					$filter[] = array(
+					$filter[ ] = array(
 						'key'      => $field_id,
 						'value'    => esc_attr( $cat->name ) . ':' . $val,
 						'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ),
@@ -1178,7 +1178,7 @@ 
 				$filter = array();
 
 				foreach ( $value as $val ) {
-					$filter[] = array( 'key' => $field_id, 'value' => $val );
+					$filter[ ] = array( 'key' => $field_id, 'value' => $val );
 				}
 
 				break;
@@ -1187,9 +1187,9 @@ 
 				// convert checkbox on/off into the correct search filter
 				if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field->inputs ) && ! empty( $form_field->choices ) ) {
 					foreach ( $form_field->inputs as $k => $input ) {
-						if ( $input['id'] == $field_id ) {
-							$filter['value'] = $form_field->choices[ $k ]['value'];
-							$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
+						if ( $input[ 'id' ] == $field_id ) {
+							$filter[ 'value' ] = $form_field->choices[ $k ][ 'value' ];
+							$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
 							break;
 						}
 					}
@@ -1199,7 +1199,7 @@ 
 					$filter = array();
 
 					foreach ( $value as $val ) {
-						$filter[] = array(
+						$filter[ ] = array(
 							'key'      => $field_id,
 							'value'    => $val,
 							'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ),
@@ -1220,9 +1220,9 @@ 
 					foreach ( $words as $word ) {
 						if ( ! empty( $word ) && strlen( $word ) > 1 ) {
 							// Keep the same key for each filter
-							$filter['value'] = $word;
+							$filter[ 'value' ] = $word;
 							// Add a search for the value
-							$filters[] = $filter;
+							$filters[ ] = $filter;
 						}
 					}
 
@@ -1236,19 +1236,19 @@ 
 
 					foreach ( $searchable_fields as $searchable_field ) {
 
-						if( $form_field->ID !== $searchable_field['field'] ) {
+						if ( $form_field->ID !== $searchable_field[ 'field' ] ) {
 							continue;
 						}
 
 						// Only exact-match dropdowns, not text search
-						if( in_array( $searchable_field['input'], array( 'text', 'search' ), true ) ) {
+						if ( in_array( $searchable_field[ 'input' ], array( 'text', 'search' ), true ) ) {
 							continue;
 						}
 
 						$input_id = gravityview_get_input_id_from_id( $form_field->ID );
 
 						if ( 4 === $input_id ) {
-							$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
+							$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
 						};
 					}
 				}
@@ -1276,12 +1276,12 @@ 
 						 * @since 1.16.3
 						 * Safeguard until GF implements '<=' operator
 						 */
-						if( !GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) {
+						if ( ! GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) {
 							$operator = '<';
 							$date = date( 'Y-m-d', strtotime( self::get_formatted_date( $date, 'Y-m-d', $date_format ) . ' +1 day' ) );
 						}
 
-						$filter[] = array(
+						$filter[ ] = array(
 							'key'      => $field_id,
 							'value'    => self::get_formatted_date( $date, 'Y-m-d', $date_format ),
 							'operator' => $this->get_operator( $get, $key, array( $operator ), $operator ),
@@ -1289,12 +1289,12 @@ 
 					}
 				} else {
 					$date = $value;
-					$filter['value'] = self::get_formatted_date( $date, 'Y-m-d', $date_format );
-					$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
+					$filter[ 'value' ] = self::get_formatted_date( $date, 'Y-m-d', $date_format );
+					$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
 				}
 
-				if ('payment_date' === $key) {
-					$filter['operator'] = 'contains';
+				if ( 'payment_date' === $key ) {
+					$filter[ 'operator' ] = 'contains';
 				}
 
 				break;
@@ -1323,7 +1323,7 @@ 
 			'ymd_dot' => 'Y.m.d',
 		);
 
-		if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ){
+		if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ) {
 			$format = $datepicker[ $field->dateFormat ];
 		}
 
@@ -1360,7 +1360,7 @@ 
 	public function add_template_path( $file_paths ) {
 
 		// Index 100 is the default GravityView template path.
-		$file_paths[102] = self::$file . 'templates/';
+		$file_paths[ 102 ] = self::$file . 'templates/';
 
 		return $file_paths;
 	}
@@ -1379,7 +1379,7 @@ 
 		$has_date = false;
 
 		foreach ( $search_fields as $k => $field ) {
-			if ( in_array( $field['input'], array( 'date', 'date_range', 'entry_date' ) ) ) {
+			if ( in_array( $field[ 'input' ], array( 'date', 'date_range', 'entry_date' ) ) ) {
 				$has_date = true;
 				break;
 			}
@@ -1408,7 +1408,7 @@ 
 		$view = \GV\View::by_id( $gravityview_view->view_id );
 
 		// get configured search fields
-		$search_fields = ! empty( $widget_args['search_fields'] ) ? json_decode( $widget_args['search_fields'], true ) : '';
+		$search_fields = ! empty( $widget_args[ 'search_fields' ] ) ? json_decode( $widget_args[ 'search_fields' ], true ) : '';
 
 		if ( empty( $search_fields ) || ! is_array( $search_fields ) ) {
 			gravityview()->log->debug( 'No search fields configured for widget:', array( 'data' => $widget_args ) );
@@ -1422,39 +1422,39 @@ 
 
 			$updated_field = $this->get_search_filter_details( $updated_field, $context );
 
-			switch ( $field['field'] ) {
+			switch ( $field[ 'field' ] ) {
 
 				case 'search_all':
-					$updated_field['key'] = 'search_all';
-					$updated_field['input'] = 'search_all';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_search' );
+					$updated_field[ 'key' ] = 'search_all';
+					$updated_field[ 'input' ] = 'search_all';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_search' );
 					break;
 
 				case 'entry_date':
-					$updated_field['key'] = 'entry_date';
-					$updated_field['input'] = 'entry_date';
-					$updated_field['value'] = array(
+					$updated_field[ 'key' ] = 'entry_date';
+					$updated_field[ 'input' ] = 'entry_date';
+					$updated_field[ 'value' ] = array(
 						'start' => $this->rgget_or_rgpost( 'gv_start' ),
 						'end' => $this->rgget_or_rgpost( 'gv_end' ),
 					);
 					break;
 
 				case 'entry_id':
-					$updated_field['key'] = 'entry_id';
-					$updated_field['input'] = 'entry_id';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_id' );
+					$updated_field[ 'key' ] = 'entry_id';
+					$updated_field[ 'input' ] = 'entry_id';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_id' );
 					break;
 
 				case 'created_by':
-					$updated_field['key'] = 'created_by';
-					$updated_field['name'] = 'gv_by';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_by' );
+					$updated_field[ 'key' ] = 'created_by';
+					$updated_field[ 'name' ] = 'gv_by';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_by' );
 					break;
 
 				case 'is_approved':
-					$updated_field['key'] = 'is_approved';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'filter_is_approved' );
-					$updated_field['choices'] = self::get_is_approved_choices();
+					$updated_field[ 'key' ] = 'is_approved';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'filter_is_approved' );
+					$updated_field[ 'choices' ] = self::get_is_approved_choices();
 					break;
 			}
 
@@ -1475,16 +1475,16 @@ 
 
 		$gravityview_view->permalink_fields = $this->add_no_permalink_fields( array(), $this, $widget_args );
 
-		$gravityview_view->search_layout = ! empty( $widget_args['search_layout'] ) ? $widget_args['search_layout'] : 'horizontal';
+		$gravityview_view->search_layout = ! empty( $widget_args[ 'search_layout' ] ) ? $widget_args[ 'search_layout' ] : 'horizontal';
 
 		/** @since 1.14 */
-		$gravityview_view->search_mode = ! empty( $widget_args['search_mode'] ) ? $widget_args['search_mode'] : 'any';
+		$gravityview_view->search_mode = ! empty( $widget_args[ 'search_mode' ] ) ? $widget_args[ 'search_mode' ] : 'any';
 
-		$custom_class = ! empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
+		$custom_class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
 
 		$gravityview_view->search_class = self::get_search_class( $custom_class );
 
-		$gravityview_view->search_clear = ! empty( $widget_args['search_clear'] ) ? $widget_args['search_clear'] : false;
+		$gravityview_view->search_clear = ! empty( $widget_args[ 'search_clear' ] ) ? $widget_args[ 'search_clear' ] : false;
 
 		if ( $this->has_date_field( $search_fields ) ) {
 			// enqueue datepicker stuff only if needed!
@@ -1506,10 +1506,10 @@ 
 	public static function get_search_class( $custom_class = '' ) {
 		$gravityview_view = GravityView_View::getInstance();
 
-		$search_class = 'gv-search-'.$gravityview_view->search_layout;
+		$search_class = 'gv-search-' . $gravityview_view->search_layout;
 
-		if ( ! empty( $custom_class )  ) {
-			$search_class .= ' '.$custom_class;
+		if ( ! empty( $custom_class ) ) {
+			$search_class .= ' ' . $custom_class;
 		}
 
 		/**
@@ -1560,9 +1560,9 @@ 
 
 		if ( ! $label ) {
 
-			$label = isset( $form_field['label'] ) ? $form_field['label'] : '';
+			$label = isset( $form_field[ 'label' ] ) ? $form_field[ 'label' ] : '';
 
-			switch( $field['field'] ) {
+			switch ( $field[ 'field' ] ) {
 				case 'search_all':
 					$label = __( 'Search Entries:', 'gravityview' );
 					break;
@@ -1574,10 +1574,10 @@ 
 					break;
 				default:
 					// If this is a field input, not a field
-					if ( strpos( $field['field'], '.' ) > 0 && ! empty( $form_field['inputs'] ) ) {
+					if ( strpos( $field[ 'field' ], '.' ) > 0 && ! empty( $form_field[ 'inputs' ] ) ) {
 
 						// Get the label for the field in question, which returns an array
-						$items = wp_list_filter( $form_field['inputs'], array( 'id' => $field['field'] ) );
+						$items = wp_list_filter( $form_field[ 'inputs' ], array( 'id' => $field[ 'field' ] ) );
 
 						// Get the item with the `label` key
 						$values = wp_list_pluck( $items, 'label' );
@@ -1618,13 +1618,13 @@ 
 		$form = $gravityview_view->getForm();
 
 		// for advanced field ids (eg, first name / last name )
-		$name = 'filter_' . str_replace( '.', '_', $field['field'] );
+		$name = 'filter_' . str_replace( '.', '_', $field[ 'field' ] );
 
 		// get searched value from $_GET/$_POST (string or array)
 		$value = $this->rgget_or_rgpost( $name );
 
 		// get form field details
-		$form_field = gravityview_get_field( $form, $field['field'] );
+		$form_field = gravityview_get_field( $form, $field[ 'field' ] );
 
 		$form_field_type = \GV\Utils::get( $form_field, 'type' );
 
@@ -1638,22 +1638,22 @@ 
 		);
 
 		// collect choices
-		if ( 'post_category' === $form_field_type && ! empty( $form_field['displayAllCategories'] ) && empty( $form_field['choices'] ) ) {
-			$filter['choices'] = gravityview_get_terms_choices();
-		} elseif ( ! empty( $form_field['choices'] ) ) {
-			$filter['choices'] = $form_field['choices'];
+		if ( 'post_category' === $form_field_type && ! empty( $form_field[ 'displayAllCategories' ] ) && empty( $form_field[ 'choices' ] ) ) {
+			$filter[ 'choices' ] = gravityview_get_terms_choices();
+		} elseif ( ! empty( $form_field[ 'choices' ] ) ) {
+			$filter[ 'choices' ] = $form_field[ 'choices' ];
 		}
 
-		if ( 'date_range' === $field['input'] && empty( $value ) ) {
-			$filter['value'] = array( 'start' => '', 'end' => '' );
+		if ( 'date_range' === $field[ 'input' ] && empty( $value ) ) {
+			$filter[ 'value' ] = array( 'start' => '', 'end' => '' );
 		}
 
-		if ( 'created_by' === $field['field'] ) {
-			$filter['choices'] = self::get_created_by_choices( $context->view );
-			$filter['type'] = 'created_by';
+		if ( 'created_by' === $field[ 'field' ] ) {
+			$filter[ 'choices' ] = self::get_created_by_choices( $context->view );
+			$filter[ 'type' ] = 'created_by';
 		}
 
-		if ( ! empty( $filter['choices'] ) ) {
+		if ( ! empty( $filter[ 'choices' ] ) ) {
 			/**
 			 * @filter `gravityview/search/sieve_choices` Only output used choices for this field.
 			 * @param[in,out] bool Yes or no.
@@ -1661,7 +1661,7 @@ 
 			 * @param \GV\Context The context.
 			 */
 			if ( apply_filters( 'gravityview/search/sieve_choices', false, $field, $context ) ) {
-				$filter['choices'] = $this->sieve_filter_choices( $filter, $context );
+				$filter[ 'choices' ] = $this->sieve_filter_choices( $filter, $context );
 			}
 		}
 
@@ -1690,12 +1690,12 @@ 
 	 * @return array The filter choices.
 	 */
 	private function sieve_filter_choices( $filter, $context ) {
-		if ( empty( $filter['key'] ) || empty( $filter['choices'] ) ) {
+		if ( empty( $filter[ 'key' ] ) || empty( $filter[ 'choices' ] ) ) {
 			return $filter; // @todo Populate plugins might give us empty choices
 		}
 
 		// Allow only created_by and field-ids to be sieved.
-		if ( 'created_by' !== $filter['key'] && ! is_numeric( $filter['key'] ) ) {
+		if ( 'created_by' !== $filter[ 'key' ] && ! is_numeric( $filter[ 'key' ] ) ) {
 			return $filter;
 		}
 
@@ -1706,13 +1706,13 @@ 
 		$entry_table_name = GFFormsModel::get_entry_table_name();
 		$entry_meta_table_name = GFFormsModel::get_entry_meta_table_name();
 
-		$key_like = $wpdb->esc_like( $filter['key'] ) . '.%';
+		$key_like = $wpdb->esc_like( $filter[ 'key' ] ) . '.%';
 
 		switch ( \GV\Utils::get( $filter, 'type' ) ):
 			case 'post_category':
 				$choices = $wpdb->get_col( $wpdb->prepare(
 					"SELECT DISTINCT SUBSTRING_INDEX(meta_value, ':', 1) FROM $entry_meta_table_name WHERE (meta_key LIKE %s OR meta_key = %d) AND form_id = %d",
-					$key_like, $filter['key'], $form_id
+					$key_like, $filter[ 'key' ], $form_id
 				) );
 				break;
 			case 'created_by':
@@ -1724,17 +1724,17 @@ 
 			default:
 				$choices = $wpdb->get_col( $wpdb->prepare(
 					"SELECT DISTINCT meta_value FROM $entry_meta_table_name WHERE (meta_key LIKE %s OR meta_key = %d) AND form_id = %d",
-					$key_like, $filter['key'], $form_id
+					$key_like, $filter[ 'key' ], $form_id
 				) );
 
-				if ( ( $field = gravityview_get_field( $form_id, $filter['key'] ) ) && 'json' === $field->storageType ) {
+				if ( ( $field = gravityview_get_field( $form_id, $filter[ 'key' ] ) ) && 'json' === $field->storageType ) {
 					$choices = array_map( 'json_decode', $choices );
 					$_choices_array = array();
 					foreach ( $choices as $choice ) {
 						if ( is_array( $choice ) ) {
 							$_choices_array = array_merge( $_choices_array, $choice );
 						} else {
-							$_choices_array []= $choice;
+							$_choices_array [ ] = $choice;
 						}
 					}
 					$choices = array_unique( $_choices_array );
@@ -1744,9 +1744,9 @@ 
 		endswitch;
 
 		$filter_choices = array();
-		foreach ( $filter['choices'] as $choice ) {
-			if ( in_array( $choice['text'], $choices, true ) || in_array( $choice['value'], $choices, true ) ) {
-				$filter_choices[] = $choice;
+		foreach ( $filter[ 'choices' ] as $choice ) {
+			if ( in_array( $choice[ 'text' ], $choices, true ) || in_array( $choice[ 'value' ], $choices, true ) ) {
+				$filter_choices[ ] = $choice;
 			}
 		}
 
@@ -1781,7 +1781,7 @@ 
 			 * @param \GV\View $view The view.
 			 */
 			$text = apply_filters( 'gravityview/search/created_by/text', $user->display_name, $user, $view );
-			$choices[] = array(
+			$choices[ ] = array(
 				'value' => $user->ID,
 				'text' => $text,
 			);
@@ -1801,9 +1801,9 @@ 
 
 		$choices = array();
 		foreach ( GravityView_Entry_Approval_Status::get_all() as $status ) {
-			$choices[] = array(
-				'value' => $status['value'],
-				'text' => $status['label'],
+			$choices[ ] = array(
+				'value' => $status[ 'value' ],
+				'text' => $status[ 'label' ],
 			);
 		}
 
@@ -1855,7 +1855,7 @@ 
 	 */
 	public function add_datepicker_js_dependency( $js_dependencies ) {
 
-		$js_dependencies[] = 'jquery-ui-datepicker';
+		$js_dependencies[ ] = 'jquery-ui-datepicker';
 
 		return $js_dependencies;
 	}
@@ -1899,7 +1899,7 @@ 
 			'isRTL'             => is_rtl(),
 		), $view_data );
 
-		$localizations['datepicker'] = $datepicker_settings;
+		$localizations[ 'datepicker' ] = $datepicker_settings;
 
 		return $localizations;
 
@@ -1926,7 +1926,7 @@ 
 	 * @return void
 	 */
 	private function maybe_enqueue_flexibility() {
-		if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/MSIE [8-9]/', $_SERVER['HTTP_USER_AGENT'] ) ) {
+		if ( isset( $_SERVER[ 'HTTP_USER_AGENT' ] ) && preg_match( '/MSIE [8-9]/', $_SERVER[ 'HTTP_USER_AGENT' ] ) ) {
 			wp_enqueue_script( 'gv-flexibility' );
 		}
 	}
@@ -1948,7 +1948,7 @@ 
 		add_filter( 'gravityview_js_localization', array( $this, 'add_datepicker_localization' ), 10, 2 );
 
 		$scheme = is_ssl() ? 'https://' : 'http://';
-		wp_enqueue_style( 'jquery-ui-datepicker', $scheme.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
+		wp_enqueue_style( 'jquery-ui-datepicker', $scheme . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
 
 		/**
 		 * @filter `gravityview_search_datepicker_class`
@@ -2027,7 +2027,7 @@ 
 	public function add_preview_inputs() {
 		global $wp;
 
-		if ( ! is_preview() || ! current_user_can( 'publish_gravityviews') ) {
+		if ( ! is_preview() || ! current_user_can( 'publish_gravityviews' ) ) {
 			return;
 		}
 
@@ -2085,7 +2085,7 @@ 
  */
 class GravityView_Widget_Search_Author_GF_Query_Condition extends \GF_Query_Condition {
 	public function __construct( $filter, $view ) {
-		$this->value = $filter['value'];
+		$this->value = $filter[ 'value' ];
 		$this->view = $view;
 	}
 
@@ -2117,11 +2117,11 @@ 
 		$conditions = array();
 
 		foreach ( $user_fields as $user_field ) {
-			$conditions[] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) .  '%' );
+			$conditions[ ] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) . '%' );
 		}
 
 		foreach ( $user_meta_fields as $meta_field ) {
-			$conditions[] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) .  '%' );
+			$conditions[ ] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) . '%' );
 		}
 
 		$conditions = '(' . implode( ' OR ', $conditions ) . ')';

includes/widgets/search-widget/templates/search-field-chainedselect.php

Spacing +6 added lines, -6 removed lines

@@ -19,14 +19,14 @@ 
 }
 
 // Make sure that there are choices to display
-if( empty( $search_field['choices'] ) ) {
+if ( empty( $search_field[ 'choices' ] ) ) {
 	gravityview()->log->debug( 'search-field-chainedselect.php - No choices for field' );
 	return;
 }
 
 $form = \GV\GF_Form::from_form( $gravityview_view->getForm() );
 
-$field = \GV\GF_Field::by_id( $form, $search_field['key'] );
+$field = \GV\GF_Field::by_id( $form, $search_field[ 'key' ] );
 
 /** @var GF_Chained_Field_Select $gf_field */
 $gf_field = $field->field;
@@ -52,8 +52,8 @@ 
 $gf_field->chainedSelectsAlignment = $gravityview_view->search_layout;
 ?>
 <div class="gv-search-box gv-search-field-chainedselect">
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
-		<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label>
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
+		<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
 	<?php
 	}
 
@@ -67,13 +67,13 @@ 
 <script>
 ( function( $ ) {
 	$( 'select', '.gv-search-field-chainedselect').on( 'change', function( e ) {
-		window.gform.doAction( 'gform_input_change', e.target, <?php echo (int) $form->ID; ?>, <?php echo (int) $field->ID; ?> );
+		window.gform.doAction( 'gform_input_change', e.target, <?php echo (int)$form->ID; ?>, <?php echo (int)$field->ID; ?> );
 	});
 <?php
 	echo strtr( 'new GFChainedSelects( {form_id}, {field_id}, {hide_inactive}, "{search_layout}" );', array(
 			'{form_id}'       => $form->ID,
 			'{field_id}'      => $field->ID,
-			'{hide_inactive}' => (int) $hide_inactive,
+			'{hide_inactive}' => (int)$hide_inactive,
 			'{search_layout}' => $gravityview_view->search_layout,
 	) );
 ?>