Inspection of "Merge pull request #7 from codysnider/scrutinizer-..." - codysnider/tt-rss - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 678db7...164b32 )

by Cody

created 2019-12-21 04:05 UTC

Status

Switch Indentation +88 added lines, -88 removed lines patch added patch discarded remove patch

@@ -1217,13 +1217,13 @@  discard block
 block discarded – undo
                 $version = 1;
 
             switch ($this->mode) {
-                case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size); break;
-                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size); break;
-                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size); break;
-                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size); break;
-                case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            
-                default:
-                    return 0;
+            case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size); break;
+            case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size); break;
+            case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size); break;
+            case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size); break;
+            case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            
+            default:
+                return 0;
             }
 
             $l = QRspec::lengthIndicator($this->mode, $version);
@@ -1263,14 +1263,14 @@  discard block
 block discarded – undo
                     $ret = 0;
                     
                     switch ($this->mode) {
-                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version); break;
-                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version); break;
-                        case QR_MODE_8:            $ret = $this->encodeMode8($version); break;
-                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version); break;
-                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure(); break;
+                    case QR_MODE_NUM:        $ret = $this->encodeModeNum($version); break;
+                    case QR_MODE_AN:        $ret = $this->encodeModeAn($version); break;
+                    case QR_MODE_8:            $ret = $this->encodeMode8($version); break;
+                    case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version); break;
+                    case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure(); break;
                         
-                        default:
-                            break;
+                    default:
+                        break;
                     }
                     
                     if ($ret < 0)
@@ -1420,14 +1420,14 @@  discard block
 block discarded – undo
             $bits = $w * 10;
             
             switch ($size - $w * 3) {
-                case 1:
-                    $bits += 4;
-                    break;
-                case 2:
-                    $bits += 7;
-                    break;
-                default:
-                    break;
+            case 1:
+                $bits += 4;
+                break;
+            case 2:
+                $bits += 7;
+                break;
+            default:
+                break;
             }
 
             return $bits;
@@ -1516,14 +1516,14 @@  discard block
 block discarded – undo
                 return false;
 
             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;
+            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;
                 
-                default:
-                    break;
+            default:
+                break;
             }
 
             return false;
@@ -1564,35 +1564,35 @@  discard block
 block discarded – undo
         {
             $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);
             switch ($mode) {
-                case QR_MODE_NUM:
-                    $chunks = (int) ($payload / 10);
-                    $remain = $payload - $chunks * 10;
-                    $size = $chunks * 3;
-                    if ($remain >= 7) {
-                        $size += 2;
-                    } else if ($remain >= 4) {
-                        $size += 1;
-                    }
-                    break;
-                case QR_MODE_AN:
-                    $chunks = (int) ($payload / 11);
-                    $remain = $payload - $chunks * 11;
-                    $size = $chunks * 2;
-                    if ($remain >= 6) 
-                        $size++;
-                    break;
-                case QR_MODE_8:
-                    $size = (int) ($payload / 8);
-                    break;
-                case QR_MODE_KANJI:
-                    $size = (int) (($payload / 13) * 2);
-                    break;
-                case QR_MODE_STRUCTURE:
-                    $size = (int) ($payload / 8);
-                    break;
-                default:
-                    $size = 0;
-                    break;
+            case QR_MODE_NUM:
+                $chunks = (int) ($payload / 10);
+                $remain = $payload - $chunks * 10;
+                $size = $chunks * 3;
+                if ($remain >= 7) {
+                    $size += 2;
+                } else if ($remain >= 4) {
+                    $size += 1;
+                }
+                break;
+            case QR_MODE_AN:
+                $chunks = (int) ($payload / 11);
+                $remain = $payload - $chunks * 11;
+                $size = $chunks * 2;
+                if ($remain >= 6) 
+                    $size++;
+                break;
+            case QR_MODE_8:
+                $size = (int) ($payload / 8);
+                break;
+            case QR_MODE_KANJI:
+                $size = (int) (($payload / 13) * 2);
+                break;
+            case QR_MODE_STRUCTURE:
+                $size = (int) ($payload / 8);
+                break;
+            default:
+                $size = 0;
+                break;
             }
             
             $maxsize = QRspec::maximumWords($mode, $version);
