PHPStan check src/ on level 2 (#675)

* rebuild docs

* drop Monolog dependency from ClientBuilder

* [TEST] typos

* [TEST] rename phpstan config

* fix issues found by PHPStan up to the level 2

* update phpstan/phpstan to 0.8.5

* PHPStan checks src/ on level 2

Author: mhujer

composer.json

@@ -19,7 +19,7 @@
     "cpliakas/git-wrapper": "~1.0",
     "doctrine/inflector": "^1.1",
     "mockery/mockery": "0.9.4",
-    "phpstan/phpstan-shim": "0.8.3",
+    "phpstan/phpstan-shim": "0.8.5",
     "phpunit/phpunit": "6.3.0",
     "squizlabs/php_codesniffer": "3.0.2",
     "symfony/finder": "^2.8",
@@ -48,7 +48,8 @@
       "phpcs --standard=ruleset.xml --extensions=php --encoding=utf-8 --tab-width=4 -sp tests"
     ],
     "phpstan": [
-      "@php vendor/phpstan/phpstan-shim/phpstan.phar analyse -c phpstan.neon tests --level 7 --no-progress"
+      "@php vendor/phpstan/phpstan-shim/phpstan.phar analyse -c phpstan-src.neon src --level 2 --no-progress",
+      "@php vendor/phpstan/phpstan-shim/phpstan.phar analyse -c phpstan-tests.neon tests --level 7 --no-progress"
     ]
   }
 }

phpstan-src.neon

@@ -0,0 +1,6 @@
+parameters:
+    ignoreErrors:
+
+        # because src\Elasticsearch\Connections\Connection.php
+        - '#Anonymous function has an unused use \$logger.#'
+        - '#Anonymous function has an unused use \$tracer.#'

phpstan.neon renamed to phpstan-tests.neon

@@ -82,7 +82,7 @@ class Client
      */
     protected $remote;
 
-    /** @var  callback */
+    /** @var callable */
     protected $endpoints;
 
     /** @var  NamespaceBuilderInterface[] */
@@ -1030,7 +1030,7 @@ public function scroll($params = array())
 
         /** @var \Elasticsearch\Endpoints\Scroll $endpoint */
         $endpoint = $endpointBuilder('Scroll');
-        $endpoint->setScrollID($scrollID)
+        $endpoint->setScrollId($scrollID)
                  ->setScroll($scroll)
                  ->setBody($body);
         $endpoint->setParams($params);
@@ -1057,7 +1057,7 @@ public function clearScroll($params = array())
 
         /** @var \Elasticsearch\Endpoints\ClearScroll $endpoint */
         $endpoint = $endpointBuilder('ClearScroll');
-        $endpoint->setScrollID($scrollID)
+        $endpoint->setScrollId($scrollID)
                  ->setBody($body);
         $endpoint->setParams($params);
 

src/Elasticsearch/Client.php

@@ -37,7 +37,7 @@ class ClientBuilder
     /** @var Transport */
     private $transport;
 
-    /** @var callback */
+    /** @var callable */
     private $endpoint;
 
     /** @var NamespaceBuilderInterface[] */
@@ -99,7 +99,7 @@ public static function create()
 
     /**
      * Can supply first parm to Client::__construct() when invoking manually or with dependency injection
-     * @return this->ransport
+     * @return Transport
      *
      */
     public function getTransport()
@@ -109,7 +109,7 @@ public function getTransport()
 
     /**
      * Can supply second parm to Client::__construct() when invoking manually or with dependency injection
-     * @return this->endpoint
+     * @return callable
      *
      */
     public function getEndpoint()
@@ -119,7 +119,7 @@ public function getEndpoint()
 
     /**
      * Can supply third parm to Client::__construct() when invoking manually or with dependency injection
-     * @return this->registeredNamespacesBuilders
+     * @return NamespaceBuilderInterface[]
      *
      */
     public function getRegisteredNamespacesBuilders()

src/Elasticsearch/ClientBuilder.php

@@ -16,7 +16,7 @@ interface SelectorInterface
     /**
      * Perform logic to select a single ConnectionInterface instance from the array provided
      *
-     * @param  ConnectionInterface[] $connections an array of ConnectionInterface instances to choose from
+     * @param \Elasticsearch\Connections\ConnectionInterface[] $connections an array of ConnectionInterface instances to choose from
      *
      * @return \Elasticsearch\Connections\ConnectionInterface
      */

src/Elasticsearch/ConnectionPool/Selectors/SelectorInterface.php

@@ -44,7 +44,7 @@ class SearchResponseIterator implements Iterator
     private $scroll_id;
 
     /**
-     * @var duration
+     * @var string duration
      */
     private $scroll_ttl;
 

src/Elasticsearch/Endpoints/Ingest/ProcessorGrok.php renamed to src/Elasticsearch/Endpoints/Ingest/Pipeline/ProcessorGrok.php

@@ -19,7 +19,7 @@ abstract class AbstractNamespace
     /** @var \Elasticsearch\Transport  */
     protected $transport;
 
-    /** @var  callback */
+    /** @var callable */
     protected $endpoints;
 
     /**

src/Elasticsearch/Helper/Iterators/SearchResponseIterator.php

@@ -60,7 +60,7 @@ public function allocation($params = array())
 
         /** @var \Elasticsearch\Endpoints\Cat\Allocation $endpoint */
         $endpoint = $endpointBuilder('Cat\Allocation');
-        $endpoint->setNodeID($nodeID);
+        $endpoint->setNodeId($nodeID);
         $endpoint->setParams($params);
 
         return $this->performRequest($endpoint);