Merge branch '7.3'

ezpublishlegacy · Aug 23, 2018 · 5dd42dc · 5dd42dc
2 parents 42d4850 + 0c42e41
commit 5dd42dc
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 15 deletions.
diff --git a/src/Framework/Assert.php b/src/Framework/Assert.php
@@ -287,8 +287,6 @@ public static function assertAttributeNotContains($needle, string $haystackAttri
     /**
      * Asserts that a haystack contains only values of a given type.
      *
-     * @param null|bool $isNativeType
-     *
      * @throws ExpectationFailedException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      */
@@ -349,8 +347,6 @@ public static function assertAttributeContainsOnly(string $type, string $haystac
     /**
      * Asserts that a haystack does not contain only values of a given type.
      *
-     * @param null|bool $isNativeType
-     *
      * @throws ExpectationFailedException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      */

diff --git a/src/Framework/Assert/Functions.php b/src/Framework/Assert/Functions.php
@@ -157,8 +157,6 @@ function assertAttributeNotContains($needle, string $haystackAttributeName, $hay
 /**
  * Asserts that a haystack contains only values of a given type.
  *
- * @param null|bool $isNativeType
- *
  * @throws Exception
  * @throws ExpectationFailedException
  * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
@@ -197,8 +195,6 @@ function assertAttributeContainsOnly(string $type, string $haystackAttributeName
 /**
  * Asserts that a haystack does not contain only values of a given type.
  *
- * @param null|bool $isNativeType
- *
  * @throws Exception
  * @throws ExpectationFailedException
  * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException

diff --git a/src/Framework/ExceptionWrapper.php b/src/Framework/ExceptionWrapper.php
@@ -102,8 +102,6 @@ public function getOriginalException(): ?Throwable
      * Method to contain static originalException to exclude it from stacktrace to prevent the stacktrace contents,
      * which can be quite big, from being garbage-collected, thus blocking memory until shutdown.
      * Approach works both for var_dump() and var_export() and print_r()
-     *
-     * @param null|Throwable $exceptionToStore
      */
     private function originalException(Throwable $exceptionToStore = null): ?Throwable
     {

diff --git a/src/Framework/MockObject/MockBuilder.php b/src/Framework/MockObject/MockBuilder.php
@@ -177,8 +177,6 @@ public function getMockForTrait()
     /**
      * Specifies the subset of methods to mock. Default is to mock none of them.
      *
-     * @param null|array $methods
-     *
      * @return MockBuilder
      */
     public function setMethods(array $methods = null)

diff --git a/src/Util/TestDox/NamePrettifier.php b/src/Util/TestDox/NamePrettifier.php
@@ -69,9 +69,9 @@ public function prettifyTestCase(TestCase $test): string
                 $annotation   = $annotations['method']['testdox'][0];
                 $providedData = $this->mapTestMethodParameterNamesToProvidedDataValues($test);
 
-                $result = trim(
-                    str_replace(
-                        array_keys($providedData),
+                $result = \trim(
+                    \str_replace(
+                        \array_keys($providedData),
                         $providedData,
                         $annotation
                     )