1 files changed, 60 insertions, 0 deletions
diff --git a/php-mock-phpunit/php-mock-phpunit-upstream.patch b/php-mock-phpunit/php-mock-phpunit-upstream.patch
new file mode 100644
index 0000000..bdb776a
--- /dev/null
+++ b/php-mock-phpunit/php-mock-phpunit-upstream.patch
@@ -0,0 +1,60 @@
+From 1dad555b26c919ac42803f4d84b72af4aeb529d0 Mon Sep 17 00:00:00 2001
+From: Markus Malkusch <markus@malkusch.de>
+Date: Wed, 11 Nov 2015 23:43:41 +0100
+Subject: [PATCH] [refactor] moved testDefineFunctionMock() into php-mock
+
+---
+ tests/PHPMockTest.php | 33 +++++----------------------------
+ 1 file changed, 5 insertions(+), 28 deletions(-)
+
+diff --git a/tests/PHPMockTest.php b/tests/PHPMockTest.php
+index dd0171c..fe59f78 100644
+--- a/tests/PHPMockTest.php
++++ b/tests/PHPMockTest.php
+@@ -17,6 +17,11 @@ class PHPMockTest extends AbstractMockTest
+ 
+     use PHPMock;
+     
++    protected function defineFunction($namespace, $functionName)
++    {
++        self::defineFunctionMock($namespace, $functionName);
++    }
++    
+     protected function mockFunction($namespace, $functionName, callable $function)
+     {
+         $mock = $this->getFunctionMock($namespace, $functionName);
+@@ -28,34 +33,6 @@ protected function disableMocks()
+     }
+     
+     /**
+-     * Tests defineFunctionMock().
+-     *
+-     * @test
+-     */
+-    public function testDefineFunctionMock()
+-    {
+-        self::defineFunctionMock(__NAMESPACE__, "escapeshellcmd");
+-        self::escapeshellcmd("foo");
+-        
+-        $mock = $this->getFunctionMock(__NAMESPACE__, "escapeshellcmd");
+-        $mock->expects($this->once())->willReturn("bar");
+-        
+-        $this->assertEquals("bar", self::escapeshellcmd("foo"));
+-    }
+-    
+-    /**
+-     * Returns the built-in call to escapeshellcmd().
+-     *
+-     * @param string $command Shell command.
+-     *
+-     * @return string The built-in call.
+-     */
+-    private static function escapeshellcmd($command)
+-    {
+-        return escapeshellcmd($command);
+-    }
+-    
+-    /**
+      * Tests building a mock with arguments.
+      *
+      * @test