Merge 266897a into 5f146b7

mockery · Jan 19, 2014 · 9faf949 · 9faf949
2 parents 5f146b7 + 266897a
commit 9faf949
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 52 deletions.
diff --git a/tests/Mockery/AdhocTest.php b/tests/Mockery/AdhocTest.php
@@ -29,7 +29,7 @@ public function setup ()
     {
         $this->container = new \Mockery\Container(\Mockery::getDefaultGenerator(), \Mockery::getDefaultLoader());
     }
-    
+
     public function teardown()
     {
         $this->container->mockery_close();

diff --git a/tests/Mockery/ContainerTest.php b/tests/Mockery/ContainerTest.php
@@ -548,7 +548,7 @@ public function testMockedStaticMethodsObeyMethodCounting()
      * @expectedException BadMethodCallException
      */
     public function testMockedStaticThrowsExceptionWhenMethodDoesNotExist(){
-    	\Mockery::setContainer($this->container);
+        \Mockery::setContainer($this->container);
         $m = $this->container->mock('alias:MyNamespace\StaticNoMethod');
         $this->assertEquals('bar', \MyNameSpace\StaticNoMethod::staticFoo());
         \Mockery::resetContainer();
@@ -844,9 +844,9 @@ public function testMethodsReturningParamsByReferenceDoesNotErrorOut()
 
     public function testMockCallableTypeHint()
     {
-		if(PHP_VERSION_ID >= 50400) {
-        	$this->container->mock('MockeryTest_MockCallableTypeHint');
-		}
+        if(PHP_VERSION_ID >= 50400) {
+            $this->container->mock('MockeryTest_MockCallableTypeHint');
+        }
     }
 
     public function testCanMockClassWithReservedWordMethod()

diff --git a/tests/Mockery/Generator/MockConfigurationTest.php b/tests/Mockery/Generator/MockConfigurationTest.php
@@ -156,7 +156,7 @@ interface TestTraversableInterface3 extends \Traversable, \IteratorAggregate {}
 
 final class TestFinal {}
 
-interface TestInterface 
+interface TestInterface
 {
     public function foo();
 }

diff --git a/tests/Mockery/Generator/StringManipulation/Pass/CallTypeHintPassTest.php b/tests/Mockery/Generator/StringManipulation/Pass/CallTypeHintPassTest.php
@@ -7,7 +7,7 @@
 
 class CallTypeHintPassTest extends \PHPUnit_Framework_TestCase
 {
-    const CODE = ' public function __call($method, array $args) {} 
+    const CODE = ' public function __call($method, array $args) {}
                    public static function __callStatic($method, array $args) {}
     ';
 
@@ -22,8 +22,8 @@ public function shouldRemoveCallTypeHintIfRequired()
         ))->shouldDeferMissing();
         $code = $pass->apply(static::CODE, $config);
         $this->assertContains('__call($method, $args)', $code);
-    } 
- 
+    }
+
     /**
      * @test
      */
@@ -35,5 +35,5 @@ public function shouldRemoveCallStaticTypeHintIfRequired()
         ))->shouldDeferMissing();
         $code = $pass->apply(static::CODE, $config);
         $this->assertContains('__callStatic($method, $args)', $code);
-    } 
+    }
 }
