Remove thecodingmachine/safe (#103)

Lendable · Sep 29, 2021 · 79b616b · 79b616b
1 parent 475e04f
commit 79b616b
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 211 deletions.
diff --git a/composer.json b/composer.json
@@ -31,8 +31,7 @@
   "require": {
     "php": ">=7.4.0",
     "beberlei/assert": "^3.3",
-    "ramsey/uuid": "^4.1",
-    "thecodingmachine/safe": "^1.0"
+    "ramsey/uuid": "^4.1"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^3.0",
@@ -42,8 +41,7 @@
     "phpstan/phpstan-strict-rules": "^0.12",
     "phpunit/phpunit": "^9.5",
     "qossmic/deptrac-shim": "^0.14 || ^0.15",
-    "rector/rector": "^0.11.5",
-    "thecodingmachine/phpstan-safe-rule": "^1.0"
+    "rector/rector": "^0.11.5"
   },
   "scripts": {
     "security:check": [

diff --git a/composer.lock b/composer.lock
diff --git a/phpstan.neon b/phpstan.neon
@@ -2,12 +2,11 @@ includes:
   - phar://vendor/phpstan/phpstan/phpstan.phar/conf/bleedingEdge.neon
   - vendor/phpstan/phpstan-phpunit/extension.neon
   - vendor/phpstan/phpstan-strict-rules/rules.neon
-  - vendor/thecodingmachine/phpstan-safe-rule/phpstan-safe-rule.neon
 
 parameters:
   level: max
   treatPhpDocTypesAsCertain: false
-  checkExplicitMixed: true  
+  checkExplicitMixed: true
 
   ignoreErrors:
     - '#^Dynamic call to static method PHPUnit\\Framework\\(TestCase|Assert)::[a-zA-Z]+\(\)\.$#'
diff --git a/src/CannotExtractAggregateId.php b/src/CannotExtractAggregateId.php
@@ -15,7 +15,7 @@ final class CannotExtractAggregateId extends \RuntimeException
     private function __construct(object $aggregateRoot, string $cause = '', ?\Throwable $previous = null)
     {
         parent::__construct(
-            \Safe\sprintf(
+            \sprintf(
                 'Cannot extract an aggregate id from aggregate root %s<%s>.',
                 \get_class($aggregateRoot),
                 \spl_object_hash($aggregateRoot)

diff --git a/src/CannotResolveAggregateType.php b/src/CannotResolveAggregateType.php
@@ -15,7 +15,7 @@ final class CannotResolveAggregateType extends \RuntimeException
     private function __construct(object $aggregateRoot, string $cause = '', ?\Throwable $previous = null)
     {
         parent::__construct(
-            \Safe\sprintf(
+            \sprintf(
                 'Cannot resolve an aggregate type for aggregate root %s<%s>.',
                 \get_class($aggregateRoot),
                 \spl_object_hash($aggregateRoot)

diff --git a/tests/fixture/Blog/Domain/UserId.php b/tests/fixture/Blog/Domain/UserId.php
@@ -28,7 +28,7 @@ public static function fromUuid4(UuidInterface $uuid): self
 
         if (!$fields instanceof FieldsInterface || $fields->getVersion() !== 4) {
             throw new \InvalidArgumentException(
-                \Safe\sprintf('UUID must be V4, the provided string %s does not conform.', $uuid)
+                \sprintf('UUID must be V4, the provided string %s does not conform.', $uuid)
             );
         }
 

diff --git a/tests/fixture/Blog/Domain/Version.php b/tests/fixture/Blog/Domain/Version.php
@@ -11,7 +11,7 @@ final class Version
     private function __construct(int $value)
     {
         if ($value < 1) {
-            throw new \InvalidArgumentException(\Safe\sprintf('Value must be > 0, %d given.', $value));
+            throw new \InvalidArgumentException(\sprintf('Value must be > 0, %d given.', $value));
         }
 
         $this->value = $value;

diff --git a/tests/helper/ValueObjectAssertions.php b/tests/helper/ValueObjectAssertions.php
@@ -1,5 +1,6 @@
 <?php
 
+
 declare(strict_types=1);
 
 namespace Tests\Helper\Lendable\Aggregate;
@@ -14,7 +15,7 @@ protected function makeSimpleAssertion(bool $assertion, string $expected, string
     {
         $this->assertTrue(
             $assertion,
-            \Safe\sprintf('Expected "%s", got "%s".', $expected, $actual)
+            \sprintf('Expected "%s", got "%s".', $expected, $actual)
         );
     }
 

diff --git a/tests/unit/CannotExtractAggregateIdTest.php b/tests/unit/CannotExtractAggregateIdTest.php
@@ -27,7 +27,7 @@ public function it_constructs_as_expected(string $cause, ?\Throwable $previous):
 
     private function createExpectedExceptionMessage(object $aggregateRoot, string $cause): string
     {
-        return \Safe\sprintf(
+        return \sprintf(
             'Cannot extract an aggregate id from aggregate root %s<%s>.',
             \get_class($aggregateRoot),
             \spl_object_hash($aggregateRoot)

diff --git a/tests/unit/CannotResolveAggregateTypeTest.php b/tests/unit/CannotResolveAggregateTypeTest.php
@@ -27,7 +27,7 @@ public function it_constructs_as_expected(string $cause, ?\Throwable $previous):
 
     private function createExpectedExceptionMessage(object $aggregateRoot, string $cause): string
     {
-        return \Safe\sprintf(
+        return \sprintf(
             'Cannot resolve an aggregate type for aggregate root %s<%s>.',
             \get_class($aggregateRoot),
             \spl_object_hash($aggregateRoot)

diff --git a/tests/unit/ClosureAggregateTypeResolverTest.php b/tests/unit/ClosureAggregateTypeResolverTest.php
@@ -23,7 +23,7 @@ protected function createResolver(): AggregateTypeResolver
         return new ClosureAggregateTypeResolver(
             static function (object $user): AggregateType {
                 if (!$user instanceof User) {
-                    throw CannotResolveAggregateType::of($user, \Safe\sprintf('Not an instance of %s.', User::class));
+                    throw CannotResolveAggregateType::of($user, \sprintf('Not an instance of %s.', User::class));
                 }
 
                 return AggregateType::fromString('USER');