Wipe out old unit tests and prepare github actions

Author: Corey McCormick

.github/workflows/php.yml

@@ -1,4 +1,4 @@
-name: PHP Composer
+name: Unit Tests
 
 on:
   push:

composer.json

@@ -27,6 +27,9 @@
             "SimpleSoftwareIO\\QrCode\\": "src"
         }
     },
+    "scripts": {
+        "test": "phpunit"
+    },
     "extra": {
         "laravel": {
             "providers": [

phpunit.xml

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
         >
     <testsuites>
         <testsuite name="Application Test Suite">

src/SimpleSoftwareIO/QrCode/DataTypes/BTC.php

@@ -11,13 +11,6 @@ class BTC implements DataTypeInterface
      */
     protected $prefix = 'bitcoin:';
 
-    /**
-     * The separator between the variables.
-     *
-     * @var string
-     */
-    protected $separator = '&';
-
     /**
      * The BitCoin address.
      *
@@ -123,7 +116,7 @@ protected function buildBitCoinString()
         $query = http_build_query([
             'amount'    => $this->amount,
             'label'     => $this->label,
-            '$message'  => $this->message,
+            'message'  => $this->message,
             'r'         => $this->returnAddress,
         ]);
 

src/SimpleSoftwareIO/QrCode/Generator.php

@@ -56,11 +56,86 @@ class Generator
 
     protected $gradient;
 
+    /**
+     * Holds an image string that will be merged with the QrCode.
+     *
+     * @var null|string
+     */
+    protected $imageMerge = null;
+
+    /**
+     * The percentage that a merged image should take over the source image.
+     *
+     * @var float
+     */
+    protected $imagePercentage = .2;
+
+    /**
+     * Creates a new datatype object and then generates a QrCode.
+     *
+     * @param $method
+     * @param $arguments
+     */
+    public function __call($method, $arguments)
+    {
+        $dataType = $this->createClass($method);
+        $dataType->create($arguments);
+
+        return $this->generate(strval($dataType));
+    }
+
     public function generate(string $text, string $filename = null)
     {
-        $render = $this->getRenderer();
+        $qrCode =  $this->getWriter($this->getRenderer())->writeString($text, $this->encoding, $this->errorCorrection);
+
+        if ($this->imageMerge !== null && $this->format === 'png') {
+            $merger = new ImageMerge(new Image($qrCode), new Image($this->imageMerge));
+            $qrCode = $merger->merge($this->imagePercentage);
+        }
+
+        if ($filename) {
+            file_put_contents($filename, $qrCode);
+            return;
+        }
+
+        return $qrCode;
+    }
+
+    /**
+     * Merges an image with the center of the QrCode.
+     *
+     * @param $filepath string The filepath to an image
+     * @param $percentage float The amount that the merged image should be placed over the qrcode.
+     * @param $absolute boolean Whether to use an absolute filepath or not.
+     *
+     * @return $this
+     */
+    public function merge($filepath, $percentage = .2, $absolute = false)
+    {
+        if (function_exists('base_path') && !$absolute) {
+            $filepath = base_path().$filepath;
+        }
+
+        $this->imageMerge = file_get_contents($filepath);
+        $this->imagePercentage = $percentage;
 
-        return $this->getWriter($render)->writeString($text, $this->encoding, $this->errorCorrection);
+        return $this;
+    }
+
+    /**
+     * Merges an image string with the center of the QrCode, does not check for correct format.
+     *
+     * @param $content string The string contents of an image.
+     * @param $percentage float The amount that the merged image should be placed over the qrcode.
+     *
+     * @return $this
+     */
+    public function mergeString($content, $percentage = .2)
+    {
+        $this->imageMerge = $content;
+        $this->imagePercentage = $percentage;
+
+        return $this;
     }
 
     public function size(int $pixels): self
@@ -240,4 +315,38 @@ protected function createColor(int $red, int $green, int $blue, ?int $alpha = nu
 
         return new Alpha($alpha, new Rgb($red, $green, $blue));
     }
+
+    /**
+     * Creates a new DataType class dynamically.
+     *
+     * @param string $method
+     *
+     * @return SimpleSoftwareIO\QrCode\DataTypes\DataTypeInterface
+     */
+    protected function createClass($method)
+    {
+        $class = $this->formatClass($method);
+
+        if (!class_exists($class)) {
+            throw new \BadMethodCallException();
+        }
+
+        return new $class();
+    }
+
+    /**
+     * Formats the method name correctly.
+     *
+     * @param $method
+     *
+     * @return string
+     */
+    protected function formatClass($method)
+    {
+        $method = ucfirst($method);
+
+        $class = "SimpleSoftwareIO\QrCode\DataTypes\\".$method;
+
+        return $class;
+    }
 }

tests/BaconQrCodeGeneratorTest.php

@@ -5,7 +5,7 @@
 
 class BTCTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->btc = new BTC();
     }
@@ -40,7 +40,7 @@ public function test_it_generates_a_valid_btc_qrcode_with_an_address_amount_labe
             ],
         ]);
 
-        $properFormat = 'bitcoin:btcaddress?amount=0.0034&label=label&%24message=message&r='.urlencode('https://www.returnaddress.com');
+        $properFormat = 'bitcoin:btcaddress?amount=0.0034&label=label&message=message&r='.urlencode('https://www.returnaddress.com');
 
         $this->assertEquals($properFormat, strval($this->btc));
     }

tests/DataTypes/BTCTest.php

@@ -5,7 +5,7 @@
 
 class EmailTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->email = new Email();
     }
@@ -46,11 +46,10 @@ public function test_it_generates_the_proper_format_when_only_a_subject_is_provi
         $this->assertEquals($properFormat, strval($this->email));
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function test_it_throws_an_exception_when_an_invalid_email_is_given()
     {
+        $this->expectException(InvalidArgumentException::class);
+        
         $this->email->create(['foo']);
     }
 }

tests/DataTypes/EmailTest.php

@@ -5,7 +5,7 @@
 
 class SMSTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->sms = new SMS();
     }

tests/DataTypes/SMSTest.php

@@ -5,7 +5,7 @@
 
 class WiFiTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->wifi = new Wifi();
     }