Bump php deps

.phan.php

@@ -26,6 +26,6 @@
     ],
 
     'exclude_file_list' => [
-        'src/php/compatibility.php',
+        'src/compatibility.php',
     ],
 ]);

composer.json

@@ -36,12 +36,12 @@
     },
 
     "require-dev" : {
-        "jbzoo/phpunit" : "6.x-dev",
+        "jbzoo/phpunit" : ">=5.0.0",
         "jbzoo/utils"   : ">=4.5.5"
     },
 
     "autoload"    : {
-        "files" : ["src/php/compatibility.php"]
+        "files" : ["src/compatibility.php"]
     },
 
     "config"      : {
@@ -53,7 +53,7 @@
 
     "extra"       : {
         "branch-alias" : {
-            "dev-master" : "4.x-dev"
+            "dev-master" : "5.x-dev"
         }
     }
 }

phpstan.neon

@@ -12,7 +12,7 @@
 #
 
 includes:
-    - vendor/phpstan/phpstan-strict-rules/rules.neon
+    - ./vendor/phpstan/phpstan-strict-rules/rules.neon
 
 parameters:
     level: max

src/Makefiles/defines.Makefile

@@ -39,7 +39,6 @@ PHP_BIN           ?= php
 COMPOSER_BIN      ?= $(shell if [ $(PHP_BIN) = "php" ]; then echo "composer"; else which composer fi;)
 PHP_VERSION_ALIAS ?= $(shell $(PHP_BIN) --version | head -n 1 | cut -d " " -f 2 | cut -c 1,3)
 PROJECT_ALIAS     ?= $(shell basename `git rev-parse --show-toplevel` | sed 's/-//g')
-PHPUNIT_PRETTY_PRINT_PROGRESS ?= true
 
 
 ifeq ($(strip $(PHP_BIN)),php)
@@ -80,7 +79,7 @@ endif
 ifneq (, $(wildcard ./phpstan.neon))
     JBZOO_CONFIG_PHPSTAN ?= `pwd`/phpstan.neon
 else
-    JBZOO_CONFIG_PHPSTAN ?= `pwd`/vendor/jbzoo/codestyle/phpstan.neon
+    JBZOO_CONFIG_PHPSTAN ?= `pwd`/vendor/jbzoo/codestyle/src/phpstan.neon
 endif
 
 
@@ -124,7 +123,7 @@ endif
 ifneq (, $(wildcard ./phpbench.json))
     JBZOO_CONFIG_PHPBENCH ?= `pwd`/phpbench.json
 else
-    JBZOO_CONFIG_PHPBENCH ?= `pwd`/vendor/jbzoo/codestyle/src/phpbench/phpbench.json
+    JBZOO_CONFIG_PHPBENCH ?= `pwd`/vendor/jbzoo/codestyle/src/phpbench.json
 endif
 
 

src/Makefiles/project.Makefile

@@ -35,6 +35,6 @@ build-phar: ##@Project Compile phar file
 	$(call download_phar,$(BOX_PHAR),"box")
 	@$(PHP_BIN) `pwd`/vendor/bin/box.phar --version
 	@$(PHP_BIN) `pwd`/vendor/bin/box.phar validate                      -vvv
-	@$(COMPOSER_BIN) config autoloader-suffix $(PROJECT_ALIAS)                 -v
+	@$(COMPOSER_BIN) config autoloader-suffix $(PROJECT_ALIAS)          -v
 	@$(PHP_BIN) `pwd`/vendor/bin/box.phar compile --working-dir="`pwd`" -v
-	@$(COMPOSER_BIN) config autoloader-suffix --unset                          -v
+	@$(COMPOSER_BIN) config autoloader-suffix --unset                   -v

src/Makefiles/tests.Makefile

@@ -47,7 +47,6 @@ test-phpunit-teamcity:
 test-phpunit-local:
 	@XDEBUG_MODE=coverage $(PHP_BIN) `pwd`/vendor/bin/phpunit       \
         --configuration="$(JBZOO_CONFIG_PHPUNIT)"                   \
-        --printer=Codedungeon\\PHPUnitPrettyResultPrinter\\Printer  \
         --order-by=random                                           \
         --colors=always                                             \
         --verbose

src/phpstan.neon

@@ -0,0 +1,22 @@
+#
+# JBZoo Toolbox - Codestyle
+#
+# This file is part of the JBZoo Toolbox project.
+# For the full copyright and license information, please view the LICENSE
+# file that was distributed with this source code.
+#
+# @package    Codestyle
+# @license    MIT
+# @copyright  Copyright (C) JBZoo.com, All rights reserved.
+# @link       https://github.com/JBZoo/Codestyle
+#
+
+includes:
+    - ../../../../vendor/phpstan/phpstan-strict-rules/rules.neon
+
+parameters:
+    level: max
+    checkExplicitMixed: false
+    checkMissingIterableValueType: false
+    checkGenericClassInNonGenericObjectType: false
+    reportUnmatchedIgnoredErrors: false

tests/PhpUnitDefinesTest.php

@@ -108,7 +108,7 @@ public function testPhanConfig(): void
             ],
             'exclude_file_regex'                                => '@^vendor/.*/(tests?|Tests?)/@',
             'exclude_file_list'                                 => [
-                'src/php/compatibility.php',
+                'src/compatibility.php',
             ],
             'exclude_analysis_directory_list'                   => [
                 'vendor/',