Merge pull request #122 from eliashaeussler/task/phpstan-config

[!!!][TASK] Use `eliashaeussler/phpstan-config` and require `spomky-labs/otphp` >= 11.1
eliashaeussler · Mar 11, 2023 · fd917eb · fd917eb
2 parents aa3dba3 + 803fa4e
commit fd917eb
Show file tree

Hide file tree

Showing 6 changed files with 152 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ composer require eliashaeussler/cpanel-requests
 
 :warning: If you want to use two-factor authentication together with
 the HTTP session [authorization](#authorization) method, you must
-**manually require the `spomky-labs/otphp` package**.
+**manually require the `spomky-labs/otphp` package (>= 11.1)**.
 
 ## :zap:Usage
 

diff --git a/composer.json b/composer.json
@@ -28,17 +28,17 @@
         "armin/editorconfig-cli": "^1.5",
         "donatj/mock-webserver": "^2.4",
         "eliashaeussler/php-cs-fixer-config": "^1.1",
+        "eliashaeussler/phpstan-config": "^1.0",
         "eliashaeussler/rector-config": "^1.0",
         "ergebnis/composer-normalize": "^2.28",
-        "phpstan/phpstan": "^1.8",
+        "phpstan/extension-installer": "^1.2",
         "phpstan/phpstan-phpunit": "^1.1",
-        "phpstan/phpstan-strict-rules": "^1.2",
         "phpunit/phpunit": "^10.0",
-        "spomky-labs/otphp": "^11.0",
+        "spomky-labs/otphp": "^11.1",
         "thecodingmachine/safe": "^2.0"
     },
     "suggest": {
-        "spomky-labs/otphp": "Used for authentication via HTTP session (^11.0)"
+        "spomky-labs/otphp": "Used for authentication via HTTP session (^11.1)"
     },
     "autoload": {
         "psr-4": {
@@ -53,7 +53,8 @@
     "bin": "bin/cpanel-requests",
     "config": {
         "allow-plugins": {
-            "ergebnis/composer-normalize": true
+            "ergebnis/composer-normalize": true,
+            "phpstan/extension-installer": true
         },
         "sort-packages": true
     },

diff --git a/composer.lock b/composer.lock
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,7 +1,5 @@
 includes:
 	- vendor/phpstan/phpstan/conf/bleedingEdge.neon
-	- vendor/phpstan/phpstan-phpunit/extension.neon
-	- vendor/phpstan/phpstan-strict-rules/rules.neon
 parameters:
 	level: max
 	paths:

diff --git a/src/Application/Authorization/HttpAuthorization.php b/src/Application/Authorization/HttpAuthorization.php
@@ -121,7 +121,7 @@ private function getOTP(): ?string
             return null;
         }
 
-        return TOTP::create(trim($this->otpSecret))->now();
+        return TOTP::createFromSecret(trim($this->otpSecret))->now();
     }
 
     private function createUriBuilder(): Http\UriBuilder\UriBuilderInterface

diff --git a/tests/Application/Authorization/HttpAuthorizationTest.php b/tests/Application/Authorization/HttpAuthorizationTest.php
@@ -91,7 +91,7 @@ public function sendAuthorizedRequestProvidesOTPTokenIfOTPSecretIsGiven(): void
 
         self::assertNotEmpty($otpSecret);
 
-        $otp = TOTP::create($otpSecret)->now();
+        $otp = TOTP::createFromSecret($otpSecret)->now();
         $subject = new Application\Authorization\HttpAuthorization('foo', 'bar', $otpSecret);
         $request = new Http\Request\ApiRequest(self::getMockServerBaseUri(), 'foo');