From 4530d56c3574d44f0d64d38368f8e41a48887bb8 Mon Sep 17 00:00:00 2001
From: Hugo Alliaume <hugo@alliau.me>
Date: Sat, 15 May 2021 00:50:10 +0200
Subject: [PATCH] Drop Phing for Makefile

See https://github.com/phpstan/phpstan-symfony/pull/160
---
 .gitattributes       |  20 ++++---
 .gitignore           |   5 +-
 Makefile             |  30 ++++++++++
 build.xml            | 136 -------------------------------------------
 composer.json        |   1 -
 phpcs.xml            |   8 +++
 phpunit.xml          |  36 ++++++++++++
 tests/phpunit.xml    |  17 ------
 tmp/.gitignore       |   3 +
 tmp/cache/.gitignore |   2 +
 10 files changed, 93 insertions(+), 165 deletions(-)
 create mode 100644 Makefile
 delete mode 100644 build.xml
 create mode 100644 phpunit.xml
 delete mode 100644 tests/phpunit.xml
 create mode 100644 tmp/.gitignore
 create mode 100644 tmp/cache/.gitignore

diff --git a/.gitattributes b/.gitattributes
index 6462e41..c1e4760 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,15 +1,17 @@
 *.abnf text eol=crlf
+*.php text eol=lf
 
-/tests export-ignore
-/doc/grammars export-ignore
-/build-cs export-ignore
+.github export-ignore
+build-cs export-ignore
+doc/grammars export-ignore
+tests export-ignore
+tmp export-ignore
+.editorconfig export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
-.editorconfig export-ignore
-.github export-ignore
-build.xml export-ignore
-phpcs.xml export-ignore
-build.xml export-ignore
-phpstan.neon export-ignore
 build-abnfgen.sh export-ignore
 CODE_OF_CONDUCT.md export-ignore
+Makefile export-ignore
+phpcs.xml export-ignore
+phpstan.neon export-ignore
+phpunit.xml export-ignore
diff --git a/.gitignore b/.gitignore
index c67023c..dab6983 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /temp
 /tools
+/tests/tmp
 /vendor
