Merge branch 'test-refactoring'

Phauthentic · Mar 16, 2024 · a4f29de · a4f29de
2 parents d3a630c + 33fa98b
commit a4f29de
Show file tree

Hide file tree

Showing 79 changed files with 806 additions and 484 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,10 +9,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 1
 
@@ -26,35 +26,38 @@ jobs:
 
     - name: Composer install
       run: |
-        if [[ ${{ matrix.prefer-lowest == '7.4' }} ]]; then
+        if [[ ${{ matrix.prefer-lowest == '8.3' }} ]]; then
           composer update --prefer-lowest --prefer-stable
         else
           composer install
         fi
     - name: Run PHPUnit
       run: |
-        if [[ ${{ matrix.php-version }} == '7.4' ]]; then
+        if [[ ${{ matrix.php-version }} == '8.3' ]]; then
           bin/phpunit --coverage-clover=coverage.xml
         else
           bin/phpunit
         fi
     - name: Code Coverage Report
-      if: success() && matrix.php-version == '7.4'
-      uses: codecov/codecov-action@v1
+      if: success() && matrix.php-version == '8.3'
+      uses: codecov/codecov-action@v4
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        slug: phauthentic/authentication
 
   validation:
     name: Coding Standard & Static Analysis
     runs-on: ubuntu-20.04
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 1
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.4'
+        php-version: '8.3'
         extensions: json, pdo, ldap
         coverage: none
         tools: pecl

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -3,7 +3,7 @@ build:
       tests-php74:
           environment:
               php:
-                  version: '7.4'
+                  version: '8.0'
                   ini:
                       phar.readonly: 'Off'
                   pecl_extensions:
@@ -18,7 +18,7 @@ build:
       tests-php80:
           environment:
               php:
-                  version: '8.0'
+                  version: '8.3'
                   ini:
                       phar.readonly: 'Off'
                   pecl_extensions:

diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,9 @@ language: php
 php:
   - 7.4
   - 8.0
+  - 8.1
+  - 8.2
+  - 8.3
 
 sudo: false
 

