Merge branch '2.12' into 2.14

.gitignore

@@ -1,4 +1,6 @@
 /.php_cs
+/box.json
 /composer.lock
+/php-cs-fixer.phar
 /phpunit.xml
 /vendor/

box.json.dist

@@ -0,0 +1,34 @@
+{
+    "check-requirements": false,
+    "dump-autoload": false,
+    "stub": "php-cs-fixer",
+    "compactors": [
+        "KevinGH\\Box\\Compactor\\Json",
+        "KevinGH\\Box\\Compactor\\Php"
+    ],
+    "files": [
+        "dev-tools/ci-integration.sh",
+        "LICENSE"
+    ],
+    "finder": [
+        {
+            "name": [
+                "*.php"
+            ],
+            "exclude": [
+                "Test",
+                "test",
+                "Tests",
+                "tests"
+            ],
+            "in": [
+                "src",
+                "vendor"
+            ]
+        }
+    ],
+    "blacklist": [
+        "psalm-autoload.php"
+    ],
+    "git-commit": "git-commit"
+}

dev-tools/build.sh

@@ -8,14 +8,14 @@ composer config platform.php 2> /dev/null || composer config platform.php 5.6.0
 composer require --no-update symfony/polyfill-mbstring
 
 # install package deps without dev-deps / remove already installed dev-deps
+# box can ignore dev-deps, but dev-deps, when installed, may lower version of prod-deps
 composer update --no-interaction --no-progress --no-dev --prefer-stable
 composer info -D | sort
 
-# install box2 globally
-composer global show kherge/box -q || composer global require --no-interaction --no-progress kherge/box:^2.7
+composer show -d dev-tools humbug/box -q || composer update -d dev-tools --no-interaction --no-progress
 
 # build phar file
-php -d phar.readonly=false "$(composer config home)/vendor/bin/box" build
+dev-tools/vendor/bin/box compile
 
 # revert changes to composer
 git checkout composer.json

dev-tools/composer.json

@@ -3,6 +3,7 @@
         "php": "^7.1"
     },
     "require-dev": {
+        "humbug/box": "~3.7.0",
         "localheinz/composer-normalize": "^1.1",
         "maglnet/composer-require-checker": "^2.0",
         "mi-schi/phpmd-extension": "^4.3",