@@ -2198,14 +2198,14 @@  discard block
 block discarded – undo
                 $mode = $this->identifyMode(0);
                 
                 switch ($mode) {
-                    case QR_MODE_NUM: $length = $this->eatNum(); break;
-                    case QR_MODE_AN:  $length = $this->eatAn(); break;
-                    case QR_MODE_KANJI:
-                        if ($this->modeHint == QR_MODE_KANJI)
-                                $length = $this->eatKanji();
-                        else    $length = $this->eat8();
-                        break;
-                    default: $length = $this->eat8(); break;
+                case QR_MODE_NUM: $length = $this->eatNum(); break;
+                case QR_MODE_AN:  $length = $this->eatAn(); break;
+                case QR_MODE_KANJI:
+                    if ($this->modeHint == QR_MODE_KANJI)
+                            $length = $this->eatKanji();
+                    else    $length = $this->eat8();
+                    break;
+                default: $length = $this->eat8(); break;
                 
                 }
 
@@ -3234,28 +3234,28 @@  discard block
 block discarded – undo
             $enc->margin = $margin;
             
             switch ($level.'') {
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                        $enc->level = $level;
-                    break;
-                case 'l':
-                case 'L':
-                        $enc->level = QR_ECLEVEL_L;
-                    break;
-                case 'm':
-                case 'M':
-                        $enc->level = QR_ECLEVEL_M;
-                    break;
-                case 'q':
-                case 'Q':
-                        $enc->level = QR_ECLEVEL_Q;
-                    break;
-                case 'h':
-                case 'H':
-                        $enc->level = QR_ECLEVEL_H;
-                    break;
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+                    $enc->level = $level;
+                break;
+            case 'l':
+            case 'L':
+                    $enc->level = QR_ECLEVEL_L;
+                break;
+            case 'm':
+            case 'M':
+                    $enc->level = QR_ECLEVEL_M;
+                break;
+            case 'q':
+            case 'Q':
+                    $enc->level = QR_ECLEVEL_Q;
+                break;
+            case 'h':
+            case 'H':
+                    $enc->level = QR_ECLEVEL_H;
+                break;
             }
             
             return $enc;

Please login to merge, or discard this patch.

lib/phpqrcode/bindings/tcpdf/qrcode.php 1 patch

Switch Indentation +128 added lines, -128 removed lines patch added patch discarded remove patch

@@ -1461,26 +1461,26 @@  discard block
 block discarded – undo
 				}
 				$mode = $this->identifyMode(0);
 				switch ($mode) {
-					case QR_MODE_NM: {
-						$length = $this->eatNum();
-						break;
-					}
-					case QR_MODE_AN: {
-						$length = $this->eatAn();
-						break;
-					}
-					case QR_MODE_KJ: {
-						if ($this->hint == QR_MODE_KJ) {
-							$length = $this->eatKanji();
-						} else {
-							$length = $this->eat8();
-						}
-						break;
-					}
-					default: {
+				case QR_MODE_NM: {
+					$length = $this->eatNum();
+					break;
+				}
+				case QR_MODE_AN: {
+					$length = $this->eatAn();
+					break;
+				}
+				case QR_MODE_KJ: {
+					if ($this->hint == QR_MODE_KJ) {
+						$length = $this->eatKanji();
+					} else {
 						$length = $this->eat8();
-						break;
 					}
+					break;
+				}
+				default: {
+					$length = $this->eat8();
+					break;
+				}
 				}
 				if ($length == 0) {
 					return 0;
@@ -1665,29 +1665,29 @@  discard block
 block discarded – undo
 				$inputitem['bstream'] = $this->appendBitstream($inputitem['bstream'], $st2['bstream']);
 			} else {
 				switch ($inputitem['mode']) {
-					case QR_MODE_NM: {
-						$inputitem = $this->encodeModeNum($inputitem, $version);
-						break;
-					}
-					case QR_MODE_AN: {
-						$inputitem = $this->encodeModeAn($inputitem, $version);
-						break;
-					}
-					case QR_MODE_8B: {
-						$inputitem = $this->encodeMode8($inputitem, $version);
-						break;
-					}
-					case QR_MODE_KJ: {
-						$inputitem = $this->encodeModeKanji($inputitem, $version);
-						break;
-					}
-					case QR_MODE_ST: {
-						$inputitem = $this->encodeModeStructure($inputitem);
-						break;
-					}
-					default: {
-						break;
-					}
+				case QR_MODE_NM: {
+					$inputitem = $this->encodeModeNum($inputitem, $version);
+					break;
+				}
+				case QR_MODE_AN: {
+					$inputitem = $this->encodeModeAn($inputitem, $version);
+					break;
+				}
+				case QR_MODE_8B: {
+					$inputitem = $this->encodeMode8($inputitem, $version);
+					break;
+				}
+				case QR_MODE_KJ: {
+					$inputitem = $this->encodeModeKanji($inputitem, $version);
+					break;
+				}
+				case QR_MODE_ST: {
+					$inputitem = $this->encodeModeStructure($inputitem);
+					break;
+				}
+				default: {
+					break;
+				}
 				}
 			}
 			return $inputitem;
@@ -1774,17 +1774,17 @@  discard block
 block discarded – undo
 			$w = (int) $size / 3;
 			$bits = $w * 10;
 			switch ($size - $w * 3) {
-				case 1: {
-					$bits += 4;
-					break;
-				}
-				case 2: {
-					$bits += 7;
-					break;
-				}
-				default: {
-					break;
-				}
+			case 1: {
+				$bits += 4;
+				break;
+			}
+			case 2: {
+				$bits += 7;
+				break;
+			}
+			default: {
+				break;
+			}
 			}
 			return $bits;
 		}
