Skip to content

Commit 3be64ae

Browse files
committed
Fixed CS
1 parent fd2985c commit 3be64ae

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ protected function get(string $id)
7373
*
7474
* @final
7575
*/
76-
protected function generateUrl(string $route, array $parameters = array(), int $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH): string
76+
protected function generateUrl(string $route, array $parameters = [], int $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH): string
7777
{
7878
return $this->container->get('router')->generate($route, $parameters, $referenceType);
7979
}
@@ -85,7 +85,7 @@ protected function generateUrl(string $route, array $parameters = array(), int $
8585
*
8686
* @final
8787
*/
88-
protected function forward(string $controller, array $path = array(), array $query = array()): Response
88+
protected function forward(string $controller, array $path = [], array $query = []): Response
8989
{
9090
$request = $this->container->get('request_stack')->getCurrentRequest();
9191
$path['_controller'] = $controller;
@@ -109,7 +109,7 @@ protected function redirect(string $url, int $status = 302): RedirectResponse
109109
*
110110
* @final
111111
*/
112-
protected function redirectToRoute(string $route, array $parameters = array(), int $status = 302): RedirectResponse
112+
protected function redirectToRoute(string $route, array $parameters = [], int $status = 302): RedirectResponse
113113
{
114114
return $this->redirect($this->generateUrl($route, $parameters), $status);
115115
}
@@ -119,12 +119,12 @@ protected function redirectToRoute(string $route, array $parameters = array(), i
119119
*
120120
* @final
121121
*/
122-
protected function json($data, int $status = 200, array $headers = array(), array $context = array()): JsonResponse
122+
protected function json($data, int $status = 200, array $headers = [], array $context = []): JsonResponse
123123
{
124124
if ($this->container->has('serializer')) {
125-
$json = $this->container->get('serializer')->serialize($data, 'json', array_merge(array(
125+
$json = $this->container->get('serializer')->serialize($data, 'json', array_merge([
126126
'json_encode_options' => JsonResponse::DEFAULT_ENCODING_OPTIONS,
127-
), $context));
127+
], $context));
128128

129129
return new JsonResponse($json, $status, $headers, true);
130130
}
@@ -203,7 +203,7 @@ protected function denyAccessUnlessGranted($attributes, $subject = null, string
203203
*
204204
* @final
205205
*/
206-
protected function renderView(string $view, array $parameters = array()): string
206+
protected function renderView(string $view, array $parameters = []): string
207207
{
208208
if ($this->container->has('templating')) {
209209
return $this->container->get('templating')->render($view, $parameters);
@@ -221,7 +221,7 @@ protected function renderView(string $view, array $parameters = array()): string
221221
*
222222
* @final
223223
*/
224-
protected function render(string $view, array $parameters = array(), Response $response = null): Response
224+
protected function render(string $view, array $parameters = [], Response $response = null): Response
225225
{
226226
if ($this->container->has('templating')) {
227227
$content = $this->container->get('templating')->render($view, $parameters);
@@ -245,7 +245,7 @@ protected function render(string $view, array $parameters = array(), Response $r
245245
*
246246
* @final
247247
*/
248-
protected function stream(string $view, array $parameters = array(), StreamedResponse $response = null): StreamedResponse
248+
protected function stream(string $view, array $parameters = [], StreamedResponse $response = null): StreamedResponse
249249
{
250250
if ($this->container->has('templating')) {
251251
$templating = $this->container->get('templating');
@@ -311,7 +311,7 @@ protected function createAccessDeniedException(string $message = 'Access Denied.
311311
*
312312
* @final
313313
*/
314-
protected function createForm(string $type, $data = null, array $options = array()): FormInterface
314+
protected function createForm(string $type, $data = null, array $options = []): FormInterface
315315
{
316316
return $this->container->get('form.factory')->create($type, $data, $options);
317317
}
@@ -321,7 +321,7 @@ protected function createForm(string $type, $data = null, array $options = array
321321
*
322322
* @final
323323
*/
324-
protected function createFormBuilder($data = null, array $options = array()): FormBuilderInterface
324+
protected function createFormBuilder($data = null, array $options = []): FormBuilderInterface
325325
{
326326
return $this->container->get('form.factory')->createBuilder(FormType::class, $data, $options);
327327
}
@@ -419,7 +419,7 @@ protected function addLink(Request $request, Link $link)
419419
}
420420

421421
if (null === $linkProvider = $request->attributes->get('_links')) {
422-
$request->attributes->set('_links', new GenericLinkProvider(array($link)));
422+
$request->attributes->set('_links', new GenericLinkProvider([$link]));
423423

424424
return;
425425
}

src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function testForward()
6060
public function testGetUser()
6161
{
6262
$user = new User('user', 'pass');
63-
$token = new UsernamePasswordToken($user, 'pass', 'default', array('ROLE_USER'));
63+
$token = new UsernamePasswordToken($user, 'pass', 'default', ['ROLE_USER']);
6464

6565
$controller = $this->createController();
6666
$controller->setContainer($this->getContainerWithTokenStorage($token));
@@ -122,7 +122,7 @@ public function testJson()
122122
$controller = $this->createController();
123123
$controller->setContainer(new Container());
124124

125-
$response = $controller->json(array());
125+
$response = $controller->json([]);
126126
$this->assertInstanceOf(JsonResponse::class, $response);
127127
$this->assertEquals('[]', $response->getContent());
128128
}
@@ -135,15 +135,15 @@ public function testJsonWithSerializer()
135135
$serializer
136136
->expects($this->once())
137137
->method('serialize')
138-
->with(array(), 'json', array('json_encode_options' => JsonResponse::DEFAULT_ENCODING_OPTIONS))
138+
->with([], 'json', ['json_encode_options' => JsonResponse::DEFAULT_ENCODING_OPTIONS])
139139
->will($this->returnValue('[]'));
140140

141141
$container->set('serializer', $serializer);
142142

143143
$controller = $this->createController();
144144
$controller->setContainer($container);
145145

146-
$response = $controller->json(array());
146+
$response = $controller->json([]);
147147
$this->assertInstanceOf(JsonResponse::class, $response);
148148
$this->assertEquals('[]', $response->getContent());
149149
}
@@ -156,15 +156,15 @@ public function testJsonWithSerializerContextOverride()
156156
$serializer
157157
->expects($this->once())
158158
->method('serialize')
159-
->with(array(), 'json', array('json_encode_options' => 0, 'other' => 'context'))
159+
->with([], 'json', ['json_encode_options' => 0, 'other' => 'context'])
160160
->will($this->returnValue('[]'));
161161

162162
$container->set('serializer', $serializer);
163163

164164
$controller = $this->createController();
165165
$controller->setContainer($container);
166166

167-
$response = $controller->json(array(), 200, array(), array('json_encode_options' => 0, 'other' => 'context'));
167+
$response = $controller->json([], 200, [], ['json_encode_options' => 0, 'other' => 'context']);
168168
$this->assertInstanceOf(JsonResponse::class, $response);
169169
$this->assertEquals('[]', $response->getContent());
170170
$response->setEncodingOptions(JSON_FORCE_OBJECT);
@@ -389,7 +389,7 @@ public function testAddFlash()
389389
$controller->setContainer($container);
390390
$controller->addFlash('foo', 'bar');
391391

392-
$this->assertSame(array('bar'), $flashBag->get('foo'));
392+
$this->assertSame(['bar'], $flashBag->get('foo'));
393393
}
394394

395395
public function testCreateAccessDeniedException()

0 commit comments

Comments
 (0)