Merge pull request #102 from basz/update-tooling

Update tooling

.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/

README.md

@@ -1,6 +1,6 @@
 # ZfrOAuth2Server
 
-[![Build Status](https://travis-ci.org/zf-fr/zfr-oauth2-server.png)](https://travis-ci.org/zf-fr/zfr-oauth2-server)
+[![Continuous Integration](https://github.com/zf-fr/zfr-oauth2-server/actions/workflows/continuous-integration.yml/badge.svg)](https://github.com/zf-fr/zfr-oauth2-server/actions/workflows/continuous-integration.yml)
 [![Latest Stable Version](https://poser.pugx.org/zfr/zfr-oauth2-server/v/stable.png)](https://packagist.org/packages/zfr/zfr-oauth2-server)
 [![Coverage Status](https://coveralls.io/repos/github/zf-fr/zfr-oauth2-server/badge.svg?branch=master)](https://coveralls.io/github/zf-fr/zfr-oauth2-server?branch=master)
 [![Total Downloads](https://poser.pugx.org/zfr/zfr-oauth2-server/downloads.png)](https://packagist.org/packages/zfr/zfr-oauth2-server)
@@ -22,7 +22,7 @@ Here are other OAuth2 library you can use:
 
 ## Requirements
 
-- PHP 7.2 or higher
+- PHP 7.4 or higher
 
 ## To-do
 

composer.json

@@ -21,19 +21,26 @@
       "homepage": "https://baskamer.nl"
     }
   ],
+  "config": {
+    "sort-packages": true,
+    "allow-plugins": {
+      "dealerdirect/phpcodesniffer-composer-installer": true
+    }
+  },
   "require": {
-    "php": "^7.3",
+    "php": "^7.4 || ^8.0",
     "laminas/laminas-diactoros": "^2.6",
+    "nesbot/carbon": "^2.62",
     "psr/container": "^1.0 || ^2.0",
+    "psr/http-server-middleware": "^1.0",
     "ramsey/uuid": "^3.1 || ^4.0",
-    "roave/security-advisories": "dev-master",
-    "psr/http-server-middleware": "^1.0"
+    "roave/security-advisories": "dev-master"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^2.1",
-    "phpunit/phpunit": "^8.5",
-    "satooshi/php-coveralls": "^1.0",
-    "php-mock/php-mock-phpunit": "^2.5"
+    "laminas/laminas-coding-standard": "^2.4",
+    "php-mock/php-mock-phpunit": "^2.6",
+    "phpunit/phpunit": "^9.5.5"
   },
   "autoload": {
     "psr-4": {
@@ -42,12 +49,22 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "ZfrOAuth2Test\\Server\\": "tests/src/"
+      "ZfrOAuth2Test\\Server\\": "test/src/"
     }
   },
   "extra": {
     "branch-alias": {
       "dev-master": "0.10.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"
   }
 }

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>

phpunit.xml.dist

@@ -1,20 +1,24 @@
-<?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="ZfrOAuth2Server 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">
+            <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"/>
+    </php>
 </phpunit>