Fix phpstan errors (php-pm#410)

andig · web-flow · commit a7370f6e1a80 · 2018-07-31T17:51:01.000+02:00
* Add linting stage

* Fix phpstan errors
diff --git a/.phpstan.neon b/.phpstan.neon
@@ -1,4 +1,5 @@
 parameters:
     ignoreErrors:
-        - '#Result of method React\\Socket\\ServerInterface::close\(\) \(void\) is used#'
-        - '#Call to an undefined static method Symfony\\Component\\Process\\ProcessUtils::escapeArgument\(\)#'
+        - '#Call to an undefined static method Symfony\\Component\\Process\\ProcessUtils::escapeArgument\(\)#'
+        - '#Binary operation#'
+        - '#Call to function method_exists.. with ...Symfony..Component#'
diff --git a/.travis.yml b/.travis.yml
@@ -35,13 +35,13 @@ jobs:
       php: 7.1
       install:
         - rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
-        - composer require "phpstan/phpstan:^0.9" "friendsofphp/php-cs-fixer:^2.8"
+        - composer require "phpstan/phpstan" "friendsofphp/php-cs-fixer:^2.8"
       script:
         # Static analyzer check
         - ./vendor/bin/phpstan analyze -c .phpstan.neon --level=4 --no-progress src
         # Check the code style
         - IFS=$'\n'; COMMIT_SCA_FILES=($(git diff --name-only --diff-filter=ACMRTUXB "${TRAVIS_COMMIT_RANGE}")); unset IFS
-        - ./vendor/bin/php-cs-fixer fix --config=.php_cs.php -v --dry-run --stop-on-violation --using-cache=no --path-mode=intersection -- "${COMMIT_SCA_FILES[@]}"
+        - ./vendor/bin/php-cs-fixer fix --config=.php_cs.php -v --dry-run --diff --stop-on-violation --using-cache=no --path-mode=intersection -- "${COMMIT_SCA_FILES[@]}"
 
 # Cache package sources
 cache:
diff --git a/src/ProcessManager.php b/src/ProcessManager.php
@@ -47,7 +47,7 @@ class ProcessManager
     protected $status = self::STATE_STARTING;
 
     /**
-     * @var LoopInterface
+     * @var LoopInterface|null
      */
     protected $loop;
 
@@ -81,12 +81,12 @@ class ProcessManager
     protected $controllerHost;
 
     /**
-     * @var ServerInterface
+     * @var ServerInterface|null
      */
     protected $controller;
 
     /**
-     * @var ServerInterface
+     * @var ServerInterface|null
      */
     protected $web;
 
@@ -1165,7 +1165,7 @@ protected function newSlaveInstance($port)
         // we can not use -q since this disables basically all header support
         // but since this is necessary at least in Symfony we can not use it.
         // e.g. headers_sent() returns always true, although wrong.
-        //For version 2.x and 3.x of \Symfony\Component\Process\Process package
+        // For version 2.x and 3.x of \Symfony\Component\Process\Process package
         if (method_exists('\Symfony\Component\Process\ProcessUtils', 'escapeArgument')) {
             $commandline = 'exec ' . $this->phpCgiExecutable . ' -C ' . ProcessUtils::escapeArgument($file);
         } else {
diff --git a/src/ProcessSlave.php b/src/ProcessSlave.php
@@ -34,19 +34,19 @@ class ProcessSlave
     /**
      * The HTTP Server.
      *
-     * @var ServerInterface
+     * @var ServerInterface|null
      */
     protected $server;
 
     /**
-     * @var LoopInterface
+     * @var LoopInterface|null
      */
     protected $loop;
 
     /**
      * ProcessManager master process connection
      *
-     * @var ConnectionInterface
+     * @var ConnectionInterface|null
      */
     protected $controller;
 
@@ -83,7 +83,7 @@ class ProcessSlave
     protected $inShutdown = false;
 
     /**
-     * @var BufferingLogger|\Symfony\Component\Debug\BufferingLogger
+     * @var BufferingLogger|\Symfony\Component\Debug\BufferingLogger|null
      */
     protected $errorLogger;
 
@@ -215,7 +215,7 @@ protected function getStaticDirectory()
     }
 
     /**
-     * @return BridgeInterface
+     * @return BridgeInterface|null
      */
     protected function getBridge()
     {
diff --git a/src/RequestHandler.php b/src/RequestHandler.php
@@ -23,7 +23,7 @@ class RequestHandler
     private $incoming;
 
     /**
-     * @var ConnectionInterface
+     * @var ConnectionInterface|null
      */
     private $connection;
 
diff --git a/src/Slave.php b/src/Slave.php
@@ -42,6 +42,10 @@ class Slave
 
     private $process;
     private $pid;
+
+    /**
+     * @var ConnectionInterface
+     */
     private $connection; // slave incoming
 
     /**
@@ -208,7 +212,7 @@ public function getPort()
     /**
      * Get slave incoming connection
      *
-     * @return ConnectionInterface slave connection
+     * @return ConnectionInterface|null slave connection
      */
     public function getConnection()
     {
