Merge pull request #252 from fredemmott/datetime-override

Datetime override
mockery · Jan 19, 2014 · 5f146b7 · 5f146b7
2 parents 067918f + 16dcec7
commit 5f146b7
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 0 deletions.
diff --git a/library/Mockery/Adapter/Phpunit/TestListener.php b/library/Mockery/Adapter/Phpunit/TestListener.php
@@ -71,6 +71,8 @@ public function addIncompleteTest(\PHPUnit_Framework_Test $test, \Exception $e,
 
     public function addSkippedTest(\PHPUnit_Framework_Test $test, \Exception $e, $time) {}
 
+    public function addRiskyTest(\PHPUnit_Framework_Test $test, \Exception $e, $time) {}
+
 
     public function endTestSuite(\PHPUnit_Framework_TestSuite $suite) {}
 

diff --git a/library/Mockery/Configuration.php b/library/Mockery/Configuration.php
@@ -103,6 +103,13 @@ public function setInternalClassMethodParamMap($class, $method, array $map)
         }
         $this->_internalClassParamMap[strtolower($class)][strtolower($method)] = $map;
     }
+
+    /**
+     * Remove all overriden parameter maps from internal PHP classes.
+     */
+    public function resetInternalClassMethodParamMaps() {
+        $this->_internalClassParamMap = array();
+    }
 
     /**
      * Get the parameter map of an internal PHP class method

diff --git a/tests/Mockery/ContainerTest.php b/tests/Mockery/ContainerTest.php
@@ -686,7 +686,37 @@ public function testMethodParamsPassedByReferenceHaveReferencePreserved()
         $this->assertEquals(1, $b);
     }
 
+    /**
+     * Meant to test the same logic as
+     * testCanOverrideExpectedParametersOfExtensionPHPClassesToPreserveRefs,
+     * but:
+     * - doesn't require an extension
+     * - isn't actually known to be used
+     */
     public function testCanOverrideExpectedParametersOfInternalPHPClassesToPreserveRefs()
+    {
+        \Mockery::getConfiguration()->setInternalClassMethodParamMap(
+            'DateTime', 'modify', array('&$string')
+        );
+        // @ used to avoid E_STRICT for incompatible signature
+        @$m = $this->container->mock('DateTime');
+        $this->assertInstanceOf("Mockery\MockInterface", $m, "Mocking failed, remove @ error suppresion to debug");
+        $m->shouldReceive('modify')->with(
+            \Mockery::on(function(&$string) {$string = 'foo'; return true;})
+        );
+        $data ='bar';
+        $m->modify($data);
+        $this->assertEquals('foo', $data);
+        $this->container->mockery_verify();
+        \Mockery::resetContainer();
+        \Mockery::getConfiguration()->resetInternalClassMethodParamMaps();
+    }
+
+    /**
+     * Real world version of
+     * testCanOverrideExpectedParametersOfInternalPHPClassesToPreserveRefs
+     */
+    public function testCanOverrideExpectedParametersOfExtensionPHPClassesToPreserveRefs()
     {
         if (!class_exists('MongoCollection', false)) $this->markTestSkipped('ext/mongo not installed');
         \Mockery::getConfiguration()->setInternalClassMethodParamMap(
@@ -705,6 +735,33 @@ public function testCanOverrideExpectedParametersOfInternalPHPClassesToPreserveR
         $this->assertEquals(123, $data['_id']);
         $this->container->mockery_verify();
         \Mockery::resetContainer();
+        \Mockery::getConfiguration()->resetInternalClassMethodParamMaps();
+    }
+
+    public function testCanCreateNonOverridenInstanceOfPreviouslyOverridenInternalClasses()
+    {
+        \Mockery::getConfiguration()->setInternalClassMethodParamMap(
+            'DateTime', 'modify', array('&$string')
+        );
+        // @ used to avoid E_STRICT for incompatible signature
+        @$m = $this->container->mock('DateTime');
+        $this->assertInstanceOf("Mockery\MockInterface", $m, "Mocking failed, remove @ error suppresion to debug");
+        $rc = new ReflectionClass($m);
+        $rm = $rc->getMethod('modify');
+        $params = $rm->getParameters();
+        $this->assertTrue($params[0]->isPassedByReference());
+
+        \Mockery::getConfiguration()->resetInternalClassMethodParamMaps();
+
+        $m = $this->container->mock('DateTime');
+        $this->assertInstanceOf("Mockery\MockInterface", $m, "Mocking failed");
+        $rc = new ReflectionClass($m);
+        $rm = $rc->getMethod('modify');
+        $params = $rm->getParameters();
+        $this->assertFalse($params[0]->isPassedByReference());
+
+        \Mockery::resetContainer();
+        \Mockery::getConfiguration()->resetInternalClassMethodParamMaps();
     }
 
     /**