diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d9d7792660da4e3a2253b5f6bbed94bbb4bd9bb..68cbf703204e4f5737d99fc31703a61e2a35dac3 100644 --- a/.gitlab-ci.yml +++ b/.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 diff --git a/composer.json b/composer.json index 30582c51c7d3a745665810594ebbadcdd4851cd0..2795a135f815baf30bcbfce74ba548ac68af7172 100644 --- a/composer.json +++ b/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": [ diff --git a/tests/nested.phpt b/tests/nested.phpt index 8bb53827d4faade25a83b1af9cb3003765e67d01..dd2fb0667586f2c3ea31ef8cbf30160de62b77f0 100644 --- a/tests/nested.phpt +++ b/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); diff --git a/tests/nested_exception-message.txt b/tests/nested_exception-message.txt index af012b40e14fedee68b84d7e3440fb10f147a2a3..cce86096e6842950c1dc0cf1c2d7fda583a45eb2 100644 --- a/tests/nested_exception-message.txt +++ b/tests/nested_exception-message.txt @@ -1,12 +1,12 @@ 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