Merge pull request #20 from qhxin/master

khanamiryan · web-flow · commit cda63b7f4a8c · 2016-12-26T11:48:05.000+04:00
fixed InvalidArgumentException namespacing
diff --git a/lib/GDLuminanceSource.php b/lib/GDLuminanceSource.php
@@ -34,7 +34,7 @@ public function __construct($gdImage,
         }
         parent::__construct($width, $height);
         if ($left + $width > $dataWidth || $top + $height > $dataHeight) {
-            throw new InvalidArgumentException("Crop rectangle does not fit within image data.");
+            throw new \InvalidArgumentException("Crop rectangle does not fit within image data.");
         }
         $this->luminances = $gdImage;
         $this->dataWidth = $dataWidth;
@@ -112,7 +112,7 @@ public function GDLuminanceSource($gdImage, $width, $height)
 //@Override
     public function getRow($y, $row=null) {
         if ($y < 0 || $y >= $this->getHeight()) {
-            throw new InvalidArgumentException("Requested row is outside the image: " + y);
+            throw new \InvalidArgumentException("Requested row is outside the image: " + y);
         }
         $width = $this->getWidth();
         if ($row == null || count($row) < $width) {
diff --git a/lib/IMagickLuminanceSource.php b/lib/IMagickLuminanceSource.php
@@ -34,7 +34,7 @@ public function __construct($image,
         }
         parent::__construct($width, $height);
         if ($left + $width > $dataWidth || $top + $height > $dataHeight) {
-            throw new InvalidArgumentException("Crop rectangle does not fit within image data.");
+            throw new \InvalidArgumentException("Crop rectangle does not fit within image data.");
         }
         $this->luminances = $image;
         $this->dataWidth = $dataWidth;
@@ -88,7 +88,7 @@ public function _IMagickLuminanceSource($image, $width, $height)
 //@Override
     public function getRow($y, $row=null) {
         if ($y < 0 || $y >= $this->getHeight()) {
-            throw new InvalidArgumentException("Requested row is outside the image: " + y);
+            throw new \InvalidArgumentException("Requested row is outside the image: " + y);
         }
         $width = $this->getWidth();
         if ($row == null || count($row) < $width) {
diff --git a/lib/RGBLuminanceSource.php b/lib/RGBLuminanceSource.php
@@ -48,7 +48,7 @@ public function __construct($pixels,
         }
         parent::__construct($width, $height);
         if ($left + $width > $dataWidth || $top + $height > $dataHeight) {
-            throw new InvalidArgumentException("Crop rectangle does not fit within image data.");
+            throw new \InvalidArgumentException("Crop rectangle does not fit within image data.");
         }
         $this->luminances = $pixels;
         $this->dataWidth = $dataWidth;
@@ -249,7 +249,7 @@ function grayScaleToBitmap ($grayScale)
 //@Override
     public function getRow($y, $row=null) {
         if ($y < 0 || $y >= $this->getHeight()) {
-            throw new InvalidArgumentException("Requested row is outside the image: " + y);
+            throw new \InvalidArgumentException("Requested row is outside the image: " + y);
         }
         $width = $this->getWidth();
         if ($row == null || count($row) < $width) {
diff --git a/lib/common/BitArray.php b/lib/common/BitArray.php
@@ -166,7 +166,7 @@ public function setBulk($i, $newBits) {
      */
     public function setRange($start, $end) {
         if ($end < $start) {
-            throw new InvalidArgumentException();
+            throw new \InvalidArgumentException();
         }
         if ($end == $start) {
             return;
@@ -211,7 +211,7 @@ public function clear() {
      */
     public function isRange($start, $end, $value) {
         if ($end < $start) {
-            throw new InvalidArgumentException();
+            throw new \InvalidArgumentException();
         }
         if ($end == $start) {
             return true; // empty range matches
@@ -259,7 +259,7 @@ public function appendBit($bit) {
      */
     public function appendBits($value, $numBits) {
         if ($numBits < 0 || $numBits > 32) {
-            throw new InvalidArgumentException("Num bits must be between 0 and 32");
+            throw new \InvalidArgumentException("Num bits must be between 0 and 32");
         }
         $this->ensureCapacity($this->size + $numBits);
         for ($numBitsLeft = $numBits; $numBitsLeft > 0; $numBitsLeft--) {
@@ -277,7 +277,7 @@ public function appendBitArray($other) {
 
     public function _xor($other) {
         if (count($this->bits) != count($other->bits)) {
-            throw new InvalidArgumentException("Sizes don't match");
+            throw new \InvalidArgumentException("Sizes don't match");
         }
         for ($i = 0; $i < count($this->bits); $i++) {
             // The last byte could be incomplete (i.e. not have 8 bits in
diff --git a/lib/common/BitMatrix.php b/lib/common/BitMatrix.php
@@ -25,7 +25,7 @@ public function __construct($width, $height=false, $rowSize=false, $bits=false)
     }
     public static  function parse($stringRepresentation, $setString, $unsetString){
         if (!$stringRepresentation) {
-            throw new InvalidArgumentException();
+            throw new \InvalidArgumentException();
         }
         $bits = array();
         $bitsPos = 0;
@@ -41,7 +41,7 @@ public static  function parse($stringRepresentation, $setString, $unsetString){
                         $rowLength = $bitsPos - $rowStartPos;
                     }
                     else if ($bitsPos - $rowStartPos != $rowLength) {
-                        throw new InvalidArgumentException("row lengths do not match");
+                        throw new \InvalidArgumentException("row lengths do not match");
                     }
                     $rowStartPos = $bitsPos;
                     $nRows++;
@@ -58,7 +58,7 @@ public static  function parse($stringRepresentation, $setString, $unsetString){
                 $bits[$bitsPos] = false;
                 $bitsPos++;
             } else {
-                throw new InvalidArgumentException(
+                throw new \InvalidArgumentException(
                     "illegal character encountered: " . substr($stringRepresentation,$pos));
             }
         }
@@ -68,7 +68,7 @@ public static  function parse($stringRepresentation, $setString, $unsetString){
             if($rowLength == -1) {
                 $rowLength = $bitsPos - $rowStartPos;
             } else if ($bitsPos - $rowStartPos != $rowLength) {
-                throw new InvalidArgumentException("row lengths do not match");
+                throw new \InvalidArgumentException("row lengths do not match");
             }
             $nRows++;
         }
@@ -151,7 +151,7 @@ public function flip($x, $y) {
     public function _xor($mask) {//было xor, php не позволяет использовать xor
         if ($this->width != $mask->getWidth() || $this->height != $mask->getHeight()
             || $this->rowSize != $mask->getRowSize()) {
-            throw new InvalidArgumentException("input matrix dimensions do not match");
+            throw new \InvalidArgumentException("input matrix dimensions do not match");
         }
         $rowArray = new BitArray($this->width / 32 + 1);
         for ($y = 0; $y < $this->height; $y++) {
@@ -183,15 +183,15 @@ public function clear() {
      */
     public function setRegion($left, $top, $width, $height) {
         if ($top < 0 || $left < 0) {
-            throw new InvalidArgumentException("Left and top must be nonnegative");
+            throw new \InvalidArgumentException("Left and top must be nonnegative");
         }
         if ($height < 1 || $width < 1) {
-            throw new InvalidArgumentException("Height and width must be at least 1");
+            throw new \InvalidArgumentException("Height and width must be at least 1");
         }
         $right = $left + $width;
         $bottom = $top + $height;
         if ($bottom > $this->height || $right > $this->width) { //> this.height || right > this.width
-            throw new InvalidArgumentException("The region must fit inside the matrix");
+            throw new \InvalidArgumentException("The region must fit inside the matrix");
         }
         for ($y = $top; $y < $bottom; $y++) {
             $offset = $y * $this->rowSize;
diff --git a/lib/common/reedsolomon/GenericGF.php b/lib/common/reedsolomon/GenericGF.php
@@ -108,7 +108,7 @@ function getOne() {
      */
     function buildMonomial($degree, $coefficient) {
         if ($degree < 0) {
-            throw new InvalidArgumentException();
+            throw new \InvalidArgumentException();
         }
         if ($coefficient == 0) {
             return $this->zero;
@@ -139,7 +139,7 @@ function exp($a) {
      */
     function log($a) {
         if ($a == 0) {
-            throw new InvalidArgumentException();
+            throw new \InvalidArgumentException();
         }
         return $this->logTable[$a];
     }
diff --git a/lib/qrcode/decoder/DataMask.php b/lib/qrcode/decoder/DataMask.php
@@ -85,7 +85,7 @@ abstract function isMasked($i, $j);
     static function forReference($reference)
     {
         if ($reference < 0 || $reference > 7) {
-            throw new InvalidArgumentException();
+            throw new \InvalidArgumentException();
         }
         return self::$DATA_MASKS[$reference];
     }
diff --git a/lib/qrcode/decoder/ErrorCorrectionLevel.php b/lib/qrcode/decoder/ErrorCorrectionLevel.php
@@ -74,7 +74,7 @@ public function getOrdinal() {
      */
     public static function forBits($bits) {
         if ($bits < 0 || $bits >= count(self::$FOR_BITS)) {
-            throw new InvalidArgumentException();
+            throw new \InvalidArgumentException();
         }
         $level = self::$FOR_BITS[$bits];
        // $lev = self::$$bit;
diff --git a/lib/qrcode/decoder/Version.php b/lib/qrcode/decoder/Version.php
@@ -118,7 +118,7 @@ public static function getProvisionalVersionForDimension($dimension)
     public  static function getVersionForNumber($versionNumber)
     {
         if ($versionNumber < 1 || $versionNumber > 40) {
-            throw new InvalidArgumentException();
+            throw new \InvalidArgumentException();
         }
         if(!self::$VERSIONS){
 

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function __construct($gdImage,`
`34`	`34`	`}`
`35`	`35`	`parent::__construct($width, $height);`
`36`	`36`	`if ($left + $width > $dataWidth \|\| $top + $height > $dataHeight) {`
`37`		`- throw new InvalidArgumentException("Crop rectangle does not fit within image data.");`
	`37`	`+ throw new \InvalidArgumentException("Crop rectangle does not fit within image data.");`
`38`	`38`	`}`
`39`	`39`	`$this->luminances = $gdImage;`
`40`	`40`	`$this->dataWidth = $dataWidth;`
`@@ -112,7 +112,7 @@ public function GDLuminanceSource($gdImage, $width, $height)`
`112`	`112`	`//@Override`
`113`	`113`	`public function getRow($y, $row=null) {`
`114`	`114`	`if ($y < 0 \|\| $y >= $this->getHeight()) {`
`115`		`- throw new InvalidArgumentException("Requested row is outside the image: " + y);`
	`115`	`+ throw new \InvalidArgumentException("Requested row is outside the image: " + y);`
`116`	`116`	`}`
`117`	`117`	`$width = $this->getWidth();`
`118`	`118`	`if ($row == null \|\| count($row) < $width) {`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function __construct($pixels,`
`48`	`48`	`}`
`49`	`49`	`parent::__construct($width, $height);`
`50`	`50`	`if ($left + $width > $dataWidth \|\| $top + $height > $dataHeight) {`
`51`		`- throw new InvalidArgumentException("Crop rectangle does not fit within image data.");`
	`51`	`+ throw new \InvalidArgumentException("Crop rectangle does not fit within image data.");`
`52`	`52`	`}`
`53`	`53`	`$this->luminances = $pixels;`
`54`	`54`	`$this->dataWidth = $dataWidth;`
`@@ -249,7 +249,7 @@ function grayScaleToBitmap ($grayScale)`
`249`	`249`	`//@Override`
`250`	`250`	`public function getRow($y, $row=null) {`
`251`	`251`	`if ($y < 0 \|\| $y >= $this->getHeight()) {`
`252`		`- throw new InvalidArgumentException("Requested row is outside the image: " + y);`
	`252`	`+ throw new \InvalidArgumentException("Requested row is outside the image: " + y);`
`253`	`253`	`}`
`254`	`254`	`$width = $this->getWidth();`
`255`	`255`	`if ($row == null \|\| count($row) < $width) {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function __construct($width, $height=false, $rowSize=false, $bits=false)`
`25`	`25`	`}`
`26`	`26`	`public static function parse($stringRepresentation, $setString, $unsetString){`
`27`	`27`	`if (!$stringRepresentation) {`
`28`		`- throw new InvalidArgumentException();`
	`28`	`+ throw new \InvalidArgumentException();`
`29`	`29`	`}`
`30`	`30`	`$bits = array();`
`31`	`31`	`$bitsPos = 0;`
`@@ -41,7 +41,7 @@ public static function parse($stringRepresentation, $setString, $unsetString){`
`41`	`41`	`$rowLength = $bitsPos - $rowStartPos;`
`42`	`42`	`}`
`43`	`43`	`else if ($bitsPos - $rowStartPos != $rowLength) {`
`44`		`- throw new InvalidArgumentException("row lengths do not match");`
	`44`	`+ throw new \InvalidArgumentException("row lengths do not match");`
`45`	`45`	`}`
`46`	`46`	`$rowStartPos = $bitsPos;`
`47`	`47`	`$nRows++;`
`@@ -58,7 +58,7 @@ public static function parse($stringRepresentation, $setString, $unsetString){`
`58`	`58`	`$bits[$bitsPos] = false;`
`59`	`59`	`$bitsPos++;`
`60`	`60`	`} else {`
`61`		`- throw new InvalidArgumentException(`
	`61`	`+ throw new \InvalidArgumentException(`
`62`	`62`	`"illegal character encountered: " . substr($stringRepresentation,$pos));`
`63`	`63`	`}`
`64`	`64`	`}`
`@@ -68,7 +68,7 @@ public static function parse($stringRepresentation, $setString, $unsetString){`
`68`	`68`	`if($rowLength == -1) {`
`69`	`69`	`$rowLength = $bitsPos - $rowStartPos;`
`70`	`70`	`} else if ($bitsPos - $rowStartPos != $rowLength) {`
`71`		`- throw new InvalidArgumentException("row lengths do not match");`
	`71`	`+ throw new \InvalidArgumentException("row lengths do not match");`
`72`	`72`	`}`
`73`	`73`	`$nRows++;`
`74`	`74`	`}`
`@@ -151,7 +151,7 @@ public function flip($x, $y) {`
`151`	`151`	`public function _xor($mask) {//было xor, php не позволяет использовать xor`
`152`	`152`	`if ($this->width != $mask->getWidth() \|\| $this->height != $mask->getHeight()`
`153`	`153`	`\|\| $this->rowSize != $mask->getRowSize()) {`
`154`		`- throw new InvalidArgumentException("input matrix dimensions do not match");`
	`154`	`+ throw new \InvalidArgumentException("input matrix dimensions do not match");`
`155`	`155`	`}`
`156`	`156`	`$rowArray = new BitArray($this->width / 32 + 1);`
`157`	`157`	`for ($y = 0; $y < $this->height; $y++) {`
`@@ -183,15 +183,15 @@ public function clear() {`
`183`	`183`	`*/`
`184`	`184`	`public function setRegion($left, $top, $width, $height) {`
`185`	`185`	`if ($top < 0 \|\| $left < 0) {`
`186`		`- throw new InvalidArgumentException("Left and top must be nonnegative");`
	`186`	`+ throw new \InvalidArgumentException("Left and top must be nonnegative");`
`187`	`187`	`}`
`188`	`188`	`if ($height < 1 \|\| $width < 1) {`
`189`		`- throw new InvalidArgumentException("Height and width must be at least 1");`
	`189`	`+ throw new \InvalidArgumentException("Height and width must be at least 1");`
`190`	`190`	`}`
`191`	`191`	`$right = $left + $width;`
`192`	`192`	`$bottom = $top + $height;`
`193`	`193`	`if ($bottom > $this->height \|\| $right > $this->width) { //> this.height \|\| right > this.width`
`194`		`- throw new InvalidArgumentException("The region must fit inside the matrix");`
	`194`	`+ throw new \InvalidArgumentException("The region must fit inside the matrix");`
`195`	`195`	`}`
`196`	`196`	`for ($y = $top; $y < $bottom; $y++) {`
`197`	`197`	`$offset = $y * $this->rowSize;`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ function getOne() {`
`108`	`108`	`*/`
`109`	`109`	`function buildMonomial($degree, $coefficient) {`
`110`	`110`	`if ($degree < 0) {`
`111`		`- throw new InvalidArgumentException();`
	`111`	`+ throw new \InvalidArgumentException();`
`112`	`112`	`}`
`113`	`113`	`if ($coefficient == 0) {`
`114`	`114`	`return $this->zero;`
`@@ -139,7 +139,7 @@ function exp($a) {`
`139`	`139`	`*/`
`140`	`140`	`function log($a) {`
`141`	`141`	`if ($a == 0) {`
`142`		`- throw new InvalidArgumentException();`
	`142`	`+ throw new \InvalidArgumentException();`
`143`	`143`	`}`
`144`	`144`	`return $this->logTable[$a];`
`145`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ abstract function isMasked($i, $j);`
`85`	`85`	`static function forReference($reference)`
`86`	`86`	`{`
`87`	`87`	`if ($reference < 0 \|\| $reference > 7) {`
`88`		`- throw new InvalidArgumentException();`
	`88`	`+ throw new \InvalidArgumentException();`
`89`	`89`	`}`
`90`	`90`	`return self::$DATA_MASKS[$reference];`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function getOrdinal() {`
`74`	`74`	`*/`
`75`	`75`	`public static function forBits($bits) {`
`76`	`76`	`if ($bits < 0 \|\| $bits >= count(self::$FOR_BITS)) {`
`77`		`- throw new InvalidArgumentException();`
	`77`	`+ throw new \InvalidArgumentException();`
`78`	`78`	`}`
`79`	`79`	`$level = self::$FOR_BITS[$bits];`
`80`	`80`	`// $lev = self::$$bit;`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public static function getProvisionalVersionForDimension($dimension)`
`118`	`118`	`public static function getVersionForNumber($versionNumber)`
`119`	`119`	`{`
`120`	`120`	`if ($versionNumber < 1 \|\| $versionNumber > 40) {`
`121`		`- throw new InvalidArgumentException();`
	`121`	`+ throw new \InvalidArgumentException();`
`122`	`122`	`}`
`123`	`123`	`if(!self::$VERSIONS){`
`124`	`124`