From 4360c589b816fdd6e7be1fc4340d6ab37c74a887 Mon Sep 17 00:00:00 2001
From: Corey McCormick <corey@simplesoftware.io>
Date: Mon, 5 Dec 2016 20:30:39 -0500
Subject: [PATCH 1/4] Fix docblock

---
 src/SimpleSoftwareIO/QrCode/BaconQrCodeGenerator.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/SimpleSoftwareIO/QrCode/BaconQrCodeGenerator.php b/src/SimpleSoftwareIO/QrCode/BaconQrCodeGenerator.php
index 8632b39..a452efd 100644
--- a/src/SimpleSoftwareIO/QrCode/BaconQrCodeGenerator.php
+++ b/src/SimpleSoftwareIO/QrCode/BaconQrCodeGenerator.php
@@ -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)
     {

From 02eef070d175f766d18121c61422d1d3d8353651 Mon Sep 17 00:00:00 2001
From: Corey McCormick <corey@simplesoftware.io>
Date: Mon, 5 Dec 2016 20:31:27 -0500
Subject: [PATCH 2/4] Return new instance on each facade call

---
 src/SimpleSoftwareIO/QrCode/Facades/QrCode.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/SimpleSoftwareIO/QrCode/Facades/QrCode.php b/src/SimpleSoftwareIO/QrCode/Facades/QrCode.php
index 41c2479..db9f391 100644
--- 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';
     }
 }

From 24a5517d7600baa19a027043cbcf95236e6da133 Mon Sep 17 00:00:00 2001
From: Corey McCormick <corey@simplesoftware.io>
Date: Mon, 5 Dec 2016 20:32:20 -0500
Subject: [PATCH 3/4] Update change log

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 427fa75..7a07597 100644
--- 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

From b65635d4358fdd61ca3e5b1d09883cf47bd2adfa Mon Sep 17 00:00:00 2001
From: Corey McCormick <corey@simplesoftware.io>
Date: Tue, 6 Dec 2016 01:35:53 +0000
Subject: [PATCH 4/4] Apply fixes from StyleCI

---
 src/SimpleSoftwareIO/QrCode/BaconQrCodeGenerator.php | 10 +++++-----
 src/SimpleSoftwareIO/QrCode/DataTypes/Email.php      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/SimpleSoftwareIO/QrCode/BaconQrCodeGenerator.php b/src/SimpleSoftwareIO/QrCode/BaconQrCodeGenerator.php
index a452efd..072d923 100644
--- 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
 {
@@ -96,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;
         }
 
@@ -265,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
index b703d99..37d4aca 100644
--- 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');
         }