Merge pull request #1916 from wallabag/cleanup

Convert array + phpDoc

2 files changed, 16 insertions, 16 deletions

diff --git a/src/Wallabag/AnnotationBundle/Tests/Controller/AnnotationControllerTest.php b/src/Wallabag/AnnotationBundle/Tests/Controller/AnnotationControllerTest.php
index e972c2de..3eba7193 100644
--- a/src/Wallabag/AnnotationBundle/Tests/Controller/AnnotationControllerTest.php
+++ b/src/Wallabag/AnnotationBundle/Tests/Controller/AnnotationControllerTest.php
@@ -35,13 +35,13 @@ class AnnotationControllerTest extends WallabagAnnotationTestCase
             ->getRepository('WallabagCoreBundle:Entry')
             ->findOneByUsernameAndNotArchived('admin');
 
-        $headers = array('CONTENT_TYPE' => 'application/json');
-        $content = json_encode(array(
+        $headers = ['CONTENT_TYPE' => 'application/json'];
+        $content = json_encode([
             'text' => 'my annotation',
             'quote' => 'my quote',
-            'ranges' => array('start' => '', 'startOffset' => 24, 'end' => '', 'endOffset' => 31),
-        ));
-        $crawler = $this->client->request('POST', 'annotations/'.$entry->getId().'.json', array(), array(), $headers, $content);
+            'ranges' => ['start' => '', 'startOffset' => 24, 'end' => '', 'endOffset' => 31],
+        ]);
+        $crawler = $this->client->request('POST', 'annotations/'.$entry->getId().'.json', [], [], $headers, $content);
 
         $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
 
@@ -69,11 +69,11 @@ class AnnotationControllerTest extends WallabagAnnotationTestCase
 
         $this->logInAs('admin');
 
-        $headers = array('CONTENT_TYPE' => 'application/json');
-        $content = json_encode(array(
+        $headers = ['CONTENT_TYPE' => 'application/json'];
+        $content = json_encode([
             'text' => 'a modified annotation',
-        ));
-        $crawler = $this->client->request('PUT', 'annotations/'.$annotation->getId().'.json', array(), array(), $headers, $content);
+        ]);
+        $crawler = $this->client->request('PUT', 'annotations/'.$annotation->getId().'.json', [], [], $headers, $content);
         $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
 
         $content = json_decode($this->client->getResponse()->getContent(), true);
@@ -99,11 +99,11 @@ class AnnotationControllerTest extends WallabagAnnotationTestCase
 
         $this->logInAs('admin');
 
-        $headers = array('CONTENT_TYPE' => 'application/json');
-        $content = json_encode(array(
+        $headers = ['CONTENT_TYPE' => 'application/json'];
+        $content = json_encode([
             'text' => 'a modified annotation',
-        ));
-        $crawler = $this->client->request('DELETE', 'annotations/'.$annotation->getId().'.json', array(), array(), $headers, $content);
+        ]);
+        $crawler = $this->client->request('DELETE', 'annotations/'.$annotation->getId().'.json', [], [], $headers, $content);
         $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
 
         $content = json_decode($this->client->getResponse()->getContent(), true);
diff --git a/src/Wallabag/AnnotationBundle/Tests/WallabagAnnotationTestCase.php b/src/Wallabag/AnnotationBundle/Tests/WallabagAnnotationTestCase.php
index 2deff6bf..a9035acc 100644
--- a/src/Wallabag/AnnotationBundle/Tests/WallabagAnnotationTestCase.php
+++ b/src/Wallabag/AnnotationBundle/Tests/WallabagAnnotationTestCase.php
@@ -26,10 +26,10 @@ abstract class WallabagAnnotationTestCase extends WebTestCase
     {
         $crawler = $this->client->request('GET', '/login');
         $form = $crawler->filter('button[type=submit]')->form();
-        $data = array(
+        $data = [
             '_username' => $username,
             '_password' => 'mypassword',
-        );
+        ];
 
         $this->client->submit($form, $data);
     }
@@ -48,7 +48,7 @@ abstract class WallabagAnnotationTestCase extends WebTestCase
         $loginManager = $container->get('fos_user.security.login_manager');
         $firewallName = $container->getParameter('fos_user.firewall_name');
 
-        $this->user = $userManager->findUserBy(array('username' => 'admin'));
+        $this->user = $userManager->findUserBy(['username' => 'admin']);
         $loginManager->loginUser($firewallName, $this->user);
 
         // save the login token into the session and put it in a cookie