majiameng / QrCode-php

src/Gateways/barcode/BCGColor.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
  * http://www.barcodephp.com
  */
 class BCGColor {
-    protected $r, $g, $b;    // int Hexadecimal Value
+    protected $r, $g, $b; // int Hexadecimal Value
     protected $transparent;
 
     /**
@@ -112,7 +112,7 @@ 
      * @param string $default
      */
     public static function getColor($code, $default = 'white') {
-        switch(strtolower($code)) {
+        switch (strtolower($code)) {
             case '':
             case 'white':
                 return 0xffffff;

src/Gateways/qrcode/QRmask.php

Spacing +61 added lines, -61 removed lines

@@ -45,10 +45,10 @@ 
     public function writeFormatInformation($width, &$frame, $mask, $level)
     {
         $blacks = 0;
-        $format =  QRspec::getFormatInfo($mask, $level);
+        $format = QRspec::getFormatInfo($mask, $level);
 
-        for($i=0; $i<8; $i++) {
-            if($format & 1) {
+        for ($i = 0; $i < 8; $i++) {
+            if ($format & 1) {
                 $blacks += 2;
                 $v = 0x85;
             } else {
@@ -56,7 +56,7 @@ 
             }
             
             $frame[8][$width - 1 - $i] = chr($v);
-            if($i < 6) {
+            if ($i < 6) {
                 $frame[$i][8] = chr($v);
             } else {
                 $frame[$i + 1][8] = chr($v);
@@ -64,8 +64,8 @@ 
             $format = $format >> 1;
         }
         
-        for($i=0; $i<7; $i++) {
-            if($format & 1) {
+        for ($i = 0; $i < 7; $i++) {
+            if ($format & 1) {
                 $blacks += 2;
                 $v = 0x85;
             } else {
@@ -73,7 +73,7 @@ 
             }
             
             $frame[$width - 7 + $i][8] = chr($v);
-            if($i == 0) {
+            if ($i == 0) {
                 $frame[8][7] = chr($v);
             } else {
                 $frame[8][6 - $i] = chr($v);
@@ -86,27 +86,27 @@ 
     }
     
     //----------------------------------------------------------------------
-    public function mask0($x, $y) { return ($x+$y)&1;                       }
-    public function mask1($x, $y) { return ($y&1);                          }
-    public function mask2($x, $y) { return ($x%3);                          }
-    public function mask3($x, $y) { return ($x+$y)%3;                       }
-    public function mask4($x, $y) { return (((int)($y/2))+((int)($x/3)))&1; }
-    public function mask5($x, $y) { return (($x*$y)&1)+($x*$y)%3;           }
-    public function mask6($x, $y) { return ((($x*$y)&1)+($x*$y)%3)&1;       }
-    public function mask7($x, $y) { return ((($x*$y)%3)+(($x+$y)&1))&1;     }
+    public function mask0($x, $y) { return ($x + $y)&1; }
+    public function mask1($x, $y) { return ($y&1); }
+    public function mask2($x, $y) { return ($x % 3); }
+    public function mask3($x, $y) { return ($x + $y) % 3; }
+    public function mask4($x, $y) { return (((int) ($y / 2)) + ((int) ($x / 3)))&1; }
+    public function mask5($x, $y) { return (($x * $y)&1) + ($x * $y) % 3; }
+    public function mask6($x, $y) { return ((($x * $y)&1) + ($x * $y) % 3)&1; }
+    public function mask7($x, $y) { return ((($x * $y) % 3) + (($x + $y)&1))&1; }
     
     //----------------------------------------------------------------------
     private function generateMaskNo($maskNo, $width, $frame)
     {
         $bitMask = array_fill(0, $width, array_fill(0, $width, 0));
         
-        for($y=0; $y<$width; $y++) {
-            for($x=0; $x<$width; $x++) {
-                if(ord($frame[$y][$x]) & 0x80) {
+        for ($y = 0; $y < $width; $y++) {
+            for ($x = 0; $x < $width; $x++) {
+                if (ord($frame[$y][$x]) & 0x80) {
                     $bitMask[$y][$x] = 0;
                 } else {
                     $maskFunc = call_user_func(array($this, 'mask'.$maskNo), $x, $y);
-                    $bitMask[$y][$x] = ($maskFunc == 0)?1:0;
+                    $bitMask[$y][$x] = ($maskFunc == 0) ? 1 : 0;
                 }
                 
             }
@@ -164,12 +164,12 @@ 
             
         $d = $s;
 
-        for($y=0; $y<$width; $y++) {
-            for($x=0; $x<$width; $x++) {
-                if($bitMask[$y][$x] == 1) {
-                    $d[$y][$x] = chr(ord($s[$y][$x]) ^ (int)$bitMask[$y][$x]);
+        for ($y = 0; $y < $width; $y++) {
+            for ($x = 0; $x < $width; $x++) {
+                if ($bitMask[$y][$x] == 1) {
+                    $d[$y][$x] = chr(ord($s[$y][$x]) ^ (int) $bitMask[$y][$x]);
                 }
-                $b += (int)(ord($d[$y][$x]) & 1);
+                $b += (int) (ord($d[$y][$x]) & 1);
             }
         }
 
@@ -191,21 +191,21 @@ 
     {
         $demerit = 0;
 
-        for($i=0; $i<$length; $i++) {
+        for ($i = 0; $i < $length; $i++) {
             
-            if($this->runLength[$i] >= 5) {
+            if ($this->runLength[$i] >= 5) {
                 $demerit += (N1 + ($this->runLength[$i] - 5));
             }
-            if($i & 1) {
-                if(($i >= 3) && ($i < ($length-2)) && ($this->runLength[$i] % 3 == 0)) {
-                    $fact = (int)($this->runLength[$i] / 3);
-                    if(($this->runLength[$i-2] == $fact) &&
-                       ($this->runLength[$i-1] == $fact) &&
-                       ($this->runLength[$i+1] == $fact) &&
-                       ($this->runLength[$i+2] == $fact)) {
-                        if(($this->runLength[$i-3] < 0) || ($this->runLength[$i-3] >= (4 * $fact))) {
+            if ($i & 1) {
+                if (($i >= 3) && ($i < ($length - 2)) && ($this->runLength[$i] % 3 == 0)) {
+                    $fact = (int) ($this->runLength[$i] / 3);
+                    if (($this->runLength[$i - 2] == $fact) &&
+                       ($this->runLength[$i - 1] == $fact) &&
+                       ($this->runLength[$i + 1] == $fact) &&
+                       ($this->runLength[$i + 2] == $fact)) {
+                        if (($this->runLength[$i - 3] < 0) || ($this->runLength[$i - 3] >= (4 * $fact))) {
                             $demerit += N3;
-                        } else if((($i+3) >= $length) || ($this->runLength[$i+3] >= (4 * $fact))) {
+                        } else if ((($i + 3) >= $length) || ($this->runLength[$i + 3] >= (4 * $fact))) {
                             $demerit += N3;
                         }
                     }
@@ -221,30 +221,30 @@ 
         $head = 0;
         $demerit = 0;
 
-        for($y=0; $y<$width; $y++) {
+        for ($y = 0; $y < $width; $y++) {
             $head = 0;
             $this->runLength[0] = 1;
             
             $frameY = $frame[$y];
             
-            if ($y>0)
-                $frameYM = $frame[$y-1];
+            if ($y > 0)
+                $frameYM = $frame[$y - 1];
             
-            for($x=0; $x<$width; $x++) {
-                if(($x > 0) && ($y > 0)) {
-                    $b22 = ord($frameY[$x]) & ord($frameY[$x-1]) & ord($frameYM[$x]) & ord($frameYM[$x-1]);
-                    $w22 = ord($frameY[$x]) | ord($frameY[$x-1]) | ord($frameYM[$x]) | ord($frameYM[$x-1]);
+            for ($x = 0; $x < $width; $x++) {
+                if (($x > 0) && ($y > 0)) {
+                    $b22 = ord($frameY[$x]) & ord($frameY[$x - 1]) & ord($frameYM[$x]) & ord($frameYM[$x - 1]);
+                    $w22 = ord($frameY[$x]) | ord($frameY[$x - 1]) | ord($frameYM[$x]) | ord($frameYM[$x - 1]);
                     
-                    if(($b22 | ($w22 ^ 1))&1) {                                                                     
+                    if (($b22 | ($w22 ^ 1))&1) {                                                                     
                         $demerit += N2;
                     }
                 }
-                if(($x == 0) && (ord($frameY[$x]) & 1)) {
+                if (($x == 0) && (ord($frameY[$x]) & 1)) {
                     $this->runLength[0] = -1;
                     $head = 1;
                     $this->runLength[$head] = 1;
-                } else if($x > 0) {
-                    if((ord($frameY[$x]) ^ ord($frameY[$x-1])) & 1) {
+                } else if ($x > 0) {
+                    if ((ord($frameY[$x]) ^ ord($frameY[$x - 1])) & 1) {
                         $head++;
                         $this->runLength[$head] = 1;
                     } else {
@@ -253,20 +253,20 @@ 
                 }
             }
 
-            $demerit += $this->calcN1N3($head+1);
+            $demerit += $this->calcN1N3($head + 1);
         }
 
-        for($x=0; $x<$width; $x++) {
+        for ($x = 0; $x < $width; $x++) {
             $head = 0;
             $this->runLength[0] = 1;
             
-            for($y=0; $y<$width; $y++) {
-                if($y == 0 && (ord($frame[$y][$x]) & 1)) {
+            for ($y = 0; $y < $width; $y++) {
+                if ($y == 0 && (ord($frame[$y][$x]) & 1)) {
                     $this->runLength[0] = -1;
                     $head = 1;
                     $this->runLength[$head] = 1;
-                } else if($y > 0) {
-                    if((ord($frame[$y][$x]) ^ ord($frame[$y-1][$x])) & 1) {
+                } else if ($y > 0) {
+                    if ((ord($frame[$y][$x]) ^ ord($frame[$y - 1][$x])) & 1) {
                         $head++;
                         $this->runLength[$head] = 1;
                     } else {
@@ -275,7 +275,7 @@ 
                 }
             }
         
-            $demerit += $this->calcN1N3($head+1);
+            $demerit += $this->calcN1N3($head + 1);
         }
 
         return $demerit;
@@ -289,13 +289,13 @@ 
         $bestMaskNum = 0;
         $bestMask = array();
         
-        $checked_masks = array(0,1,2,3,4,5,6,7);
+        $checked_masks = array(0, 1, 2, 3, 4, 5, 6, 7);
         
         if (QR_FIND_FROM_RANDOM !== false) {
         
-            $howManuOut = 8-(QR_FIND_FROM_RANDOM % 9);
-            for ($i = 0; $i <  $howManuOut; $i++) {
-                $remPos = rand (0, count($checked_masks)-1);
+            $howManuOut = 8 - (QR_FIND_FROM_RANDOM % 9);
+            for ($i = 0; $i < $howManuOut; $i++) {
+                $remPos = rand(0, count($checked_masks) - 1);
                 unset($checked_masks[$remPos]);
                 $checked_masks = array_values($checked_masks);
             }
@@ -304,18 +304,18 @@ 
         
         $bestMask = $frame;
          
-        foreach($checked_masks as $i) {
+        foreach ($checked_masks as $i) {
             $mask = array_fill(0, $width, str_repeat("\0", $width));
 
             $demerit = 0;
             $blacks = 0;
             $blacks  = $this->makeMaskNo($i, $width, $frame, $mask);
             $blacks += $this->writeFormatInformation($width, $mask, $i, $level);
-            $blacks  = (int)(100 * $blacks / ($width * $width));
-            $demerit = (int)((int)(abs($blacks - 50) / 5) * N4);
+            $blacks  = (int) (100 * $blacks / ($width * $width));
+            $demerit = (int) ((int) (abs($blacks - 50) / 5) * N4);
             $demerit += $this->evaluateSymbol($width, $mask);
             
-            if($demerit < $minDemerit) {
+            if ($demerit < $minDemerit) {
                 $minDemerit = $demerit;
                 $bestMask = $mask;
                 $bestMaskNum = $i;

Braces +15 added lines, -10 removed lines

@@ -120,8 +120,9 @@ 
     {
         $codeArr = array();
         
-        foreach ($bitFrame as $line)
-            $codeArr[] = join('', $line);
+        foreach ($bitFrame as $line) {
+                    $codeArr[] = join('', $line);
+        }
             
         return gzcompress(join("\n", $codeArr), 9);
     }
@@ -132,8 +133,9 @@ 
         $codeArr = array();
         
         $codeLines = explode("\n", gzuncompress($code));
-        foreach ($codeLines as $line)
-            $codeArr[] = str_split($line);
+        foreach ($codeLines as $line) {
+                    $codeArr[] = str_split($line);
+        }
         
         return $codeArr;
     }
@@ -151,16 +153,18 @@ 
                 $bitMask = self::unserial(file_get_contents($fileName));
             } else {
                 $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
-                if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo))
-                    mkdir(QR_CACHE_DIR.'mask_'.$maskNo);
+                if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo)) {
+                                    mkdir(QR_CACHE_DIR.'mask_'.$maskNo);
+                }
                 file_put_contents($fileName, self::serial($bitMask));
             }
         } else {
             $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
         }
 
-        if ($maskGenOnly)
-            return;
+        if ($maskGenOnly) {
+                    return;
+        }
             
         $d = $s;
 
@@ -227,8 +231,9 @@ 
             
             $frameY = $frame[$y];
             
-            if ($y>0)
-                $frameYM = $frame[$y-1];
+            if ($y>0) {
+                            $frameYM = $frame[$y-1];
+            }
             
             for($x=0; $x<$width; $x++) {
                 if(($x > 0) && ($y > 0)) {

src/Gateways/qrcode/QRinput.php

Indentation +1 added lines, -1 removed lines

@@ -180,7 +180,7 @@
         -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
         -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
         36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43,
-         0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1,
+            0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1,
         -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
         25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,
         -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

Spacing +59 added lines, -59 removed lines

@@ -26,7 +26,7 @@ 
 */
 namespace tinymeng\code\Gateways\qrcode;
 
-define('STRUCTURE_HEADER_BITS',  20);
+define('STRUCTURE_HEADER_BITS', 20);
 define('MAX_STRUCTURED_SYMBOLS', 16);
 
 class QRinput {
@@ -57,7 +57,7 @@ 
     //----------------------------------------------------------------------
     public function setVersion($version)
     {
-        if($version < 0 || $version > QRSPEC_VERSION_MAX) {
+        if ($version < 0 || $version > QRSPEC_VERSION_MAX) {
             throw new Exception('Invalid version no');
             return -1;
         }
@@ -76,7 +76,7 @@ 
     //----------------------------------------------------------------------
     public function setErrorCorrectionLevel($level)
     {
-        if($level > QR_ECLEVEL_H) {
+        if ($level > QR_ECLEVEL_H) {
             throw new Exception('Invalid ECLEVEL');
             return -1;
         }
@@ -108,11 +108,11 @@ 
     
     public function insertStructuredAppendHeader($size, $index, $parity)
     {
-        if( $size > MAX_STRUCTURED_SYMBOLS ) {
+        if ($size > MAX_STRUCTURED_SYMBOLS) {
             throw new Exception('insertStructuredAppendHeader wrong size');
         }
         
-        if( $index <= 0 || $index > MAX_STRUCTURED_SYMBOLS ) {
+        if ($index <= 0 || $index > MAX_STRUCTURED_SYMBOLS) {
             throw new Exception('insertStructuredAppendHeader wrong index');
         }
 
@@ -132,9 +132,9 @@ 
     {
         $parity = 0;
         
-        foreach($this->items as $item) {
-            if($item->mode != QR_MODE_STRUCTURE) {
-                for($i=$item->size-1; $i>=0; $i--) {
+        foreach ($this->items as $item) {
+            if ($item->mode != QR_MODE_STRUCTURE) {
+                for ($i = $item->size - 1; $i >= 0; $i--) {
                     $parity ^= $item->data[$i];
                 }
             }
@@ -146,8 +146,8 @@ 
     //----------------------------------------------------------------------
     public static function checkModeNum($size, $data)
     {
-        for($i=0; $i<$size; $i++) {
-            if((ord($data[$i]) < ord('0')) || (ord($data[$i]) > ord('9'))){
+        for ($i = 0; $i < $size; $i++) {
+            if ((ord($data[$i]) < ord('0')) || (ord($data[$i]) > ord('9'))) {
                 return false;
             }
         }
@@ -158,10 +158,10 @@ 
     //----------------------------------------------------------------------
     public static function estimateBitsModeNum($size)
     {
-        $w = (int)$size / 3;
+        $w = (int) $size / 3;
         $bits = $w * 10;
         
-        switch($size - $w * 3) {
+        switch ($size - $w * 3) {
             case 1:
                 $bits += 4;
                 break;
@@ -180,7 +180,7 @@ 
         -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
         -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
         36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43,
-         0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1,
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1,
         -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
         25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,
         -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -190,13 +190,13 @@ 
     //----------------------------------------------------------------------
     public static function lookAnTable($c)
     {
-        return (($c > 127)?-1:self::$anTable[$c]);
+        return (($c > 127) ?-1 : self::$anTable[$c]);
     }
     
     //----------------------------------------------------------------------
     public static function checkModeAn($size, $data)
     {
-        for($i=0; $i<$size; $i++) {
+        for ($i = 0; $i < $size; $i++) {
             if (self::lookAnTable(ord($data[$i])) == -1) {
                 return false;
             }
@@ -208,10 +208,10 @@ 
     //----------------------------------------------------------------------
     public static function estimateBitsModeAn($size)
     {
-        $w = (int)($size / 2);
+        $w = (int) ($size / 2);
         $bits = $w * 11;
         
-        if($size & 1) {
+        if ($size & 1) {
             $bits += 6;
         }
 
@@ -227,18 +227,18 @@ 
     //----------------------------------------------------------------------
     public function estimateBitsModeKanji($size)
     {
-        return (int)(($size / 2) * 13);
+        return (int) (($size / 2) * 13);
     }
     
     //----------------------------------------------------------------------
     public static function checkModeKanji($size, $data)
     {
-        if($size & 1)
+        if ($size & 1)
             return false;
 
-        for($i=0; $i<$size; $i+=2) {
-            $val = (ord($data[$i]) << 8) | ord($data[$i+1]);
-            if( $val < 0x8140 
+        for ($i = 0; $i < $size; $i += 2) {
+            $val = (ord($data[$i]) << 8) | ord($data[$i + 1]);
+            if ($val < 0x8140 
             || ($val > 0x9ffc && $val < 0xe040) 
             || $val > 0xebbf) {
                 return false;
@@ -254,12 +254,12 @@ 
 
     public static function check($mode, $size, $data)
     {
-        if($size <= 0) 
+        if ($size <= 0) 
             return false;
 
-        switch($mode) {
-            case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;
-            case QR_MODE_AN:        return self::checkModeAn($size, $data);    break;
+        switch ($mode) {
+            case QR_MODE_NUM:       return self::checkModeNum($size, $data); break;
+            case QR_MODE_AN:        return self::checkModeAn($size, $data); break;
             case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;
             case QR_MODE_8:         return true; break;
             case QR_MODE_STRUCTURE: return true; break;
@@ -277,7 +277,7 @@ 
     {
         $bits = 0;
 
-        foreach($this->items as $item) {
+        foreach ($this->items as $item) {
             $bits += $item->estimateBitStreamSizeOfEntry($version);
         }
 
@@ -292,7 +292,7 @@ 
         do {
             $prev = $version;
             $bits = $this->estimateBitStreamSize($prev);
-            $version = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);
+            $version = QRspec::getMinimumVersion((int) (($bits + 7) / 8), $this->level);
             if ($version < 0) {
                 return -1;
             }
@@ -305,32 +305,32 @@ 
     public static function lengthOfCode($mode, $version, $bits)
     {
         $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);
-        switch($mode) {
+        switch ($mode) {
             case QR_MODE_NUM:
-                $chunks = (int)($payload / 10);
+                $chunks = (int) ($payload / 10);
                 $remain = $payload - $chunks * 10;
                 $size = $chunks * 3;
-                if($remain >= 7) {
+                if ($remain >= 7) {
                     $size += 2;
-                } else if($remain >= 4) {
+                } else if ($remain >= 4) {
                     $size += 1;
                 }
                 break;
             case QR_MODE_AN:
-                $chunks = (int)($payload / 11);
+                $chunks = (int) ($payload / 11);
                 $remain = $payload - $chunks * 11;
                 $size = $chunks * 2;
-                if($remain >= 6) 
+                if ($remain >= 6) 
                     $size++;
                 break;
             case QR_MODE_8:
-                $size = (int)($payload / 8);
+                $size = (int) ($payload / 8);
                 break;
             case QR_MODE_KANJI:
-                $size = (int)(($payload / 13) * 2);
+                $size = (int) (($payload / 13) * 2);
                 break;
             case QR_MODE_STRUCTURE:
-                $size = (int)($payload / 8);
+                $size = (int) ($payload / 8);
                 break;
             default:
                 $size = 0;
@@ -338,8 +338,8 @@ 
         }
         
         $maxsize = QRspec::maximumWords($mode, $version);
-        if($size < 0) $size = 0;
-        if($size > $maxsize) $size = $maxsize;
+        if ($size < 0) $size = 0;
+        if ($size > $maxsize) $size = $maxsize;
 
         return $size;
     }
@@ -349,10 +349,10 @@ 
     {
         $total = 0;
 
-        foreach($this->items as $item) {
+        foreach ($this->items as $item) {
             $bits = $item->encodeBitStream($this->version);
             
-            if($bits < 0) 
+            if ($bits < 0) 
                 return -1;
                 
             $total += $bits;
@@ -365,21 +365,21 @@ 
     public function convertData()
     {
         $ver = $this->estimateVersion();
-        if($ver > $this->getVersion()) {
+        if ($ver > $this->getVersion()) {
             $this->setVersion($ver);
         }
 
-        for(;;) {
+        for (;;) {
             $bits = $this->createBitStream();
             
-            if($bits < 0) 
+            if ($bits < 0) 
                 return -1;
                 
-            $ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);
-            if($ver < 0) {
+            $ver = QRspec::getMinimumVersion((int) (($bits + 7) / 8), $this->level);
+            if ($ver < 0) {
                 throw new Exception('WRONG VERSION');
                 return -1;
-            } else if($ver > $this->getVersion()) {
+            } else if ($ver > $this->getVersion()) {
                 $this->setVersion($ver);
             } else {
                 break;
@@ -405,26 +405,26 @@ 
         }
 
         $bits += 4;
-        $words = (int)(($bits + 7) / 8);
+        $words = (int) (($bits + 7) / 8);
 
         $padding = new QRbitstream();
         $ret = $padding->appendNum($words * 8 - $bits + 4, 0);
         
-        if($ret < 0) 
+        if ($ret < 0) 
             return $ret;
 
         $padlen = $maxwords - $words;
         
-        if($padlen > 0) {
+        if ($padlen > 0) {
             
             $padbuf = array();
-            for($i=0; $i<$padlen; $i++) {
-                $padbuf[$i] = ($i&1)?0x11:0xec;
+            for ($i = 0; $i < $padlen; $i++) {
+                $padbuf[$i] = ($i&1) ? 0x11 : 0xec;
             }
             
             $ret = $padding->appendBytes($padlen, $padbuf);
             
-            if($ret < 0)
+            if ($ret < 0)
                 return $ret;
             
         }
@@ -437,15 +437,15 @@ 
     //----------------------------------------------------------------------
     public function mergeBitStream()
     {
-        if($this->convertData() < 0) {
+        if ($this->convertData() < 0) {
             return null;
         }
 
         $bstream = new QRbitstream();
         
-        foreach($this->items as $item) {
+        foreach ($this->items as $item) {
             $ret = $bstream->append($item->bstream);
-            if($ret < 0) {
+            if ($ret < 0) {
                 return null;
             }
         }
@@ -459,12 +459,12 @@ 
 
         $bstream = $this->mergeBitStream();
         
-        if($bstream == null) {
+        if ($bstream == null) {
             return null;
         }
         
         $ret = $this->appendPaddingBit($bstream);
-        if($ret < 0) {
+        if ($ret < 0) {
             return null;
         }
 
@@ -475,7 +475,7 @@ 
     public function getByteStream()
     {
         $bstream = $this->getBitStream();
-        if($bstream == null) {
+        if ($bstream == null) {
             return null;
         }
         

Braces +27 added lines, -16 removed lines

@@ -233,8 +233,9 @@ 
     //----------------------------------------------------------------------
     public static function checkModeKanji($size, $data)
     {
-        if($size & 1)
-            return false;
+        if($size & 1) {
+                    return false;
+        }
 
         for($i=0; $i<$size; $i+=2) {
             $val = (ord($data[$i]) << 8) | ord($data[$i+1]);
@@ -254,8 +255,9 @@ 
 
     public static function check($mode, $size, $data)
     {
-        if($size <= 0) 
-            return false;
+        if($size <= 0) {
+                    return false;
+        }
 
         switch($mode) {
             case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;
@@ -320,8 +322,9 @@ 
                 $chunks = (int)($payload / 11);
                 $remain = $payload - $chunks * 11;
                 $size = $chunks * 2;
-                if($remain >= 6) 
-                    $size++;
+                if($remain >= 6) {
+                                    $size++;
+                }
                 break;
             case QR_MODE_8:
                 $size = (int)($payload / 8);
@@ -338,8 +341,12 @@ 
         }
         
         $maxsize = QRspec::maximumWords($mode, $version);
-        if($size < 0) $size = 0;
-        if($size > $maxsize) $size = $maxsize;
+        if($size < 0) {
+            $size = 0;
+        }
+        if($size > $maxsize) {
+            $size = $maxsize;
+        }
 
         return $size;
     }
@@ -352,8 +359,9 @@ 
         foreach($this->items as $item) {
             $bits = $item->encodeBitStream($this->version);
             
-            if($bits < 0) 
-                return -1;
+            if($bits < 0) {
+                            return -1;
+            }
                 
             $total += $bits;
         }
@@ -372,8 +380,9 @@ 
         for(;;) {
             $bits = $this->createBitStream();
             
-            if($bits < 0) 
-                return -1;
+            if($bits < 0) {
+                            return -1;
+            }
                 
             $ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);
             if($ver < 0) {
@@ -410,8 +419,9 @@ 
         $padding = new QRbitstream();
         $ret = $padding->appendNum($words * 8 - $bits + 4, 0);
         
-        if($ret < 0) 
-            return $ret;
+        if($ret < 0) {
+                    return $ret;
+        }
 
         $padlen = $maxwords - $words;
         
@@ -424,8 +434,9 @@ 
             
             $ret = $padding->appendBytes($padlen, $padbuf);
             
-            if($ret < 0)
-                return $ret;
+            if($ret < 0) {
+                            return $ret;
+            }
             
         }
 

src/Gateways/qrcode/QRrsItem.php

Spacing +46 added lines, -46 removed lines

@@ -8,16 +8,16 @@ 
 
 class QRrsItem {
 
-    public $mm;                  // Bits per symbol 
-    public $nn;                  // Symbols per block (= (1<<mm)-1) 
-    public $alpha_to = array();  // log lookup table 
-    public $index_of = array();  // Antilog lookup table 
-    public $genpoly = array();   // Generator polynomial 
-    public $nroots;              // Number of generator roots = number of parity symbols 
-    public $fcr;                 // First consecutive root, index form 
-    public $prim;                // Primitive element, index form 
-    public $iprim;               // prim-th root of 1, index form 
-    public $pad;                 // Padding bytes in shortened block 
+    public $mm; // Bits per symbol 
+    public $nn; // Symbols per block (= (1<<mm)-1) 
+    public $alpha_to = array(); // log lookup table 
+    public $index_of = array(); // Antilog lookup table 
+    public $genpoly = array(); // Generator polynomial 
+    public $nroots; // Number of generator roots = number of parity symbols 
+    public $fcr; // First consecutive root, index form 
+    public $prim; // Primitive element, index form 
+    public $iprim; // prim-th root of 1, index form 
+    public $pad; // Padding bytes in shortened block 
     public $gfpoly;
 
     //----------------------------------------------------------------------
@@ -41,47 +41,47 @@ 
         $rs = null;
 
         // Check parameter ranges
-        if($symsize < 0 || $symsize > 8)                     return $rs;
-        if($fcr < 0 || $fcr >= (1<<$symsize))                return $rs;
-        if($prim <= 0 || $prim >= (1<<$symsize))             return $rs;
-        if($nroots < 0 || $nroots >= (1<<$symsize))          return $rs; // Can't have more roots than symbol values!
-        if($pad < 0 || $pad >= ((1<<$symsize) -1 - $nroots)) return $rs; // Too much padding
+        if ($symsize < 0 || $symsize > 8)                     return $rs;
+        if ($fcr < 0 || $fcr >= (1 << $symsize))                return $rs;
+        if ($prim <= 0 || $prim >= (1 << $symsize))             return $rs;
+        if ($nroots < 0 || $nroots >= (1 << $symsize))          return $rs; // Can't have more roots than symbol values!
+        if ($pad < 0 || $pad >= ((1 << $symsize) - 1 - $nroots)) return $rs; // Too much padding
 
         $rs = new QRrsItem();
         $rs->mm = $symsize;
-        $rs->nn = (1<<$symsize)-1;
+        $rs->nn = (1 << $symsize) - 1;
         $rs->pad = $pad;
 
-        $rs->alpha_to = array_fill(0, $rs->nn+1, 0);
-        $rs->index_of = array_fill(0, $rs->nn+1, 0);
+        $rs->alpha_to = array_fill(0, $rs->nn + 1, 0);
+        $rs->index_of = array_fill(0, $rs->nn + 1, 0);
 
         // PHP style macro replacement ;)
-        $NN =& $rs->nn;
-        $A0 =& $NN;
+        $NN = & $rs->nn;
+        $A0 = & $NN;
 
         // Generate Galois field lookup tables
         $rs->index_of[0] = $A0; // log(zero) = -inf
         $rs->alpha_to[$A0] = 0; // alpha**-inf = 0
         $sr = 1;
 
-        for($i=0; $i<$rs->nn; $i++) {
+        for ($i = 0; $i < $rs->nn; $i++) {
             $rs->index_of[$sr] = $i;
             $rs->alpha_to[$i] = $sr;
             $sr <<= 1;
-            if($sr & (1<<$symsize)) {
+            if ($sr & (1 << $symsize)) {
                 $sr ^= $gfpoly;
             }
             $sr &= $rs->nn;
         }
 
-        if($sr != 1){
+        if ($sr != 1) {
             // field generator polynomial is not primitive!
             $rs = NULL;
             return $rs;
         }
 
         /* Form RS code generator polynomial from its roots */
-        $rs->genpoly = array_fill(0, $nroots+1, 0);
+        $rs->genpoly = array_fill(0, $nroots + 1, 0);
 
         $rs->fcr = $fcr;
         $rs->prim = $prim;
@@ -89,21 +89,21 @@ 
         $rs->gfpoly = $gfpoly;
 
         /* Find prim-th root of 1, used in decoding */
-        for($iprim=1;($iprim % $prim) != 0;$iprim += $rs->nn)
+        for ($iprim = 1; ($iprim % $prim) != 0; $iprim += $rs->nn)
             ; // intentional empty-body loop!
 
-        $rs->iprim = (int)($iprim / $prim);
+        $rs->iprim = (int) ($iprim / $prim);
         $rs->genpoly[0] = 1;
 
-        for ($i = 0,$root=$fcr*$prim; $i < $nroots; $i++, $root += $prim) {
-            $rs->genpoly[$i+1] = 1;
+        for ($i = 0, $root = $fcr * $prim; $i < $nroots; $i++, $root += $prim) {
+            $rs->genpoly[$i + 1] = 1;
 
             // Multiply rs->genpoly[] by  @**(root + x)
             for ($j = $i; $j > 0; $j--) {
                 if ($rs->genpoly[$j] != 0) {
-                    $rs->genpoly[$j] = $rs->genpoly[$j-1] ^ $rs->alpha_to[$rs->modnn($rs->index_of[$rs->genpoly[$j]] + $root)];
+                    $rs->genpoly[$j] = $rs->genpoly[$j - 1] ^ $rs->alpha_to[$rs->modnn($rs->index_of[$rs->genpoly[$j]] + $root)];
                 } else {
-                    $rs->genpoly[$j] = $rs->genpoly[$j-1];
+                    $rs->genpoly[$j] = $rs->genpoly[$j - 1];
                 }
             }
             // rs->genpoly[0] can never be zero
@@ -120,38 +120,38 @@ 
     //----------------------------------------------------------------------
     public function encode_rs_char($data, &$parity)
     {
-        $MM       =& $this->mm;
-        $NN       =& $this->nn;
-        $ALPHA_TO =& $this->alpha_to;
-        $INDEX_OF =& $this->index_of;
-        $GENPOLY  =& $this->genpoly;
-        $NROOTS   =& $this->nroots;
-        $FCR      =& $this->fcr;
-        $PRIM     =& $this->prim;
-        $IPRIM    =& $this->iprim;
-        $PAD      =& $this->pad;
-        $A0       =& $NN;
+        $MM       = & $this->mm;
+        $NN       = & $this->nn;
+        $ALPHA_TO = & $this->alpha_to;
+        $INDEX_OF = & $this->index_of;
+        $GENPOLY  = & $this->genpoly;
+        $NROOTS   = & $this->nroots;
+        $FCR      = & $this->fcr;
+        $PRIM     = & $this->prim;
+        $IPRIM    = & $this->iprim;
+        $PAD      = & $this->pad;
+        $A0       = & $NN;
 
         $parity = array_fill(0, $NROOTS, 0);
 
-        for($i=0; $i< ($NN-$NROOTS-$PAD); $i++) {
+        for ($i = 0; $i < ($NN - $NROOTS - $PAD); $i++) {
 
             $feedback = $INDEX_OF[$data[$i] ^ $parity[0]];
-            if($feedback != $A0) {
+            if ($feedback != $A0) {
                 // feedback term is non-zero
 
                 // This line is unnecessary when GENPOLY[NROOTS] is unity, as it must
                 // always be for the polynomials constructed by init_rs()
                 $feedback = $this->modnn($NN - $GENPOLY[$NROOTS] + $feedback);
 
-                for($j=1;$j<$NROOTS;$j++) {
-                    $parity[$j] ^= $ALPHA_TO[$this->modnn($feedback + $GENPOLY[$NROOTS-$j])];
+                for ($j = 1; $j < $NROOTS; $j++) {
+                    $parity[$j] ^= $ALPHA_TO[$this->modnn($feedback + $GENPOLY[$NROOTS - $j])];
                 }
             }
 
             // Shift 
             array_shift($parity);
-            if($feedback != $A0) {
+            if ($feedback != $A0) {
                 array_push($parity, $ALPHA_TO[$this->modnn($feedback + $GENPOLY[0])]);
             } else {
                 array_push($parity, 0);

Braces +20 added lines, -7 removed lines

@@ -41,11 +41,23 @@ 
         $rs = null;
 
         // Check parameter ranges
-        if($symsize < 0 || $symsize > 8)                     return $rs;
-        if($fcr < 0 || $fcr >= (1<<$symsize))                return $rs;
-        if($prim <= 0 || $prim >= (1<<$symsize))             return $rs;
-        if($nroots < 0 || $nroots >= (1<<$symsize))          return $rs; // Can't have more roots than symbol values!
-        if($pad < 0 || $pad >= ((1<<$symsize) -1 - $nroots)) return $rs; // Too much padding
+        if($symsize < 0 || $symsize > 8) {
+            return $rs;
+        }
+        if($fcr < 0 || $fcr >= (1<<$symsize)) {
+            return $rs;
+        }
+        if($prim <= 0 || $prim >= (1<<$symsize)) {
+            return $rs;
+        }
+        if($nroots < 0 || $nroots >= (1<<$symsize)) {
+            return $rs;
+        }
+        // Can't have more roots than symbol values!
+        if($pad < 0 || $pad >= ((1<<$symsize) -1 - $nroots)) {
+            return $rs;
+        }
+        // Too much padding
 
         $rs = new QRrsItem();
         $rs->mm = $symsize;
@@ -111,8 +123,9 @@ 
         }
 
         // convert rs->genpoly[] to index form for quicker encoding
-        for ($i = 0; $i <= $nroots; $i++)
-            $rs->genpoly[$i] = $rs->index_of[$rs->genpoly[$i]];
+        for ($i = 0; $i <= $nroots; $i++) {
+                    $rs->genpoly[$i] = $rs->index_of[$rs->genpoly[$i]];
+        }
 
         return $rs;
     }

src/Gateways/qrcode/QRsplit.php

Spacing +40 added lines, -40 removed lines

@@ -52,7 +52,7 @@ 
         if ($pos >= strlen($str))
             return false;
         
-        return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));
+        return ((ord($str[$pos]) >= ord('0')) && (ord($str[$pos]) <= ord('9')));
     }
     
     //----------------------------------------------------------------------
@@ -72,17 +72,17 @@ 
             
         $c = $this->dataStr[$pos];
         
-        if(self::isdigitat($this->dataStr, $pos)) {
+        if (self::isdigitat($this->dataStr, $pos)) {
             return QR_MODE_NUM;
-        } else if(self::isalnumat($this->dataStr, $pos)) {
+        } else if (self::isalnumat($this->dataStr, $pos)) {
             return QR_MODE_AN;
-        } else if($this->modeHint == QR_MODE_KANJI) {
+        } else if ($this->modeHint == QR_MODE_KANJI) {
         
-            if ($pos+1 < strlen($this->dataStr)) 
+            if ($pos + 1 < strlen($this->dataStr)) 
             {
-                $d = $this->dataStr[$pos+1];
+                $d = $this->dataStr[$pos + 1];
                 $word = (ord($c) << 8) | ord($d);
-                if(($word >= 0x8140 && $word <= 0x9ffc) || ($word >= 0xe040 && $word <= 0xebbf)) {
+                if (($word >= 0x8140 && $word <= 0x9ffc) || ($word >= 0xe040 && $word <= 0xebbf)) {
                     return QR_MODE_KANJI;
                 }
             }
@@ -97,32 +97,32 @@ 
         $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());
 
         $p = 0;
-        while(self::isdigitat($this->dataStr, $p)) {
+        while (self::isdigitat($this->dataStr, $p)) {
             $p++;
         }
         
         $run = $p;
         $mode = $this->identifyMode($p);
         
-        if($mode == QR_MODE_8) {
+        if ($mode == QR_MODE_8) {
             $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln
                  + QRinput::estimateBitsMode8(1)         // + 4 + l8
                  - QRinput::estimateBitsMode8($run + 1); // - 4 - l8
-            if($dif > 0) {
+            if ($dif > 0) {
                 return $this->eat8();
             }
         }
-        if($mode == QR_MODE_AN) {
+        if ($mode == QR_MODE_AN) {
             $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln
                  + QRinput::estimateBitsModeAn(1)        // + 4 + la
-                 - QRinput::estimateBitsModeAn($run + 1);// - 4 - la
-            if($dif > 0) {
+                 - QRinput::estimateBitsModeAn($run + 1); // - 4 - la
+            if ($dif > 0) {
                 return $this->eatAn();
             }
         }
         
         $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr));
-        if($ret < 0)
+        if ($ret < 0)
             return -1;
 
         return $run;
@@ -131,15 +131,15 @@ 
     //----------------------------------------------------------------------
     public function eatAn()
     {
-        $la = QRspec::lengthIndicator(QR_MODE_AN,  $this->input->getVersion());
+        $la = QRspec::lengthIndicator(QR_MODE_AN, $this->input->getVersion());
         $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());
 
         $p = 0;
         
-        while(self::isalnumat($this->dataStr, $p)) {
-            if(self::isdigitat($this->dataStr, $p)) {
+        while (self::isalnumat($this->dataStr, $p)) {
+            if (self::isdigitat($this->dataStr, $p)) {
                 $q = $p;
-                while(self::isdigitat($this->dataStr, $q)) {
+                while (self::isdigitat($this->dataStr, $q)) {
                     $q++;
                 }
                 
@@ -147,7 +147,7 @@ 
                      + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln
                      - QRinput::estimateBitsModeAn($q); // - 4 - la
                      
-                if($dif < 0) {
+                if ($dif < 0) {
                     break;
                 } else {
                     $p = $q;
@@ -159,17 +159,17 @@ 
 
         $run = $p;
 
-        if(!self::isalnumat($this->dataStr, $p)) {
+        if (!self::isalnumat($this->dataStr, $p)) {
             $dif = QRinput::estimateBitsModeAn($run) + 4 + $la
                  + QRinput::estimateBitsMode8(1) // + 4 + l8
                   - QRinput::estimateBitsMode8($run + 1); // - 4 - l8
-            if($dif > 0) {
+            if ($dif > 0) {
                 return $this->eat8();
             }
         }
 
         $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr));
-        if($ret < 0)
+        if ($ret < 0)
             return -1;
 
         return $run;
@@ -180,12 +180,12 @@ 
     {
         $p = 0;
         
-        while($this->identifyMode($p) == QR_MODE_KANJI) {
+        while ($this->identifyMode($p) == QR_MODE_KANJI) {
             $p += 2;
         }
         
         $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr));
-        if($ret < 0)
+        if ($ret < 0)
             return -1;
 
         return $run;
@@ -200,34 +200,34 @@ 
         $p = 1;
         $dataStrLen = strlen($this->dataStr);
         
-        while($p < $dataStrLen) {
+        while ($p < $dataStrLen) {
             
             $mode = $this->identifyMode($p);
-            if($mode == QR_MODE_KANJI) {
+            if ($mode == QR_MODE_KANJI) {
                 break;
             }
-            if($mode == QR_MODE_NUM) {
+            if ($mode == QR_MODE_NUM) {
                 $q = $p;
-                while(self::isdigitat($this->dataStr, $q)) {
+                while (self::isdigitat($this->dataStr, $q)) {
                     $q++;
                 }
                 $dif = QRinput::estimateBitsMode8($p) // + 4 + l8
                      + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln
                      - QRinput::estimateBitsMode8($q); // - 4 - l8
-                if($dif < 0) {
+                if ($dif < 0) {
                     break;
                 } else {
                     $p = $q;
                 }
-            } else if($mode == QR_MODE_AN) {
+            } else if ($mode == QR_MODE_AN) {
                 $q = $p;
-                while(self::isalnumat($this->dataStr, $q)) {
+                while (self::isalnumat($this->dataStr, $q)) {
                     $q++;
                 }
                 $dif = QRinput::estimateBitsMode8($p)  // + 4 + l8
                      + QRinput::estimateBitsModeAn($q - $p) + 4 + $la
                      - QRinput::estimateBitsMode8($q); // - 4 - l8
-                if($dif < 0) {
+                if ($dif < 0) {
                     break;
                 } else {
                     $p = $q;
@@ -240,7 +240,7 @@ 
         $run = $p;
         $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr));
         
-        if($ret < 0)
+        if ($ret < 0)
             return -1;
 
         return $run;
@@ -251,7 +251,7 @@ 
     {
         while (strlen($this->dataStr) > 0)
         {
-            if($this->dataStr == '')
+            if ($this->dataStr == '')
                 return 0;
 
             $mode = $this->identifyMode(0);
@@ -268,8 +268,8 @@ 
             
             }
 
-            if($length == 0) return 0;
-            if($length < 0)  return -1;
+            if ($length == 0) return 0;
+            if ($length < 0)  return -1;
             
             $this->dataStr = substr($this->dataStr, $length);
         }
@@ -281,9 +281,9 @@ 
         $stringLen = strlen($this->dataStr);
         $p = 0;
         
-        while ($p<$stringLen) {
+        while ($p < $stringLen) {
             $mode = self::identifyMode(substr($this->dataStr, $p), $this->modeHint);
-            if($mode == QR_MODE_KANJI) {
+            if ($mode == QR_MODE_KANJI) {
                 $p += 2;
             } else {
                 if (ord($this->dataStr[$p]) >= ord('a') && ord($this->dataStr[$p]) <= ord('z')) {
@@ -299,13 +299,13 @@ 
     //----------------------------------------------------------------------
     public static function splitStringToQRinput($string, QRinput $input, $modeHint, $casesensitive = true)
     {
-        if(is_null($string) || $string == '\0' || $string == '') {
+        if (is_null($string) || $string == '\0' || $string == '') {
             throw new Exception('empty string!!!');
         }
 
         $split = new QRsplit($string, $input, $modeHint);
         
-        if(!$casesensitive)
+        if (!$casesensitive)
             $split->toUpper();
             
         return $split->splitString();

Braces +38 added lines, -23 removed lines

@@ -49,8 +49,9 @@ 
     //----------------------------------------------------------------------
     public static function isdigitat($str, $pos)
     {    
-        if ($pos >= strlen($str))
-            return false;
+        if ($pos >= strlen($str)) {
+                    return false;
+        }
         
         return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));
     }
@@ -58,8 +59,9 @@ 
     //----------------------------------------------------------------------
     public static function isalnumat($str, $pos)
     {
-        if ($pos >= strlen($str))
-            return false;
+        if ($pos >= strlen($str)) {
+                    return false;
+        }
             
         return (QRinput::lookAnTable(ord($str[$pos])) >= 0);
     }
@@ -67,8 +69,9 @@ 
     //----------------------------------------------------------------------
     public function identifyMode($pos)
     {
-        if ($pos >= strlen($this->dataStr)) 
-            return QR_MODE_NUL;
+        if ($pos >= strlen($this->dataStr)) {
+                    return QR_MODE_NUL;
+        }
             
         $c = $this->dataStr[$pos];
         
@@ -122,8 +125,9 @@ 
         }
         
         $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr));
-        if($ret < 0)
-            return -1;
+        if($ret < 0) {
+                    return -1;
+        }
 
         return $run;
     }
@@ -169,8 +173,9 @@ 
         }
 
         $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr));
-        if($ret < 0)
-            return -1;
+        if($ret < 0) {
+                    return -1;
+        }
 
         return $run;
     }
@@ -185,8 +190,9 @@ 
         }
         
         $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr));
-        if($ret < 0)
-            return -1;
+        if($ret < 0) {
+                    return -1;
+        }
 
         return $run;
     }
@@ -240,8 +246,9 @@ 
         $run = $p;
         $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr));
         
-        if($ret < 0)
-            return -1;
+        if($ret < 0) {
+                    return -1;
+        }
 
         return $run;
     }
@@ -251,8 +258,9 @@ 
     {
         while (strlen($this->dataStr) > 0)
         {
-            if($this->dataStr == '')
-                return 0;
+            if($this->dataStr == '') {
+                            return 0;
+            }
 
             $mode = $this->identifyMode(0);
             
@@ -260,16 +268,22 @@ 
                 case QR_MODE_NUM: $length = $this->eatNum(); break;
                 case QR_MODE_AN:  $length = $this->eatAn(); break;
                 case QR_MODE_KANJI:
-                    if ($hint == QR_MODE_KANJI)
-                            $length = $this->eatKanji();
-                    else    $length = $this->eat8();
+                    if ($hint == QR_MODE_KANJI) {
+                                                $length = $this->eatKanji();
+                    } else {
+                        $length = $this->eat8();
+                    }
                     break;
                 default: $length = $this->eat8(); break;
             
             }
 
-            if($length == 0) return 0;
-            if($length < 0)  return -1;
+            if($length == 0) {
+                return 0;
+            }
+            if($length < 0) {
+                return -1;
+            }
             
             $this->dataStr = substr($this->dataStr, $length);
         }
@@ -305,8 +319,9 @@ 
 
         $split = new QRsplit($string, $input, $modeHint);
         
-        if(!$casesensitive)
-            $split->toUpper();
+        if(!$casesensitive) {
+                    $split->toUpper();
+        }
             
         return $split->splitString();
     }

src/Gateways/qrcode/QRrawcode.php

Spacing +15 added lines, -15 removed lines

@@ -23,10 +23,10 @@ 
     //----------------------------------------------------------------------
     public function __construct(QRinput $input)
     {
-        $spec = array(0,0,0,0,0);
+        $spec = array(0, 0, 0, 0, 0);
 
         $this->datacode = $input->getByteStream();
-        if(is_null($this->datacode)) {
+        if (is_null($this->datacode)) {
             throw new Exception('null imput string');
         }
 
@@ -40,7 +40,7 @@ 
         $this->blocks = QRspec::rsBlockNum($spec);
 
         $ret = $this->init($spec);
-        if($ret < 0) {
+        if ($ret < 0) {
             throw new Exception('block alloc error');
             return null;
         }
@@ -59,29 +59,29 @@ 
         $blockNo = 0;
         $dataPos = 0;
         $eccPos = 0;
-        for($i=0; $i<QRspec::rsBlockNum1($spec); $i++) {
-            $ecc = array_slice($this->ecccode,$eccPos);
-            $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el,  $ecc, $rs);
-            $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);
+        for ($i = 0; $i < QRspec::rsBlockNum1($spec); $i++) {
+            $ecc = array_slice($this->ecccode, $eccPos);
+            $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs);
+            $this->ecccode = array_merge(array_slice($this->ecccode, 0, $eccPos), $ecc);
 
             $dataPos += $dl;
             $eccPos += $el;
             $blockNo++;
         }
 
-        if(QRspec::rsBlockNum2($spec) == 0)
+        if (QRspec::rsBlockNum2($spec) == 0)
             return 0;
 
         $dl = QRspec::rsDataCodes2($spec);
         $el = QRspec::rsEccCodes2($spec);
         $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);
 
-        if($rs == NULL) return -1;
+        if ($rs == NULL) return -1;
 
-        for($i=0; $i<QRspec::rsBlockNum2($spec); $i++) {
-            $ecc = array_slice($this->ecccode,$eccPos);
+        for ($i = 0; $i < QRspec::rsBlockNum2($spec); $i++) {
+            $ecc = array_slice($this->ecccode, $eccPos);
             $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs);
-            $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);
+            $this->ecccode = array_merge(array_slice($this->ecccode, 0, $eccPos), $ecc);
 
             $dataPos += $dl;
             $eccPos += $el;
@@ -96,14 +96,14 @@ 
     {
         $ret;
 
-        if($this->count < $this->dataLength) {
+        if ($this->count < $this->dataLength) {
             $row = $this->count % $this->blocks;
             $col = $this->count / $this->blocks;
-            if($col >= $this->rsblocks[0]->dataLength) {
+            if ($col >= $this->rsblocks[0]->dataLength) {
                 $row += $this->b1;
             }
             $ret = $this->rsblocks[$row]->data[$col];
-        } else if($this->count < $this->dataLength + $this->eccLength) {
+        } else if ($this->count < $this->dataLength + $this->eccLength) {
             $row = ($this->count - $this->dataLength) % $this->blocks;
             $col = ($this->count - $this->dataLength) / $this->blocks;
             $ret = $this->rsblocks[$row]->ecc[$col];

Braces +6 added lines, -3 removed lines

@@ -69,14 +69,17 @@
             $blockNo++;
         }
 
-        if(QRspec::rsBlockNum2($spec) == 0)
-            return 0;
+        if(QRspec::rsBlockNum2($spec) == 0) {
+                    return 0;
+        }
 
         $dl = QRspec::rsDataCodes2($spec);
         $el = QRspec::rsEccCodes2($spec);
         $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);
 
-        if($rs == NULL) return -1;
+        if($rs == NULL) {
+            return -1;
+        }
 
         for($i=0; $i<QRspec::rsBlockNum2($spec); $i++) {
             $ecc = array_slice($this->ecccode,$eccPos);

src/Gateways/qrcode/QRtools.php

Spacing +12 added lines, -12 removed lines

@@ -31,8 +31,8 @@ 
         $len = count($frame);
         foreach ($frame as &$frameLine) {
 
-            for($i=0; $i<$len; $i++) {
-                $frameLine[$i] = (ord($frameLine[$i])&1)?'1':'0';
+            for ($i = 0; $i < $len; $i++) {
+                $frameLine[$i] = (ord($frameLine[$i])&1) ? '1' : '0';
             }
         }
 
@@ -62,8 +62,8 @@ 
 
         foreach ($qrTab as $line) {
             $arrAdd = array();
-            foreach(str_split($line) as $char)
-                $arrAdd[] = ($char=='1')?1:0;
+            foreach (str_split($line) as $char)
+                $arrAdd[] = ($char == '1') ? 1 : 0;
             $barcode_array['bcode'][] = $arrAdd;
         }
 
@@ -82,7 +82,7 @@ 
         QRtools::markTime('before_build_cache');
 
         $mask = new QRmask();
-        for ($a=1; $a <= QRSPEC_VERSION_MAX; $a++) {
+        for ($a = 1; $a <= QRSPEC_VERSION_MAX; $a++) {
             $frame = QRspec::newFrame($a);
             if (QR_IMAGE) {
                 $fileName = QR_CACHE_DIR.'frame_'.$a.'.png';
@@ -91,7 +91,7 @@ 
 
             $width = count($frame);
             $bitMask = array_fill(0, $width, array_fill(0, $width, 0));
-            for ($maskNo=0; $maskNo<8; $maskNo++)
+            for ($maskNo = 0; $maskNo < 8; $maskNo++)
                 $mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
         }
 
@@ -116,8 +116,8 @@ 
     public static function dumpMask($frame)
     {
         $width = count($frame);
-        for($y=0;$y<$width;$y++) {
-            for($x=0;$x<$width;$x++) {
+        for ($y = 0; $y < $width; $y++) {
+            for ($x = 0; $x < $width; $x++) {
                 echo ord($frame[$y][$x]).',';
             }
         }
@@ -127,7 +127,7 @@ 
     public static function markTime($markerId)
     {
         list($usec, $sec) = explode(" ", microtime());
-        $time = ((float)$usec + (float)$sec);
+        $time = ((float) $usec + (float) $sec);
 
         if (!isset($GLOBALS['qr_time_bench']))
             $GLOBALS['qr_time_bench'] = array();
@@ -148,9 +148,9 @@ 
                 <thead><tr style="border-bottom:1px solid silver"><td colspan="2" style="text-align:center">BENCHMARK</td></tr></thead>
                 <tbody>';
 
-        foreach($GLOBALS['qr_time_bench'] as $markerId=>$thisTime) {
+        foreach ($GLOBALS['qr_time_bench'] as $markerId=>$thisTime) {
             if ($p > 0) {
-                echo '<tr><th style="text-align:right">till '.$markerId.': </th><td>'.number_format($thisTime-$lastTime, 6).'s</td></tr>';
+                echo '<tr><th style="text-align:right">till '.$markerId.': </th><td>'.number_format($thisTime - $lastTime, 6).'s</td></tr>';
             } else {
                 $startTime = $thisTime;
             }
@@ -160,7 +160,7 @@ 
         }
 
         echo '</tbody><tfoot>
-            <tr style="border-top:2px solid black"><th style="text-align:right">TOTAL: </th><td>'.number_format($lastTime-$startTime, 6).'s</td></tr>
+            <tr style="border-top:2px solid black"><th style="text-align:right">TOTAL: </th><td>'.number_format($lastTime - $startTime, 6).'s</td></tr>
         </tfoot>
         </table>';
     }

Braces +12 added lines, -8 removed lines

@@ -44,8 +44,9 @@ 
     {
         $barcode_array = array();
 
-        if (!is_array($mode))
-            $mode = explode(',', $mode);
+        if (!is_array($mode)) {
+                    $mode = explode(',', $mode);
+        }
 
         $eccLevel = 'L';
 
@@ -62,8 +63,9 @@ 
 
         foreach ($qrTab as $line) {
             $arrAdd = array();
-            foreach(str_split($line) as $char)
-                $arrAdd[] = ($char=='1')?1:0;
+            foreach(str_split($line) as $char) {
+                            $arrAdd[] = ($char=='1')?1:0;
+            }
             $barcode_array['bcode'][] = $arrAdd;
         }
 
@@ -91,8 +93,9 @@ 
 
             $width = count($frame);
             $bitMask = array_fill(0, $width, array_fill(0, $width, 0));
-            for ($maskNo=0; $maskNo<8; $maskNo++)
-                $mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
+            for ($maskNo=0; $maskNo<8; $maskNo++) {
+                            $mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
+            }
         }
 
         QRtools::markTime('after_build_cache');
@@ -129,8 +132,9 @@ 
         list($usec, $sec) = explode(" ", microtime());
         $time = ((float)$usec + (float)$sec);
 
-        if (!isset($GLOBALS['qr_time_bench']))
-            $GLOBALS['qr_time_bench'] = array();
+        if (!isset($GLOBALS['qr_time_bench'])) {
+                    $GLOBALS['qr_time_bench'] = array();
+        }
 
         $GLOBALS['qr_time_bench'][$markerId] = $time;
     }

src/Gateways/qrcode/FrameFiller.php

Spacing +9 added lines, -9 removed lines

@@ -44,7 +44,7 @@ 
     {
         do {
 
-            if($this->bit == -1) {
+            if ($this->bit == -1) {
                 $this->bit = 0;
                 return array('x'=>$this->x, 'y'=>$this->y);
             }
@@ -53,7 +53,7 @@ 
             $y = $this->y;
             $w = $this->width;
 
-            if($this->bit == 0) {
+            if ($this->bit == 0) {
                 $x--;
                 $this->bit++;
             } else {
@@ -62,33 +62,33 @@ 
                 $this->bit--;
             }
 
-            if($this->dir < 0) {
-                if($y < 0) {
+            if ($this->dir < 0) {
+                if ($y < 0) {
                     $y = 0;
                     $x -= 2;
                     $this->dir = 1;
-                    if($x == 6) {
+                    if ($x == 6) {
                         $x--;
                         $y = 9;
                     }
                 }
             } else {
-                if($y == $w) {
+                if ($y == $w) {
                     $y = $w - 1;
                     $x -= 2;
                     $this->dir = -1;
-                    if($x == 6) {
+                    if ($x == 6) {
                         $x--;
                         $y -= 8;
                     }
                 }
             }
-            if($x < 0 || $y < 0) return null;
+            if ($x < 0 || $y < 0) return null;
 
             $this->x = $x;
             $this->y = $y;
 
-        } while(ord($this->frame[$y][$x]) & 0x80);
+        } while (ord($this->frame[$y][$x]) & 0x80);
 
         return array('x'=>$x, 'y'=>$y);
     }

Braces +3 added lines, -1 removed lines

@@ -83,7 +83,9 @@
                     }
                 }
             }
-            if($x < 0 || $y < 0) return null;
+            if($x < 0 || $y < 0) {
+                return null;
+            }
 
             $this->x = $x;
             $this->y = $y;

src/Gateways/qrcode/Qrcode.php

Spacing +30 added lines, -30 removed lines

@@ -24,25 +24,25 @@ 
 define('QR_ECLEVEL_H', 3);
 // Supported output formats
 define('QR_FORMAT_TEXT', 0);
-define('QR_FORMAT_PNG',  1);
+define('QR_FORMAT_PNG', 1);
 /**
  * config
  */
-define('QR_CACHEABLE', true);                                                               // use cache - more disk reads but less CPU power, masks and format templates are stored there
-define('QR_CACHE_DIR', dirname(__FILE__).DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR);  // used when QR_CACHEABLE === true
-define('QR_LOG_DIR', dirname(__FILE__).DIRECTORY_SEPARATOR);                                // default error logs dir
-define('QR_FIND_BEST_MASK', true);                                                          // if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code
-define('QR_FIND_FROM_RANDOM', false);                                                       // if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly
-define('QR_DEFAULT_MASK', 2);                                                               // when QR_FIND_BEST_MASK === false
-define('QR_PNG_MAXIMUM_SIZE',  1024);                                                       // maximum allowed png image width (in pixels), tune to make sure GD and PHP can handle such big images
+define('QR_CACHEABLE', true); // use cache - more disk reads but less CPU power, masks and format templates are stored there
+define('QR_CACHE_DIR', dirname(__FILE__).DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR); // used when QR_CACHEABLE === true
+define('QR_LOG_DIR', dirname(__FILE__).DIRECTORY_SEPARATOR); // default error logs dir
+define('QR_FIND_BEST_MASK', true); // if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code
+define('QR_FIND_FROM_RANDOM', false); // if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly
+define('QR_DEFAULT_MASK', 2); // when QR_FIND_BEST_MASK === false
+define('QR_PNG_MAXIMUM_SIZE', 1024); // maximum allowed png image width (in pixels), tune to make sure GD and PHP can handle such big images
 
 define('QRSPEC_VERSION_MAX', 40);
-define('QRSPEC_WIDTH_MAX',   177);
-define('QRCAP_WIDTH',        0);
-define('QRCAP_WORDS',        1);
-define('QRCAP_REMINDER',     2);
-define('QRCAP_EC',           3);
-class Qrcode{
+define('QRSPEC_WIDTH_MAX', 177);
+define('QRCAP_WIDTH', 0);
+define('QRCAP_WORDS', 1);
+define('QRCAP_REMINDER', 2);
+define('QRCAP_EC', 3);
+class Qrcode {
 
 
     public $version;
@@ -52,10 +52,10 @@ 
     //----------------------------------------------------------------------
     public function encodeMask(QRinput $input, $mask)
     {
-        if($input->getVersion() < 0 || $input->getVersion() > QRSPEC_VERSION_MAX) {
+        if ($input->getVersion() < 0 || $input->getVersion() > QRSPEC_VERSION_MAX) {
             throw new Exception('wrong version');
         }
-        if($input->getErrorCorrectionLevel() > QR_ECLEVEL_H) {
+        if ($input->getErrorCorrectionLevel() > QR_ECLEVEL_H) {
             throw new Exception('wrong level');
         }
 
@@ -68,15 +68,15 @@ 
         $frame = QRspec::newFrame($version);
 
         $filler = new FrameFiller($width, $frame);
-        if(is_null($filler)) {
+        if (is_null($filler)) {
             return NULL;
         }
 
         // inteleaved data and ecc codes
-        for($i=0; $i<$raw->dataLength + $raw->eccLength; $i++) {
+        for ($i = 0; $i < $raw->dataLength + $raw->eccLength; $i++) {
             $code = $raw->getCode();
             $bit = 0x80;
-            for($j=0; $j<8; $j++) {
+            for ($j = 0; $j < 8; $j++) {
                 $addr = $filler->next();
                 $filler->setFrameAt($addr, 0x02 | (($bit & $code) != 0));
                 $bit = $bit >> 1;
@@ -89,7 +89,7 @@ 
 
         // remainder bits
         $j = QRspec::getRemainder($version);
-        for($i=0; $i<$j; $i++) {
+        for ($i = 0; $i < $j; $i++) {
             $addr = $filler->next();
             $filler->setFrameAt($addr, 0x02);
         }
@@ -100,7 +100,7 @@ 
 
         // masking
         $maskObj = new QRmask();
-        if($mask < 0) {
+        if ($mask < 0) {
 
             if (QR_FIND_BEST_MASK) {
                 $masked = $maskObj->mask($width, $frame, $input->getErrorCorrectionLevel());
@@ -111,7 +111,7 @@ 
             $masked = $maskObj->makeMask($width, $frame, $mask, $input->getErrorCorrectionLevel());
         }
 
-        if($masked == NULL) {
+        if ($masked == NULL) {
             return NULL;
         }
 
@@ -133,16 +133,16 @@ 
     //----------------------------------------------------------------------
     public function encodeString8bit($string, $version, $level)
     {
-        if(string == NULL) {
+        if (string == NULL) {
             throw new Exception('empty string!');
             return NULL;
         }
 
         $input = new QRinput($version, $level);
-        if($input == NULL) return NULL;
+        if ($input == NULL) return NULL;
 
         $ret = $input->append($input, QR_MODE_8, strlen($string), str_split($string));
-        if($ret < 0) {
+        if ($ret < 0) {
             unset($input);
             return NULL;
         }
@@ -153,16 +153,16 @@ 
     public function encodeString($string, $version, $level, $hint, $casesensitive)
     {
 
-        if($hint != QR_MODE_8 && $hint != QR_MODE_KANJI) {
+        if ($hint != QR_MODE_8 && $hint != QR_MODE_KANJI) {
             throw new Exception('bad hint');
             return NULL;
         }
 
         $input = new QRinput($version, $level);
-        if($input == NULL) return NULL;
+        if ($input == NULL) return NULL;
 
         $ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive);
-        if($ret < 0) {
+        if ($ret < 0) {
             return NULL;
         }
 
@@ -170,10 +170,10 @@ 
     }
 
     //----------------------------------------------------------------------
-    public static function png($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint=false)
+    public static function png($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint = false)
     {
         $enc = QRencode::factory($level, $size, $margin);
-        return $enc->encodePNG($text, $outfile, $saveandprint=false);
+        return $enc->encodePNG($text, $outfile, $saveandprint = false);
     }
 
     //----------------------------------------------------------------------

Braces +6 added lines, -2 removed lines

@@ -139,7 +139,9 @@ 
         }
 
         $input = new QRinput($version, $level);
-        if($input == NULL) return NULL;
+        if($input == NULL) {
+            return NULL;
+        }
 
         $ret = $input->append($input, QR_MODE_8, strlen($string), str_split($string));
         if($ret < 0) {
@@ -159,7 +161,9 @@ 
         }
 
         $input = new QRinput($version, $level);
-        if($input == NULL) return NULL;
+        if($input == NULL) {
+            return NULL;
+        }
 
         $ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive);
         if($ret < 0) {