Merge pull request #7 from core23/develop

Fixed CS
nucleos · May 10, 2019 · d6b61f8 · d6b61f8
2 parents fa7db92 + 88a894b
commit d6b61f8
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 36 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,6 +1,7 @@
 .*               export-ignore
 Makefile         export-ignore
+phpstan.neon     export-ignore
 phpunit.xml.dist export-ignore
-docs/*           export-ignore
-tests/*          export-ignore
-vendor-bin/      export-ignore
+/docs            export-ignore
+/tests           export-ignore
+/vendor-bin      export-ignore
diff --git a/tests/Action/AuthErrorActionTest.php b/tests/Action/AuthErrorActionTest.php
@@ -63,8 +63,8 @@ public function testExecute(): void
 
         $response = $action();
 
-        $this->assertNotInstanceOf(RedirectResponse::class, $response);
-        $this->assertSame(200, $response->getStatusCode());
+        static::assertNotInstanceOf(RedirectResponse::class, $response);
+        static::assertSame(200, $response->getStatusCode());
     }
 
     public function testExecuteWithCaughtEvent(): void
@@ -94,7 +94,7 @@ public function testExecuteWithCaughtEvent(): void
 
         $response = $action();
 
-        $this->assertSame($eventResponse, $response);
+        static::assertSame($eventResponse, $response);
     }
 
     public function testExecuteWithNoAuth(): void
@@ -115,6 +115,6 @@ public function testExecuteWithNoAuth(): void
             $this->eventDispatcher->reveal()
         );
 
-        $this->assertInstanceOf(RedirectResponse::class, $action());
+        static::assertInstanceOf(RedirectResponse::class, $action());
     }
 }
diff --git a/tests/Action/AuthSuccessActionTest.php b/tests/Action/AuthSuccessActionTest.php
@@ -72,8 +72,8 @@ public function testExecute(): void
 
         $response = $action();
 
-        $this->assertNotInstanceOf(RedirectResponse::class, $response);
-        $this->assertSame(200, $response->getStatusCode());
+        static::assertNotInstanceOf(RedirectResponse::class, $response);
+        static::assertSame(200, $response->getStatusCode());
     }
 
     public function testExecuteWithCaughtEvent(): void
@@ -107,7 +107,7 @@ public function testExecuteWithCaughtEvent(): void
 
         $response = $action();
 
-        $this->assertSame($eventResponse, $response);
+        static::assertSame($eventResponse, $response);
     }
 
     public function testExecuteNoAuth(): void
@@ -128,7 +128,7 @@ public function testExecuteNoAuth(): void
             $this->eventDispatcher->reveal()
         );
 
-        $this->assertInstanceOf(RedirectResponse::class, $action());
+        static::assertInstanceOf(RedirectResponse::class, $action());
     }
 
     public function testExecuteNoSession(): void
@@ -152,6 +152,6 @@ public function testExecuteNoSession(): void
             $this->eventDispatcher->reveal()
         );
 
-        $this->assertInstanceOf(RedirectResponse::class, $action());
+        static::assertInstanceOf(RedirectResponse::class, $action());
     }
 }
diff --git a/tests/Action/CheckAuthActionTest.php b/tests/Action/CheckAuthActionTest.php
@@ -59,7 +59,7 @@ public function testExecute(): void
 
         $response = $action($request);
 
-        $this->assertSame('/success', $response->getTargetUrl());
+        static::assertSame('/success', $response->getTargetUrl());
     }
 
     public function testExecuteWithNoToken(): void
@@ -79,7 +79,7 @@ public function testExecuteWithNoToken(): void
 
         $response = $action($request);
 
-        $this->assertSame('/auth', $response->getTargetUrl());
+        static::assertSame('/auth', $response->getTargetUrl());
     }
 
     public function testExecuteWithNoSession(): void
@@ -102,6 +102,6 @@ public function testExecuteWithNoSession(): void
 
         $response = $action($request);
 
-        $this->assertSame('/error', $response->getTargetUrl());
+        static::assertSame('/error', $response->getTargetUrl());
     }
 }
diff --git a/tests/Action/StartAuthActionTest.php b/tests/Action/StartAuthActionTest.php
@@ -42,6 +42,6 @@ public function testExecute(): void
             $this->router->reveal()
         );
 
-        $this->assertSame('https://lastFm/login', $action()->getTargetUrl());
+        static::assertSame('https://lastFm/login', $action()->getTargetUrl());
     }
 }
diff --git a/tests/Core23LastFmBundleTest.php b/tests/Core23LastFmBundleTest.php
@@ -20,13 +20,13 @@ public function testItIsInstantiable(): void
     {
         $bundle = new Core23LastFmBundle();
 
-        $this->assertInstanceOf(BundleInterface::class, $bundle);
+        static::assertInstanceOf(BundleInterface::class, $bundle);
     }
 
     public function testGetContainerExtension(): void
     {
         $bundle = new Core23LastFmBundle();
 
-        $this->assertInstanceOf(Core23LastFmExtension::class, $bundle->getContainerExtension());
+        static::assertInstanceOf(Core23LastFmExtension::class, $bundle->getContainerExtension());
     }
 }
diff --git a/tests/DependencyInjection/ConfigurationTest.php b/tests/DependencyInjection/ConfigurationTest.php
@@ -41,6 +41,6 @@ public function testOptions(): void
             ],
         ];
 
-        $this->assertSame($expected, $config);
+        static::assertSame($expected, $config);
     }
 }
diff --git a/tests/Event/AuthFailedEventTest.php b/tests/Event/AuthFailedEventTest.php
@@ -20,14 +20,14 @@ public function testCreation(): void
     {
         $event = new AuthFailedEvent();
 
-        $this->assertInstanceOf(Event::class, $event);
+        static::assertInstanceOf(Event::class, $event);
     }
 
     public function testGetResponse(): void
     {
         $event = new AuthFailedEvent();
 
-        $this->assertNull($event->getResponse());
+        static::assertNull($event->getResponse());
     }
 
     public function testSetResponse(): void
@@ -37,6 +37,6 @@ public function testSetResponse(): void
         $event = new AuthFailedEvent();
         $event->setResponse($reponse->reveal());
 
-        $this->assertSame($reponse->reveal(), $event->getResponse());
+        static::assertSame($reponse->reveal(), $event->getResponse());
     }
 }
diff --git a/tests/Event/AuthSuccessEventTest.php b/tests/Event/AuthSuccessEventTest.php
@@ -23,7 +23,7 @@ public function testCreation(): void
 
         $event = new AuthSuccessEvent($session->reveal());
 
-        $this->assertInstanceOf(Event::class, $event);
+        static::assertInstanceOf(Event::class, $event);
     }
 
     public function testGetUsername(): void
@@ -33,7 +33,7 @@ public function testGetUsername(): void
 
         $event = new AuthSuccessEvent($session->reveal());
 
-        $this->assertSame('MyUser', $event->getUsername());
+        static::assertSame('MyUser', $event->getUsername());
     }
 
     public function testGetSession(): void
@@ -42,7 +42,7 @@ public function testGetSession(): void
 
         $event = new AuthSuccessEvent($session->reveal());
 
-        $this->assertSame($session->reveal(), $event->getSession());
+        static::assertSame($session->reveal(), $event->getSession());
     }
 
     public function testGetResponse(): void
@@ -51,7 +51,7 @@ public function testGetResponse(): void
 
         $event = new AuthSuccessEvent($session->reveal());
 
-        $this->assertNull($event->getResponse());
+        static::assertNull($event->getResponse());
     }
 
     public function testSetResponse(): void
@@ -63,6 +63,6 @@ public function testSetResponse(): void
         $event = new AuthSuccessEvent($session->reveal());
         $event->setResponse($reponse->reveal());
 
-        $this->assertSame($reponse->reveal(), $event->getResponse());
+        static::assertSame($reponse->reveal(), $event->getResponse());
     }
 }
diff --git a/tests/Session/SessionManagerTest.php b/tests/Session/SessionManagerTest.php
@@ -25,7 +25,7 @@ public function testIsAuthenticated(): void
         ;
 
         $manager = new SessionManager($session->reveal());
-        $this->assertTrue($manager->isAuthenticated());
+        static::assertTrue($manager->isAuthenticated());
     }
 
     public function testIsNotAuthenticated(): void
@@ -36,7 +36,7 @@ public function testIsNotAuthenticated(): void
         ;
 
         $manager = new SessionManager($session->reveal());
-        $this->assertFalse($manager->isAuthenticated());
+        static::assertFalse($manager->isAuthenticated());
     }
 
     public function testGetUsername(): void
@@ -47,7 +47,7 @@ public function testGetUsername(): void
         ;
 
         $manager = new SessionManager($session->reveal());
-        $this->assertSame('MyUser', $manager->getUsername());
+        static::assertSame('MyUser', $manager->getUsername());
     }
 
     public function testGetUsernameNotExist(): void
@@ -58,7 +58,7 @@ public function testGetUsernameNotExist(): void
         ;
 
         $manager = new SessionManager($session->reveal());
-        $this->assertNull($manager->getUsername());
+        static::assertNull($manager->getUsername());
     }
 
     public function testStore(): void
@@ -72,7 +72,7 @@ public function testStore(): void
         $manager = new SessionManager($session->reveal());
         $manager->store($lastfmSession);
 
-        $this->assertTrue(true);
+        static::assertTrue(true);
     }
 
     public function testClear(): void
@@ -100,9 +100,9 @@ public function testGetSession(): void
         /** @var SessionInterface $lastfmSession */
         $lastfmSession = $manager->getSession();
 
-        $this->assertNotNull($lastfmSession);
-        $this->assertSame('MyUser', $lastfmSession->getName());
-        $this->assertSame('TheToken', $lastfmSession->getKey());
+        static::assertNotNull($lastfmSession);
+        static::assertSame('MyUser', $lastfmSession->getName());
+        static::assertSame('TheToken', $lastfmSession->getKey());
     }
 
     public function testGetSessionWithNoAuth(): void
@@ -114,6 +114,6 @@ public function testGetSessionWithNoAuth(): void
 
         $manager = new SessionManager($session->reveal());
 
-        $this->assertNull($manager->getSession());
+        static::assertNull($manager->getSession());
     }
 }