Merge pull request #143 from TomasVotruba/ecs-fix

EasyCodingStandard - config path fixes + apply coding style

.travis.yml

@@ -7,7 +7,9 @@ php:
 matrix:
   include:
     - php: 7.1
-      env: STATIC_ANALYSIS=true
+      env: ECS=true
+    - php: 7.1
+      env: PHPSTAN=true
 
 cache:
   directories:
@@ -15,14 +17,12 @@ cache:
 
 install:
   - composer install --no-interaction
-  # coding style
+  - if [[ $ECS != "" ]]; then composer create-project symplify/easy-coding-standard temp/ecs; fi
-  - if [[ $STATIC_ANALYSIS != "" ]]; then composer create-project symplify/easy-coding-standard temp/ecs; fi
 
 script:
   - vendor/bin/phpunit --coverage-clover=coverage.xml -v
-  # coding style
+  - if [[ $ECS != "" ]]; then temp/ecs/bin/ecs check src tests; fi
-  - if [[ $STATIC_ANALYSIS != "" ]]; then temp/ecs/bin/ecs check src tests; fi
+  - if [[ $PHPSTAN != "" ]]; then vendor/bin/phpstan analyse src --level max --configuration phpstan.neon; fi
-  - if [[ $STATIC_ANALYSIS != "" ]]; then vendor/bin/phpstan analyse src --level max --configuration phpstan.neon; fi
 
 after_script:
   - wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar;

composer.lock

@@ -261,20 +261,20 @@
         },
         {
             "name": "jean85/pretty-package-versions",
-            "version": "1.0.2",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Jean85/pretty-package-versions.git",
-                "reference": "cda6ed1bfbcf7a3736b8943466ad8b1b5c0cc7c9"
+                "reference": "3c8487fdd6c750ff3f10c32ddfdd2a7803c1d461"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/cda6ed1bfbcf7a3736b8943466ad8b1b5c0cc7c9",
+                "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/3c8487fdd6c750ff3f10c32ddfdd2a7803c1d461",
-                "reference": "cda6ed1bfbcf7a3736b8943466ad8b1b5c0cc7c9",
+                "reference": "3c8487fdd6c750ff3f10c32ddfdd2a7803c1d461",
                 "shasum": ""
             },
             "require": {
-                "ocramius/package-versions": "^1.1.3",
+                "ocramius/package-versions": "^1.2.0",
                 "php": "^7.0"
             },
             "require-dev": {
@@ -300,7 +300,7 @@
             "keywords": [
                 "package versions"
             ],
-            "time": "2017-09-06T15:48:57+00:00"
+            "time": "2017-11-30T22:02:29+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -875,16 +875,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v3.1.2",
+            "version": "v3.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "08131e7ff29de6bb9f12275c7d35df71f25f4d89"
+                "reference": "579f4ce846734a1cf55d6a531d00ca07a43e3cda"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/08131e7ff29de6bb9f12275c7d35df71f25f4d89",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/579f4ce846734a1cf55d6a531d00ca07a43e3cda",
-                "reference": "08131e7ff29de6bb9f12275c7d35df71f25f4d89",
+                "reference": "579f4ce846734a1cf55d6a531d00ca07a43e3cda",
                 "shasum": ""
             },
             "require": {
@@ -922,20 +922,20 @@
                 "parser",
                 "php"
             ],
-            "time": "2017-11-04T11:48:34+00:00"
+            "time": "2017-12-26T14:43:21+00:00"
         },
         {
             "name": "ocramius/package-versions",
-            "version": "1.1.3",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Ocramius/PackageVersions.git",
-                "reference": "72b226d2957e9e6a9ed09aeaa29cabd840d1a3b7"
+                "reference": "ad8a245decad4897cc6b432743913dad0d69753c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/72b226d2957e9e6a9ed09aeaa29cabd840d1a3b7",
+                "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/ad8a245decad4897cc6b432743913dad0d69753c",
-                "reference": "72b226d2957e9e6a9ed09aeaa29cabd840d1a3b7",
+                "reference": "ad8a245decad4897cc6b432743913dad0d69753c",
                 "shasum": ""
             },
             "require": {
@@ -946,7 +946,7 @@
                 "composer/composer": "^1.3",
                 "ext-zip": "*",
                 "humbug/humbug": "dev-master",
-                "phpunit/phpunit": "^5.7.5"
+                "phpunit/phpunit": "^6.4"
             },
             "type": "composer-plugin",
             "extra": {
@@ -971,7 +971,7 @@
                 }
             ],
             "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
