Merge pull request #3104 from t0mmy742/drop_php7.2

Drop php7.2
slimphp · Aug 4, 2021 · c431514 · c431514
2 parents 4b3818d + ccab75e
commit c431514
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 168 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,7 +6,3 @@ updates:
     interval: monthly
   open-pull-requests-limit: 10
   versioning-strategy: increase
-  ignore:
-  - dependency-name: phpunit/phpunit
-    versions:
-    - "8.5.*"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [7.2, 7.3, 7.4, 8.0]
+        php: [7.3, 7.4, 8.0]
         experimental: [false]
         include:
           - php: 8.0
@@ -37,7 +37,7 @@ jobs:
 
       - name: Static analysis
         if: matrix.analysis
-        run: vendor/bin/phpstan analyse Slim
+        run: vendor/bin/phpstan
 
       - name: Tests
         run: vendor/bin/phpunit --coverage-clover clover.xml

diff --git a/composer.json b/composer.json
@@ -43,7 +43,7 @@
         "wiki": "https://github.com/slimphp/Slim/wiki"
     },
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^7.3 || ^8.0",
         "ext-json": "*",
         "nikic/fast-route": "^1.3",
         "psr/container": "^1.0 || ^2.0",
@@ -57,17 +57,17 @@
         "ext-simplexml": "*",
         "adriansuter/php-autoload-override": "^1.2",
         "guzzlehttp/psr7": "^2.0",
-        "http-interop/http-factory-guzzle": "^1.1",
-        "laminas/laminas-diactoros": "^2.4",
+        "http-interop/http-factory-guzzle": "^1.2",
+        "laminas/laminas-diactoros": "^2.6",
         "nyholm/psr7": "^1.4",
         "nyholm/psr7-server": "^1.0",
         "phpspec/prophecy": "^1.13",
+        "phpspec/prophecy-phpunit": "^2.0",
         "phpstan/phpstan": "^0.12.94",
-        "phpunit/phpunit": "^8.5 || ^9.5",
+        "phpunit/phpunit": "^9.5",
         "slim/http": "^1.2",
         "slim/psr7": "^1.4",
-        "squizlabs/php_codesniffer": "^3.6",
-        "weirdan/prophecy-shim": "^1.0 || ^2.0"
+        "squizlabs/php_codesniffer": "^3.6"
     },
     "autoload": {
         "psr-4": {
@@ -87,7 +87,7 @@
         ],
         "phpunit": "phpunit",
         "phpcs": "phpcs",
-        "phpstan": "phpstan analyse Slim --memory-limit=-1"
+        "phpstan": "phpstan --memory-limit=-1"
     },
     "suggest": {
         "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,3 +1,4 @@
 parameters:
-  level: max
-  inferPrivatePropertyTypeFromConstructor: true
+    level: max
+    paths:
+        - Slim
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,36 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/8.5/phpunit.xsd"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         beStrictAboutTestsThatDoNotTestAnything="true"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
          beStrictAboutChangesToGlobalState="true"
          beStrictAboutOutputDuringTests="true"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
          bootstrap="tests/bootstrap.php"
          executionOrder="random"
 >
     <testsuites>
         <testsuite name="Slim Test Suite">
-            <directory>./tests/</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory>./Slim/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log
-            type="coverage-html"
-            target="./coverage"
-            lowUpperBound="20"
-            highLowerBound="50"
-        />
-    </logging>
+
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory>Slim</directory>
+        </include>
+        <report>
+            <html outputDirectory="coverage" lowUpperBound="20" highLowerBound="50"/>
+        </report>
+    </coverage>
 </phpunit>
diff --git a/tests/Assets/PhpFunctionOverrides.php b/tests/Assets/PhpFunctionOverrides.php
diff --git a/tests/Assets/PhpRoutingFunctionOverrides.php b/tests/Assets/PhpRoutingFunctionOverrides.php
diff --git a/tests/MigratePhpUnitDeprecations.php b/tests/MigratePhpUnitDeprecations.php
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -27,7 +27,6 @@
 
 abstract class TestCase extends PhpUnitTestCase
 {
-    use MigratePhpUnitDeprecations;
     use ProphecyTrait;
 
     /**

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -15,9 +15,6 @@
 
 $classLoader = require __DIR__ . '/../vendor/autoload.php';
 
-//require __DIR__ . '/Assets/PhpFunctionOverrides.php';
-//require __DIR__ . '/Assets/PhpRoutingFunctionOverrides.php';
-
 Override::apply($classLoader, [
     ResponseEmitter::class => [
         'connection_status' => function (): int {
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,6 @@ @@
     abstract class TestCase extends PhpUnitTestCase
     {
-        use MigratePhpUnitDeprecations;
         use ProphecyTrait;
         /**
@@ Expand Down @@