Correct style and PHPStan errors

Author: sstok

.travis.yml

@@ -6,7 +6,7 @@ matrix:
         - php: 7.0
           env: DEPENDENCIES='dev'
         - php: 7.1
-          env: DEPENDENCIES='low'
+          env: DEPENDENCIES='low' lint=1
     fast_finish: true
 
 sudo: false
@@ -17,6 +17,10 @@ cache:
 
 before_install:
     - phpenv config-rm xdebug.ini || echo "xdebug not available"
+    - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+    - if [[ $lint = 1 ]]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.3.2/php-cs-fixer.phar; fi
+    - if [[ $lint = 1 ]]; then composer global require --dev 'phpstan/phpstan:^0.8'; fi
+    - export PATH="$PATH:$HOME/.composer/vendor/bin"
 
 install:
     - if [ "$DEPENDENCIES" == "dev" ]; then composer config minimum-stability dev; fi;
@@ -28,3 +32,5 @@ script:
     - export SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
     - export SYMFONY_DEPRECATIONS_HELPER=strict
     - vendor/bin/simple-phpunit --verbose
+    - if [[ $lint = 1 ]]; then php php-cs-fixer.phar fix --dry-run --diff --no-ansi; fi
+    - if [[ $lint = 1 ]]; then phpstan analyse -c phpstan.neon -l5 --ansi src tests; fi

phpstan.neon

@@ -0,0 +1,12 @@
+parameters:
+    autoload_files:
+        - vendor/autoload.php
+        - vendor/symfony/phpunit-bridge/bin/.phpunit/phpunit-5.7.1/vendor/autoload.php
+
+    ignoreErrors:
+        #- '#__construct\(\) does not call parent constructor from .+#'
+        - '#Access to an undefined property Symfony\\Component\\Validator\\Constraint\:\:#'
+        - "#Casting to string something that's already string#"
+
+        # Tests
+        - '#Parameter \#1 \$password of method Rollerworks\\Component\\PasswordStrength\\Blacklist\\[a-zA-Z]+\:\:isBlacklisted\(\) expects string#'

src/Blacklist/ArrayProvider.php

@@ -20,7 +20,7 @@
  */
 class ArrayProvider implements BlacklistProviderInterface
 {
-    private $blacklist = array();
+    private $blacklist = [];
 
     /**
      * @param array $blacklist

src/Blacklist/ChainProvider.php

@@ -28,7 +28,7 @@ class ChainProvider implements BlacklistProviderInterface
      *
      * @param BlacklistProviderInterface[] $providers
      */
-    public function __construct(array $providers = array())
+    public function __construct(array $providers = [])
     {
         foreach ($providers as $provider) {
             $this->addProvider($provider);

src/Blacklist/PdoProvider.php

@@ -51,10 +51,10 @@ public function add($password)
         }
 
         $db = $this->initDb();
-        $args = array(
+        $args = [
             ':password' => $password,
             ':created_at' => time(),
-        );
+        ];
 
         try {
             if ($this->isBlacklisted($password)) {
@@ -84,9 +84,9 @@ public function delete($password)
         }
 
         $db = $this->initDb();
-        $args = array(
+        $args = [
             ':password' => $password,
-        );
+        ];
 
         try {
             $this->exec($db, 'DELETE FROM rollerworks_passdbl WHERE passwd = :password', $args);
@@ -132,7 +132,7 @@ public function isBlacklisted($password)
         }
 
         $db = $this->initDb();
-        $tokenExists = $this->fetch($db, 'SELECT 1 FROM rollerworks_passdbl WHERE passwd = :password LIMIT 1', array(':password' => $password));
+        $tokenExists = $this->fetch($db, 'SELECT 1 FROM rollerworks_passdbl WHERE passwd = :password LIMIT 1', [':password' => $password]);
 
         return !empty($tokenExists);
     }
@@ -151,7 +151,7 @@ abstract protected function initDb();
      *
      * @return mixed
      */
-    protected function fetch($db, $query, array $args = array())
+    protected function fetch($db, $query, array $args = [])
     {
         $stmt = $this->prepareStatement($db, $query);
 
@@ -170,7 +170,7 @@ protected function fetch($db, $query, array $args = array())
      *
      * @throws \RuntimeException
      */
-    protected function exec($db, $query, array $args = array())
+    protected function exec($db, $query, array $args = [])
     {
         $stmt = $this->prepareStatement($db, $query);
 

src/Blacklist/SqliteProvider.php

@@ -77,7 +77,7 @@ protected function initDb()
     /**
      * {@inheritdoc}
      */
-    protected function exec($db, $query, array $args = array())
+    protected function exec($db, $query, array $args = [])
     {
         if ($db instanceof \SQLite3) {
             $stmt = $this->prepareStatement($db, $query);
@@ -98,12 +98,12 @@ protected function exec($db, $query, array $args = array())
     /**
      * {@inheritdoc}
      */
-    protected function fetch($db, $query, array $args = array())
+    protected function fetch($db, $query, array $args = [])
     {
-        $return = array();
+        $return = [];
 
         if ($db instanceof \SQLite3) {
-            $stmt = $this->prepareStatement($db, $query, true);
+            $stmt = $this->prepareStatement($db, $query);
             foreach ($args as $arg => $val) {
                 $stmt->bindValue($arg, $val, is_int($val) ? \SQLITE3_INTEGER : \SQLITE3_TEXT);
             }

src/Command/BlacklistCommonCommand.php

@@ -11,7 +11,6 @@
 
 namespace Rollerworks\Component\PasswordStrength\Command;
 
-use Rollerworks\Component\PasswordStrength\Blacklist\SqliteProvider;
 use Rollerworks\Component\PasswordStrength\Blacklist\UpdatableBlacklistProviderInterface;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;

src/Command/BlacklistDeleteCommand.php

@@ -11,7 +11,6 @@
 
 namespace Rollerworks\Component\PasswordStrength\Command;
 
-use Rollerworks\Component\PasswordStrength\Blacklist\SqliteProvider;
 use Rollerworks\Component\PasswordStrength\Blacklist\UpdatableBlacklistProviderInterface;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;

src/Command/BlacklistPurgeCommand.php

@@ -11,12 +11,9 @@
 
 namespace Rollerworks\Component\PasswordStrength\Command;
 
-use Symfony\Component\Console\Helper\DialogHelper;
-use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 class BlacklistPurgeCommand extends BlacklistCommand

src/Validator/Constraints/PasswordRequirementsValidator.php

@@ -33,7 +33,7 @@ public function validate($value, Constraint $constraint)
 
         if ($constraint->minLength > 0 && (mb_strlen($value) < $constraint->minLength)) {
             $this->context->buildViolation($constraint->tooShortMessage)
-                ->setParameters(array('{{length}}' => $constraint->minLength))
+                ->setParameters(['{{length}}' => $constraint->minLength])
                 ->setInvalidValue($value)
                 ->addViolation();
         }