Merge branch '2.15' into 2.16

Author: keradus

.travis.yml

@@ -54,7 +54,7 @@ jobs:
                 - php -d auto_prepend_file=dev-tools/vendor/autoload.php ./dev-tools/tools/phpstan analyse
                 - if [ -n "$CHANGED_PHP_FILES" ]; then ./dev-tools/vendor/bin/phpmd `echo "$CHANGED_PHP_FILES" | xargs | sed 's/ /,/g'` text phpmd.xml || travis_terminate 1; fi
                 - ./dev-tools/tools/composer-require-checker check composer.json --config-file $(realpath .composer-require-checker.json) || travis_terminate 1
-                - composer normalize -d ./dev-tools ./../composer.json --dry-run
+                - ./dev-tools/tools/composer-normalize composer.json --dry-run
                 - ./dev-tools/check-shell-scripts.sh
 
         - &STANDARD_TEST_JOB

README.rst

@@ -166,9 +166,17 @@ NOTE: the output for the following formats are generated in accordance with XML
 * ``junit`` follows the `JUnit xml schema from Jenkins </doc/junit-10.xsd>`_
 * ``checkstyle`` follows the common `"checkstyle" xml schema </doc/checkstyle.xsd>`_
 
+The ``--quiet`` Do not output any message.
 
 The ``--verbose`` option will show the applied rules. When using the ``txt`` format it will also display progress notifications.
 
+NOTE: if there is an error like "errors reported during linting after fixing", you can use this to be even more verbose for debugging purpose
+
+* ``--verbose=0`` or no option: normal
+* ``--verbose``, ``--verbose=1``, ``-v``: verbose
+* ``--verbose=2``, ``-vv``: very verbose
+* ``--verbose=3``, ``-vvv``: debug
+
 The ``--rules`` option limits the rules to apply to the
 project:
 

dev-tools/composer.json

@@ -5,7 +5,6 @@
     "require-dev": {
         "humbug/box": "^3.8",
         "jangregor/phpstan-prophecy": "^0.6",
-        "localheinz/composer-normalize": "^1.1",
         "mi-schi/phpmd-extension": "^4.3",
         "phpmd/phpmd": "^2.6",
         "phpstan/phpstan-phpunit": "^0.12"

dev-tools/install.sh

@@ -28,12 +28,19 @@ echo λλλ phive
 if [ ! -x bin/phive ]; then
     wget -Obin/phive https://phar.io/releases/phive.phar
     wget -Obin/phive.asc https://phar.io/releases/phive.phar.asc
-    gpg --keyserver pool.sks-keyservers.net --recv-keys 0x9D8A98B29B2D5D79
+    gpg --list-keys 0x9D8A98B29B2D5D79 \
+        || gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0x9D8A98B29B2D5D79 \
+        || gpg --keyserver keys.fedoraproject.org --recv-keys 0x9D8A98B29B2D5D79 \
+        || gpg --keyserver keyserver.ubuntu.com --recv-keys 0x9D8A98B29B2D5D79 \
+        || gpg --keyserver pgp.mit.edu --recv-keys 0x9D8A98B29B2D5D79
     gpg --verify bin/phive.asc bin/phive
     chmod u+x bin/phive
 fi
 bin/phive --version
 
+echo λλλ phive packages
+./bin/phive install --trust-gpg-keys D2CCAC42F6295E7D,8E730BA25823D8B5,C00543248C87FB13,CF1A108D0E7AE720
+
 echo λλλ checkbashisms
 if [ ! -x bin/checkbashisms ]; then
     wget -Obin/checkbashisms https://sourceforge.net/projects/checkbaskisms/files/${VERSION_CB}/checkbashisms/download
@@ -53,7 +60,3 @@ bin/shellcheck --version
 echo λλλ composer packages
 composer update
 composer info -D | sort
-
-echo λλλ phive packages
-
-./bin/phive install --trust-gpg-keys D2CCAC42F6295E7D,8E730BA25823D8B5,CF1A108D0E7AE720

dev-tools/phive.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
+  <phar name="composer-normalize" version="^2.1.2" installed="2.1.2" location="./tools/composer-normalize" copy="false"/>
   <phar name="composer-require-checker" version="^2.0" installed="2.0.0" location="./tools/composer-require-checker" copy="false"/>
   <phar name="phpstan" version="^0.12" installed="0.12.9" location="./tools/phpstan" copy="true"/>
 </phive>

src/Console/Command/HelpCommand.php

@@ -71,9 +71,17 @@ public static function getHelpCopy()
 * ``junit`` follows the `JUnit xml schema from Jenkins </doc/junit-10.xsd>`_
 * ``checkstyle`` follows the common `"checkstyle" xml schema </doc/checkstyle.xsd>`_
 
+The <comment>--quiet</comment> Do not output any message.
 
 The <comment>--verbose</comment> option will show the applied rules. When using the ``txt`` format it will also display progress notifications.
 
+NOTE: if there is an error like "errors reported during linting after fixing", you can use this to be even more verbose for debugging purpose
+
+* ``--verbose=0`` or no option: normal
+* ``--verbose``, ``--verbose=1``, ``-v``: verbose
+* ``--verbose=2``, ``-vv``: very verbose
+* ``--verbose=3``, ``-vvv``: debug
+
 The <comment>--rules</comment> option limits the rules to apply to the
 project: