fix: Drop thecodingmachine/safe < 2.0 support

pl-github · temp · commit 94e9f35d5242 · 2024-04-26T15:23:14.000+02:00
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "license": "MIT",
     "require": {
         "php": "^8.1",
-        "thecodingmachine/safe": "^1.3|^2.0"
+        "thecodingmachine/safe": "^2.0"
     },
     "require-dev": {
         "ext-dom": "*",
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -8,7 +8,6 @@ parameters:
         - tests/bootstrap.php
         - src/HttpClientMock/CallbackHandler.php # needed because of unknown classes when installed with monolog 2.x
         - src/HttpClientMock/LegacyCallbackHandler.php # needed because of unknown classes when installed with monolog 2.x
-        - src/ZipContents/ZipContents.php # remove after updating to thecodingmachine/safe >= 2.0
     ignoreErrors:
         - '#Constructor in .* has parameter .* with default value#'
         - '#In method "Brainbits\\FunctionalTestHelpers\\Snapshot\\IsXml::.*", caught "Throwable" must be rethrown. Either catch a more specific exception or add a "throw" clause in the "catch" block to propagate the exception.#'
@@ -18,6 +17,7 @@ parameters:
         - '#Method Brainbits\\FunctionalTestHelpers\\Tests\\Request\\RequestTraitTest::.*\(\) is protected, but since the containing class is final, it can be private#'
         - '#Method Brainbits\\FunctionalTestHelpers\\Tests\\Uuid\\UuidTraitTest::.*\(\) is protected, but since the containing class is final, it can be private#'
         - '#Method Brainbits\\FunctionalTestHelpers\\Tests\\ZipContents\\ZipContentsTraitTest::.*\(\) is protected, but since the containing class is final, it can be private#'
+        - '#Safe\\DateTimeImmutable#'
     ergebnis:
         noNullableReturnTypeDeclaration:
             enabled: false
diff --git a/src/HttpClientMock/CallStack.php b/src/HttpClientMock/CallStack.php
@@ -11,7 +11,7 @@
 use function array_map;
 use function array_merge;
 use function count;
-use function Safe\sprintf;
+use function sprintf;
 
 use const PHP_EOL;
 
diff --git a/src/HttpClientMock/Exception/AddMockResponseFailed.php b/src/HttpClientMock/Exception/AddMockResponseFailed.php
@@ -7,7 +7,7 @@
 use Brainbits\FunctionalTestHelpers\HttpClientMock\MockRequestBuilder;
 use RuntimeException;
 
-use function Safe\sprintf;
+use function sprintf;
 
 use const PHP_EOL;
 
diff --git a/src/HttpClientMock/Exception/InvalidMockRequest.php b/src/HttpClientMock/Exception/InvalidMockRequest.php
@@ -6,7 +6,7 @@
 
 use RuntimeException;
 
-use function Safe\sprintf;
+use function sprintf;
 
 final class InvalidMockRequest extends RuntimeException implements HttpClientMockException
 {
diff --git a/src/HttpClientMock/Exception/NoMatchingMockRequest.php b/src/HttpClientMock/Exception/NoMatchingMockRequest.php
@@ -8,7 +8,7 @@
 use Brainbits\FunctionalTestHelpers\HttpClientMock\MockRequestMatch;
 use RuntimeException;
 
-use function Safe\sprintf;
+use function sprintf;
 
 use const PHP_EOL;
 
diff --git a/src/HttpClientMock/Exception/NoResponseMock.php b/src/HttpClientMock/Exception/NoResponseMock.php
@@ -7,7 +7,7 @@
 use Brainbits\FunctionalTestHelpers\HttpClientMock\MockRequestBuilder;
 use RuntimeException;
 
-use function Safe\sprintf;
+use function sprintf;
 
 use const PHP_EOL;
 
diff --git a/src/HttpClientMock/Exception/NoUriConfigured.php b/src/HttpClientMock/Exception/NoUriConfigured.php
@@ -6,7 +6,7 @@
 
 use RuntimeException;
 
-use function Safe\sprintf;
+use function sprintf;
 
 final class NoUriConfigured extends RuntimeException implements HttpClientMockException
 {
diff --git a/src/HttpClientMock/HttpClientMockTrait.php b/src/HttpClientMock/HttpClientMockTrait.php
@@ -17,7 +17,7 @@
 
 use function assert;
 use function class_exists;
-use function Safe\sprintf;
+use function sprintf;
 use function ucfirst;
 
 /** @mixin TestCase */
diff --git a/src/HttpClientMock/MockRequestBuilder.php b/src/HttpClientMock/MockRequestBuilder.php
@@ -30,13 +30,13 @@
 use function Safe\json_encode;
 use function Safe\preg_match;
 use function Safe\simplexml_load_string;
-use function Safe\sprintf;
-use function Safe\substr;
+use function sprintf;
 use function str_contains;
 use function str_repeat;
 use function str_replace;
 use function strpos;
 use function strtolower;
+use function substr;
 use function trim;
 use function ucwords;
 use function urldecode;
diff --git a/src/HttpClientMock/MockRequestMatch.php b/src/HttpClientMock/MockRequestMatch.php
@@ -7,7 +7,7 @@
 use Stringable;
 
 use function Safe\json_encode;
-use function Safe\sprintf;
+use function sprintf;
 
 final class MockRequestMatch
 {
diff --git a/src/HttpClientMock/MockResponseBuilder.php b/src/HttpClientMock/MockResponseBuilder.php
@@ -8,7 +8,7 @@
 use function count;
 use function Safe\json_decode;
 use function Safe\json_encode;
-use function Safe\sprintf;
+use function sprintf;
 use function str_repeat;
 use function str_replace;
 use function strtolower;
diff --git a/src/Request/InvalidRequest.php b/src/Request/InvalidRequest.php
@@ -6,7 +6,7 @@
 
 use RuntimeException;
 
-use function Safe\sprintf;
+use function sprintf;
 
 // phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod.Found
 
diff --git a/src/Request/RequestBuilder.php b/src/Request/RequestBuilder.php
@@ -13,7 +13,7 @@
 use function rawurlencode;
 use function Safe\array_walk_recursive;
 use function Safe\json_encode;
-use function Safe\sprintf;
+use function sprintf;
 use function str_replace;
 use function strpos;
 use function sys_get_temp_dir;
diff --git a/src/Request/RequestTrait.php b/src/Request/RequestTrait.php
@@ -14,7 +14,7 @@
 
 use function assert;
 use function method_exists;
-use function Safe\sprintf;
+use function sprintf;
 
 /** @mixin TestCase */
 trait RequestTrait
diff --git a/src/Schema/NoSchemaStrategyFound.php b/src/Schema/NoSchemaStrategyFound.php
@@ -7,7 +7,7 @@
 use RuntimeException;
 
 use function Safe\json_encode;
-use function Safe\sprintf;
+use function sprintf;
 
 final class NoSchemaStrategyFound extends RuntimeException
 {
diff --git a/src/Schema/Strategy/MysqlBasedSchemaStrategy.php b/src/Schema/Strategy/MysqlBasedSchemaStrategy.php
@@ -11,7 +11,7 @@
 use Doctrine\DBAL\Schema\Identifier;
 
 use function count;
-use function Safe\sprintf;
+use function sprintf;
 
 final class MysqlBasedSchemaStrategy implements SchemaStrategy
 {
diff --git a/src/Schema/Strategy/MysqlDamaBasedSchemaStrategy.php b/src/Schema/Strategy/MysqlDamaBasedSchemaStrategy.php
@@ -12,7 +12,7 @@
 use Doctrine\DBAL\Schema\Identifier;
 
 use function count;
-use function Safe\sprintf;
+use function sprintf;
 
 final class MysqlDamaBasedSchemaStrategy implements SchemaStrategy
 {
diff --git a/src/Snapshot/IsXml.php b/src/Snapshot/IsXml.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\Constraint\Constraint;
 use Throwable;
 
-use function Safe\sprintf;
+use function sprintf;
 
 use const LIBXML_NOERROR;
 use const LIBXML_NOWARNING;
diff --git a/src/Snapshot/SnapshotTrait.php b/src/Snapshot/SnapshotTrait.php
@@ -22,12 +22,12 @@
 use function Safe\json_encode;
 use function Safe\preg_match;
 use function Safe\preg_replace;
-use function Safe\sprintf;
-use function Safe\substr;
+use function sprintf;
 use function str_contains;
 use function str_replace;
 use function strlen;
 use function strpos;
+use function substr;
 
 use const JSON_PRETTY_PRINT;
 use const JSON_UNESCAPED_LINE_TERMINATORS;
diff --git a/src/ZipContents/InvalidArchive.php b/src/ZipContents/InvalidArchive.php
@@ -7,7 +7,7 @@
 use RuntimeException;
 
 use function gettype;
-use function Safe\sprintf;
+use function sprintf;
 
 final class InvalidArchive extends RuntimeException
 {
diff --git a/src/ZipContents/ZipContents.php b/src/ZipContents/ZipContents.php
@@ -14,16 +14,16 @@
 use function iconv_strlen;
 use function is_file;
 use function is_resource;
-use function mb_convert_encoding;
 use function ord;
 use function Safe\filesize;
 use function Safe\fopen;
 use function Safe\fread;
 use function Safe\iconv;
+use function Safe\mb_convert_encoding;
 use function Safe\rewind;
-use function Safe\substr;
 use function Safe\unpack;
 use function strlen;
+use function substr;
 use function time;
 
 final class ZipContents
diff --git a/tests/Schema/SchemaTraitTest.php b/tests/Schema/SchemaTraitTest.php
@@ -14,7 +14,7 @@
 
 use function getenv;
 use function Safe\putenv;
-use function Safe\sprintf;
+use function sprintf;
 
 /** @covers \Brainbits\FunctionalTestHelpers\Schema\SchemaTrait */
 final class SchemaTraitTest extends TestCase
diff --git a/tests/ZipContents/ZipContentsTest.php b/tests/ZipContents/ZipContentsTest.php
@@ -10,7 +10,7 @@
 
 use function Safe\filesize;
 use function Safe\fopen;
-use function Safe\sprintf;
+use function sprintf;
 
 /** @covers \Brainbits\FunctionalTestHelpers\ZipContents\ZipContents */
 final class ZipContentsTest extends TestCase

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`use RuntimeException;`
`8`	`8`
`9`		`-use function Safe\sprintf;`
	`9`	`+use function sprintf;`
`10`	`10`
`11`	`11`	`final class InvalidMockRequest extends RuntimeException implements HttpClientMockException`
`12`	`12`	`{`