onlyMethods/addMethods - blank arrays fix

sebastianbergmann · Aug 2, 2019 · ae94283 · ae94283
1 parent e77a49b
commit ae94283
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/.psalm/baseline.xml b/.psalm/baseline.xml
@@ -198,7 +198,7 @@
     <PossiblyInvalidPropertyAssignmentValue occurrences="1">
       <code>$type</code>
     </PossiblyInvalidPropertyAssignmentValue>
-    <PossiblyNullPropertyAssignmentValue occurrences="1">
+    <PossiblyNullPropertyAssignmentValue occurrences="3">
       <code>null</code>
     </PossiblyNullPropertyAssignmentValue>
     <ArgumentTypeCoercion occurrences="2">

diff --git a/src/Framework/MockObject/MockBuilder.php b/src/Framework/MockObject/MockBuilder.php
@@ -207,6 +207,12 @@ public function setMethods(array $methods = null): self
      */
     public function onlyMethods(array $methods): self
     {
+        if (!$methods) {
+            $this->methods = null;
+
+            return $this;
+        }
+
         if ($this->alreadyUsedMockMethodConfiguration) {
             throw new RuntimeException(
                 \sprintf(
@@ -254,6 +260,12 @@ public function onlyMethods(array $methods): self
      */
     public function addMethods(array $methods): self
     {
+        if (!$methods) {
+            $this->methods = null;
+
+            return $this;
+        }
+
         if ($this->alreadyUsedMockMethodConfiguration) {
             throw new RuntimeException(
                 \sprintf(

diff --git a/tests/unit/Framework/MockObject/MockBuilderTest.php b/tests/unit/Framework/MockObject/MockBuilderTest.php
@@ -79,6 +79,15 @@ public function testOnlyMethodsWithExistingMethodNames(): void
         $this->assertTrue($mock->anotherMockableMethod());
     }
 
+    public function testOnlyMethodsWithBlankArray(): void
+    {
+        $mock = $this->getMockBuilder(Mockable::class)
+                    ->onlyMethods([])
+                    ->getMock();
+
+        $this->assertTrue($mock->mockableMethod());
+    }
+
     public function testAddMethodsWithNonExistentMethodNames(): void
     {
         $this->expectException(RuntimeException::class);
@@ -98,6 +107,15 @@ public function testAddMethodsWithExistingMethodNames(): void
         $this->assertTrue($mock->anotherMockableMethod());
     }
 
+    public function testAddMethodsWithBlankArray(): void
+    {
+        $mock = $this->getMockBuilder(Mockable::class)
+                     ->addMethods([])
+                     ->getMock();
+
+        $this->assertTrue($mock->mockableMethod());
+    }
+
     public function testEmptyMethodExceptionsToMockCanBeSpecified(): void
     {
         $mock = $this->getMockBuilder(Mockable::class)