Merge pull request #93 from laminas/4.4.x-merge-up-into-4.5.x_81Sfg3MR

Merge release 4.4.2 into 4.5.x
laminas · Jul 9, 2021 · 17fd2af · 17fd2af
2 parents e29ca9d + 54251ab
commit 17fd2af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Generator/MethodGenerator.php b/src/Generator/MethodGenerator.php
@@ -15,7 +15,7 @@
 use function strtolower;
 use function substr;
 use function trim;
-use function usort;
+use function uasort;
 
 class MethodGenerator extends AbstractMemberGenerator
 {
@@ -315,7 +315,7 @@ public function setReturnsReference($returnsReference)
      */
     private function sortParameters(): void
     {
-        usort($this->parameters, static function (ParameterGenerator $item1, ParameterGenerator $item2) {
+        uasort($this->parameters, static function (ParameterGenerator $item1, ParameterGenerator $item2) {
             return $item1->getPosition() <=> $item2->getPosition();
         });
     }

diff --git a/test/Generator/MethodGeneratorTest.php b/test/Generator/MethodGeneratorTest.php
@@ -106,7 +106,7 @@ public function testSetMethodParameters()
             return $parameter->getName();
         }, $params);
 
-        self::assertEquals(['foo', 'baz', 'bar'], $sorting);
+        self::assertEquals(['foo' => 'foo', 'baz' => 'baz', 'bar' => 'bar'], $sorting);
     }
 
     public function testMethodBodyGetterAndSetter()