Merge pull request #4 from SychO9/pr-back

PHP 8.1 Compatibility

Author: vasa-c

.editorconfig

@@ -0,0 +1,19 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.{diff,md}]
+trim_trailing_whitespace = false
+
+[*.{php,xml,json}]
+indent_size = 4

.travis.yml

@@ -12,10 +12,11 @@ language: php
 
 matrix:
   include:
-    - php: 7.1
-      env: CHECKS=yes
-    - php: 7.2
     - php: 7.3
+      env: CHECKS=yes
+    - php: 7.4
+    - php: 8.0
+    - php: 8.1
 
 sudo: false
 

composer.json

@@ -15,20 +15,29 @@
         }
     ],
     "require": {
-        "php": ">=7.1",
+        "php": ">=7.3",
         "axy/backtrace": "~2.0.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5",
+        "phpunit/phpunit": "^9.0",
         "squizlabs/php_codesniffer": "^3.4",
         "phpmd/phpmd": "^2.6"
     },
     "autoload": {
         "psr-4": {
-            "axy\\errors\\": "src",
-            "axy\\errors\\tests\\": "tests"
+            "axy\\errors\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "axy\\errors\\tests\\": "tests/"
+        }
+    },
+    "scripts": {
+        "test": "phpunit -c phpunit.xml.dist",
+        "md": "phpmd --exclude vendor . text phpmd.xml.dist",
+        "cs": "phpcs --standard=PSR2 --encoding=utf-8 --ignore=vendor ."
+    },
     "archive": {
         "exclude": ["/tests/*", "/doc/*", "/cs.sh", "/phpmd.sh", "/*.xml.dist", "/CHANGELOG.md"]
     }

cs.sh

@@ -5,7 +5,6 @@ args="text phpmd.xml.dist"
 
 if [ "$#" -ne 0 ]; then
 ${cmd} "$@" ${args}
-else 
+else
 ${cmd} . ${args}
 fi
-

index.php

@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         backupGlobals="false"
          backupStaticAttributes="false"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         bootstrap="tests/bootstrap.php"
-         cacheResult="false"
 >
-    <testsuites>
-        <testsuite name="Base Test Suite">
-            <directory suffix="Test.php">./tests/</directory>
-        </testsuite>
-    </testsuites>
 
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Base Test Suite">
+      <directory suffix="Test.php">./tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
 

phpmd.sh

@@ -15,7 +15,7 @@
  *
  * @link https://github.com/axypro/errors/blob/master/doc/classes/ContainerReadOnly.md documentation
  */
-class ContainerReadOnly extends Logic implements ReadOnly
+class ContainerReadOnly extends Logic implements ReadOnlyException
 {
     /**
      * {@inheritdoc}

phpunit.xml.dist

@@ -15,7 +15,7 @@
  *
  * @link https://github.com/axypro/errors/blob/master/doc/classes/PropertyReadOnly.md documentation
  */
-class PropertyReadOnly extends Logic implements ReadOnly
+class PropertyReadOnly extends Logic implements ReadOnlyException
 {
     /**
      * {@inheritdoc}

src/ContainerReadOnly.php

@@ -13,6 +13,6 @@
  *
  * @link https://github.com/axypro/errors/blob/master/doc/errors.md documentation
  */
-interface ReadOnly extends Forbidden
+interface ReadOnlyException extends Forbidden
 {
 }