-            "time": "2017-09-06T15:24:43+00:00"
+            "time": "2017-11-24T11:07:03+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -1180,20 +1180,20 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "0.9",
+            "version": "0.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "f8cccde009c856e42704b7e4c250d5c73c60d00d"
+                "reference": "ef60e5cc0a32ddb2637523dafef966e0aac1e16f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f8cccde009c856e42704b7e4c250d5c73c60d00d",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ef60e5cc0a32ddb2637523dafef966e0aac1e16f",
-                "reference": "f8cccde009c856e42704b7e4c250d5c73c60d00d",
+                "reference": "ef60e5cc0a32ddb2637523dafef966e0aac1e16f",
                 "shasum": ""
             },
             "require": {
-                "jean85/pretty-package-versions": "^1.0.2",
+                "jean85/pretty-package-versions": "^1.0.3",
                 "nette/bootstrap": "^2.4 || ^3.0",
                 "nette/di": "^2.4.7 || ^3.0",
                 "nette/robot-loader": "^3.0.1",
@@ -1211,7 +1211,7 @@
                 "phpstan/phpstan-php-parser": "^0.9",
                 "phpstan/phpstan-phpunit": "^0.9",
                 "phpstan/phpstan-strict-rules": "^0.9",
-                "phpunit/phpunit": "^6.3",
+                "phpunit/phpunit": "^6.5.2",
                 "slevomat/coding-standard": "4.0.0"
             },
             "bin": [
@@ -1236,20 +1236,20 @@
                 "MIT"
             ],
             "description": "PHPStan - PHP Static Analysis Tool",
-            "time": "2017-11-29T11:25:41+00:00"
+            "time": "2017-12-02T19:34:06+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "5.2.3",
+            "version": "5.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d"
+                "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1",
-                "reference": "8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d",
+                "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1",
                 "shasum": ""
             },
             "require": {
@@ -1258,14 +1258,13 @@
                 "php": "^7.0",
                 "phpunit/php-file-iterator": "^1.4.2",
                 "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^2.0",
+                "phpunit/php-token-stream": "^2.0.1",
                 "sebastian/code-unit-reverse-lookup": "^1.0.1",
                 "sebastian/environment": "^3.0",
                 "sebastian/version": "^2.0.1",
                 "theseer/tokenizer": "^1.1"
             },
             "require-dev": {
-                "ext-xdebug": "^2.5",
                 "phpunit/phpunit": "^6.0"
             },
             "suggest": {
@@ -1274,7 +1273,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.2.x-dev"
+                    "dev-master": "5.3.x-dev"
                 }
             },
             "autoload": {
@@ -1289,7 +1288,7 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
+                    "email": "sebastian@phpunit.de",
                     "role": "lead"
                 }
             ],
