bot: fix cs [skip ci]

zenstruck · Feb 1, 2024 · a1e2480 · a1e2480
1 parent 57c0cb9
commit a1e2480
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 51 deletions.
diff --git a/src/Assert/Expectation.php b/src/Assert/Expectation.php
@@ -49,7 +49,7 @@ public function and($value): self
     /**
      * Assert the expectation value is empty (if countable, has a count of 0).
      *
-     * @param Assert\string|null $message Available context: {actual}, {count} (if countable)
+     * @param string|null $message Available context: {actual}, {count} (if countable)
      */
     public function isEmpty(?string $message = null, array $context = []): self
     {
@@ -61,7 +61,7 @@ public function isEmpty(?string $message = null, array $context = []): self
     /**
      * Assert the expectation value is NOT empty (if countable, has a count > 0).
      *
-     * @param Assert\string|null $message Available context: {actual}
+     * @param string|null $message Available context: {actual}
      */
     public function isNotEmpty(?string $message = null, array $context = []): self
     {
@@ -73,7 +73,7 @@ public function isNotEmpty(?string $message = null, array $context = []): self
     /**
      * Assert the expectation value is null.
      *
-     * @param Assert\string|null $message Available context: {actual}
+     * @param string|null $message Available context: {actual}
      */
     public function isNull(?string $message = null, array $context = []): self
     {
@@ -99,7 +99,7 @@ public function isNotNull(?string $message = null, array $context = []): self
     /**
      * Assert the expectation is an instance of $expected.
      *
-     * @param Assert\string|null $message Available context: {actual}, {expected}
+     * @param string|null $message Available context: {actual}, {expected}
      */
     public function isInstanceOf(string $expected, ?string $message = null, array $context = []): self
     {
@@ -115,7 +115,7 @@ public function isInstanceOf(string $expected, ?string $message = null, array $c
     /**
      * Assert the expectation is NOT an instance of $expected.
      *
-     * @param Assert\string|null $message Available context: {actual}, {expected}
+     * @param string|null $message Available context: {actual}, {expected}
      */
     public function isNotInstanceOf(string $expected, ?string $message = null, array $context = []): self
     {
@@ -131,7 +131,7 @@ public function isNotInstanceOf(string $expected, ?string $message = null, array
     /**
      * Assert the expectation value has the expected $count.
      *
-     * @param Assert\string|null $message Available context: {expected}, {actual}, {haystack}
+     * @param string|null $message Available context: {expected}, {actual}, {haystack}
      */
     public function hasCount(int $count, ?string $message = null, array $context = []): self
     {
@@ -143,7 +143,7 @@ public function hasCount(int $count, ?string $message = null, array $context = [
     /**
      * Assert the expectation value does NOT have the expected $count.
      *
-     * @param Assert\string|null $message Available context: {expected}, {haystack}
+     * @param string|null $message Available context: {expected}, {haystack}
      */
     public function doesNotHaveCount(int $count, ?string $message = null, array $context = []): self
     {
@@ -157,9 +157,9 @@ public function doesNotHaveCount(int $count, ?string $message = null, array $con
      * value is a string, str_contains() is used, if it's iterable, in_array()
      * is used.
      *
-     * @param mixed              $needle
-     * @param Assert\string|null $message Available context: {needle}, {haystack}
-     * @param bool               $strict  Use in_array() strict comparison or case-sensitive str_contains()
+     * @param mixed       $needle
+     * @param string|null $message Available context: {needle}, {haystack}
+     * @param bool        $strict  Use in_array() strict comparison or case-sensitive str_contains()
      */
     public function contains($needle, ?string $message = null, array $context = [], bool $strict = true): self
     {
@@ -173,9 +173,9 @@ public function contains($needle, ?string $message = null, array $context = [],
      * value is a string, str_contains() is used, if it's iterable, in_array()
      * is used.
      *
-     * @param mixed              $needle
-     * @param Assert\string|null $message Available context: {needle}, {haystack}
-     * @param bool               $strict  Use in_array() strict comparison or case-sensitive str_contains()
+     * @param mixed       $needle
+     * @param string|null $message Available context: {needle}, {haystack}
+     * @param bool        $strict  Use in_array() strict comparison or case-sensitive str_contains()
      */
     public function doesNotContain($needle, ?string $message = null, array $context = [], bool $strict = true): self
     {
@@ -187,8 +187,8 @@ public function doesNotContain($needle, ?string $message = null, array $context
     /**
      * Asserts the expectation value and $expected are "equal" using "==".
      *
-     * @param mixed              $expected
-     * @param Assert\string|null $message  Available context: {expected}, {actual}
+     * @param mixed       $expected
+     * @param string|null $message  Available context: {expected}, {actual}
      */
     public function equals($expected, ?string $message = null, array $context = []): self
     {
@@ -200,8 +200,8 @@ public function equals($expected, ?string $message = null, array $context = []):
     /**
      * Asserts the expectation value and $expected are NOT "equal" using "!=".
      *
-     * @param mixed              $expected
-     * @param Assert\string|null $message  Available context: {expected}, {actual}
+     * @param mixed       $expected
+     * @param string|null $message  Available context: {expected}, {actual}
      */
     public function isNotEqualTo($expected, ?string $message = null, array $context = []): self
     {
@@ -253,14 +253,14 @@ public function isFalsy(string $message = 'Expected "{actual}" to be "falsy".',
     /**
      * Asserts the expectation value and $expected are "the same" using "===".
      *
-     * If a {@see Assert\Type} object is passed as expected, asserts the type matches.
+     * If a {@see Type} object is passed as expected, asserts the type matches.
      *
-     * @param mixed|Type         $expected
-     * @param Assert\string|null $message  Available context: {expected}, {actual}
+     * @param mixed|Type  $expected
+     * @param string|null $message  Available context: {expected}, {actual}
      */
     public function is($expected, ?string $message = null, array $context = []): self
     {
-        if ($expected instanceof Assert\Type) {
+        if ($expected instanceof Type) {
             Assert::run(new TypeAssertion($this->value, $expected, $message, $context));
 
             return $this;
@@ -274,14 +274,14 @@ public function is($expected, ?string $message = null, array $context = []): sel
     /**
      * Asserts the expectation value and $expected are NOT "the same" using "!==".
      *
-     * If a {@see Assert\Type} object is passed as expected, asserts the type DOES NOT matche.
+     * If a {@see Type} object is passed as expected, asserts the type DOES NOT matche.
      *
-     * @param mixed|Type         $expected
-     * @param Assert\string|null $message  Available context: {expected}, {actual}
+     * @param mixed|Type  $expected
+     * @param string|null $message  Available context: {expected}, {actual}
      */
     public function isNot($expected, ?string $message = null, array $context = []): self
     {
-        if ($expected instanceof Assert\Type) {
+        if ($expected instanceof Type) {
             Assert::not(new TypeAssertion($this->value, $expected, $message, $context));
 
             return $this;
@@ -295,8 +295,8 @@ public function isNot($expected, ?string $message = null, array $context = []):
     /**
      * Asserts the expectation value is "greater than" $expected.
      *
-     * @param mixed              $expected
-     * @param Assert\string|null $message  Available context: {expected}, {actual}
+     * @param mixed       $expected
+     * @param string|null $message  Available context: {expected}, {actual}
      */
     public function isGreaterThan($expected, ?string $message = null, array $context = []): self
     {
@@ -308,8 +308,8 @@ public function isGreaterThan($expected, ?string $message = null, array $context
     /**
      * Asserts the expectation value is "greater than or equal to" $expected.
      *
-     * @param mixed              $expected
-     * @param Assert\string|null $message  Available context: {expected}, {actual}
+     * @param mixed       $expected
+     * @param string|null $message  Available context: {expected}, {actual}
      */
     public function isGreaterThanOrEqualTo($expected, ?string $message = null, array $context = []): self
     {
@@ -321,8 +321,8 @@ public function isGreaterThanOrEqualTo($expected, ?string $message = null, array
     /**
      * Asserts the expectation value is "less than" $expected.
      *
-     * @param mixed              $expected
-     * @param Assert\string|null $message  Available context: {expected}, {actual}
+     * @param mixed       $expected
+     * @param string|null $message  Available context: {expected}, {actual}
      */
     public function isLessThan($expected, ?string $message = null, array $context = []): self
     {
@@ -334,8 +334,8 @@ public function isLessThan($expected, ?string $message = null, array $context =
     /**
      * Asserts the expectation value is "less than or equal to" $expected.
      *
-     * @param mixed              $expected
-     * @param Assert\string|null $message  Available context: {expected}, {actual}
+     * @param mixed       $expected
+     * @param string|null $message  Available context: {expected}, {actual}
      */
     public function isLessThanOrEqualTo($expected, ?string $message = null, array $context = []): self
     {
@@ -345,8 +345,8 @@ public function isLessThanOrEqualTo($expected, ?string $message = null, array $c
     }
 
     /**
-     * @param string|iterable    $haystack
-     * @param Assert\string|null $message  Available context: {needle}, {haystack}
+     * @param string|iterable $haystack
+     * @param string|null     $message  Available context: {needle}, {haystack}
      */
     public function isSubsetOf($haystack, ?string $message = null, array $context = []): self
     {
@@ -356,8 +356,8 @@ public function isSubsetOf($haystack, ?string $message = null, array $context =
     }
 
     /**
-     * @param string|iterable    $needle
-     * @param Assert\string|null $message Available context: {needle}, {haystack}
+     * @param string|iterable $needle
+     * @param string|null     $message Available context: {needle}, {haystack}
      */
     public function hasSubset($needle, ?string $message = null, array $context = []): self
     {
@@ -367,8 +367,8 @@ public function hasSubset($needle, ?string $message = null, array $context = [])
     }
 
     /**
-     * @param string|iterable    $haystack
-     * @param Assert\string|null $message  Available context: {needle}, {haystack}
+     * @param string|iterable $haystack
+     * @param string|null     $message  Available context: {needle}, {haystack}
      */
     public function isNotSubsetOf($haystack, ?string $message = null, array $context = []): self
     {
@@ -378,8 +378,8 @@ public function isNotSubsetOf($haystack, ?string $message = null, array $context
     }
 
     /**
-     * @param string|iterable    $needle
-     * @param Assert\string|null $message Available context: {needle}, {haystack}
+     * @param string|iterable $needle
+     * @param string|null     $message Available context: {needle}, {haystack}
      */
     public function notHasSubset($needle, ?string $message = null, array $context = []): self
     {
@@ -394,13 +394,13 @@ public function notHasSubset($needle, ?string $message = null, array $context =
      * assertions within. Optionally pass $expectedMessage to assert the caught exception contains
      * this value.
      *
-     * @param string|callable    $expectedException string: class name of the expected exception
-     *                                              callable: uses the first argument's type-hint
-     *                                              to determine the expected exception class. When
-     *                                              exception is caught, callable is invoked with
-     *                                              the caught exception
-     * @param Assert\string|null $expectedMessage   Assert the caught exception message "contains"
-     *                                              this string
+     * @param string|callable $expectedException string: class name of the expected exception
+     *                                           callable: uses the first argument's type-hint
+     *                                           to determine the expected exception class. When
+     *                                           exception is caught, callable is invoked with
+     *                                           the caught exception
+     * @param string|null     $expectedMessage   Assert the caught exception message "contains"
+     *                                           this string
      */
     public function throws($expectedException, ?string $expectedMessage = null): self
     {

diff --git a/tests/AssertTest.php b/tests/AssertTest.php
@@ -21,7 +21,7 @@
  */
 final class AssertTest extends TestCase
 {
-    use Assert\Tests\HasTraceableHandler;
+    use HasTraceableHandler;
 
     /**
      * @test

diff --git a/tests/ExpectationTest.php b/tests/ExpectationTest.php
@@ -22,7 +22,7 @@
  */
 final class ExpectationTest extends TestCase
 {
-    use Assert\Tests\HasTraceableHandler;
+    use HasTraceableHandler;
 
     /**
      * @test

diff --git a/tests/HasTraceableHandler.php b/tests/HasTraceableHandler.php
@@ -19,7 +19,7 @@
  */
 trait HasTraceableHandler
 {
-    use Assert\Tests\ResetHandler;
+    use ResetHandler;
 
     /** @var TraceableHandler */
     private $handler;