diff --git a/tests/Mockery/Generator/StringManipulation/Pass/ClassNamePassTest.php b/tests/Mockery/Generator/StringManipulation/Pass/ClassNamePassTest.php
@@ -9,11 +9,11 @@
 class ClassNamePassTest extends \PHPUnit_Framework_TestCase
 {
     const CODE = "namespace Mockery; class Mock {}";
-    
+
     public function setup()
     {
        $this->pass = new ClassNamePass();
-    } 
+    }
 
     /**
      * @test
@@ -23,7 +23,7 @@ public function shouldRemoveNamespaceDefinition()
         $config = new MockConfiguration(array(), array(), array(), "Dave\Dave");
         $code = $this->pass->apply(static::CODE, $config);
         $this->assertNotContains('namespace Mockery;', $code);
-    } 
+    }
 
     /**
      * @test
@@ -34,7 +34,7 @@ public function shouldReplaceNamespaceIfClassNameIsNamespaced()
         $code = $this->pass->apply(static::CODE, $config);
         $this->assertNotContains('namespace Mockery;', $code);
         $this->assertContains('namespace Dave;', $code);
-    } 
+    }
 
     /**
      * @test

diff --git a/tests/Mockery/Generator/StringManipulation/Pass/InterfacePassTest.php b/tests/Mockery/Generator/StringManipulation/Pass/InterfacePassTest.php
@@ -43,5 +43,5 @@ public function shouldAddAnyInterfaceNamesToImplementsDefinition()
 
         $this->assertContains("implements MockInterface, \Dave\Dave, \Paddy\Paddy", $code);
     }
-    
+
 }
diff --git a/tests/Mockery/HamcrestExpectationTest.php b/tests/Mockery/HamcrestExpectationTest.php
@@ -27,30 +27,30 @@ public function setUp()
         $this->container = new \Mockery\Container(\Mockery::getDefaultGenerator(), \Mockery::getDefaultLoader());
         $this->mock = $this->container->mock('foo');
     }
-    
+
 
     public function tearDown()
     {
         \Mockery::getConfiguration()->allowMockingNonExistentMethods(true);
         $this->container->mockery_close();
     }
-    
+
     /** Just a quickie roundup of a few Hamcrest matchers to check nothing obvious out of place **/
-    
+
     public function testAnythingConstraintMatchesArgument()
     {
         $this->mock->shouldReceive('foo')->with(anything())->once();
         $this->mock->foo(2);
         $this->container->mockery_verify();
     }
-    
+
     public function testGreaterThanConstraintMatchesArgument()
     {
         $this->mock->shouldReceive('foo')->with(greaterThan(1))->once();
         $this->mock->foo(2);
         $this->container->mockery_verify();
     }
-    
+
     /**
      * @expectedException Mockery\Exception
      */
@@ -60,5 +60,5 @@ public function testGreaterThanConstraintNotMatchesArgument()
         $this->mock->foo(1);
         $this->container->mockery_verify();
     }
-    
+
 }
diff --git a/tests/Mockery/Loader/EvalLoaderTest.php b/tests/Mockery/Loader/EvalLoaderTest.php
@@ -12,5 +12,5 @@ class EvalLoaderTest extends LoaderTestCase
     public function getLoader()
     {
         return new EvalLoader();
-    } 
+    }
 }
diff --git a/tests/Mockery/Loader/RequireLoaderTest.php b/tests/Mockery/Loader/RequireLoaderTest.php
@@ -12,5 +12,5 @@ class RequireLoaderTest extends LoaderTestCase
     public function getLoader()
     {
         return new RequireLoader(sys_get_temp_dir());
-    } 
+    }
 }
diff --git a/tests/Mockery/MockClassWithUnknownTypeHintTest.php b/tests/Mockery/MockClassWithUnknownTypeHintTest.php
@@ -16,7 +16,7 @@
 
 namespace test\Mockery;
 
-class MockClassWithUnknownTypeHintTest extends \PHPUnit_Framework_TestCase 
+class MockClassWithUnknownTypeHintTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp() {
         $this->container = new \Mockery\Container;

diff --git a/tests/Mockery/MockTest.php b/tests/Mockery/MockTest.php
@@ -28,7 +28,7 @@ public function setup ()
     {
         $this->container = new \Mockery\Container(\Mockery::getDefaultGenerator(), \Mockery::getDefaultLoader());
     }
-    
+
     public function teardown()
     {
         $this->container->mockery_close();

diff --git a/tests/Mockery/MockingProtectedMethodsTest.php b/tests/Mockery/MockingProtectedMethodsTest.php
@@ -34,10 +34,10 @@ public function teardown()
         $this->container->mockery_close();
     }
 
-    /** 
-     * @test 
+    /**
+     * @test
      *
-     * This is a regression test, basically we don't want the mock handling 
+     * This is a regression test, basically we don't want the mock handling
      * interfering with calling protected methods partials
      */
     public function shouldAutomaticallyDeferCallsToProtectedMethodsForPartials()
@@ -46,10 +46,10 @@ public function shouldAutomaticallyDeferCallsToProtectedMethodsForPartials()
         $this->assertEquals("bar", $mock->bar());
     }
 
-    /** 
-     * @test 
+    /**
+     * @test
      *
-     * This is a regression test, basically we don't want the mock handling 
+     * This is a regression test, basically we don't want the mock handling
      * interfering with calling protected methods partials
      */
     public function shouldAutomaticallyDeferCallsToProtectedMethodsForRuntimePartials()

