Merge branch 'jkuchar1-master-patch-55444' into 'master'

composer: allow PHP8

See merge request !2

.gitlab-ci.yml

@@ -13,7 +13,31 @@ build.composer:
     - vendor
     expire_in: 10 days
 
-test.verify:
+test.verify.php71:
+  stage: test
+  script:
+  - composer run verify
+
+test.verify.php72:
+  image: grifart/php7.2-with-gulp-and-all-php-modules
+  stage: test
+  script:
+  - composer run verify
+
+test.verify.php73:
+  image: grifart/php7.3-with-gulp-and-all-php-modules
+  stage: test
+  script:
+  - composer run verify
+
+test.verify.php74:
+  image: grifart/php7.4-with-gulp-and-all-php-modules
+  stage: test
+  script:
+  - composer run verify
+
+test.verify.php8:
+  image: grifart/php8.0-with-all-modules-and-various-tools
   stage: test
   script:
   - composer run verify

composer.json

@@ -3,7 +3,7 @@
     "description": "Adds support for suppressed exceptions as known in Java. https://docs.oracle.com/javase/tutorial/essential/exceptions/tryResourceClose.html#suppressed-exceptions",
     "type": "library",
     "require": {
-        "php": "~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0"
+        "php": "~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0"
     },
 	"scripts": {
         "verify": [
@@ -17,10 +17,10 @@
 	},
     "require-dev": {
         "nette/tester": "^2.1",
-        "phpstan/phpstan": "^0.11",
-        "grifart/phpstan-oneline": "^0.2.1",
-        "jakub-onderka/php-parallel-lint": "^1.0",
-        "jakub-onderka/php-console-highlighter": "^0.4.0"
+        "phpstan/phpstan": "^0.12",
+        "grifart/phpstan-oneline": "^0.4.0",
+        "php-parallel-lint/php-console-highlighter": "^0.5.0",
+        "php-parallel-lint/php-parallel-lint": "^1.2"
     },
     "license": "MIT",
     "authors": [

tests/nested.phpt

@@ -4,7 +4,6 @@ namespace Grifart\SuppressedExceptions\__tests;
 
 use Grifart\SuppressedExceptions\SuppressedExceptions;
 use Grifart\SuppressedExceptions\WithSuppressedExceptions;
-use Symfony\Component\Console\Exception\RuntimeException;
 use Tester\Assert;
 
 require __DIR__ . '/bootstrap.php';
@@ -15,9 +14,9 @@ class TestingSuppressedExceptionsException extends \RuntimeException implements
 
 }
 
-$previous = new TestingSuppressedExceptionsException('previous', -1, new RuntimeException());
+$previous = new TestingSuppressedExceptionsException('previous', -1, new \RuntimeException());
 $exception1 = new TestingSuppressedExceptionsException('message', 42, $previous);
-$exception1->addSuppressed(new RuntimeException('message', 0, $previous));
+$exception1->addSuppressed(new \RuntimeException('message', 0, $previous));
 
 $exception2 = new TestingSuppressedExceptionsException('message2', 42);
 $exception2->addSuppressed($previous);

tests/nested_exception-message.txt

 message2
 Suppressed exceptions:
-- nested.phpt:18 - previous (Grifart\SuppressedExceptions\__tests\TestingSuppressedExceptionsException)
-    previous: nested.phpt:18 - Symfony\Component\Console\Exception\RuntimeException
-- nested.phpt:19 - message
+- nested.phpt:17 - previous (Grifart\SuppressedExceptions\__tests\TestingSuppressedExceptionsException)
+    previous: nested.phpt:17 - RuntimeException
+- nested.phpt:18 - message
   Suppressed exceptions:
-  - nested.phpt:20 - message (Symfony\Component\Console\Exception\RuntimeException)
-      previous: nested.phpt:18 - previous (Grifart\SuppressedExceptions\__tests\TestingSuppressedExceptionsException)
-      previous: nested.phpt:18 - Symfony\Component\Console\Exception\RuntimeException
+  - nested.phpt:19 - message (RuntimeException)
+      previous: nested.phpt:17 - previous (Grifart\SuppressedExceptions\__tests\TestingSuppressedExceptionsException)
+      previous: nested.phpt:17 - RuntimeException
    (Grifart\SuppressedExceptions\__tests\TestingSuppressedExceptionsException)
-    previous: nested.phpt:18 - previous (Grifart\SuppressedExceptions\__tests\TestingSuppressedExceptionsException)
-    previous: nested.phpt:18 - Symfony\Component\Console\Exception\RuntimeException
+    previous: nested.phpt:17 - previous (Grifart\SuppressedExceptions\__tests\TestingSuppressedExceptionsException)
+    previous: nested.phpt:17 - RuntimeException