require PHP 7.4

mimmi20 · Mar 7, 2021 · d724985 · d724985
1 parent c001e05
commit d724985
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 69 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -21,13 +21,13 @@ updates:
     commit-message:
       include: "scope"
       prefix: "composer"
-    ignore:
-      - dependency-name: infection/infection
-        versions:
-          - ">= 0"
-      - dependency-name: phpunit/phpunit
-        versions:
-          - ">= 0"
+#    ignore:
+#      - dependency-name: infection/infection
+#        versions:
+#          - ">= 0"
+#      - dependency-name: phpunit/phpunit
+#        versions:
+#          - ">= 0"
 
   - package-ecosystem: "github-actions"
     directory: "/"

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -57,57 +57,23 @@ jobs:
 
     runs-on: "${{ matrix.operating-system }}"
 
-    continue-on-error: ${{ matrix.continue-on-error }}
+    continue-on-error: false
 
     strategy:
       fail-fast: false
 
       matrix:
         operating-system:
           - "ubuntu-latest"
-          - "windows-latest"
-          - "macos-latest"
 
         php-version:
-          - "7.1"
-          - "7.2"
-          - "7.3"
           - "7.4"
           - "8.0"
 
         dependencies:
           - "--prefer-lowest"
           - ""
 
-        continue-on-error:
-          - false
-
-        include:
-          - operating-system: "ubuntu-latest"
-            php-version: "8.1"
-            dependencies: "--prefer-lowest"
-            continue-on-error: true
-          - operating-system: "ubuntu-latest"
-            php-version: "8.1"
-            dependencies: ""
-            continue-on-error: true
-          - operating-system: "windows-latest"
-            dependencies: "--prefer-lowest"
-            php-version: "8.1"
-            continue-on-error: true
-          - operating-system: "windows-latest"
-            dependencies: ""
-            php-version: "8.1"
-            continue-on-error: true
-          - operating-system: "macos-latest"
-            dependencies: "--prefer-lowest"
-            php-version: "8.1"
-            continue-on-error: true
-          - operating-system: "macos-latest"
-            dependencies: ""
-            php-version: "8.1"
-            continue-on-error: true
-
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2.3.4"
@@ -155,7 +121,7 @@ jobs:
           - "ubuntu-latest"
 
         php-version:
-          - "7.1"
+          - "7.4"
 
         dependencies:
           - ""
@@ -207,7 +173,7 @@ jobs:
           - "ubuntu-latest"
 
         php-version:
-          - "7.1"
+          - "7.4"
 
         dependencies:
           - ""
@@ -260,7 +226,7 @@ jobs:
           - "ubuntu-latest"
 
         php-version:
-          - "7.1"
+          - "7.4"
 
         dependencies:
           - ""
@@ -314,9 +280,6 @@ jobs:
           - "macos-latest"
 
         php-version:
-          - "7.1"
-          - "7.2"
-          - "7.3"
           - "7.4"
 
         dependencies:
@@ -383,7 +346,7 @@ jobs:
           - "ubuntu-latest"
 
         php-version:
-          - "7.1"
+          - "7.4"
 
         dependencies:
           - ""

diff --git a/.php_cs b/.php_cs
@@ -2,7 +2,7 @@
 /**
  * This file is part of the json-class package.
  *
- * Copyright (c) 2018-2020, Thomas Mueller <mimmi20@live.de>
+ * Copyright (c) 2018-2021, Thomas Mueller <mimmi20@live.de>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +13,7 @@ declare(strict_types = 1);
 $header = <<<'EOF'
 This file is part of the json-class package.
 
-Copyright (c) 2018-2020, Thomas Mueller <mimmi20@live.de>
+Copyright (c) 2018-2021, Thomas Mueller <mimmi20@live.de>
 
 For the full copyright and license information, please view the LICENSE
 file that was distributed with this source code.

diff --git a/README.md b/README.md
@@ -8,7 +8,6 @@ This class add a class wrapper around [daverandom/exceptional-json](https://gith
 
 ## Code Status
 
-[![Build Status](https://travis-ci.org/mimmi20/json-class.svg?branch=master)](https://travis-ci.org/mimmi20/json-class)
 [![codecov](https://codecov.io/gh/mimmi20/json-class/branch/master/graph/badge.svg)](https://codecov.io/gh/mimmi20/json-class)
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/mimmi20/json-class.svg)](http://isitmaintained.com/project/mimmi20/json-class "Average time to resolve an issue")
 [![Percentage of issues still open](http://isitmaintained.com/badge/open/mimmi20/json-class.svg)](http://isitmaintained.com/project/mimmi20/json-class "Percentage of issues still open")

diff --git a/composer.json b/composer.json
@@ -16,24 +16,21 @@
     }
   ],
   "require": {
-    "php": "^7.1.3 || ^8.0.0",
+    "php": "^7.4.0 || ^8.0.0",
     "ext-json": "*",
     "daverandom/exceptional-json": "^1.0.4"
   },
   "require-dev": {
-    "infection/infection": "^0.13.6 || ^0.18 || ^0.21.0",
-    "mimmi20/coding-standard": "^1.0.10",
+    "infection/infection": "^0.21.4",
+    "mimmi20/coding-standard": "^2.0.1",
     "pepakriz/phpstan-exception-rules": "^0.11.6",
     "phpstan/extension-installer": "^1.1.0",
     "phpstan/phpstan": "^0.12.80",
     "phpstan/phpstan-deprecation-rules": "^0.12.6",
-    "phpstan/phpstan-phpunit": "~0.12.17",
-    "phpunit/phpunit": "^7.5.20 || ^8.5.14 || ^9.5.2"
+    "phpstan/phpstan-phpunit": "~0.12.18",
+    "phpunit/phpunit": "^9.5.2"
   },
   "config": {
-    "platform": {
-      "php": "7.1.3"
-    },
     "preferred-install": "dist",
     "sort-packages": true
   },

diff --git a/phpunit.xml b/phpunit.xml
@@ -10,8 +10,12 @@
     beStrictAboutOutputDuringTests="true"
     beStrictAboutTestsThatDoNotTestAnything="true"
     beStrictAboutTodoAnnotatedTests="true"
-    failOnWarning="true"
+    beStrictAboutResourceUsageDuringSmallTests="true"
+    failOnEmptyTestSuite="true"
+    failOnIncomplete="true"
     failOnRisky="true"
+    failOnSkipped="true"
+    failOnWarning="true"
     verbose="false"
     bootstrap="vendor/autoload.php"
     enforceTimeLimit="false"
@@ -28,13 +32,13 @@
         <directory>tests/</directory>
     </testsuite>
 
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">
+    <coverage includeUncoveredFiles="true" processUncoveredFiles="true">
+        <include>
             <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 
     <logging>
-        <log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
+        <text outputFile="php://stdout"/>
     </logging>
 </phpunit>
diff --git a/src/Json.php b/src/Json.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the json-class package.
  *
- * Copyright (c) 2018-2020, Thomas Mueller <mimmi20@live.de>
+ * Copyright (c) 2018-2021, Thomas Mueller <mimmi20@live.de>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/JsonInterface.php b/src/JsonInterface.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the json-class package.
  *
- * Copyright (c) 2018-2020, Thomas Mueller <mimmi20@live.de>
+ * Copyright (c) 2018-2021, Thomas Mueller <mimmi20@live.de>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/tests/JsonTest.php b/tests/JsonTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the json-class package.
  *
- * Copyright (c) 2018-2020, Thomas Mueller <mimmi20@live.de>
+ * Copyright (c) 2018-2021, Thomas Mueller <mimmi20@live.de>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.