Skip to content

Commit c9b2751

Browse files
merkmerk
committed
Fix test CS
1 parent 09b63b2 commit c9b2751

File tree

9 files changed

+72
-36
lines changed

9 files changed

+72
-36
lines changed

‎Tests/DependencyInjection/Compiler/ConfigurationCheckPassTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class ConfigurationCheckPassTest extends \PHPUnit_Framework_TestCase
2727
*/
2828
public function testShouldThrowRuntimeExceptionWhenFOSRestBundleAnnotations()
2929
{
30-
$container = $this->getMock('\Symfony\Component\DependencyInjection\ContainerBuilder');
30+
$container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
3131
$container->expects($this->at(0))
3232
->method('has')
3333
->with($this->equalTo('sensio_framework_extra.view.listener'))
@@ -48,7 +48,7 @@ public function testShouldThrowRuntimeExceptionWhenBodyConverterIsEnabledButPara
4848
'RuntimeException',
4949
'You need to enable the parameter converter listeners in SensioFrameworkExtraBundle when using the FOSRestBundle RequestBodyParamConverter'
5050
);
51-
$container = $this->getMock('\Symfony\Component\DependencyInjection\ContainerBuilder');
51+
$container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
5252
$container->expects($this->at(1))
5353
->method('has')
5454
->with($this->equalTo('fos_rest.converter.request_body'))

‎Tests/DependencyInjection/FOSRestExtensionTest.php‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,20 +193,44 @@ public function testConfigLoad()
193193
*/
194194
public function testLoadBadClassThrowsException()
195195
{
196-
$this->extension->load(array('fos_rest' => array('exception' => array('messages'=> array('UnknownException' => true)))), $this->container);
196+
$this->extension->load(array(
197+
'fos_rest' => array(
198+
'exception' => array(
199+
'messages'=> array(
200+
'UnknownException' => true
201+
)
202+
)
203+
)
204+
), $this->container);
197205
}
198206

199207
/**
200208
* @expectedException \InvalidArgumentException
201209
*/
202210
public function testLoadBadMessagesClassThrowsException()
203211
{
204-
$this->extension->load(array('fos_rest' => array('exception' => array('codes'=> array('UnknownException' => 404)))), $this->container);
212+
$this->extension->load(array(
213+
'fos_rest' => array(
214+
'exception' => array(
215+
'codes'=> array(
216+
'UnknownException' => 404
217+
)
218+
)
219+
)
220+
), $this->container);
205221
}
206222

207223
public function testLoadOkMessagesClass()
208224
{
209-
$this->extension->load(array('fos_rest' => array('exception' => array('codes'=> array('\Exception' => 404)))), $this->container);
225+
$this->extension->load(array(
226+
'fos_rest' => array(
227+
'exception' => array(
228+
'codes'=> array(
229+
'Exception' => 404
230+
)
231+
)
232+
)
233+
), $this->container);
210234
$this->assertFalse($this->container->hasDefinition('fos_rest.exception.codes'));
211235
}
212236

