Integrate phpstan at level 2 (#240)

Author: norkunas

.travis.yml

@@ -24,7 +24,7 @@ matrix:
         - php: 7.0
         - php: 7.1
         - php: 7.2
-          env: COVERAGE=true PHPUNIT_FLAGS="-v --testsuite main --coverage-text --coverage-clover=build/coverage.xml"
+          env: COVERAGE=true PHPUNIT_FLAGS="-v --testsuite main --coverage-text --coverage-clover=build/coverage.xml" DEPENDENCIES="phpstan/phpstan"
 
         - php: 7.1
           # We need `--prefer-source`, otherwise the `Doctrine\Tests\OrmTestCase` class won't be found.
@@ -48,14 +48,16 @@ before_install:
     - if ! [ -v "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi;
 
 install:
-    # To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
-    - if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi
     - composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
     - ./vendor/bin/simple-phpunit install
 
 script:
     - composer validate --strict --no-check-lock
     - ./vendor/bin/simple-phpunit $PHPUNIT_FLAGS
+    - |
+        if [[ $COVERAGE == true ]]; then
+          vendor/bin/phpstan analyze -c phpstan.neon.dist --no-interaction --no-progress
+        fi
 
 after_success:
     - if [[ $COVERAGE = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi

DependencyInjection/Configuration.php

@@ -13,7 +13,6 @@
 namespace Bazinga\GeocoderBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
-use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
@@ -42,7 +41,7 @@ public function __construct($debug)
     /**
      * Proxy to get root node for Symfony < 4.2.
      *
-     * @return NodeDefinition
+     * @return ArrayNodeDefinition
      */
     protected function getRootNode(TreeBuilder $treeBuilder, string $name)
     {
@@ -104,7 +103,7 @@ private function getProvidersNode()
         return $this->getRootNode($treeBuilder, 'providers')
             ->requiresAtLeastOneElement()
             ->useAttributeAsKey('name')
-            ->prototype('array')
+            ->arrayPrototype()
             ->fixXmlConfig('plugin')
                 ->children()
                     ->scalarNode('factory')->isRequired()->cannotBeEmpty()->end()
@@ -119,7 +118,7 @@ private function getProvidersNode()
                     ->scalarNode('locale')->defaultNull()->end()
                     ->scalarNode('logger')->defaultNull()->end()
                     ->arrayNode('aliases')
-                        ->prototype('scalar')->end()
+                        ->scalarPrototype()->end()
                     ->end()
                     ->append($this->createClientPluginNode())
                 ->end()
@@ -139,7 +138,7 @@ private function createClientPluginNode()
         /** @var ArrayNodeDefinition $pluginList */
         $pluginList = $node
             ->info('A list of plugin service ids. The order is important.')
-            ->prototype('array')
+            ->arrayPrototype()
         ;
         $pluginList
             // support having just a service id in the list

composer.json

@@ -12,48 +12,48 @@
   ],
   "require": {
     "php": "^7.0",
-    "willdurand/geocoder": "^4.0",
     "geocoder-php/plugin": "^1.0",
+    "symfony/console": "^3.4 || ^4.2",
     "symfony/framework-bundle": "^3.4 || ^4.2",
     "symfony/options-resolver": "^3.4 || ^4.2",
-    "symfony/console": "^3.4 || ^4.2"
+    "willdurand/geocoder": "^4.0"
   },
   "require-dev": {
-    "symfony/phpunit-bridge": "^4.3",
-    "symfony/yaml": "^3.4 || ^4.2",
-    "geoip/geoip": "~1.17",
     "doctrine/cache": "~1.3",
     "doctrine/orm": "~2.3",
-    "php-http/message": "^1.5",
-    "php-http/curl-client": "^1.7",
-    "nyholm/psr7": "^0.2.2",
-    "nyholm/nsa": "^1.1",
-    "nyholm/symfony-bundle-test": "^1.3",
-    "geocoder-php/google-maps-provider": "^4.0",
-    "geocoder-php/cache-provider": "^4.0",
     "geocoder-php/arcgis-online-provider": "^4.0",
     "geocoder-php/bing-maps-provider": "^4.0",
+    "geocoder-php/cache-provider": "^4.0",
     "geocoder-php/chain-provider": "^4.0",
     "geocoder-php/free-geoip-provider": "^4.0",
     "geocoder-php/geo-plugin-provider": "^4.0",
-    "geocoder-php/geonames-provider": "^4.0",
-    "geocoder-php/geoips-provider": "^4.0",
     "geocoder-php/geoip2-provider": "^4.0",
+    "geocoder-php/geoips-provider": "^4.0",
+    "geocoder-php/geonames-provider": "^4.0",
+    "geocoder-php/google-maps-provider": "^4.0",
     "geocoder-php/here-provider": "^0.2",
-    "geocoder-php/ip-info-provider": "^0.1",
+    "geocoder-php/host-ip-provider": "^4.0",
     "geocoder-php/ip-info-db-provider": "^4.0",
+    "geocoder-php/ip-info-provider": "^0.1",
     "geocoder-php/ipstack-provider": "^0.1",
-    "geocoder-php/host-ip-provider": "^4.0",
+    "geocoder-php/mapquest-provider": "^4.0",
+    "geocoder-php/mapzen-provider": "^4.0",
     "geocoder-php/maxmind-binary-provider": "^4.0",
-    "geocoder-php/yandex-provider": "^4.0",
-    "geocoder-php/tomtom-provider": "^4.0",
-    "geocoder-php/pickpoint-provider": "^4.0",
-    "geocoder-php/open-cage-provider": "^4.0",
-    "geocoder-php/nominatim-provider": "^5.0",
     "geocoder-php/maxmind-provider": "^4.0",
-    "geocoder-php/mapzen-provider": "^4.0",
-    "geocoder-php/mapquest-provider": "^4.0",
-    "symfony/validator": "^3.4 || ^4.2"
+    "geocoder-php/nominatim-provider": "^5.0",
+    "geocoder-php/open-cage-provider": "^4.0",
+    "geocoder-php/pickpoint-provider": "^4.0",
+    "geocoder-php/tomtom-provider": "^4.0",
+    "geocoder-php/yandex-provider": "^4.0",
+    "geoip/geoip": "~1.17",
+    "nyholm/nsa": "^1.1",
+    "nyholm/psr7": "^0.2.2",
+    "nyholm/symfony-bundle-test": "^1.3",
+    "php-http/curl-client": "^1.7",
+    "php-http/message": "^1.5",
+    "symfony/phpunit-bridge": "^4.3",
+    "symfony/validator": "^3.4 || ^4.2",
+    "symfony/yaml": "^3.4 || ^4.2"
   },
   "conflict":  {
     "willdurand/geocoder": "3.2",

phpstan.neon.dist

@@ -0,0 +1,14 @@
+parameters:
+	paths:
+		- %currentWorkingDirectory%
+	excludes_analyse:
+		- ./vendor/
+		- ./Tests/
+	level: 2
+	ignoreErrors:
+		-
+			path: %currentWorkingDirectory%/DependencyInjection/Configuration.php
+			message: '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeParentInterface::(end|variableNode)#'
+		-
+			path: %currentWorkingDirectory%/ProviderFactory/GeoipFactory.php
+			message: '#Geocoder\\Provider\\Geoip\\Geoip not found#'