Use getMockBuilder() to prevent warnings

aimeos · Aug 14, 2016 · 117540b · 117540b
1 parent ca0fbe6
commit 117540b
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/lib/custom/tests/MW/View/Helper/Url/FlowTest.php b/lib/custom/tests/MW/View/Helper/Url/FlowTest.php
@@ -33,21 +33,26 @@ protected function setUp()
 		$view = new \Aimeos\MW\View\Standard();
 
 		$mockHttpRequest = $this->getMockBuilder( 'TYPO3\Flow\Http\Request' )
-			->disableOriginalConstructor()
 			->setMethods( array( 'getBaseUri' ) )
+			->disableOriginalConstructor()
 			->getMock();
 		$mockHttpRequest->expects( $this->any() )
 			->method( 'getBaseUri' )
 			->will( $this->returnValue( 'http://localhost/' ) );
 
-		$mockMainRequest = $this->getMock( 'TYPO3\Flow\Mvc\ActionRequest',
-			array( 'getControllerObjectName', 'getArgumentNamespace' ), array( $mockHttpRequest ) );
+		$mockMainRequest = $this->getMockBuilder( 'TYPO3\Flow\Mvc\ActionRequest' )
+			->setMethods( array( 'getControllerObjectName', 'getArgumentNamespace' ) )
+			->setConstructorArgs( array( $mockHttpRequest ) )
+			->getMock();
 		$mockMainRequest->expects( $this->any() )
 			->method( 'getArgumentNamespace' )
 			->will( $this->returnValue( 'ai' ) );
 
 		$this->mockRouter = $this->getMockBuilder( 'TYPO3\Flow\Mvc\Routing\Router' )->getMock();
-		$mockEnv = $this->getMock( 'TYPO3\Flow\Utility\Environment', array( 'isRewriteEnabled' ), array(), '', false );
+		$mockEnv = $this->getMockBuilder( 'TYPO3\Flow\Utility\Environment' )
+			->setMethods( array( 'isRewriteEnabled' ) )
+			->disableOriginalConstructor()
+			->getMock();
 
 		$builder = new \TYPO3\Flow\Mvc\Routing\UriBuilder();
 		$builder->setRequest( $mockMainRequest );