-
-/composer.lock
+composer.lock
+.phpunit.result.cache
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..d0daa77
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,30 @@
+.PHONY: check
+check: build-abnfgen lint cs tests phpstan
+
+.PHONY: tests
+tests:
+	php vendor/bin/phpunit
+
+.PHONY: lint
+lint:
+	php vendor/bin/parallel-lint --colors \
+		src tests \
+		--exclude tests/PHPStan/Analyser/data \
+		--exclude tests/PHPStan/Rules/Methods/data \
+		--exclude tests/PHPStan/Rules/Functions/data
+
+.PHONY: cs
+cs:
+	composer install --working-dir build-cs && php build-cs/vendor/bin/phpcs
+
+.PHONY: cs-fix
+cs-fix:
+	php build-cs/vendor/bin/phpcbf
+
+.PHONY: phpstan
+phpstan:
+	php vendor/bin/phpstan analyse -l 5 -c phpstan.neon src tests
+
+.PHONY: build-abnfgen
+build-abnfgen:
+	./build-abnfgen.sh
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 0471610..0000000
--- a/build.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project name="PHPStan PHPDoc Parser" default="check">
-
-	<target name="check" depends="
-		composer-validate,
-		composer-install,
-		lint,
-		cs,
-		tests,
-		phpstan
-	"/>
-
-	<target name="composer-validate">
-		<exec
-				executable="composer"
-				logoutput="true"
-				passthru="true"
-				checkreturn="true"
-		>
-			<arg value="validate"/>
-		</exec>
-	</target>
-
-	<target name="composer-install">
-		<exec
-				executable="composer"
-				logoutput="true"
-				passthru="true"
-				checkreturn="true"
-		>
-			<arg value="install"/>
-		</exec>
-	</target>
-
-	<target name="lint">
-		<exec
-				executable="vendor/bin/parallel-lint"
-				logoutput="true"
-				passthru="true"
-				checkreturn="true"
-		>
-			<arg value="--exclude"/>
-			<arg path="tests/PHPStan/Analyser/data"/>
-			<arg value="--exclude"/>
-			<arg path="tests/PHPStan/Rules/Methods/data"/>
-			<arg value="--exclude"/>
-			<arg path="tests/PHPStan/Rules/Functions/data"/>
-			<arg path="src" />
-			<arg path="tests" />
-		</exec>
-	</target>
-
-	<target name="cs">
-		<exec
-				executable="composer"
-				logoutput="true"
-				passthru="true"
-				checkreturn="true"
-		>
-			<arg value="install"/>
-			<arg value="--working-dir"/>
-			<arg path="build-cs"/>
-			<arg value="--ignore-platform-reqs"/>
-			<arg value="--ansi"/>
-		</exec>
-		<exec
-				executable="build-cs/vendor/bin/phpcs"
-				logoutput="true"
-				passthru="true"
-				checkreturn="true"
-		>
-			<arg value="--extensions=php"/>
-			<arg value="--encoding=utf-8"/>
-			<arg value="--tab-width=4"/>
-			<arg value="--ignore=tests/*/data,tests/*/traits"/>
-			<arg value="-sp"/>
-			<arg path="src"/>
-			<arg path="tests"/>
-		</exec>
-	</target>
-
-	<target name="cs-fix">
-		<exec
-				executable="build-cs/vendor/bin/phpcbf"
-				logoutput="true"
-				passthru="true"
-				checkreturn="true"
-		>
-			<arg value="--extensions=php"/>
-			<arg value="--encoding=utf-8"/>
-			<arg value="--tab-width=4"/>
-			<arg value="--ignore=tests/*/data,tests/*/traits"/>
-			<arg value="-sp"/>
-			<arg path="src"/>
-			<arg path="tests"/>
-		</exec>
-	</target>
-
-	<target name="tests" depends="build-abnfgen">
-		<exec
-				executable="vendor/bin/phpunit"
-				logoutput="true"
-				passthru="true"
-				checkreturn="true"
-		>
-			<arg value="-c"/>
-			<arg value="tests/phpunit.xml"/>
-			<arg path="tests"/>
-		</exec>
-	</target>
-
-	<target name="phpstan">
-		<exec
-			executable="vendor/bin/phpstan"
-			logoutput="true"
-			passthru="true"
-			checkreturn="true"
-		>
-			<arg value="analyse"/>
-			<arg value="--level"/>
-			<arg value="5"/>
-			<arg path="src"/>
-			<arg path="tests"/>
-		</exec>
-	</target>
-
-	<target name="build-abnfgen">
-		<exec
-			executable="./build-abnfgen.sh"
-			logoutput="true"
-			passthru="true"
-			checkreturn="true"
-		>
-		</exec>
-	</target>
-</project>
diff --git a/composer.json b/composer.json
index e187ef2..2f08f4d 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,6 @@
 		"php": "^7.1 || ^8.0"
 	},
 	"require-dev": {
-		"phing/phing": "^2.16.3",
 		"php-parallel-lint/php-parallel-lint": "^1.2",
 		"phpstan/extension-installer": "^1.0",
 		"phpstan/phpstan": "^0.12.60",
diff --git a/phpcs.xml b/phpcs.xml
index 7088821..f50b458 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0"?>
 <ruleset name="PHPStan PHPDoc Parser">
 	<config name="php_version" value="70100"/>
+	<arg name="colors"/>
+	<arg name="extensions" value="php"/>
+	<arg name="encoding" value="utf-8"/>
+	<arg name="tab-width" value="4"/>
+	<arg name="cache" value="tmp/cache/phpcs"/>
+	<arg value="sp"/>
+	<file>src</file>
+	<file>tests</file>
 	<rule ref="build-cs/vendor/consistence-community/coding-standard/Consistence/ruleset.xml">
 		<exclude name="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.InvalidFormat"/>
 		<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameAfterKeyword"/>
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 0000000..6d50fc8
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         bootstrap="tests/bootstrap.php"
+         colors="true"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         beStrictAboutChangesToGlobalState="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+>
+    <coverage>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+        <report>
+            <clover outputFile="tests/tmp/clover.xml"/>
+            <text
+                outputFile="php://stdout"
+                showUncoveredFiles="true"
+                showOnlySummary="true"
+            />
+        </report>
+    </coverage>
+
+    <testsuites>
+        <testsuite name="PHPStan PHPDoc Parser">
+            <directory suffix="Test.php">tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <logging/>
+</phpunit>
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
deleted file mode 100644
index f476295..0000000
--- a/tests/phpunit.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.2/phpunit.xsd"
-	bootstrap="bootstrap.php"
-	colors="true"
-	failOnRisky="true"
-	failOnWarning="true"
-	beStrictAboutChangesToGlobalState="true"
-	beStrictAboutCoversAnnotation="true"
-	beStrictAboutOutputDuringTests="true"
-	beStrictAboutTodoAnnotatedTests="true"
-	verbose="false">
-	<testsuite>
-		<directory suffix="Test.php">PHPStan</directory>
-	</testsuite>
-</phpunit>
-
diff --git a/tmp/.gitignore b/tmp/.gitignore
new file mode 100644
index 0000000..37890ca
--- /dev/null
+++ b/tmp/.gitignore
@@ -0,0 +1,3 @@
+*
+!cache
+!.*
diff --git a/tmp/cache/.gitignore b/tmp/cache/.gitignore
new file mode 100644
index 0000000..125e342
--- /dev/null
+++ b/tmp/cache/.gitignore
@@ -0,0 +1,2 @@
+*
+!.*