Merge branch '4.2' into short-array-master

* 4.2:
  fixed CS
  fixed CS
  fixed tests
  fixed CS
  fixed CS
  fixed CS
  fixed short array CS in comments
  fixed CS in ExpressionLanguage fixtures
  fixed CS in generated files
  fixed CS on generated container files
  fixed CS on Form PHP templates
  fixed CS on YAML fixtures
  fixed fixtures
  switched array() to []

Author: fabpot

EventListener/AddLinkHeaderListener.php

@@ -52,6 +52,6 @@ public function onKernelResponse(FilterResponseEvent $event)
      */
     public static function getSubscribedEvents()
     {
-        return array(KernelEvents::RESPONSE => 'onKernelResponse');
+        return [KernelEvents::RESPONSE => 'onKernelResponse'];
     }
 }

HttpHeaderSerializer.php

@@ -31,13 +31,13 @@ final class HttpHeaderSerializer
      */
     public function serialize(iterable $links)
     {
-        $elements = array();
+        $elements = [];
         foreach ($links as $link) {
             if ($link->isTemplated()) {
                 continue;
             }
 
-            $attributesParts = array('', sprintf('rel="%s"', implode(' ', $link->getRels())));
+            $attributesParts = ['', sprintf('rel="%s"', implode(' ', $link->getRels()))];
             foreach ($link->getAttributes() as $key => $value) {
                 if (\is_array($value)) {
                     foreach ($value as $v) {

Tests/EventListener/AddLinkHeaderListenerTest.php

@@ -28,8 +28,8 @@ class AddLinkHeaderListenerTest extends TestCase
 {
     public function testOnKernelResponse()
     {
-        $request = new Request(array(), array(), array('_links' => new GenericLinkProvider(array(new Link('preload', '/foo')))));
-        $response = new Response('', 200, array('Link' => '<https://demo.api-platform.com/docs.jsonld>; rel="http://www.w3.org/ns/hydra/core#apiDocumentation"'));
+        $request = new Request([], [], ['_links' => new GenericLinkProvider([new Link('preload', '/foo')])]);
+        $response = new Response('', 200, ['Link' => '<https://demo.api-platform.com/docs.jsonld>; rel="http://www.w3.org/ns/hydra/core#apiDocumentation"']);
 
         $subscriber = new AddLinkHeaderListener();
 
@@ -42,16 +42,16 @@ public function testOnKernelResponse()
 
         $this->assertInstanceOf(EventSubscriberInterface::class, $subscriber);
 
-        $expected = array(
+        $expected = [
             '<https://demo.api-platform.com/docs.jsonld>; rel="http://www.w3.org/ns/hydra/core#apiDocumentation"',
             '</foo>; rel="preload"',
-        );
+        ];
 
         $this->assertEquals($expected, $response->headers->get('Link', null, false));
     }
 
     public function testSubscribedEvents()
     {
-        $this->assertEquals(array(KernelEvents::RESPONSE => 'onKernelResponse'), AddLinkHeaderListener::getSubscribedEvents());
+        $this->assertEquals([KernelEvents::RESPONSE => 'onKernelResponse'], AddLinkHeaderListener::getSubscribedEvents());
     }
 }

Tests/HttpHeaderSerializerTest.php

@@ -29,19 +29,19 @@ protected function setUp()
 
     public function testSerialize()
     {
-        $links = array(
+        $links = [
             new Link('prerender', '/1'),
             (new Link('dns-prefetch', '/2'))->withAttribute('pr', 0.7),
             (new Link('preload', '/3'))->withAttribute('as', 'script')->withAttribute('nopush', false),
             (new Link('preload', '/4'))->withAttribute('as', 'image')->withAttribute('nopush', true),
-            (new Link('alternate', '/5'))->withRel('next')->withAttribute('hreflang', array('fr', 'de'))->withAttribute('title', 'Hello'),
-        );
+            (new Link('alternate', '/5'))->withRel('next')->withAttribute('hreflang', ['fr', 'de'])->withAttribute('title', 'Hello'),
+        ];
 
         $this->assertEquals('</1>; rel="prerender",</2>; rel="dns-prefetch"; pr="0.7",</3>; rel="preload"; as="script",</4>; rel="preload"; as="image"; nopush,</5>; rel="alternate next"; hreflang="fr"; hreflang="de"; title="Hello"', $this->serializer->serialize($links));
     }
 
     public function testSerializeEmpty()
     {
-        $this->assertNull($this->serializer->serialize(array()));
+        $this->assertNull($this->serializer->serialize([]));
     }
 }