Merge pull request #9 from 2amjsouza/master

Support php 8.2

.github/workflows/ci.yml

@@ -0,0 +1,28 @@
+name: tests
+on: [push]
+
+jobs:
+  test:
+    name: PHPUnit
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: checkout repo
+        uses: actions/checkout@v3
+
+      - name: setup enviroment
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+
+      - name: Install dependencies
+        run: composer install
+
+      - name: Run unit tests
+        run: ./vendor/bin/phpunit --coverage-clover ./tests/_output/coverage.xml
+
+      #- name: Upload coverage reports to Codacy
+      #  uses: codacy/codacy-coverage-reporter-action@v1
+      #  with:
+      #    project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
+      #    coverage-reports: ./tests/_output/coverage.xml

.gitignore

@@ -55,3 +55,4 @@ codeception.yml
 
 # composer.lock
 composer.lock
+/xdebug

.phpunit.result.cache

@@ -0,0 +1 @@
+{"version":1,"defects":{"Da\\TwoFA\\Tests\\ServicesTest::testQrCodeDataUriGeneratorService":3,"Da\\TwoFA\\Tests\\ServicesTest::testTOTPSecretKeyUriGeneratorService":1},"times":{"Da\\TwoFA\\Tests\\EncoderTest::testDecodesBase32Strings":0.016,"Da\\TwoFA\\Tests\\EncoderTest::testConvertsInvalidCharsToBase32":0.002,"Da\\TwoFA\\Tests\\EncoderTest::testConvertsToBase32":0.001,"Da\\TwoFA\\Tests\\EncoderTest::testDecodesBase32":0.001,"Da\\TwoFA\\Tests\\EncoderTest::testExceptionWhenIncompatibleGoogleKeyIsGivenToDecodeBase32String":0.005,"Da\\TwoFA\\Tests\\ManagerTest::testIsInitialized":0.002,"Da\\TwoFA\\Tests\\ManagerTest::testGeneratesAValidSecretKey":0.003,"Da\\TwoFA\\Tests\\ManagerTest::testGeneratesAGoogleCompatibleSecretKey":0.001,"Da\\TwoFA\\Tests\\ManagerTest::testCreatesAOneTimePassword":0.001,"Da\\TwoFA\\Tests\\ManagerTest::testVerifiesKeys":0.006,"Da\\TwoFA\\Tests\\ManagerTest::testItVerifiesNewerKeys":0.004,"Da\\TwoFA\\Tests\\ManagerTest::testAttributes":0.001,"Da\\TwoFA\\Tests\\ManagerTest::testInvalidCharactersException":0.002,"Da\\TwoFA\\Tests\\ManagerTest::testFiresInvalidSecretKeyException":0.001,"Da\\TwoFA\\Tests\\ServicesTest::testGoogleQrCodeUrlGeneratorService":0.003,"Da\\TwoFA\\Tests\\ServicesTest::testQrCodeDataUriGeneratorService":1.49,"Da\\TwoFA\\Tests\\ServicesTest::testTOTPSecretKeyUriGeneratorService":0.001}}

README.md

@@ -3,9 +3,9 @@
 
 [![Latest Version](https://img.shields.io/github/tag/2amigos/2fa-library.svg?style=flat-square&label=release)](https://github.com/2amigos/2fa-library/tags)
 [![Software License](https://img.shields.io/badge/license-BSD-brightgreen.svg?style=flat-square)](LICENSE.md)
-[![Build Status](https://img.shields.io/travis/2amigos/2fa-library/master.svg?style=flat-square)](https://travis-ci.org/2amigos/2fa-library)
-[![Code Coverage](https://codecov.io/gh/2amigos/2fa-library/branch/master/graph/badge.svg)](https://codecov.io/gh/2amigos/2fa-library)
-[![Quality Score](https://img.shields.io/scrutinizer/g/2amigos/2fa-library.svg?style=flat-square)](https://scrutinizer-ci.com/g/2amigos/2fa-library)
+[![Build Status](https://img.shields.io/travis/2amigos/2fa-library/master.svg?style=flat-square)](https://travis-ci.org/2amigos/2fa-library) -change 
+[![Code Coverage](https://codecov.io/gh/2amigos/2fa-library/branch/master/graph/badge.svg)](https://codecov.io/gh/2amigos/2fa-library) -change
+[![Quality Score](https://img.shields.io/scrutinizer/g/2amigos/2fa-library.svg?style=flat-square)](https://scrutinizer-ci.com/g/2amigos/2fa-library) -change
 [![Total Downloads](https://img.shields.io/packagist/dt/2amigos/2fa-library.svg)](https://packagist.org/packages/2amigos/2fa-library) 
 
 

composer.json

@@ -29,18 +29,17 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=7.3",
-        "2amigos/qrcode-library": "^2.0",
+        "php": ">=7.4",
+        "2amigos/qrcode-library": "^2.0|^3.0",
         "paragonie/constant_time_encoding": "^1.4|^2.0|9.99.99",
         "paragonie/random_compat": "^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0",
-        "friendsofphp/php-cs-fixer": "^2.3",
-        "scrutinizer/ocular": "~1.1",
-        "squizlabs/php_codesniffer": "*",
-        "phpmd/phpmd": "@stable"
-
+        "phpunit/phpunit": "^9.6",
+        "squizlabs/php_codesniffer": "^3.7",
+        "friendsofphp/php-cs-fixer": "^3.45",
+        "phpmd/phpmd": "@stable",
+        "psr/container": "^2.0.1|^2.0.2"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -9,7 +9,6 @@
          processIsolation="false"
          stopOnError="false"
          stopOnFailure="false"
-         syntaxCheck="true"
          verbose="true"
 >
     <testsuites>

tests/EncoderTest.php

@@ -12,7 +12,7 @@ class EncoderTest extends TestCase
      */
     protected $encoder;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->encoder = new Encoder();
     }

tests/ManagerTest.php

@@ -13,7 +13,7 @@ class ManagerTest extends TestCase
      */
     protected $manager;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->manager = new Manager();
     }

tests/ServicesTest.php

@@ -17,7 +17,7 @@ class ServicesTest extends TestCase
      */
     protected $manager;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->manager = new Manager();
     }
@@ -44,7 +44,7 @@ public function testQrCodeDataUriGeneratorService()
             $secret
         ))->run();
 
-        $uri = (new QrCodeDataUriGeneratorService($totp))->run();
+        $uri = (new QrCodeDataUriGeneratorService($totp, 220))->run();
 
         $this->assertStringEqualsFile(__DIR__ . '/_data/uri.txt', $uri);
     }