@@ -1300,20 +1299,20 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-11-03T13:47:33+00:00"
+            "time": "2017-12-06T09:29:45+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "1.4.3",
+            "version": "1.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "8ebba84e5bd74fc5fdeb916b38749016c7232f93"
+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/8ebba84e5bd74fc5fdeb916b38749016c7232f93",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                "reference": "8ebba84e5bd74fc5fdeb916b38749016c7232f93",
+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
                 "shasum": ""
             },
             "require": {
@@ -1347,7 +1346,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2017-11-24T15:00:59+00:00"
+            "time": "2017-11-27T13:52:08+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -1441,16 +1440,16 @@
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "2.0.1",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0"
+                "reference": "791198a2c6254db10131eecfe8c06670700904db"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9a02332089ac48e704c70f6cefed30c224e3c0b0",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db",
-                "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0",
+                "reference": "791198a2c6254db10131eecfe8c06670700904db",
                 "shasum": ""
             },
             "require": {
@@ -1486,20 +1485,20 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2017-08-20T05:47:52+00:00"
+            "time": "2017-11-27T05:48:46+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "6.4.4",
+            "version": "6.5.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "562f7dc75d46510a4ed5d16189ae57fbe45a9932"
+                "reference": "83d27937a310f2984fd575686138597147bdc7df"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/562f7dc75d46510a4ed5d16189ae57fbe45a9932",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/83d27937a310f2984fd575686138597147bdc7df",
-                "reference": "562f7dc75d46510a4ed5d16189ae57fbe45a9932",
+                "reference": "83d27937a310f2984fd575686138597147bdc7df",
                 "shasum": ""
             },
             "require": {
@@ -1513,12 +1512,12 @@
                 "phar-io/version": "^1.0",
                 "php": "^7.0",
                 "phpspec/prophecy": "^1.7",
-                "phpunit/php-code-coverage": "^5.2.2",
+                "phpunit/php-code-coverage": "^5.3",
-                "phpunit/php-file-iterator": "^1.4.2",
+                "phpunit/php-file-iterator": "^1.4.3",
                 "phpunit/php-text-template": "^1.2.1",
                 "phpunit/php-timer": "^1.0.9",
-                "phpunit/phpunit-mock-objects": "^4.0.3",
+                "phpunit/phpunit-mock-objects": "^5.0.5",
-                "sebastian/comparator": "^2.0.2",
+                "sebastian/comparator": "^2.1",
                 "sebastian/diff": "^2.0",
                 "sebastian/environment": "^3.1",
                 "sebastian/exporter": "^3.1",
@@ -1544,7 +1543,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.4.x-dev"
+                    "dev-master": "6.5.x-dev"
                 }
             },
             "autoload": {
@@ -1570,33 +1569,33 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-11-08T11:26:09+00:00"
+            "time": "2017-12-17T06:31:19+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
-            "version": "4.0.4",
+            "version": "5.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "2f789b59ab89669015ad984afa350c4ec577ade0"
+                "reference": "283b9f4f670e3a6fd6c4ff95c51a952eb5c75933"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/2f789b59ab89669015ad984afa350c4ec577ade0",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/283b9f4f670e3a6fd6c4ff95c51a952eb5c75933",
-                "reference": "2f789b59ab89669015ad984afa350c4ec577ade0",
+                "reference": "283b9f4f670e3a6fd6c4ff95c51a952eb5c75933",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.5",
                 "php": "^7.0",
                 "phpunit/php-text-template": "^1.2.1",
-                "sebastian/exporter": "^3.0"
+                "sebastian/exporter": "^3.1"
             },
             "conflict": {
                 "phpunit/phpunit": "<6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^6.5"
             },
             "suggest": {
                 "ext-soap": "*"
@@ -1604,7 +1603,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0.x-dev"
+                    "dev-master": "5.0.x-dev"
                 }
             },
             "autoload": {
@@ -1619,7 +1618,7 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
+                    "email": "sebastian@phpunit.de",
                     "role": "lead"
                 }
             ],
@@ -1629,54 +1628,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2017-08-03T14:08:16+00:00"
+            "time": "2017-12-10T08:01:53+00:00"
-        },
-        {
-            "name": "psr/log",
-            "version": "1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "homepage": "https://github.com/php-fig/log",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "time": "2016-10-10T12:19:37+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
@@ -1725,16 +1677,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "2.1.0",
+            "version": "2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "1174d9018191e93cb9d719edec01257fc05f8158"
+                "reference": "b11c729f95109b56a0fe9650c6a63a0fcd8c439f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1174d9018191e93cb9d719edec01257fc05f8158",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/b11c729f95109b56a0fe9650c6a63a0fcd8c439f",
-                "reference": "1174d9018191e93cb9d719edec01257fc05f8158",
+                "reference": "b11c729f95109b56a0fe9650c6a63a0fcd8c439f",
                 "shasum": ""
             },
             "require": {
@@ -1785,7 +1737,7 @@
                 "compare",
                 "equality"
             ],
