diff --git a/src/Utilities/Miscellaneous.php b/src/Utilities/Miscellaneous.php index 7dd7e61..cdc1ef7 100644 --- a/src/Utilities/Miscellaneous.php +++ b/src/Utilities/Miscellaneous.php @@ -467,14 +467,14 @@ class Miscellaneous } /* - * First step: replace strings, simple operation with strings + * 1st step: replace strings, simple operation with strings */ if ($bothAreStrings) { $effect = str_replace($search, $replacement, $subject); } /* - * Second step: replace with regular expressions. + * 2nd step: replace with regular expressions. * Attention. Searched and replacement value should be the same type: strings or arrays. */ if ($effect === $subject && ($bothAreStrings || $bothAreArrays)) { @@ -492,7 +492,7 @@ class Miscellaneous } /* - * Third step: complex replace of the replacement defined as an array. + * 3rd step: complex replace of the replacement defined as an array. * It may be useful when you want to search for a one string and replace the string with multiple values. */ if ($effect === $subject && $searchIsString && $replacementIsArray) { diff --git a/tests/Utilities/MiscellaneousTest.php b/tests/Utilities/MiscellaneousTest.php index c2ed2bb..70c36c7 100644 --- a/tests/Utilities/MiscellaneousTest.php +++ b/tests/Utilities/MiscellaneousTest.php @@ -29,9 +29,6 @@ class MiscellaneousTest extends BaseTestCase private $stringDotSeparated; private $stringWithoutSpaces; - /** - * @throws ReflectionException - */ public function testConstructor() { static::assertHasNoConstructor(Miscellaneous::class); @@ -382,7 +379,7 @@ class MiscellaneousTest extends BaseTestCase mkdir($directory1Path, 0777, true); mkdir($directory2Path, 0777, true); - self::assertTrue(Miscellaneous::removeDirectory(sys_get_temp_dir() . '/lorem', false)); + self::assertTrue(Miscellaneous::removeDirectory(sys_get_temp_dir() . '/lorem')); } /** @@ -651,10 +648,6 @@ class MiscellaneousTest extends BaseTestCase self::assertEquals(255, Miscellaneous::getValidColorComponent(255, false)); } - /** - * @throws IncorrectColorHexLengthException - * @throws InvalidColorHexValueException - */ public function testGetInvertedColorWithIncorrectLength() { $this->setExpectedException(IncorrectColorHexLengthException::class); @@ -669,10 +662,6 @@ class MiscellaneousTest extends BaseTestCase Miscellaneous::getInvertedColor('1234567'); } - /** - * @throws IncorrectColorHexLengthException - * @throws InvalidColorHexValueException - */ public function testGetInvertedColorWithInvalidValue() { $this->setExpectedException(InvalidColorHexValueException::class); @@ -684,10 +673,6 @@ class MiscellaneousTest extends BaseTestCase Miscellaneous::getInvertedColor('00ppqq'); } - /** - * @throws IncorrectColorHexLengthException - * @throws InvalidColorHexValueException - */ public function testGetInvertedColor() { /* @@ -1501,10 +1486,6 @@ class MiscellaneousTest extends BaseTestCase protected function tearDown() { parent::tearDown(); - - unset($this->stringSmall); - unset($this->stringCommaSeparated); - unset($this->stringDotSeparated); - unset($this->stringWithoutSpaces); + unset($this->stringSmall, $this->stringCommaSeparated, $this->stringDotSeparated, $this->stringWithoutSpaces); } }