styleci psr2

Author: nicklog

.travis.yml

@@ -7,11 +7,11 @@ php:
   - 'hhvm'
 matrix:
   allow_failures:
-    - php: nightly
+    -   php: nightly
 install:
   - composer install
 script:
- - ./vendor/bin/phpunit --coverage-clover ./tests/Logs/clover.xml
- - ./vendor/bin/psalm
+  - ./vendor/bin/phpunit --coverage-clover ./tests/Logs/clover.xml
+  - ./vendor/bin/psalm
 after_script:
- - php vendor/bin/php-coveralls -v
+  - php vendor/bin/php-coveralls -v

phpunit.xml

@@ -23,6 +23,6 @@
         </whitelist>
     </filter>
     <php>
-        
+
     </php>
-</phpunit>
+</phpunit>

psalm.xml

@@ -3,6 +3,6 @@
     totallyTyped="false"
 >
     <projectFiles>
-        <directory name="src" />
+        <directory name="src"/>
     </projectFiles>
 </psalm>

src/AbstractPasswordExposedChecker.php

@@ -3,15 +3,14 @@
 namespace DivineOmega\PasswordExposed;
 
 use Psr\Cache\CacheItemPoolInterface;
-use Psr\Cache\InvalidArgumentException;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\UriFactoryInterface;
 
 /**
- * Class AbstractPasswordExposedChecker
+ * Class AbstractPasswordExposedChecker.
  */
 abstract class AbstractPasswordExposedChecker implements PasswordExposedCheckerInterface
 {
@@ -33,7 +32,7 @@ public function passwordExposed(string $password): string
     public function passwordExposedByHash(string $hash): string
     {
         $cache = $this->getCache();
-        $cacheKey = substr($hash, 0, 2) . '_' . substr($hash, 2, 3);
+        $cacheKey = substr($hash, 0, 2).'_'.substr($hash, 2, 3);
         $body = null;
 
         try {
@@ -43,7 +42,7 @@ public function passwordExposedByHash(string $hash): string
             if ($cacheItem->isHit()) {
                 $body = $cacheItem->get();
             }
-        } catch (InvalidArgumentException $e) {
+        } catch (\Exception $e) {
             $cacheItem = null;
         }
 
@@ -108,12 +107,13 @@ public function isExposedByHash(string $hash): ?bool
     /**
      * @param $hash
      *
-     * @return ResponseInterface
      * @throws \Psr\Http\Client\ClientExceptionInterface
+     *
+     * @return ResponseInterface
      */
     protected function makeRequest(string $hash): ResponseInterface
     {
-        $uri = $this->getUriFactory()->createUri('https://api.pwnedpasswords.com/range/' . substr($hash, 0, 5));
+        $uri = $this->getUriFactory()->createUri('https://api.pwnedpasswords.com/range/'.substr($hash, 0, 5));
         $request = $this->getRequestFactory()->createRequest('GET', $uri);
 
         return $this->getClient()->sendRequest($request);

src/PasswordExposedChecker.php

@@ -14,11 +14,10 @@
 use Psr\Http\Message\UriFactoryInterface;
 
 /**
- * Class PasswordExposedChecker
+ * Class PasswordExposedChecker.
  */
 class PasswordExposedChecker extends AbstractPasswordExposedChecker
 {
-
     /** @var ClientInterface|null */
     protected $client;
 
@@ -50,8 +49,7 @@ public function __construct(
         ?int $cacheLifeTime = null,
         ?RequestFactoryInterface $requestFactory = null,
         ?UriFactoryInterface $uriFactory = null
-    )
-    {
+    ) {
         $this->client = $client;
         $this->cache = $cache;
         $this->cacheLifeTime = $cacheLifeTime;
@@ -60,7 +58,7 @@ public function __construct(
     }
 
     /**
-     * @return ClientInterface
+     * {@inheritdoc}
      */
     protected function getClient(): ClientInterface
     {
@@ -92,7 +90,7 @@ protected function createClient(): ClientInterface
     }
 
     /**
-     * @return CacheItemPoolInterface
+     * {@inheritdoc}
      */
     protected function getCache(): CacheItemPoolInterface
     {
@@ -151,7 +149,7 @@ protected function createRequestFactory(): RequestFactoryInterface
     }
 
     /**
-     * @return UriFactoryInterface
+     * {@inheritdoc}
      */
     protected function getUriFactory(): UriFactoryInterface
     {
@@ -210,7 +208,7 @@ protected function createBundle(): ?Bundle
      */
     protected function getBundleFromCertainty(): Bundle
     {
-        $ourCertaintyDataDir = __DIR__ . '/../bundles';
+        $ourCertaintyDataDir = __DIR__.'/../bundles';
 
         if (!is_writable($ourCertaintyDataDir)) {
 

src/PasswordExposedCheckerInterface.php

@@ -3,11 +3,10 @@
 namespace DivineOmega\PasswordExposed;
 
 /**
- * Interface PasswordExposedCheckerInterface
+ * Interface PasswordExposedCheckerInterface.
  */
 interface PasswordExposedCheckerInterface
 {
-
     public const NOT_EXPOSED = 'not_exposed';
     public const EXPOSED = 'exposed';
     public const UNKNOWN = 'unknown';

src/PasswordStatus.php

@@ -3,7 +3,7 @@
 namespace DivineOmega\PasswordExposed;
 
 /**
- * Class PasswordStatus
+ * Class PasswordStatus.
  */
 abstract class PasswordStatus
 {

tests/Unit/BundleInjectionTest.php

@@ -16,12 +16,15 @@ public function testLocalBundleInjection()
         $bundle = new Bundle(end($pemFiles));
 
         $cache = new CacheItemPool();
-        $cache->changeConfig([
-            'cacheDirectory' => __DIR__.'/../../cache/',
-            'gzipCompression' => false,
-        ]);
+        $cache->changeConfig(
+            [
+                'cacheDirectory'  => __DIR__.'/../../cache/',
+                'gzipCompression' => false,
+            ]
+        );
 
-        $passwordExposedChecker = new PasswordExposedChecker(null, $cache, $bundle);
+        $passwordExposedChecker = new PasswordExposedChecker(null, $cache);
+        $passwordExposedChecker->setBundle($bundle);
 
         $this->assertEquals(PasswordStatus::EXPOSED, $passwordExposedChecker->passwordExposed('hunter2'));
     }

tests/Unit/PasswordExposedByHashTest.php

@@ -16,10 +16,12 @@ class PasswordExposedByHashTest extends TestCase
     protected function setUp()
     {
         $cache = new CacheItemPool();
-        $cache->changeConfig([
-            'cacheDirectory' => __DIR__.'/../../cache/',
-            'gzipCompression' => false,
-        ]);
+        $cache->changeConfig(
+            [
+                'cacheDirectory'  => __DIR__.'/../../cache/',
+                'gzipCompression' => false,
+            ]
+        );
         $this->checker = new PasswordExposedChecker(null, $cache);
     }
 

tests/Unit/PasswordExposedTest.php

@@ -16,10 +16,12 @@ class PasswordExposedTest extends TestCase
     protected function setUp()
     {
         $cache = new CacheItemPool();
-        $cache->changeConfig([
-            'cacheDirectory' => __DIR__.'/../../cache/',
-            'gzipCompression' => false,
-        ]);
+        $cache->changeConfig(
+            [
+                'cacheDirectory'  => __DIR__.'/../../cache/',
+                'gzipCompression' => false,
+            ]
+        );
         $this->checker = new PasswordExposedChecker(null, $cache);
     }