enabled phpstan in travis-ci

updated phpstan to 0.11 fixed phpstan issues moved phpstan level into configuration file
kimden · Feb 12, 2019 · 12126b2 · 12126b2
1 parent 855e6e1
commit 12126b2
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 50 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,7 @@ php:
 
 script:
   - ./vendor/bin/phpunit --configuration phpunit.xml
-# TODO enable this
-#  - composer phpstan
+  - composer phpstan
   - composer phpcs
 
 before_script:

diff --git a/api/server.php b/api/server.php
@@ -35,7 +35,7 @@
             {
                 $userid = isset($_POST['userid']) ? (int)$_POST['userid'] : 0;
                 $token = isset($_POST['token']) ? $_POST['token'] : "";
-                $address = isset($_POST['address']) ? utf8_encode($_POST['address']) : null;
+                $address = isset($_POST['address']) ? (int)utf8_encode($_POST['address']) : null;
                 $port = isset($_POST['port']) ? (int)utf8_encode($_POST['port']) : null;
                 $private_port = isset($_POST['private_port']) ? (int)utf8_encode($_POST['private_port']) : null;
                 $server_name = isset($_POST['name']) ? $_POST['name'] : "";

diff --git a/composer.json b/composer.json
@@ -26,10 +26,10 @@
         "phpunit/phpunit": "^7",
         "phpmd/phpmd" : "@stable",
         "maximebf/debugbar": "1.*",
-        "phpstan/phpstan": "^0.10.1",
-        "phpstan/phpstan-phpunit": "^0.10",
-        "phpstan/phpstan-strict-rules": "^0.10",
-        "phpstan/phpstan-webmozart-assert": "^0.10",
+        "phpstan/phpstan": "^0.11",
+        "phpstan/phpstan-phpunit": "^0.11",
+        "phpstan/phpstan-strict-rules": "^0.11",
+        "phpstan/phpstan-webmozart-assert": "^0.11",
         "squizlabs/php_codesniffer": "~3.0"
     },
     "autoload": {
@@ -41,6 +41,6 @@
     },
     "scripts": {
         "phpcs": "phpcs -s --standard=phpcs/ruleset.xml --ignore=vendor/ --extensions=php .",
-        "phpstan": "phpstan analyse --level=5 -c phpstan/config.phpstan.neon ."
+        "phpstan": "phpstan analyse -c phpstan/config.phpstan.neon ."
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/include/Template.class.php b/include/Template.class.php
@@ -262,7 +262,9 @@ private function getFilledTemplate()
             // minify html
             if (!DEBUG_MODE && $this->minify)
             {
-                $this->smarty->registerFilter("output", "minify_html");
+                $this->smarty->registerFilter("output", function ($tpl_output, Smarty_Internal_Template $template) {
+                    return minify_html($tpl_output, $template);
+                });
             }
 
             ob_start();

diff --git a/phpstan/config.phpstan.neon b/phpstan/config.phpstan.neon
@@ -16,8 +16,19 @@ parameters:
         - upload.php
 
     ignoreErrors:
-        - '~^Parameter \#2 \$value of method XMLWriter::writeAttribute\(\) expects string, (bool|float|int|\(int\|false\)) given\.$~'
-        - '~^Parameter \#2 \$callback of method Smarty_Internal_TemplateBase::registerFilter\(\) expects callback, string given\.$~'
+        -
+            message: '~^If condition is always true\.$~'
+            path: 'include/ClientSession.class.php'
+        -
+            message: '~^If condition is always true\.$~'
+            path: 'include/Statistic.class.php'
+        -
+            message: '~^Offset int does not exist on array\(\)\|array\(int\)\.$~'
+            path: 'include/StkImage.class.php'
+        - '~^Parameter \#2 \$value of method XMLWriter::writeAttribute\(\) expects string, (?:int|float) given\.$~'
+        - '~^Parameter \#2 \$value of method XMLWriter::writeAttribute\(\) expects string, \(int\|false\) given\.$~'
+
+    level: 5
 
     rules:
         #- PHPStan\Rules\BooleansInConditions\BooleanInBooleanAndRule