Merge pull request #72 from SimpleSoftwareIO/develop

1.5.1
SimpleSoftwareIO · Dec 6, 2016 · 0d8fbf7 · 0d8fbf7
2 parents 49266b1 + 2bb62fe
commit 0d8fbf7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@ Simple QrCode
 
 ##Change Log
 
+#### 1.5.1
+* Fixed a bug where a QrCode used within a loop would not generate correctly.
+
 #### 1.5.0
 * Added Portuguese translation. -Thanks [francisek](https://github.com/francisek) and [Varpie!](https://github.com/Varpie)
 * Added BitCoin helper

diff --git a/src/SimpleSoftwareIO/QrCode/BaconQrCodeGenerator.php b/src/SimpleSoftwareIO/QrCode/BaconQrCodeGenerator.php
@@ -3,14 +3,14 @@
 namespace SimpleSoftwareIO\QrCode;
 
 use BaconQrCode;
-use BaconQrCode\Common\ErrorCorrectionLevel;
+use BaconQrCode\Writer;
 use BaconQrCode\Encoder\Encoder;
 use BaconQrCode\Renderer\Color\Rgb;
 use BaconQrCode\Renderer\Image\Eps;
 use BaconQrCode\Renderer\Image\Png;
-use BaconQrCode\Renderer\Image\RendererInterface;
 use BaconQrCode\Renderer\Image\Svg;
-use BaconQrCode\Writer;
+use BaconQrCode\Common\ErrorCorrectionLevel;
+use BaconQrCode\Renderer\Image\RendererInterface;
 
 class BaconQrCodeGenerator implements QrCodeInterface
 {
@@ -50,7 +50,10 @@ class BaconQrCodeGenerator implements QrCodeInterface
     protected $imagePercentage = .2;
 
     /**
-     * Creates a new QrCodeGenerator with a Writer class and with a SVG renderer set as the default.
+     * BaconQrCodeGenerator constructor.
+     *
+     * @param Writer|null $writer
+     * @param RendererInterface|null $format
      */
     public function __construct(Writer $writer = null, RendererInterface $format = null)
     {
@@ -93,7 +96,7 @@ public function generate($text, $filename = null)
      */
     public function merge($filepath, $percentage = .2, $absolute = false)
     {
-        if (function_exists('base_path') && !$absolute) {
+        if (function_exists('base_path') && ! $absolute) {
             $filepath = base_path().$filepath;
         }
 
@@ -262,7 +265,7 @@ private function createClass($method)
     {
         $class = $this->formatClass($method);
 
-        if (!class_exists($class)) {
+        if (! class_exists($class)) {
             throw new \BadMethodCallException();
         }
 

diff --git a/src/SimpleSoftwareIO/QrCode/DataTypes/Email.php b/src/SimpleSoftwareIO/QrCode/DataTypes/Email.php
@@ -113,7 +113,7 @@ protected function setEmail($email)
      */
     protected function isValidEmail($email)
     {
-        if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
+        if (! filter_var($email, FILTER_VALIDATE_EMAIL)) {
             throw new InvalidArgumentException('Invalid email provided');
         }
 

diff --git a/src/SimpleSoftwareIO/QrCode/Facades/QrCode.php b/src/SimpleSoftwareIO/QrCode/Facades/QrCode.php
@@ -13,6 +13,8 @@ class QrCode extends Facade
      */
     protected static function getFacadeAccessor()
     {
+        self::clearResolvedInstance('qrcode');
+
         return 'qrcode';
     }
 }