@@ -1876,24 +1876,24 @@  discard block
 block discarded – undo
 				return false;
 			}
 			switch ($mode) {
-				case QR_MODE_NM: {
-					return $this->checkModeNum($size, $data);
-				}
-				case QR_MODE_AN: {
-					return $this->checkModeAn($size, $data);
-				}
-				case QR_MODE_KJ: {
-					return $this->checkModeKanji($size, $data);
-				}
-				case QR_MODE_8B: {
-					return true;
-				}
-				case QR_MODE_ST: {
-					return true;
-				}
-				default: {
-					break;
-				}
+			case QR_MODE_NM: {
+				return $this->checkModeNum($size, $data);
+			}
+			case QR_MODE_AN: {
+				return $this->checkModeAn($size, $data);
+			}
+			case QR_MODE_KJ: {
+				return $this->checkModeKanji($size, $data);
+			}
+			case QR_MODE_8B: {
+				return true;
+			}
+			case QR_MODE_ST: {
+				return true;
+			}
+			default: {
+				break;
+			}
 			}
 			return false;
 		}
@@ -1911,28 +1911,28 @@  discard block
 block discarded – undo
 			}
 			foreach ($items as $item) {
 				switch ($item['mode']) {
-					case QR_MODE_NM: {
-						$bits = $this->estimateBitsModeNum($item['size']);
-						break;
-					}
-					case QR_MODE_AN: {
-						$bits = $this->estimateBitsModeAn($item['size']);
-						break;
-					}
-					case QR_MODE_8B: {
-						$bits = $this->estimateBitsMode8($item['size']);
-						break;
-					}
-					case QR_MODE_KJ: {
-						$bits = $this->estimateBitsModeKanji($item['size']);
-						break;
-					}
-					case QR_MODE_ST: {
-						return STRUCTURE_HEADER_BITS;
-					}
-					default: {
-						return 0;
-					}
+				case QR_MODE_NM: {
+					$bits = $this->estimateBitsModeNum($item['size']);
+					break;
+				}
+				case QR_MODE_AN: {
+					$bits = $this->estimateBitsModeAn($item['size']);
+					break;
+				}
+				case QR_MODE_8B: {
+					$bits = $this->estimateBitsMode8($item['size']);
+					break;
+				}
+				case QR_MODE_KJ: {
+					$bits = $this->estimateBitsModeKanji($item['size']);
+					break;
+				}
+				case QR_MODE_ST: {
+					return STRUCTURE_HEADER_BITS;
+				}
+				default: {
+					return 0;
+				}
 				}
 				$l = $this->lengthIndicator($item['mode'], $version);
 				$m = 1 << $l;
@@ -1971,42 +1971,42 @@  discard block
 block discarded – undo
 		 protected function lengthOfCode($mode, $version, $bits) {
 			$payload = $bits - 4 - $this->lengthIndicator($mode, $version);
 			switch ($mode) {
-				case QR_MODE_NM: {
-					$chunks = (int) ($payload / 10);
-					$remain = $payload - $chunks * 10;
-					$size = $chunks * 3;
-					if ($remain >= 7) {
-						$size += 2;
-					} elseif ($remain >= 4) {
-						$size += 1;
-					}
-					break;
-				}
-				case QR_MODE_AN: {
-					$chunks = (int) ($payload / 11);
-					$remain = $payload - $chunks * 11;
-					$size = $chunks * 2;
-					if ($remain >= 6) {
-						++$size;
-					}
-					break;
-				}
-				case QR_MODE_8B: {
-					$size = (int) ($payload / 8);
-					break;
-				}
-				case QR_MODE_KJ: {
-					$size = (int) (($payload / 13) * 2);
-					break;
-				}
-				case QR_MODE_ST: {
-					$size = (int) ($payload / 8);
-					break;
-				}
-				default: {
-					$size = 0;
-					break;
-				}
+			case QR_MODE_NM: {
+				$chunks = (int) ($payload / 10);
+				$remain = $payload - $chunks * 10;
+				$size = $chunks * 3;
+				if ($remain >= 7) {
+					$size += 2;
+				} elseif ($remain >= 4) {
+					$size += 1;
+				}
+				break;
+			}
+			case QR_MODE_AN: {
+				$chunks = (int) ($payload / 11);
+				$remain = $payload - $chunks * 11;
+				$size = $chunks * 2;
+				if ($remain >= 6) {
+					++$size;
+				}
+				break;
+			}
+			case QR_MODE_8B: {
+				$size = (int) ($payload / 8);
+				break;
+			}
+			case QR_MODE_KJ: {
+				$size = (int) (($payload / 13) * 2);
+				break;
+			}
+			case QR_MODE_ST: {
+				$size = (int) ($payload / 8);
+				break;
+			}
+			default: {
+				$size = 0;
+				break;
+			}
 			}
 			$maxsize = $this->maximumWords($mode, $version);
 			if ($size < 0) {

Please login to merge, or discard this patch.

		@@ -1217,13 +1217,13 @@ discard block
		block discarded – undo
1217	1217	$version = 1;
1218	1218
1219	1219	switch ($this->mode) {
1220		- case QR_MODE_NUM: $bits = QRinput::estimateBitsModeNum($this->size); break;
1221		- case QR_MODE_AN: $bits = QRinput::estimateBitsModeAn($this->size); break;
1222		- case QR_MODE_8: $bits = QRinput::estimateBitsMode8($this->size); break;
1223		- case QR_MODE_KANJI: $bits = QRinput::estimateBitsModeKanji($this->size); break;
1224		- case QR_MODE_STRUCTURE: return STRUCTURE_HEADER_BITS;
1225		- default:
1226		- return 0;
	1220	+ case QR_MODE_NUM: $bits = QRinput::estimateBitsModeNum($this->size); break;
	1221	+ case QR_MODE_AN: $bits = QRinput::estimateBitsModeAn($this->size); break;
	1222	+ case QR_MODE_8: $bits = QRinput::estimateBitsMode8($this->size); break;
	1223	+ case QR_MODE_KANJI: $bits = QRinput::estimateBitsModeKanji($this->size); break;
	1224	+ case QR_MODE_STRUCTURE: return STRUCTURE_HEADER_BITS;
	1225	+ default:
	1226	+ return 0;
1227	1227	}
1228	1228
1229	1229	$l = QRspec::lengthIndicator($this->mode, $version);
		@@ -1263,14 +1263,14 @@ discard block
		block discarded – undo
1263	1263	$ret = 0;
1264	1264
1265	1265	switch ($this->mode) {
1266		- case QR_MODE_NUM: $ret = $this->encodeModeNum($version); break;
1267		- case QR_MODE_AN: $ret = $this->encodeModeAn($version); break;
1268		- case QR_MODE_8: $ret = $this->encodeMode8($version); break;
1269		- case QR_MODE_KANJI: $ret = $this->encodeModeKanji($version); break;
1270		- case QR_MODE_STRUCTURE: $ret = $this->encodeModeStructure(); break;
	1266	+ case QR_MODE_NUM: $ret = $this->encodeModeNum($version); break;
	1267	+ case QR_MODE_AN: $ret = $this->encodeModeAn($version); break;
	1268	+ case QR_MODE_8: $ret = $this->encodeMode8($version); break;
	1269	+ case QR_MODE_KANJI: $ret = $this->encodeModeKanji($version); break;
	1270	+ case QR_MODE_STRUCTURE: $ret = $this->encodeModeStructure(); break;
1271	1271
1272		- default:
1273		- break;
	1272	+ default:
	1273	+ break;
1274	1274	}
1275	1275
1276	1276	if ($ret < 0)
		@@ -1420,14 +1420,14 @@ discard block
		block discarded – undo
1420	1420	$bits = $w * 10;
1421	1421
1422	1422	switch ($size - $w * 3) {
1423		- case 1:
1424		- $bits += 4;
1425		- break;
1426		- case 2:
1427		- $bits += 7;
1428		- break;
1429		- default:
1430		- break;
	1423	+ case 1:
	1424	+ $bits += 4;
	1425	+ break;
	1426	+ case 2:
	1427	+ $bits += 7;
	1428	+ break;
	1429	+ default:
	1430	+ break;
1431	1431	}
1432	1432
1433	1433	return $bits;
		@@ -1516,14 +1516,14 @@ discard block
		block discarded – undo
1516	1516	return false;
1517	1517
1518	1518	switch ($mode) {
1519		- case QR_MODE_NUM: return self::checkModeNum($size, $data); break;
1520		- case QR_MODE_AN: return self::checkModeAn($size, $data); break;
1521		- case QR_MODE_KANJI: return self::checkModeKanji($size, $data); break;
1522		- case QR_MODE_8: return true; break;
1523		- case QR_MODE_STRUCTURE: return true; break;
	1519	+ case QR_MODE_NUM: return self::checkModeNum($size, $data); break;
	1520	+ case QR_MODE_AN: return self::checkModeAn($size, $data); break;
	1521	+ case QR_MODE_KANJI: return self::checkModeKanji($size, $data); break;
	1522	+ case QR_MODE_8: return true; break;
	1523	+ case QR_MODE_STRUCTURE: return true; break;
1524	1524
1525		- default:
1526		- break;
	1525	+ default:
	1526	+ break;
1527	1527	}
1528	1528
1529	1529	return false;
		@@ -1564,35 +1564,35 @@ discard block
		block discarded – undo
1564	1564	{
1565	1565	$payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);
1566	1566	switch ($mode) {
1567		- case QR_MODE_NUM:
1568		- $chunks = (int) ($payload / 10);
1569		- $remain = $payload - $chunks * 10;
1570		- $size = $chunks * 3;
1571		- if ($remain >= 7) {
1572		- $size += 2;
1573		- } else if ($remain >= 4) {
1574		- $size += 1;
1575		- }
1576		- break;
1577		- case QR_MODE_AN:
1578		- $chunks = (int) ($payload / 11);
1579		- $remain = $payload - $chunks * 11;
1580		- $size = $chunks * 2;
1581		- if ($remain >= 6)
1582		- $size++;
1583		- break;
1584		- case QR_MODE_8:
1585		- $size = (int) ($payload / 8);
1586		- break;
1587		- case QR_MODE_KANJI:
1588		- $size = (int) (($payload / 13) * 2);
1589		- break;
1590		- case QR_MODE_STRUCTURE:
1591		- $size = (int) ($payload / 8);
1592		- break;
1593		- default:
1594		- $size = 0;
1595		- break;
	1567	+ case QR_MODE_NUM:
	1568	+ $chunks = (int) ($payload / 10);
	1569	+ $remain = $payload - $chunks * 10;
	1570	+ $size = $chunks * 3;
	1571	+ if ($remain >= 7) {
	1572	+ $size += 2;
	1573	+ } else if ($remain >= 4) {
	1574	+ $size += 1;
	1575	+ }
	1576	+ break;
	1577	+ case QR_MODE_AN:
	1578	+ $chunks = (int) ($payload / 11);
	1579	+ $remain = $payload - $chunks * 11;
	1580	+ $size = $chunks * 2;
	1581	+ if ($remain >= 6)
	1582	+ $size++;
	1583	+ break;
	1584	+ case QR_MODE_8:
	1585	+ $size = (int) ($payload / 8);
	1586	+ break;
	1587	+ case QR_MODE_KANJI:
	1588	+ $size = (int) (($payload / 13) * 2);
	1589	+ break;
	1590	+ case QR_MODE_STRUCTURE:
	1591	+ $size = (int) ($payload / 8);
	1592	+ break;
	1593	+ default:
	1594	+ $size = 0;
	1595	+ break;
1596	1596	}
1597	1597
1598	1598	$maxsize = QRspec::maximumWords($mode, $version);
		@@ -2198,14 +2198,14 @@ discard block
		block discarded – undo
2198	2198	$mode = $this->identifyMode(0);
2199	2199
2200	2200	switch ($mode) {
2201		- case QR_MODE_NUM: $length = $this->eatNum(); break;
2202		- case QR_MODE_AN: $length = $this->eatAn(); break;
2203		- case QR_MODE_KANJI:
2204		- if ($this->modeHint == QR_MODE_KANJI)
2205		- $length = $this->eatKanji();
2206		- else $length = $this->eat8();
2207		- break;
2208		- default: $length = $this->eat8(); break;
	2201	+ case QR_MODE_NUM: $length = $this->eatNum(); break;
	2202	+ case QR_MODE_AN: $length = $this->eatAn(); break;
	2203	+ case QR_MODE_KANJI:
	2204	+ if ($this->modeHint == QR_MODE_KANJI)
	2205	+ $length = $this->eatKanji();
	2206	+ else $length = $this->eat8();
	2207	+ break;
	2208	+ default: $length = $this->eat8(); break;
2209	2209
2210	2210	}
2211	2211
		@@ -3234,28 +3234,28 @@ discard block
		block discarded – undo
3234	3234	$enc->margin = $margin;
3235	3235
3236	3236	switch ($level.'') {
3237		- case '0':
3238		- case '1':
3239		- case '2':
3240		- case '3':
3241		- $enc->level = $level;
3242		- break;
3243		- case 'l':
3244		- case 'L':
3245		- $enc->level = QR_ECLEVEL_L;
3246		- break;
3247		- case 'm':
3248		- case 'M':
3249		- $enc->level = QR_ECLEVEL_M;
3250		- break;
3251		- case 'q':
3252		- case 'Q':
3253		- $enc->level = QR_ECLEVEL_Q;
3254		- break;
3255		- case 'h':
3256		- case 'H':
3257		- $enc->level = QR_ECLEVEL_H;
3258		- break;
	3237	+ case '0':
	3238	+ case '1':
	3239	+ case '2':
	3240	+ case '3':
	3241	+ $enc->level = $level;
	3242	+ break;
	3243	+ case 'l':
	3244	+ case 'L':
	3245	+ $enc->level = QR_ECLEVEL_L;
	3246	+ break;
	3247	+ case 'm':
	3248	+ case 'M':
	3249	+ $enc->level = QR_ECLEVEL_M;
	3250	+ break;
	3251	+ case 'q':
	3252	+ case 'Q':
	3253	+ $enc->level = QR_ECLEVEL_Q;
	3254	+ break;
	3255	+ case 'h':
	3256	+ case 'H':
	3257	+ $enc->level = QR_ECLEVEL_H;
	3258	+ break;
3259	3259	}
3260	3260
3261	3261	return $enc;

		@@ -1461,26 +1461,26 @@ discard block
		block discarded – undo
1461	1461	}
1462	1462	$mode = $this->identifyMode(0);
1463	1463	switch ($mode) {
1464		- case QR_MODE_NM: {
1465		- $length = $this->eatNum();
1466		- break;
1467		- }
1468		- case QR_MODE_AN: {
1469		- $length = $this->eatAn();
1470		- break;
1471		- }
1472		- case QR_MODE_KJ: {
1473		- if ($this->hint == QR_MODE_KJ) {
1474		- $length = $this->eatKanji();
1475		- } else {
1476		- $length = $this->eat8();
1477		- }
1478		- break;
1479		- }
1480		- default: {
	1464	+ case QR_MODE_NM: {
	1465	+ $length = $this->eatNum();
	1466	+ break;
	1467	+ }
	1468	+ case QR_MODE_AN: {
	1469	+ $length = $this->eatAn();
	1470	+ break;
	1471	+ }
	1472	+ case QR_MODE_KJ: {
	1473	+ if ($this->hint == QR_MODE_KJ) {
	1474	+ $length = $this->eatKanji();
	1475	+ } else {
1481	1476	$length = $this->eat8();
1482		- break;
1483	1477	}
	1478	+ break;
	1479	+ }
	1480	+ default: {
	1481	+ $length = $this->eat8();
	1482	+ break;
	1483	+ }
1484	1484	}
1485	1485	if ($length == 0) {
1486	1486	return 0;
		@@ -1665,29 +1665,29 @@ discard block
		block discarded – undo
1665	1665	$inputitem['bstream'] = $this->appendBitstream($inputitem['bstream'], $st2['bstream']);
1666	1666	} else {
1667	1667	switch ($inputitem['mode']) {
1668		- case QR_MODE_NM: {
1669		- $inputitem = $this->encodeModeNum($inputitem, $version);
1670		- break;
1671		- }
1672		- case QR_MODE_AN: {
1673		- $inputitem = $this->encodeModeAn($inputitem, $version);
1674		- break;
1675		- }
1676		- case QR_MODE_8B: {
1677		- $inputitem = $this->encodeMode8($inputitem, $version);
1678		- break;
1679		- }
1680		- case QR_MODE_KJ: {
1681		- $inputitem = $this->encodeModeKanji($inputitem, $version);
1682		- break;
1683		- }
1684		- case QR_MODE_ST: {
1685		- $inputitem = $this->encodeModeStructure($inputitem);
1686		- break;
1687		- }
1688		- default: {
1689		- break;
1690		- }
	1668	+ case QR_MODE_NM: {
	1669	+ $inputitem = $this->encodeModeNum($inputitem, $version);
	1670	+ break;
	1671	+ }
	1672	+ case QR_MODE_AN: {
	1673	+ $inputitem = $this->encodeModeAn($inputitem, $version);
	1674	+ break;
	1675	+ }
	1676	+ case QR_MODE_8B: {
	1677	+ $inputitem = $this->encodeMode8($inputitem, $version);
	1678	+ break;
	1679	+ }
	1680	+ case QR_MODE_KJ: {
	1681	+ $inputitem = $this->encodeModeKanji($inputitem, $version);
	1682	+ break;
	1683	+ }
	1684	+ case QR_MODE_ST: {
	1685	+ $inputitem = $this->encodeModeStructure($inputitem);
	1686	+ break;
	1687	+ }
	1688	+ default: {
	1689	+ break;
	1690	+ }
1691	1691	}
1692	1692	}
1693	1693	return $inputitem;
		@@ -1774,17 +1774,17 @@ discard block
		block discarded – undo
1774	1774	$w = (int) $size / 3;
1775	1775	$bits = $w * 10;
1776	1776	switch ($size - $w * 3) {
1777		- case 1: {
1778		- $bits += 4;
1779		- break;
1780		- }
1781		- case 2: {
1782		- $bits += 7;
1783		- break;
1784		- }
1785		- default: {
1786		- break;
1787		- }
	1777	+ case 1: {
	1778	+ $bits += 4;
	1779	+ break;
	1780	+ }
	1781	+ case 2: {
	1782	+ $bits += 7;
	1783	+ break;
	1784	+ }
	1785	+ default: {
	1786	+ break;
	1787	+ }
1788	1788	}
1789	1789	return $bits;
1790	1790	}
		@@ -1876,24 +1876,24 @@ discard block
		block discarded – undo
1876	1876	return false;
1877	1877	}
1878	1878	switch ($mode) {
1879		- case QR_MODE_NM: {
1880		- return $this->checkModeNum($size, $data);
1881		- }
1882		- case QR_MODE_AN: {
1883		- return $this->checkModeAn($size, $data);
1884		- }
1885		- case QR_MODE_KJ: {
1886		- return $this->checkModeKanji($size, $data);
1887		- }
1888		- case QR_MODE_8B: {
1889		- return true;
1890		- }
1891		- case QR_MODE_ST: {
1892		- return true;
1893		- }
1894		- default: {
1895		- break;
1896		- }
	1879	+ case QR_MODE_NM: {
	1880	+ return $this->checkModeNum($size, $data);
	1881	+ }
	1882	+ case QR_MODE_AN: {
	1883	+ return $this->checkModeAn($size, $data);
	1884	+ }
	1885	+ case QR_MODE_KJ: {
	1886	+ return $this->checkModeKanji($size, $data);
	1887	+ }
	1888	+ case QR_MODE_8B: {
	1889	+ return true;
	1890	+ }
	1891	+ case QR_MODE_ST: {
	1892	+ return true;
	1893	+ }
	1894	+ default: {
	1895	+ break;
	1896	+ }
1897	1897	}
1898	1898	return false;
1899	1899	}
		@@ -1911,28 +1911,28 @@ discard block
		block discarded – undo