diff --git a/composer.json b/composer.json
@@ -8,21 +8,23 @@
         "library"
     ],
     "require": {
-        "php": "^7.4|^8.0",
+        "php": "^8.0",
+        "ext-json": "*",
         "phauthentic/password-hashers": "^2.0",
         "psr/http-factory": "^1.0",
         "psr/http-message": "~1.0",
         "psr/http-server-handler": "~1.0",
-        "psr/http-server-middleware": "^1.0",
-        "ext-json": "*"
+        "psr/http-server-middleware": "^1.0"
     },
     "require-dev": {
         "ext-pdo": "*",
         "dms/phpunit-arraysubset-asserts": "^0.3.0",
-        "firebase/php-jwt": "~4.0",
+        "firebase/php-jwt": "6.*",
         "misantron/dbunit": "dev-master",
-        "roave/security-advisories": "dev-master",
-        "laminas/laminas-diactoros": "^2.5.0"
+        "nyholm/psr7": "^1.8",
+        "phpstan/phpstan": "^1.10",
+        "phpunit/phpunit": "^9.5",
+        "squizlabs/php_codesniffer": "^3.9"
     },
     "suggest": {
         "firebase/php-jwt": "If you want to use the JWT adapter add this dependency",
@@ -47,15 +49,6 @@
         }
     ],
     "scripts": {
-        "post-install-cmd": [
-            "php config/composer_post_install.php"
-        ],
-        "post-update-cmd": [
-            "php config/composer_post_install.php"
-        ],
-        "phive": [
-            "php ./config/composer_phive.php"
-        ],
         "check": [
             "@cs-check",
             "@test"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,33 @@
+version: '3.8'
+
+services:
+  php:
+    build: ./docker/php
+    container_name: phpunit-container
+    volumes:
+      - .:/app
+    working_dir: /app
+    command: "tail -f /dev/null"
+    depends_on:
+      - mysql
+    networks:
+      - phpnet
+    environment:
+      PDO_DB_DSN: "mysql:host=mysql;dbname=test"
+
+  mysql:
+    image: mysql:latest
+    container_name: mysql-container
+    environment:
+      MYSQL_ROOT_PASSWORD: changeme
+      MYSQL_DATABASE: test
+      MYSQL_USER: test
+      MYSQL_PASSWORD: changeme
+    ports:
+      - "3306:3306"
+    networks:
+      - phpnet
+
+networks:
+  phpnet:
+    driver: bridge
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
@@ -0,0 +1,14 @@
+FROM php:8.3-cli
+
+RUN apt-get update
+RUN apt-get install -y libzip-dev zip git
+
+RUN pear update-channels \
+    && pecl update-channels \
+    && pecl install xdebug redis
+
+RUN docker-php-ext-install pdo_mysql zip
+RUN docker-php-ext-enable pdo_mysql zip redis xdebug
+
+# Install Composer globally
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,42 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-	colors="true"
-	processIsolation="false"
-	stopOnFailure="false"
-	bootstrap="./tests/bootstrap.php"
-	>
-	<php>
-		<ini name="memory_limit" value="-1"/>
-		<ini name="apc.enable_cli" value="1"/>
-	</php>
-
-	<!-- Add any additional test suites you want to run here -->
-	<testsuites>
-		<testsuite name="authentication">
-			<directory>tests/TestCase/</directory>
-		</testsuite>
-		<!-- Add plugin test suites here. -->
-	</testsuites>
-
-	<logging>
-		<log type="coverage-html" target="./tmp/tests/report" lowUpperBound="35" highLowerBound="70"/>
-		<!--<log type="coverage-clover" target="./tmp/tests/coverage.xml"/>-->
-		<!--<log type="coverage-php" target="/tmp/coverage.serialized"/>-->
-		<!--<log type="coverage-text" target="php://stdout" showUncoveredFiles="false"/>-->
-		<!--<log type="json" target="/tmp/logfile.json"/>-->
-		<!--<log type="tap" target="/tmp/logfile.tap"/>-->
-		<!--<log type="junit" target="/tmp/logfile.xml" logIncompleteSkipped="false"/>-->
-		<!--<log type="testdox-html" target=".//tmp/tests/testdox.html"/>-->
-		<!--<log type="testdox-text" target=".//tmp/tests/testdox.txt"/>-->
-	</logging>
-
-	<filter>
-		<whitelist processUncoveredFilesFromWhitelist="true">
-			<directory suffix=".php">src/</directory>
-			<exclude>
-				<file>src/Identifier/Ldap/ExtensionAdapter.php</file>
-			</exclude>
-		</whitelist>
-	</filter>
-
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" processIsolation="false" stopOnFailure="false" bootstrap="./tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+    <exclude>
+      <file>src/Identifier/Ldap/ExtensionAdapter.php</file>
+    </exclude>
+    <report>
+      <html outputDirectory="./tmp/tests/report" lowUpperBound="35" highLowerBound="70"/>
+    </report>
+  </coverage>
+  <php>
+    <ini name="memory_limit" value="-1"/>
+    <ini name="apc.enable_cli" value="1"/>
+  </php>
+  <!-- Add any additional test suites you want to run here -->
+  <testsuites>
+    <testsuite name="authentication">
+      <directory>tests/TestCase/</directory>
+    </testsuite>
+    <!-- Add plugin test suites here. -->
+  </testsuites>
+  <logging>
+    <!--<log type="coverage-clover" target="./tmp/tests/coverage.xml"/>-->
+    <!--<log type="coverage-php" target="/tmp/coverage.serialized"/>-->
+    <!--<log type="coverage-text" target="php://stdout" showUncoveredFiles="false"/>-->
+    <!--<log type="json" target="/tmp/logfile.json"/>-->
+    <!--<log type="tap" target="/tmp/logfile.tap"/>-->
+    <!--<log type="junit" target="/tmp/logfile.xml" logIncompleteSkipped="false"/>-->
+    <!--<log type="testdox-html" target=".//tmp/tests/testdox.html"/>-->
+    <!--<log type="testdox-text" target=".//tmp/tests/testdox.txt"/>-->
+  </logging>
 </phpunit>
diff --git a/readme.md b/readme.md
@@ -4,7 +4,6 @@
 [![Scrutinizer Coverage](https://img.shields.io/scrutinizer/coverage/g/Phauthentic/authentication/2.0.svg?style=flat-square)](https://scrutinizer-ci.com/g/Phauthentic/authentication/?branch=2.0)
 [![Code Quality](https://img.shields.io/scrutinizer/g/Phauthentic/authentication/2.0.svg?style=flat-square)](https://scrutinizer-ci.com/g/Phauthentic/authentication/?branch=2.0)
 ![phpstan Level 8](https://img.shields.io/badge/phpstan-Level%208-brightgreen?style=flat-square)
-![php 7.4](https://img.shields.io/badge/php-7.4-blue?style=flat-square)
 ![php 8.0](https://img.shields.io/badge/php-8.0-blue?style=flat-square)
 
 

diff --git a/src/AuthenticationException.php b/src/AuthenticationException.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Phauthentic\Authentication;
+
+use Exception;
+
+/**
+ * Authentication Exception
+ */
+class AuthenticationException extends Exception
+{
+}
diff --git a/src/AuthenticationService.php b/src/AuthenticationService.php
@@ -14,6 +14,8 @@
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
+declare(strict_types=1);
+
 namespace Phauthentic\Authentication;
 
 use ArrayAccess;
@@ -138,7 +140,7 @@ public function authenticate(ServerRequestInterface $request): bool
                 return true;
             }
 
-            if (!$result->isValid()) {
+            if ($result->isValid() === false) {
                 if ($authenticator instanceof StatelessInterface) {
                     $authenticator->unauthorizedChallenge($request);
                 }

diff --git a/src/AuthenticationServiceInterface.php b/src/AuthenticationServiceInterface.php
@@ -14,6 +14,8 @@
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
+declare(strict_types=1);
+
 namespace Phauthentic\Authentication;
 
 use Phauthentic\Authentication\Authenticator\AuthenticatorInterface;

diff --git a/src/AuthenticationServiceProviderInterface.php b/src/AuthenticationServiceProviderInterface.php
@@ -14,6 +14,8 @@
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
+declare(strict_types=1);
+
 namespace Phauthentic\Authentication;
 
 use Psr\Http\Message\ServerRequestInterface;

diff --git a/src/Authenticator/AbstractAuthenticator.php b/src/Authenticator/AbstractAuthenticator.php
@@ -14,6 +14,8 @@
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
+declare(strict_types=1);
+
 namespace Phauthentic\Authentication\Authenticator;
 
 use Phauthentic\Authentication\Identifier\IdentifierInterface;

diff --git a/src/Authenticator/AuthenticatorCollection.php b/src/Authenticator/AuthenticatorCollection.php
@@ -14,6 +14,8 @@
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
+declare(strict_types=1);
+
 namespace Phauthentic\Authentication\Authenticator;
 
 use ArrayIterator;

diff --git a/src/Authenticator/AuthenticatorCollectionInterface.php b/src/Authenticator/AuthenticatorCollectionInterface.php
@@ -14,6 +14,8 @@
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
+declare(strict_types=1);
+
 namespace Phauthentic\Authentication\Authenticator;
 
 use IteratorAggregate;

diff --git a/src/Authenticator/AuthenticatorInterface.php b/src/Authenticator/AuthenticatorInterface.php
@@ -14,6 +14,8 @@
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
+declare(strict_types=1);
+
 namespace Phauthentic\Authentication\Authenticator;
 
 use Psr\Http\Message\ServerRequestInterface;

diff --git a/src/Authenticator/CookieAuthenticator.php b/src/Authenticator/CookieAuthenticator.php
@@ -14,6 +14,8 @@
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
+declare(strict_types=1);
+
 namespace Phauthentic\Authentication\Authenticator;
 
 use ArrayAccess;
@@ -126,8 +128,11 @@ public function authenticate(ServerRequestInterface $request): ResultInterface
      * {@inheritDoc}
      * @throws \JsonException
      */
-    public function persistIdentity(ServerRequestInterface $request, ResponseInterface $response, ArrayAccess $data): ResponseInterface
-    {
+    public function persistIdentity(
+        ServerRequestInterface $request,
+        ResponseInterface $response,
+        ArrayAccess $data
+    ): ResponseInterface {
         $field = $this->rememberMeField;
         $bodyData = $request->getParsedBody();
 

diff --git a/src/Authenticator/CredentialFieldsTrait.php b/src/Authenticator/CredentialFieldsTrait.php
@@ -14,6 +14,8 @@
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
+declare(strict_types=1);
+
 namespace Phauthentic\Authentication\Authenticator;
 
 use Phauthentic\Authentication\Identifier\IdentifierInterface;
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,9 @@ language: php @@
     php:
       - 7.4
       - 8.0
+      - 8.1
+      - 8.2
+      - 8.3
     sudo: false
@@ Expand Down @@