‎Tests/EventListener/BodyListenerTest.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function testOnKernelRequest($decode, $request, $method, $contentType, $e
4545
$listener = new BodyListener($decoderProvider);
4646

4747
if ($decode) {
48-
$container = $this->getMock('\Symfony\Component\DependencyInjection\Container', array('get'));
48+
$container = $this->getMock('Symfony\Component\DependencyInjection\Container', array('get'));
4949
$container
5050
->expects($this->once())
5151
->method('get')
@@ -57,7 +57,9 @@ public function testOnKernelRequest($decode, $request, $method, $contentType, $e
5757

5858
$request->setMethod($method);
5959
$request->headers = new HeaderBag(array('Content-Type' => $contentType));
60-
$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
60+
$event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')
61+
->disableOriginalConstructor()
62+
->getMock();
6163
$event->expects($this->once())
6264
->method('getRequest')
6365
->will($this->returnValue($request));

‎Tests/EventListener/FormatListenerTest.php‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,19 @@ class FormatListenerTest extends \PHPUnit_Framework_TestCase
2525
{
2626
public function testOnKernelControllerNegotiation()
2727
{
28-
$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
28+
$event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')
29+
->disableOriginalConstructor()
30+
->getMock();
2931

3032
$request = new Request();
3133

3234
$event->expects($this->once())
3335
->method('getRequest')
3436
->will($this->returnValue($request));
3537

36-
$formatNegotiator = $this->getMockBuilder('FOS\RestBundle\Util\FormatNegotiator')->disableOriginalConstructor()->getMock();
38+
$formatNegotiator = $this->getMockBuilder('FOS\RestBundle\Util\FormatNegotiator')
39+
->disableOriginalConstructor()
40+
->getMock();
3741
$formatNegotiator->expects($this->once())
3842
->method('getBestFormat')
3943
->will($this->returnValue('xml'));
@@ -50,7 +54,9 @@ public function testOnKernelControllerNegotiation()
5054
*/
5155
public function testOnKernelControllerException()
5256
{
53-
$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
57+
$event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')
58+
->disableOriginalConstructor()
59+
->getMock();
5460

5561
$request = new Request();
5662

@@ -62,7 +68,9 @@ public function testOnKernelControllerException()
6268
->method('getRequestType')
6369
->will($this->returnValue(HttpKernelInterface::MASTER_REQUEST));
6470

65-
$formatNegotiator = $this->getMockBuilder('FOS\RestBundle\Util\FormatNegotiator')->disableOriginalConstructor()->getMock();
71+
$formatNegotiator = $this->getMockBuilder('FOS\RestBundle\Util\FormatNegotiator')
72+
->disableOriginalConstructor()
73+
->getMock();
6674

6775
$listener = new FormatListener($formatNegotiator);
6876

‎Tests/EventListener/MimeTypeListenerTest.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ class MimeTypeListenerTest extends \PHPUnit_Framework_TestCase
2424
{
2525
public function testOnKernelRequest()
2626
{
27-
$formatNegotiator = $this->getMockBuilder('FOS\RestBundle\Util\FormatNegotiator')->disableOriginalConstructor()->getMock();
27+
$formatNegotiator = $this->getMockBuilder('FOS\RestBundle\Util\FormatNegotiator')
28+
->disableOriginalConstructor()->getMock();
2829
$formatNegotiator->expects($this->any())
2930
->method('registerFormat')
3031
->with('jsonp', array('application/javascript+jsonp'), true)
@@ -33,7 +34,8 @@ public function testOnKernelRequest()
3334
$listener = new MimeTypeListener(array('jsonp' => array('application/javascript+jsonp')), $formatNegotiator);
3435

3536
$request = new Request;
36-
$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
37+
$event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')
38+
->disableOriginalConstructor()->getMock();
3739
$event->expects($this->any())
3840
->method('getRequest')
3941
->will($this->returnValue($request));

‎Tests/Request/ParamFetcherTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function setup()
3535
{
3636
$this->controller = array(new \stdClass(), 'indexAction');
3737

38-
$this->paramReader = $this->getMockBuilder('\FOS\RestBundle\Request\ParamReader')
38+
$this->paramReader = $this->getMockBuilder('FOS\RestBundle\Request\ParamReader')
3939
->disableOriginalConstructor()
4040
->getMock();
4141

‎Tests/Request/ParamReaderTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class ParamReaderTest extends \PHPUnit_Framework_TestCase
2929
*/
3030
public function setup()
3131
{
32-
$annotationReader = $this->getMock('\Doctrine\Common\Annotations\Reader');
32+
$annotationReader = $this->getMock('Doctrine\Common\Annotations\Reader');
3333

3434
$annotations = array();
3535
$foo = new QueryParam;

‎Tests/View/JsonpHandlerTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ public function testHandle($query, $callbackFilter = '/(^[a-z0-9_]+$)|(^YUI\.Env
3636
$jsonpHandler = new JsonpHandler(key($query), $callbackFilter);
3737
$viewHandler->registerHandler('jsonp', array($jsonpHandler, 'createResponse'));
3838

39-
$container = $this->getMock('\Symfony\Component\DependencyInjection\Container', array('get', 'getParameter'));
40-
$serializer = $this->getMock('\stdClass', array('serialize', 'setVersion'));
39+
$container = $this->getMock('Symfony\Component\DependencyInjection\Container', array('get', 'getParameter'));
40+
$serializer = $this->getMock('stdClass', array('serialize', 'setVersion'));
4141
$serializer
4242
->expects($this->once())
4343
->method('serialize')
@@ -87,8 +87,8 @@ public function testGetCallbackFailure(Request $request, $callbackFilter = '/(^[
8787
$jsonpHandler = new JsonpHandler('callback', $callbackFilter);
8888
$viewHandler->registerHandler('jsonp', array($jsonpHandler, 'createResponse'));
8989

90-
$container = $this->getMock('\Symfony\Component\DependencyInjection\Container', array('get', 'getParameter'));
91-
$serializer = $this->getMock('\stdClass', array('serialize', 'setVersion'));
90+
$container = $this->getMock('Symfony\Component\DependencyInjection\Container', array('get', 'getParameter'));
91+
$serializer = $this->getMock('stdClass', array('serialize', 'setVersion'));
9292
$serializer
9393
->expects($this->once())
9494
->method('serialize')

‎Tests/View/ViewHandlerTest.php‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ public function testRegisterHandleExpectsException()
7070
*/
7171
public function testGetStatusCode($expected, $data, $isBound, $isValid, $isBoundCalled, $isValidCalled, $noContentCode)
7272
{
73-
$reflectionMethod = new \ReflectionMethod('\FOS\RestBundle\View\ViewHandler', 'getStatusCode');
73+
$reflectionMethod = new \ReflectionMethod('FOS\RestBundle\View\ViewHandler', 'getStatusCode');
7474
$reflectionMethod->setAccessible(true);
7575

76-
$form = $this->getMock('\Symfony\Component\Form\Form', array('isBound', 'isValid'), array(), '', false);
76+
$form = $this->getMock('Symfony\Component\Form\Form', array('isBound', 'isValid'), array(), '', false);
7777
$form
7878
->expects($this->exactly($isBoundCalled))
7979
->method('isBound')
@@ -132,7 +132,7 @@ public static function createResponseWithLocationDataProvider()
132132
public function testCreateResponseWithLocationAndData()
133133
{
134134
$testValue = array('naviter' => 'oudie');
135-
$container = $this->getMock('\Symfony\Component\DependencyInjection\Container', array('get', 'getParameter'));
135+
$container = $this->getMock('Symfony\Component\DependencyInjection\Container', array('get', 'getParameter'));
136136
$this->setupMockedSerializer($container, $testValue);
137137

138138
$viewHandler = new ViewHandler(array('json' => false));
@@ -150,7 +150,7 @@ public function testCreateResponseWithLocationAndData()
150150

151151
public function testCreateResponseWithRoute()
152152
{
153-
$container = $this->getMock('\Symfony\Component\DependencyInjection\Container', array('get'));
153+
$container = $this->getMock('Symfony\Component\DependencyInjection\Container', array('get'));
154154

155155
$doRoute = function ($name, $parameters) {
156156
$route = '/';
@@ -194,9 +194,9 @@ public function testCreateResponseWithoutLocation($format, $expected, $createVie
194194
{
195195
$viewHandler = new ViewHandler(array('html' => true, 'json' => false));
196196

197-
$container = $this->getMock('\Symfony\Component\DependencyInjection\Container', array('get', 'getParameter'));
197+
$container = $this->getMock('Symfony\Component\DependencyInjection\Container', array('get', 'getParameter'));
198198
if ('html' === $format) {
199-
$templating = $this->getMockBuilder('\Symfony\Bundle\FrameworkBundle\Templating\PhpEngine')
199+
$templating = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Templating\PhpEngine')
200200
->setMethods(array('render'))
201201
->disableOriginalConstructor()
202202
->getMock();
@@ -218,7 +218,7 @@ public function testCreateResponseWithoutLocation($format, $expected, $createVie
218218
$viewHandler->setContainer($container);
219219

220220
if ($form) {
221-
$data = $this->getMock('\Symfony\Component\Form\Form', array('createView', 'getData', 'isValid', 'isBound'), array(), '', false);
221+
$data = $this->getMock('Symfony\Component\Form\Form', array('createView', 'getData', 'isValid', 'isBound'), array(), '', false);
222222
$data
223223
->expects($this->exactly($createViewCalls))
224224
->method('createView')
@@ -246,7 +246,7 @@ public function testCreateResponseWithoutLocation($format, $expected, $createVie
246246

247247
private function setupMockedSerializer($container, $expected)
248248
{
249-
$serializer = $this->getMockBuilder('\JMS\Serializer\Serializer')
249+
$serializer = $this->getMockBuilder('JMS\Serializer\Serializer')
250250
->setMethods(array('serialize'))
251251
->disableOriginalConstructor()
252252
->getMock();
@@ -304,11 +304,11 @@ public static function createResponseWithoutLocationDataProvider()
304304
public function testSerializeNull($expected, $serializeNull)
305305
{
306306
$viewHandler = new ViewHandler(array('json' => false), 404, 200, $serializeNull);
307-
$container = $this->getMock('\Symfony\Component\DependencyInjection\Container', array('get', 'getParameter'));
307+
$container = $this->getMock('Symfony\Component\DependencyInjection\Container', array('get', 'getParameter'));
308308

309309
$viewHandler->setContainer($container);
310310

311-
$serializer = $this->getMockBuilder('\JMS\Serializer\Serializer')
311+
$serializer = $this->getMockBuilder('JMS\Serializer\Serializer')
312312
->setMethods(array('serialize', 'setExclusionStrategy'))
313313
->disableOriginalConstructor()
314314
->getMock();
@@ -352,7 +352,7 @@ public static function createSerializeNullDataProvider()
352352
public function testSerializeNullDataValues($expected, $serializeNull)
353353
{
354354
$viewHandler = new ViewHandler(array('json' => false), 404, 200);
355-
$container = $this->getMock('\Symfony\Component\DependencyInjection\Container', array('get', 'getParameter'));
355+
$container = $this->getMock('Symfony\Component\DependencyInjection\Container', array('get', 'getParameter'));
356356

357357
$viewHandler->setContainer($container);
358358

@@ -405,7 +405,7 @@ public function testHandle()
405405
{
406406
$viewHandler = new ViewHandler(array('html' => true));
407407

408-
$templating = $this->getMockBuilder('\Symfony\Bundle\FrameworkBundle\Templating\PhpEngine')
408+
$templating = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Templating\PhpEngine')
409409
->setMethods(array('render'))
410410
->disableOriginalConstructor()
411411
->getMock();
@@ -414,7 +414,7 @@ public function testHandle()
414414
->method('render')
415415
->will($this->returnValue(''));
416416

417-
$container = $this->getMock('\Symfony\Component\DependencyInjection\Container', array('get'));
417+
$container = $this->getMock('Symfony\Component\DependencyInjection\Container', array('get'));
418418
$container
419419
->expects($this->exactly(2))
420420
->method('get')
@@ -424,15 +424,15 @@ public function testHandle()
424424
$data = array('foo' => 'bar');
425425

426426
$view = new View($data);
427-
$this->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $viewHandler->handle($view));
427+
$this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $viewHandler->handle($view));
428428
}
429429

430430
public function testHandleCustom()
431431
{
432432
$viewHandler = new ViewHandler(array());
433433
$viewHandler->registerHandler('html', ($callback = function(){ return 'foo'; }));
434434

435-
$container = $this->getMock('\Symfony\Component\DependencyInjection\Container', array('get'));
435+
$container = $this->getMock('Symfony\Component\DependencyInjection\Container', array('get'));
436436
$container
437437
->expects($this->once())
438438
->method('get')
@@ -453,7 +453,7 @@ public function testHandleNotSupported()
453453
{
454454
$viewHandler = new ViewHandler(array());
455455

456-
$container = $this->getMock('\Symfony\Component\DependencyInjection\Container', array('get'));
456+
$container = $this->getMock('Symfony\Component\DependencyInjection\Container', array('get'));
457457
$container
458458
->expects($this->once())
459459
->method('get')
@@ -485,7 +485,7 @@ public function prepareTemplateParametersDataProvider()
485485
$object = new \stdClass();
486486

487487
$formView = new FormView();
488-
$form = $this->getMockBuilder('\Symfony\Component\Form\Form')
488+
$form = $this->getMockBuilder('Symfony\Component\Form\Form')
489489
->setMethods(array('createView', 'getData'))
490490
->disableOriginalConstructor()
491491
->getMock();

0 commit comments

Comments
 (0)