Merge pull request #26 from basz/update-tooling

Update tooling
zf-fr · Aug 30, 2022 · f017c3f · f017c3f
2 parents 205309b + f522e57
commit f017c3f
Show file tree

Hide file tree

Showing 37 changed files with 219 additions and 335 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,10 @@
-.idea
-vendor
-build
-composer.lock
-.php_cs.cache
-.phpunit.result.cache
+/.phpcs-cache
+/.phpunit.result.cache
+/clover.xml
+/composer.lock
+/coveralls-upload.json
+/docs/html/
+/laminas-mkdoc-theme.tgz
+/laminas-mkdoc-theme/
+/phpunit.xml
+/vendor/
diff --git a/.php_cs b/.php_cs
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 Doctrine 2 adapter for [ZfrOAuth2Server](http://github.com/zf-fr/zfr-oauth2-server)
 
-[![Build Status](https://travis-ci.org/zf-fr/zfr-oauth2-server-doctrine.png)](https://travis-ci.org/zf-fr/zfr-oauth2-server-doctrine)
+[![Continuous Integration](https://github.com/zf-fr/zfr-oauth2-server-doctrine/actions/workflows/continuous-integration.yml/badge.svg)](https://github.com/zf-fr/zfr-oauth2-server-doctrine/actions/workflows/continuous-integration.yml)
 [![Latest Stable Version](https://poser.pugx.org/zfr/zfr-oauth2-server-doctrine/v/stable.png)](https://packagist.org/packages/zfr/zfr-oauth2-server-doctrine)
 [![Coverage Status](https://coveralls.io/repos/github/zf-fr/zfr-oauth2-server-doctrine/badge.svg?branch=master)](https://coveralls.io/github/zf-fr/zfr-oauth2-server-doctrine?branch=master)
 [![Total Downloads](https://poser.pugx.org/zfr/zfr-oauth2-server-doctrine/downloads.png)](https://packagist.org/packages/zfr/zfr-oauth2-server-doctrine)
@@ -11,15 +11,15 @@ Doctrine 2 adapter for [ZfrOAuth2Server](http://github.com/zf-fr/zfr-oauth2-serv
 
 ## Requirements
 
-- PHP 7.2 or higher
-- doctrine/orm ~2.5
+- PHP 7.4 or higher
+- doctrine/orm ^2.8
 
 ## Installation
 
 Installation is only officially supported using Composer:
 
 ```sh
-php composer.phar require zfr/zfr-oauth2-server-doctrine:^0.2
+php composer.phar require zfr/zfr-oauth2-server-doctrine:^0.3
 ```
 
 ## Support

diff --git a/composer.json b/composer.json
@@ -22,17 +22,23 @@
   ],
   "minimum-stability": "dev",
   "prefer-stable": true,
+  "config": {
+    "sort-packages": true,
+    "allow-plugins": {
+      "dealerdirect/phpcodesniffer-composer-installer": true
+    }
+  },
   "require": {
-    "php": "^7.3",
+    "php": "^7.4 || ^8.0",
     "zfr/zfr-oauth2-server": "^0.10",
-    "doctrine/orm": "^2.7",
-    "psr/container": "^1.0",
+    "doctrine/orm": "^2.8",
+    "psr/container": "^1.0 || ^2.0",
     "roave/security-advisories": "dev-master"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^2.1",
-    "phpunit/phpunit": "^8.5",
-    "satooshi/php-coveralls": "~1.0"
+    "laminas/laminas-coding-standard": "^2.4",
+    "phpunit/phpunit": "^9.5"
   },
   "autoload": {
     "psr-4": {
@@ -41,12 +47,22 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "ZfrOAuth2Test\\Server\\Doctrine\\": "tests/src/"
+      "ZfrOAuth2Test\\Server\\Doctrine\\": "test/src/"
     }
   },
   "extra": {
     "branch-alias": {
       "dev-master": "0.3.x-dev"
     }
+  },
+  "scripts": {
+    "check": [
+      "@cs-check",
+      "@test"
+    ],
+    "cs-check": "phpcs",
+    "cs-fix": "phpcbf",
+    "test": "phpunit --colors=always",
+    "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
   }
 }
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<ruleset
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="./vendor/squizlabs/php_codesniffer/phpcs.xsd">
+
+    <arg name="basepath" value="."/>
+    <arg name="cache" value=".phpcs-cache"/>
+    <arg name="colors"/>
+    <arg name="extensions" value="php"/>
+    <arg name="parallel" value="80"/>
+
+    <!-- Show progress -->
+    <arg value="p"/>
+
+    <!-- Paths to check -->
+    <file>src</file>
+    <file>test</file>
+
+    <!-- Include all rules from Laminas Coding Standard -->
+    <rule ref="LaminasCodingStandard"/>
+</ruleset>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,20 +1,31 @@
-<?xml version="1.0"?>
-<phpunit
-        bootstrap="./tests/Bootstrap.php"
-        colors="true"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
-        verbose="true"
-        stopOnFailure="false"
-        processIsolation="false"
-        backupGlobals="false">
-    <testsuite name="ZfrOAuth2ServerDoctrine tests">
-        <directory>./tests</directory>
-    </testsuite>
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd" bootstrap="./test/Bootstrap.php" colors="true">
+    <testsuites>
+        <testsuite name="zfr-oauth2-server-doctrine">
+            <directory>./test/</directory>
+        </testsuite>
+    </testsuites>
+
+    <groups>
+        <exclude>
+            <group>disable</group>
+        </exclude>
+    </groups>
+
+    <coverage includeUncoveredFiles="true">
+        <include>
             <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
+
+    <php>
+        <ini name="date.timezone" value="UTC"/>
+
+        <!-- OB_ENABLED should be enabled for some tests to check if all
+             functionality works as expected. Such tests include those for
+             Laminas\Soap and Laminas\Session, which require that headers not be sent
+             in order to work. -->
+        <env name="TESTS_LAMINAS_OB_ENABLED" value="false" />
+
+    </php>
 </phpunit>
diff --git a/src/Container/AccessTokenRepositoryFactory.php b/src/Container/AccessTokenRepositoryFactory.php
@@ -1,6 +1,7 @@
 <?php
 
 declare(strict_types=1);
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -27,9 +28,6 @@
 use ZfrOAuth2\Server\Doctrine\Repository;
 use ZfrOAuth2\Server\Model\AccessToken;
 
-/**
- * Class AccessTokenRepositoryFactory
- */
 class AccessTokenRepositoryFactory
 {
     public function __invoke(ContainerInterface $container): Repository\AccessTokenRepository

diff --git a/src/Container/AuthorizationCodeRepositoryFactory.php b/src/Container/AuthorizationCodeRepositoryFactory.php
@@ -1,6 +1,7 @@
 <?php
 
 declare(strict_types=1);
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -27,9 +28,6 @@
 use ZfrOAuth2\Server\Doctrine\Repository;
 use ZfrOAuth2\Server\Model\AuthorizationCode;
 
-/**
- * Class AuthorizationCodeRepositoryFactory
- */
 class AuthorizationCodeRepositoryFactory
 {
     public function __invoke(ContainerInterface $container): Repository\AuthorizationCodeRepository

diff --git a/src/Container/ClientRepositoryFactory.php b/src/Container/ClientRepositoryFactory.php
@@ -1,6 +1,7 @@
 <?php
 
 declare(strict_types=1);
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -27,9 +28,6 @@
 use ZfrOAuth2\Server\Doctrine\Repository;
 use ZfrOAuth2\Server\Model\Client;
 
-/**
- * Class ClientRepositoryFactory
- */
 class ClientRepositoryFactory
 {
     public function __invoke(ContainerInterface $container): Repository\ClientRepository

diff --git a/src/Container/DoctrineOptionsFactory.php b/src/Container/DoctrineOptionsFactory.php
@@ -1,6 +1,7 @@
 <?php
 
 declare(strict_types=1);
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -24,15 +25,10 @@
 use ZfrOAuth2\Server\Doctrine\Options\DoctrineOptions;
 
 /**
- * @author  Michaël Gallego <[email protected]>
  * @licence MIT
  */
 class DoctrineOptionsFactory
 {
-    /**
-     * @param ContainerInterface $container
-     * @return DoctrineOptions
-     */
     public function __invoke(ContainerInterface $container): DoctrineOptions
     {
         $config  = $container->get('config');

diff --git a/src/Container/RefreshTokenRepositoryFactory.php b/src/Container/RefreshTokenRepositoryFactory.php
@@ -1,6 +1,7 @@
 <?php
 
 declare(strict_types=1);
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -27,9 +28,6 @@
 use ZfrOAuth2\Server\Doctrine\Repository;
 use ZfrOAuth2\Server\Model\RefreshToken;
 
-/**
- * Class RefreshTokenRepositoryFactory
- */
 class RefreshTokenRepositoryFactory
 {
     public function __invoke(ContainerInterface $container): Repository\RefreshTokenRepository

diff --git a/src/Container/ScopeRepositoryFactory.php b/src/Container/ScopeRepositoryFactory.php
@@ -1,6 +1,7 @@
 <?php
 
 declare(strict_types=1);
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -27,9 +28,6 @@
 use ZfrOAuth2\Server\Doctrine\Repository;
 use ZfrOAuth2\Server\Model\Scope;
 
-/**
- * Class ScopeRepositoryFactory
- */
 class ScopeRepositoryFactory
 {
     public function __invoke(ContainerInterface $container): Repository\ScopeRepository