Bump minimum to 7.3, update deps, support PHP 8.0 (#2)

.github/workflows/ci.yml

@@ -16,9 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['7.2', '7.3', '7.4']
-        # TODO: When bacon/bacon-qr-code supports PHP 8:
-        # php-versions: ['7.2', '7.3', '7.4', '8.0']
+        php-versions: ['7.3', '7.4', '8.0']
 
     steps:
       - name: Checkout
@@ -30,6 +28,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           coverage: pcov
           tools: composer:v2
+          extensions: gd
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

README.md

@@ -9,7 +9,7 @@ This is a fork of https://github.com/PHPGangsta/GoogleAuthenticator with the fol
 - No longer generates Google's Chart API to make QR code links
 - Uses namespacing
 - Augmented test coverage to 100%
-- Bumped minimum PHP version to 7.2
+- Bumped minimum PHP version to 7.3
 
 Original License:
 -----------------

composer.json

@@ -23,11 +23,11 @@
     "issues": "https://github.com/Vectorface/GoogleAuthenticator/issues"
   },
   "require": {
-    "php": ">=7.2",
-    "endroid/qr-code": "^3.9.3"
+    "php": ">=7.3",
+    "endroid/qr-code": "^4.0.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^8"
+    "phpunit/phpunit": "^9"
   },
   "config": {
     "sort-packages": true

src/GoogleAuthenticator.php

@@ -2,8 +2,8 @@
 
 namespace Vectorface;
 
-use Endroid\QrCode\ErrorCorrectionLevel;
-use Endroid\QrCode\QrCode;
+use Endroid\QrCode\Builder\Builder;
+use Endroid\QrCode\Writer\PngWriter;
 use Exception;
 
 /**
@@ -105,26 +105,25 @@ public function getCode(string $secret, int $timeSlice = null) : string
     public function getQRCodeUrl(string $name, string $secret) : string
     {
         $uri = "otpauth://totp/$name?secret=$secret";
-        return 'data:image/png;base64,' . base64_encode($this->getQRCodeSRC($uri));
+        return $this->getQRCodeDataUri($uri);
     }
 
     /**
      * Generate a QRCode for a given string
      *
      * @param string $uri to encode into a QRCode
      * @return string binary data of the PNG of the QRCode
+     * @throws Exception
      */
-    protected function getQRCodeSRC(string $uri) : string
+    protected function getQRCodeDataUri(string $uri) : string
     {
-        $qr_code = new QrCode($uri);
-        $qr_code->setSize(260);
-        $qr_code->setMargin(10);
-        $qr_code->setErrorCorrectionLevel(ErrorCorrectionLevel::LOW());
-        $qr_code->setForegroundColor(['r' => 0, 'g' => 0, 'b' => 0]);
-        $qr_code->setBackgroundColor(['r' => 255, 'g' => 255, 'b' => 255]);
-        $qr_code->setValidateResult(false);
-
-        return $qr_code->writeString();
+        return Builder::create()
+            ->data($uri)
+            ->writer(new PngWriter)
+            ->size(260)
+            ->margin(10)
+            ->build()
+            ->getDataUri();
     }
 
     /**

tests/GoogleAuthenticatorTest.php

@@ -103,7 +103,7 @@ public function testGetQRCodeUrl()
         $this->assertStringStartsWith($prefix, $url);
 
         $base64part = substr($url, strlen($prefix));
-        $this->assertRegExp("#^[a-zA-Z0-9/+]*={0,2}$#", $base64part);
+        $this->assertMatchesRegularExpression("#^[a-zA-Z0-9/+]*={0,2}$#", $base64part);
     }
 
     /**