-            "time": "2017-11-03T07:16:52+00:00"
+            "time": "2017-12-22T14:50:35+00:00"
         },
         {
             "name": "sebastian/diff",
@@ -2239,44 +2191,44 @@
         },
         {
             "name": "symfony/console",
-            "version": "v3.3.13",
+            "version": "v4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "63cd7960a0a522c3537f6326706d7f3b8de65805"
+                "reference": "de8cf039eacdec59d83f7def67e3b8ff5ed46714"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/63cd7960a0a522c3537f6326706d7f3b8de65805",
+                "url": "https://api.github.com/repos/symfony/console/zipball/de8cf039eacdec59d83f7def67e3b8ff5ed46714",
-                "reference": "63cd7960a0a522c3537f6326706d7f3b8de65805",
+                "reference": "de8cf039eacdec59d83f7def67e3b8ff5ed46714",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
+                "php": "^7.1.3",
-                "symfony/debug": "~2.8|~3.0",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/dependency-injection": "<3.3"
+                "symfony/dependency-injection": "<3.4",
+                "symfony/process": "<3.3"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~3.3",
+                "symfony/config": "~3.4|~4.0",
-                "symfony/dependency-injection": "~3.3",
+                "symfony/dependency-injection": "~3.4|~4.0",
-                "symfony/event-dispatcher": "~2.8|~3.0",
+                "symfony/event-dispatcher": "~3.4|~4.0",
-                "symfony/filesystem": "~2.8|~3.0",
+                "symfony/lock": "~3.4|~4.0",
-                "symfony/process": "~2.8|~3.0"
+                "symfony/process": "~3.4|~4.0"
             },
             "suggest": {
                 "psr/log": "For using the console logger",
                 "symfony/event-dispatcher": "",
-                "symfony/filesystem": "",
+                "symfony/lock": "",
                 "symfony/process": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -2303,85 +2255,29 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2017-11-16T15:24:32+00:00"
+            "time": "2017-12-14T19:48:22+00:00"
-        },
-        {
-            "name": "symfony/debug",
-            "version": "v3.3.13",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/debug.git",
-                "reference": "74557880e2846b5c84029faa96b834da37e29810"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/74557880e2846b5c84029faa96b834da37e29810",
-                "reference": "74557880e2846b5c84029faa96b834da37e29810",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "psr/log": "~1.0"
-            },
-            "conflict": {
-                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
-            },
-            "require-dev": {
-                "symfony/http-kernel": "~2.8|~3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Debug\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "[email protected]"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Debug Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-11-10T16:38:39+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v3.3.13",
+            "version": "v4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "138af5ec075d4b1d1bd19de08c38a34bb2d7d880"
+                "reference": "c9cdda4dc4a3182d8d6daeebce4a25fef078ea4c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/138af5ec075d4b1d1bd19de08c38a34bb2d7d880",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/c9cdda4dc4a3182d8d6daeebce4a25fef078ea4c",
-                "reference": "138af5ec075d4b1d1bd19de08c38a34bb2d7d880",
+                "reference": "c9cdda4dc4a3182d8d6daeebce4a25fef078ea4c",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8"
+                "php": "^7.1.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -2408,7 +2304,7 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2017-11-05T15:47:03+00:00"
+            "time": "2017-11-07T14:45:01+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",

easy-coding-standard.neon

@@ -1,7 +1,6 @@
 includes:
     - temp/ecs/config/clean-code.neon
-    - temp/ecs/config/psr2-checkers.neon
+    - temp/ecs/config/psr2.neon
-    - temp/ecs/config/spaces.neon
     - temp/ecs/config/common.neon
 
 checkers:

src/DocBlock/DescriptionFactory.php

@@ -156,7 +156,7 @@ class DescriptionFactory
 
         // determine how many whitespace characters need to be stripped
         $startingSpaceCount = 9999999;
-        for ($i = 1; $i < count($lines); $i++) {
+        for ($i = 1; $i < count($lines); ++$i) {
             // lines with a no length do not count as they are not indented at all
             if (strlen(trim($lines[$i])) === 0) {
                 continue;
@@ -169,7 +169,7 @@ class DescriptionFactory
 
         // strip the number of spaces from each line
         if ($startingSpaceCount > 0) {
-            for ($i = 1; $i < count($lines); $i++) {
+            for ($i = 1; $i < count($lines); ++$i) {
                 $lines[$i] = substr($lines[$i], $startingSpaceCount);
             }
         }

src/DocBlock/StandardTagFactory.php

@@ -63,7 +63,7 @@ final class StandardTagFactory implements TagFactory
         'throws' => '\phpDocumentor\Reflection\DocBlock\Tags\Throws',
         'uses' => '\phpDocumentor\Reflection\DocBlock\Tags\Uses',
         'var' => '\phpDocumentor\Reflection\DocBlock\Tags\Var_',
-        'version'        => '\phpDocumentor\Reflection\DocBlock\Tags\Version'
+        'version' => '\phpDocumentor\Reflection\DocBlock\Tags\Version',
     ];
 
     /**
@@ -278,7 +278,7 @@ final class StandardTagFactory implements TagFactory
             [
                 'name' => $tagName,
                 'body' => $tagBody,
-                TypeContext::class => $context
+                TypeContext::class => $context,
             ]
         );
 

src/DocBlock/Tags/Link.php

@@ -40,7 +40,7 @@ final class Link extends BaseTag implements Factory\StaticMethod
     /**
      * {@inheritdoc}
      */
-    public static function create(string $body, ?DescriptionFactory $descriptionFactory = null, ?TypeContext $context = null): Link
+    public static function create(string $body, ?DescriptionFactory $descriptionFactory = null, ?TypeContext $context = null): self
     {
         Assert::notNull($descriptionFactory);
 

src/DocBlockFactory.php

@@ -41,7 +41,7 @@ final class DocBlockFactory implements DocBlockFactoryInterface
      *
      * @param string[] $additionalTags
      */
-    public static function createInstance(array $additionalTags = []): DocBlockFactory
+    public static function createInstance(array $additionalTags = []): self
     {
         $fqsenResolver = new FqsenResolver();
         $tagFactory = new StandardTagFactory($fqsenResolver);

tests/unit/DocBlock/SerializerTest.php

@@ -58,7 +58,7 @@ DOCCOMMENT;
             'This is a summary',
             new Description('This is a description'),
             [
-                new DocBlock\Tags\Generic('unknown-tag', new Description('Test description for the unknown tag'))
+                new DocBlock\Tags\Generic('unknown-tag', new Description('Test description for the unknown tag')),
             ]
         );
 
@@ -92,7 +92,7 @@ DOCCOMMENT;
             'This is a summary',
             new Description('This is a description'),
             [
-                new DocBlock\Tags\Generic('unknown-tag', new Description('Test description for the unknown tag'))
+                new DocBlock\Tags\Generic('unknown-tag', new Description('Test description for the unknown tag')),
             ]
         );
 
@@ -126,7 +126,7 @@ DOCCOMMENT;
             'This is a summary',
             new Description('This is a description'),
             [
-                new DocBlock\Tags\Generic('unknown-tag', new Description('Test description for the unknown tag'))
+                new DocBlock\Tags\Generic('unknown-tag', new Description('Test description for the unknown tag')),
             ]
         );
 
@@ -166,7 +166,7 @@ DOCCOMMENT;
             'This is a summary',
             new Description('This is a description'),
             [
-                new DocBlock\Tags\Generic('unknown-tag', new Description('Test description for the unknown tag'))
+                new DocBlock\Tags\Generic('unknown-tag', new Description('Test description for the unknown tag')),
             ]
         );
 

tests/unit/DocBlock/StandardTagFactoryTest.php

@@ -32,7 +32,6 @@ use PHPUnit\Framework\TestCase;
  */
 class StandardTagFactoryTest extends TestCase
 {
-
     /**
      * Call Mockery::close after each test.
      */

tests/unit/DocBlock/Tags/CoversTest.php

@@ -27,7 +27,6 @@ use PHPUnit\Framework\TestCase;
  */
 class CoversTest extends TestCase
 {
-
     /**
      * Call Mockery::close after each test.
      */

tests/unit/DocBlock/Tags/ExampleTest.php

@@ -11,7 +11,6 @@ use PHPUnit\Framework\TestCase;
  */
 class ExampleTest extends TestCase
 {
-
     /**
      * Call Mockery::close after each test.
      */

tests/unit/DocBlock/Tags/Formatter/AlignFormatterTest.php

@@ -50,14 +50,14 @@ class AlignFormatterTest extends TestCase
         $tags = [
             new Param('foobar', new String_()),
             new Version('1.2.0'),
-            new Link('http://www.example.com', new Description('Examples'))
+            new Link('http://www.example.com', new Description('Examples')),
         ];
         $fixture = new AlignFormatter($tags);
 
         $expected = [
             '@param   string $foobar',
             '@version 1.2.0',
-            '@link    http://www.example.com Examples'
+            '@link    http://www.example.com Examples',
         ];
 
         foreach ($tags as $key => $tag) {

tests/unit/DocBlock/Tags/GenericTest.php

@@ -32,6 +32,7 @@ class GenericTest extends TestCase
     {
         m::close();
     }
+
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Generic::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description

tests/unit/DocBlock/Tags/MethodTest.php

@@ -66,7 +66,7 @@ class MethodTest extends TestCase
     {
         $arguments = [
             ['name' => 'argument1', 'type' => new String_()],
-            ['name' => 'argument2', 'type' => new Object_()]
+            ['name' => 'argument2', 'type' => new Object_()],
         ];
         $fixture = new Method('myMethod', $arguments, new Void_(), true, new Description('My Description'));
 
@@ -111,7 +111,7 @@ class MethodTest extends TestCase
     public function testHasArguments(): void
     {
         $arguments = [
-            [ 'name' => 'argument1', 'type' => new String_() ]
+            ['name' => 'argument1', 'type' => new String_()],
         ];
 
         $fixture = new Method('myMethod', $arguments);
@@ -127,7 +127,7 @@ class MethodTest extends TestCase
     {
         $arguments = ['argument1'];
         $expected = [
-            [ 'name' => $arguments[0], 'type' => new Void_() ]
+            ['name' => $arguments[0], 'type' => new Void_()],
         ];
 
         $fixture = new Method('myMethod', $arguments);
@@ -143,7 +143,7 @@ class MethodTest extends TestCase
     {
         $arguments = [['name' => 'argument1']];
         $expected = [
-            [ 'name' => $arguments[0]['name'], 'type' => new Void_() ]
+            ['name' => $arguments[0]['name'], 'type' => new Void_()],
         ];
 
         $fixture = new Method('myMethod', $arguments);
@@ -244,7 +244,7 @@ class MethodTest extends TestCase
     {
         $arguments = [
             ['name' => 'argument1', 'type' => new String_()],
-            ['name' => 'argument2', 'type' => new Object_()]
+            ['name' => 'argument2', 'type' => new Object_()],
         ];
         $fixture = new Method('myMethod', $arguments, new Void_(), true, new Description('My Description'));
 
@@ -272,7 +272,7 @@ class MethodTest extends TestCase
         $description = new Description('My Description');
         $expectedArguments = [
             ['name' => 'argument1', 'type' => new String_()],
-            [ 'name' => 'argument2', 'type' => new Void_() ]
+            ['name' => 'argument2', 'type' => new Void_()],
         ];
 
         $descriptionFactory->shouldReceive('create')->with('My Description', $context)->andReturn($description);
@@ -334,15 +334,14 @@ class MethodTest extends TestCase
     /**
      * @dataProvider collectionReturnTypesProvider
      * @covers ::create
-     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Method::<public>
+     * @uses phpDocumentor\Reflection\DocBlock\Tags\Method::<public>
-     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     * @uses phpDocumentor\Reflection\DocBlock\Description
-     * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
+     * @uses phpDocumentor\Reflection\DocBlock\DescriptionFactory
-     * @uses \phpDocumentor\Reflection\TypeResolver
+     * @uses phpDocumentor\Reflection\TypeResolver
-     * @uses \phpDocumentor\Reflection\Types\Array_
+     * @uses phpDocumentor\Reflection\Types\Array_
-     * @uses \phpDocumentor\Reflection\Types\Compound
+     * @uses phpDocumentor\Reflection\Types\Compound
-     * @uses \phpDocumentor\Reflection\Types\Integer
+     * @uses phpDocumentor\Reflection\Types\Integer
-     * @uses \phpDocumentor\Reflection\Types\Object_
+     * @uses phpDocumentor\Reflection\Types\Object_
-     * @param string null $expectedKeyType
      */
     public function testCollectionReturnTypes(
         string $returnType,
@@ -354,7 +353,7 @@ class MethodTest extends TestCase
         $descriptionFactory = m::mock(DescriptionFactory::class);
         $descriptionFactory->shouldReceive('create')->with('', null)->andReturn(new Description(''));
 
-        $fixture = Method::create("$returnType myMethod(\$arg)", $resolver, $descriptionFactory);
+        $fixture = Method::create("${returnType} myMethod(\$arg)", $resolver, $descriptionFactory);
         $returnType = $fixture->getReturnType();
         $this->assertInstanceOf($expectedType, $returnType);
 

tests/unit/DocBlock/Tags/SinceTest.php

@@ -25,7 +25,6 @@ use PHPUnit\Framework\TestCase;
  */
 class SinceTest extends TestCase
 {
-
     /**
      * Call Mockery::close after each test.
      */

tests/unit/DocBlockFactoryTest.php

@@ -202,7 +202,7 @@ DOCBLOCK;
             [
                 'This is a DocBlock. This should still be summary.',
                 'This is a DocBlock. This should still be summary.',
-                ''
+                '',
             ],
             [
                 <<<DOCBLOCK
@@ -211,7 +211,7 @@ This should be a Description.
 DOCBLOCK
                 ,
                 'This is a DocBlock.',
-                'This should be a Description.'
+                'This should be a Description.',
             ],
             [
                 <<<DOCBLOCK
@@ -221,7 +221,7 @@ This should be a Description.
 DOCBLOCK
                 ,
                 "This is a\nmultiline Summary.",
-                'This should be a Description.'
+                'This should be a Description.',
             ],
             [
                 <<<DOCBLOCK
@@ -231,7 +231,7 @@ This should be a Description.
 DOCBLOCK
                 ,
                 'This is a Summary without dot but with a whiteline',
-                'This should be a Description.'
+                'This should be a Description.',
             ],
             [
                 <<<DOCBLOCK
@@ -241,7 +241,7 @@ This should be a Description.
 DOCBLOCK
                 ,
                 'This is a Summary with dot and with a whiteline.',
-                'This should be a Description.'
+                'This should be a Description.',
             ],
         ];
     }

tests/unit/DocBlockTest.php

@@ -73,7 +73,7 @@ class DocBlockTest extends TestCase
     public function testDocBlockCanHaveTags(): void
     {
         $tags = [
-            m::mock(DocBlock\Tag::class)
+            m::mock(DocBlock\Tag::class),
         ];
 
         $fixture = new DocBlock('', null, $tags);
@@ -91,7 +91,7 @@ class DocBlockTest extends TestCase
     {
         $this->expectException('InvalidArgumentException');
         $tags = [
-            null
+            null,
         ];
         $fixture = new DocBlock('', null, $tags);
     }