diff --git a/tests/Mockery/RecorderTest.php b/tests/Mockery/RecorderTest.php
@@ -26,7 +26,7 @@ public function setup ()
     {
         $this->container = new \Mockery\Container(\Mockery::getDefaultGenerator(), \Mockery::getDefaultLoader());
     }
-    
+
     public function teardown()
     {
         $this->container->mockery_close();
@@ -39,35 +39,35 @@ public function testRecorderWithSimpleObject()
             $user = new MockeryTestSubjectUser($subject);
             $user->doFoo();
         });
-        
+
         $this->assertEquals(1, $mock->foo());
         $mock->mockery_verify();
     }
-    
+
     public function testArgumentsArePassedAsMethodExpectations()
     {
         $mock = $this->container->mock(new MockeryTestSubject);
         $mock->shouldExpect(function ($subject) {
             $user = new MockeryTestSubjectUser($subject);
             $user->doBar();
         });
-        
+
         $this->assertEquals(4, $mock->bar(2));
         $mock->mockery_verify();
     }
-    
+
     public function testArgumentsLooselyMatchedByDefault()
     {
         $mock = $this->container->mock(new MockeryTestSubject);
         $mock->shouldExpect(function ($subject) {
             $user = new MockeryTestSubjectUser($subject);
             $user->doBar();
         });
-        
+
         $this->assertEquals(4, $mock->bar('2'));
         $mock->mockery_verify();
     }
-    
+
     public function testMultipleMethodExpectations()
     {
         $mock = $this->container->mock(new MockeryTestSubject);
@@ -76,12 +76,12 @@ public function testMultipleMethodExpectations()
             $user->doFoo();
             $user->doBar();
         });
-        
+
         $this->assertEquals(1, $mock->foo());
         $this->assertEquals(4, $mock->bar(2));
         $mock->mockery_verify();
     }
-    
+
     public function testRecordingDoesNotSpecifyExactOrderByDefault()
     {
         $mock = $this->container->mock(new MockeryTestSubject);
@@ -90,12 +90,12 @@ public function testRecordingDoesNotSpecifyExactOrderByDefault()
             $user->doFoo();
             $user->doBar();
         });
-        
+
         $this->assertEquals(4, $mock->bar(2));
         $this->assertEquals(1, $mock->foo());
         $mock->mockery_verify();
     }
-    
+
     /**
      * @expectedException \Mockery\Exception
      */
@@ -108,12 +108,12 @@ public function testRecordingDoesSpecifyExactOrderInStrictMode()
             $user->doFoo();
             $user->doBar();
         });
-        
+
         $mock->bar(2);
         $mock->foo();
         $mock->mockery_verify();
     }
-    
+
     /**
      * @expectedException \Mockery\Exception
      */
@@ -125,10 +125,10 @@ public function testArgumentsAreMatchedExactlyUnderStrictMode()
             $user = new MockeryTestSubjectUser($subject);
             $user->doBar();
         });
-        
+
         $mock->bar('2');
     }
-    
+
     /**
      * @expectedException \Mockery\Exception
      */
@@ -139,23 +139,23 @@ public function testThrowsExceptionWhenArgumentsNotExpected()
             $user = new MockeryTestSubjectUser($subject);
             $user->doBar();
         });
-        
+
         $mock->bar(4);
     }
-    
+
     public function testCallCountUnconstrainedByDefault()
     {
         $mock = $this->container->mock(new MockeryTestSubject);
         $mock->shouldExpect(function ($subject) {
             $user = new MockeryTestSubjectUser($subject);
             $user->doBar();
         });
-        
+
         $mock->bar(2);
         $this->assertEquals(4, $mock->bar(2));
         $mock->mockery_verify();
     }
-    
+
     /**
      * @expectedException \Mockery\CountValidator\Exception
      */
@@ -167,12 +167,12 @@ public function testCallCountConstrainedInStrictMode()
             $user = new MockeryTestSubjectUser($subject);
             $user->doBar();
         });
-        
+
         $mock->bar(2);
         $mock->bar(2);
         $mock->mockery_verify();
     }
-    
+
 }
 
 class MockeryTestSubject {