Long array syntax + PHP CS fixes

ezpublishlegacy · Feb 8, 2017 · 6ec1f96 · 6ec1f96
1 parent 8a0e367
commit 6ec1f96
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/.php_cs b/.php_cs
@@ -7,6 +7,8 @@ return Symfony\CS\Config\Config::create()
     ->fixers([
         'concat_with_spaces',
         'phpdoc_order',
+        'long_array_syntax',
+        '-short_array_syntax',
         '-psr0',
         '-concat_without_spaces',
         '-phpdoc_params',

diff --git a/Core/FieldType/Tags/TagsStorage/Gateway/LegacyStorage.php b/Core/FieldType/Tags/TagsStorage/Gateway/LegacyStorage.php
@@ -237,7 +237,7 @@ protected function loadFieldData($fieldId, $versionNo)
                 $tagList[$tagId]['keywords'][$row['eztags_keyword_locale']] = $row['eztags_keyword_keyword'];
             }
 
-            if (!in_array([$row['eztags_keyword_locale']], $tagList[$tagId]['language_codes'])) {
+            if (!in_array(array($row['eztags_keyword_locale']), $tagList[$tagId]['language_codes'])) {
                 $tagList[$tagId]['language_codes'][] = $row['eztags_keyword_locale'];
             }
         }

diff --git a/Tests/PlatformUI/EventListener/RedirectResponseListenerTest.php b/Tests/PlatformUI/EventListener/RedirectResponseListenerTest.php
@@ -5,7 +5,6 @@
 use Netgen\TagsBundle\PlatformUI\EventListener\PlatformUIListener;
 use Netgen\TagsBundle\PlatformUI\EventListener\RedirectResponseListener;
 use PHPUnit_Framework_TestCase;
-use PHPUnit_Framework_MockObject_MockObject;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -17,27 +16,27 @@
 class RedirectResponseListenerTest extends PHPUnit_Framework_TestCase
 {
     /**
-     * @var RedirectResponseListener
+     * @var \Netgen\TagsBundle\PlatformUI\EventListener\RedirectResponseListener
      */
     protected $listener;
 
     /**
-     * @var PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject
      */
     protected $kernel;
 
     /**
-     * @var PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject
      */
     protected $platformUiRequest;
 
     /**
-     * @var PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject
      */
     protected $response;
 
     /**
-     * @var PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject
      */
     protected $event;
 
@@ -47,19 +46,19 @@ public function setUp()
 
         $this->kernel = $this->getMockBuilder(HttpKernelInterface::class)
             ->disableOriginalConstructor()
-            ->setMethods([])
+            ->setMethods(array())
             ->getMock();
 
         $this->response = $this->getMockBuilder(Response::class)
             ->disableOriginalConstructor()
-            ->setMethods(['isRedirect', 'setStatusCode'])
+            ->setMethods(array('isRedirect', 'setStatusCode'))
             ->getMock();
 
-        $this->platformUiRequest = new Request([], [], ['_route' => 'netgen_tags_admin'], [], [], ['HTTP_X-PJAX' => 'weeee', 'HTTP_X-Requested-With' => 'XMLHttpRequest']);
+        $this->platformUiRequest = new Request(array(), array(), array('_route' => 'netgen_tags_admin'), array(), array(), array('HTTP_X-PJAX' => 'weeee', 'HTTP_X-Requested-With' => 'XMLHttpRequest'));
 
         $this->event = $this->getMockBuilder(FilterResponseEvent::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getResponse', 'isMasterRequest', 'getRequest'])
+            ->setMethods(array('getResponse', 'isMasterRequest', 'getRequest'))
             ->getMock();
     }
 
@@ -75,7 +74,7 @@ public function testInstanceOfPlatformUIListener()
 
     public function testGetSubscribedEventShouldReturnValidConfiguration()
     {
-        $this->assertEquals([KernelEvents::RESPONSE => 'onKernelResponse'], RedirectResponseListener::getSubscribedEvents());
+        $this->assertEquals(array(KernelEvents::RESPONSE => 'onKernelResponse'), RedirectResponseListener::getSubscribedEvents());
     }
 
     public function testIfNotMasterRequestThenReturn()
@@ -152,7 +151,7 @@ public function testIsPlatformUIRequestWithRoute()
 
         $this->event->expects($this->once())
             ->method('getRequest')
-            ->willReturn(new Request([], [], ['_route' => 'something']));
+            ->willReturn(new Request(array(), array(), array('_route' => 'something')));
 
         $this->response->expects($this->never())
             ->method('setStatusCode');
@@ -176,7 +175,7 @@ public function testIsPlatformUIRequestWithHeaders()
 
         $this->event->expects($this->once())
             ->method('getRequest')
-            ->willReturn(new Request([], [], ['_route' => 'netgen_tags_admin']));
+            ->willReturn(new Request(array(), array(), array('_route' => 'netgen_tags_admin')));
 
         $this->response->expects($this->never())
             ->method('setStatusCode');

diff --git a/Tests/PlatformUI/EventListener/SetAdminPageLayoutRequestListenerTest.php b/Tests/PlatformUI/EventListener/SetAdminPageLayoutRequestListenerTest.php
@@ -6,7 +6,6 @@
 use Netgen\TagsBundle\PlatformUI\EventListener\SetAdminPageLayoutRequestListener;
 use Netgen\TagsBundle\Templating\Twig\AdminGlobalVariable;
 use PHPUnit_Framework_TestCase;
-use PHPUnit_Framework_MockObject_MockObject;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
@@ -15,22 +14,22 @@
 class SetAdminPageLayoutRequestListenerTest extends PHPUnit_Framework_TestCase
 {
     /**
-     * @var SetAdminPageLayoutRequestListener
+     * @var \Netgen\TagsBundle\PlatformUI\EventListener\SetAdminPageLayoutRequestListener
      */
     protected $listener;
 
     /**
-     * @var PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject
      */
     protected $globalVariable;
 
     /**
-     * @var PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject
      */
     protected $event;
 
     /**
-     * @var Request
+     * @var \Symfony\Component\HttpFoundation\Request
      */
     protected $request;
 
@@ -43,17 +42,17 @@ public function setUp()
     {
         $this->globalVariable = $this->getMockBuilder(AdminGlobalVariable::class)
             ->disableOriginalConstructor()
-            ->setMethods(['setPageLayoutTemplate'])
+            ->setMethods(array('setPageLayoutTemplate'))
             ->getMock();
 
         $this->pageLayoutTemplate = 'AcmeBundle::pagelayout.html.twig';
 
         $this->event = $this->getMockBuilder(GetResponseEvent::class)
             ->disableOriginalConstructor()
-            ->setMethods(['isMasterRequest', 'getRequest'])
+            ->setMethods(array('isMasterRequest', 'getRequest'))
             ->getMock();
 
-        $this->request = new Request([], [], ['_route' => 'netgen_tags_admin'], [], [], ['HTTP_X-PJAX' => 'weeee', 'HTTP_X-Requested-With' => 'XMLHttpRequest']);
+        $this->request = new Request(array(), array(), array('_route' => 'netgen_tags_admin'), array(), array(), array('HTTP_X-PJAX' => 'weeee', 'HTTP_X-Requested-With' => 'XMLHttpRequest'));
 
         $this->listener = new SetAdminPageLayoutRequestListener($this->globalVariable, $this->pageLayoutTemplate);
     }
@@ -70,7 +69,7 @@ public function testInstanceOfPlatformUIListener()
 
     public function testGetSubscribedEventShouldReturnValidConfiguration()
     {
-        $this->assertEquals([KernelEvents::REQUEST => 'onKernelRequest'], SetAdminPageLayoutRequestListener::getSubscribedEvents());
+        $this->assertEquals(array(KernelEvents::REQUEST => 'onKernelRequest'), SetAdminPageLayoutRequestListener::getSubscribedEvents());
     }
 
     public function testIsMasterRequestFalse()