Dogfood QA Tools 3.0.0-alpha2

.gitignore

@@ -6,4 +6,5 @@
 /var/cache/*
 /bin/box
 /box.json
+/build.xml
 /signing-key-*.pem

Makefile

@@ -35,8 +35,7 @@ test: test-unit test-integration test-system-dev code-metrics clean build-test t
 test-fast: test-unit test-integration test-system-dev code-metrics verify-readme-installer-hash
 
 coverage:
-	vendor/bin/phpunit -c . --testsuite unit,integration --coverage-text
-
+	vendor/bin/phpunit --coverage-text --bootstrap tests/bootstrap.php --exclude-group system
 
 test-unit: phpunit-unit
 test-integration: phpunit-integration
@@ -48,21 +47,21 @@ verify-build: test-no-absolute-paths-in-container
 
 
 phpunit-unit:
-	vendor/bin/phpunit -c . --testsuite unit
+	vendor/bin/phpunit tests/unit --bootstrap tests/bootstrap.php
 phpunit-integration:
-	vendor/bin/phpunit -c . --testsuite integration
+	vendor/bin/phpunit tests/integration --bootstrap tests/bootstrap.php
 phpunit-system-dev:
-	vendor/bin/phpunit -c . --testsuite system
+	vendor/bin/phpunit tests/system --bootstrap tests/bootstrap.php
 phpunit-system-phar:
-	QA_TOOLS_BIN=phar vendor/bin/phpunit -c . --testsuite system
+	QA_TOOLS_BIN=phar vendor/bin/phpunit tests/system --bootstrap tests/bootstrap.php
 phplint:
-	vendor/bin/parallel-lint -e php --exclude vendor .
+	vendor/bin/parallel-lint --exclude vendor -e php .
 phpcs:
 	# Blank line is needed to provide STDIN input to phpcs when phpcs is called from the Git pre-push hook context
 	# See https://github.com/squizlabs/PHP_CodeSniffer/issues/993
-	echo '' | vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1 --standard=phpcs.xml --extensions=php --report=full src
+	echo '' | vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1 --report=full --standard=ruleset.xml --extensions=php/php src
 phpmd:
-	vendor/bin/phpmd src text phpmd.xml
+	vendor/bin/phpmd src text phpmd.xml --suffixes php
 
 
 verify-test-build-is-signed: build-test

composer.json

@@ -10,7 +10,8 @@
             "Ibuildings\\QaTools\\UnitTest\\": ["tests/unit"],
             "Ibuildings\\QaTools\\IntegrationTest\\": ["tests/integration"],
             "Ibuildings\\QaTools\\SystemTest\\": ["tests/system"],
-            "Ibuildings\\QaTools\\ComposerTest\\": ["tests/composer"]
+            "Ibuildings\\QaTools\\ComposerTest\\": ["tests/composer"],
+            "Ibuildings\\QaTools\\Test\\": ["tests"]
         },
         "files": ["tests/system/assert.php"]
     },
@@ -46,12 +47,12 @@
         "jakub-onderka/php-parallel-lint": "^0.9.2",
         "liip/rmt": "^1.2.5",
         "mockery/mockery": "^0.9.4",
-        "phpmd/phpmd": "^2.4",
-        "phpunit/phpunit": "^5.4",
+        "phpmd/phpmd": "^2.0",
+        "phpunit/phpunit": "^5.7",
         "sebastian/diff": "^1.4",
-        "sebastian/exporter": "^1.2",
+        "sebastian/exporter": "^2",
         "sensiolabs/security-checker": "^3.0",
-        "squizlabs/php_codesniffer": "^2.6",
+        "squizlabs/php_codesniffer": "^2.7",
         "symfony/filesystem": "^3.1"
     },
     "config": {