1911	1911	}
1912	1912	foreach ($items as $item) {
1913	1913	switch ($item['mode']) {
1914		- case QR_MODE_NM: {
1915		- $bits = $this->estimateBitsModeNum($item['size']);
1916		- break;
1917		- }
1918		- case QR_MODE_AN: {
1919		- $bits = $this->estimateBitsModeAn($item['size']);
1920		- break;
1921		- }
1922		- case QR_MODE_8B: {
1923		- $bits = $this->estimateBitsMode8($item['size']);
1924		- break;
1925		- }
1926		- case QR_MODE_KJ: {
1927		- $bits = $this->estimateBitsModeKanji($item['size']);
1928		- break;
1929		- }
1930		- case QR_MODE_ST: {
1931		- return STRUCTURE_HEADER_BITS;
1932		- }
1933		- default: {
1934		- return 0;
1935		- }
	1914	+ case QR_MODE_NM: {
	1915	+ $bits = $this->estimateBitsModeNum($item['size']);
	1916	+ break;
	1917	+ }
	1918	+ case QR_MODE_AN: {
	1919	+ $bits = $this->estimateBitsModeAn($item['size']);
	1920	+ break;
	1921	+ }
	1922	+ case QR_MODE_8B: {
	1923	+ $bits = $this->estimateBitsMode8($item['size']);
	1924	+ break;
	1925	+ }
	1926	+ case QR_MODE_KJ: {
	1927	+ $bits = $this->estimateBitsModeKanji($item['size']);
	1928	+ break;
	1929	+ }
	1930	+ case QR_MODE_ST: {
	1931	+ return STRUCTURE_HEADER_BITS;
	1932	+ }
	1933	+ default: {
	1934	+ return 0;
	1935	+ }
1936	1936	}
1937	1937	$l = $this->lengthIndicator($item['mode'], $version);
1938	1938	$m = 1 << $l;
		@@ -1971,42 +1971,42 @@ discard block
		block discarded – undo
1971	1971	protected function lengthOfCode($mode, $version, $bits) {
1972	1972	$payload = $bits - 4 - $this->lengthIndicator($mode, $version);
1973	1973	switch ($mode) {
1974		- case QR_MODE_NM: {
1975		- $chunks = (int) ($payload / 10);
1976		- $remain = $payload - $chunks * 10;
1977		- $size = $chunks * 3;
1978		- if ($remain >= 7) {
1979		- $size += 2;
1980		- } elseif ($remain >= 4) {
1981		- $size += 1;
1982		- }
1983		- break;
1984		- }
1985		- case QR_MODE_AN: {
1986		- $chunks = (int) ($payload / 11);
1987		- $remain = $payload - $chunks * 11;
1988		- $size = $chunks * 2;
1989		- if ($remain >= 6) {
1990		- ++$size;
1991		- }
1992		- break;
1993		- }
1994		- case QR_MODE_8B: {
1995		- $size = (int) ($payload / 8);
1996		- break;
1997		- }
1998		- case QR_MODE_KJ: {
1999		- $size = (int) (($payload / 13) * 2);
2000		- break;
2001		- }
2002		- case QR_MODE_ST: {
2003		- $size = (int) ($payload / 8);
2004		- break;
2005		- }
2006		- default: {
2007		- $size = 0;
2008		- break;
2009		- }
	1974	+ case QR_MODE_NM: {
	1975	+ $chunks = (int) ($payload / 10);
	1976	+ $remain = $payload - $chunks * 10;
	1977	+ $size = $chunks * 3;
	1978	+ if ($remain >= 7) {
	1979	+ $size += 2;
	1980	+ } elseif ($remain >= 4) {
	1981	+ $size += 1;
	1982	+ }
	1983	+ break;
	1984	+ }
	1985	+ case QR_MODE_AN: {
	1986	+ $chunks = (int) ($payload / 11);
	1987	+ $remain = $payload - $chunks * 11;
	1988	+ $size = $chunks * 2;
	1989	+ if ($remain >= 6) {
	1990	+ ++$size;
	1991	+ }
	1992	+ break;
	1993	+ }
	1994	+ case QR_MODE_8B: {
	1995	+ $size = (int) ($payload / 8);
	1996	+ break;
	1997	+ }
	1998	+ case QR_MODE_KJ: {
	1999	+ $size = (int) (($payload / 13) * 2);
	2000	+ break;
	2001	+ }
	2002	+ case QR_MODE_ST: {
	2003	+ $size = (int) ($payload / 8);
	2004	+ break;
	2005	+ }
	2006	+ default: {
	2007	+ $size = 0;
	2008	+ break;
	2009	+ }
2010	2010	}
2011	2011	$maxsize = $this->maximumWords($mode, $version);
2012	2012	if ($size < 0) {

codysnider / tt-rss

Push — master ( 678db7...164b32 )

Status

Category

Switch Indentation +88 added lines, -88 removed lines patch added patch discarded remove patch

Switch Indentation +128 added lines, -128 removed lines patch added patch discarded remove patch