From ef38d7d84b7b240e47b436234cea0a8f79a3117c Mon Sep 17 00:00:00 2001
From: Oliver Klee <typo3-coding@oliverklee.de>
Date: Wed, 24 Feb 2021 12:02:56 +0100
Subject: [PATCH] [TASK] Drop the .phar suffix from the tools (#204)

PhpStorm by default indexes `*.phar` files. For our current set of
tools, we do not want this. (This keeps PhpStorm from complaining
about multiple versions of the same class.)

Also mark the tools as binary for git.
---
 .gitattributes                                      |   2 +-
 composer.json                                       |  10 +++++-----
 phive.xml                                           |  12 ++++++------
 .../{composer-normalize.phar => composer-normalize} | Bin
 tools/{phive.phar => phive}                         |   0
 tools/{php-cs-fixer.phar => php-cs-fixer}           | Bin
 tools/{phpcpd.phar => phpcpd}                       | Bin
 tools/{phpcs.phar => phpcs}                         | Bin
 ...3-typoscript-lint.phar => typo3-typoscript-lint} | Bin
 9 files changed, 12 insertions(+), 12 deletions(-)
 rename tools/{composer-normalize.phar => composer-normalize} (100%)
 rename tools/{phive.phar => phive} (100%)
 rename tools/{php-cs-fixer.phar => php-cs-fixer} (100%)
 rename tools/{phpcpd.phar => phpcpd} (100%)
 rename tools/{phpcs.phar => phpcs} (100%)
 rename tools/{typo3-typoscript-lint.phar => typo3-typoscript-lint} (100%)

diff --git a/.gitattributes b/.gitattributes
index 8a10860..80a7dd6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13,4 +13,4 @@
 /Tests/ export-ignore
 /codeception.yml export-ignore
 /phpcs.xml export-ignore
-/tools/ export-ignore
+/tools/ export-ignore binary
diff --git a/composer.json b/composer.json
index a4c6a86..655a522 100644
--- a/composer.json
+++ b/composer.json
@@ -77,7 +77,7 @@
 		"ci": [
 			"@ci:static"
 		],
-		"ci:composer:normalize": "php ./tools/composer-normalize.phar --dry-run",
+		"ci:composer:normalize": "php ./tools/composer-normalize --dry-run",
 		"ci:dynamic": [
 			"@ci:tests"
 		],
@@ -86,10 +86,10 @@
 			"@ci:php:codestyle",
 			"@ci:php:sniff"
 		],
-		"ci:php:codestyle": "php ./tools/php-cs-fixer.phar fix --config .php_cs.php -v --dry-run --using-cache false --diff --diff-format=udiff",
-		"ci:php:copypaste": "php ./tools/phpcpd.phar Classes Configuration Tests",
+		"ci:php:codestyle": "php ./tools/php-cs-fixer fix --config .php_cs.php -v --dry-run --using-cache false --diff --diff-format=udiff",
+		"ci:php:copypaste": "php ./tools/phpcpd Classes Configuration Tests",
 		"ci:php:lint": "find *.php Classes Configuration Tests -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l",
-		"ci:php:sniff": "php ./tools/phpcs.phar Classes Configuration Tests",
+		"ci:php:sniff": "php ./tools/phpcs Classes Configuration Tests",
 		"ci:static": [
 			"@ci:php:lint",
 			"@ci:php:sniff",
@@ -101,7 +101,7 @@
 		],
 		"ci:tests:functional": "find 'Tests/Functional' -wholename '*Test.php' | parallel --gnu 'echo; echo \"Running functional test suite {}\"; .Build/vendor/bin/phpunit -c .Build/vendor/nimut/testing-framework/res/Configuration/FunctionalTests.xml {}';",
 		"ci:tests:unit": ".Build/vendor/bin/phpunit -c .Build/vendor/nimut/testing-framework/res/Configuration/UnitTests.xml Tests/Unit",
-		"ci:ts:lint": "php ./tools/typo3-typoscript-lint.phar -c Configuration/TsLint.yml --ansi -n --fail-on-warnings -vvv Configuration/TypoScript",
+		"ci:ts:lint": "php ./tools/typo3-typoscript-lint -c Configuration/TsLint.yml --ansi -n --fail-on-warnings -vvv Configuration/TypoScript",
 		"ci:yaml:lint": "find . ! -path '*.Build/*' -name '*.yml' | xargs .Build/vendor/bin/yaml-lint",
 		"fix:php": [
 			"@fix:php:cs",
diff --git a/phive.xml b/phive.xml
index 979fb8c..57a658a 100644
--- a/phive.xml
+++ b/phive.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phar-io/phive" version="^0.14.5" location="./tools/phive.phar" copy="true" installed="0.14.5"/>
-  <phar name="phpcpd" version="^6.0.3" location="./tools/phpcpd.phar" copy="true" installed="6.0.3"/>
-  <phar name="phpcs" version="^3.5.8" location="./tools/phpcs.phar" copy="true" installed="3.5.8"/>
-  <phar name="ergebnis/composer-normalize" version="^2.13.2" location="./tools/composer-normalize.phar" copy="true" installed="2.13.2"/>
-  <phar name="friendsofphp/php-cs-fixer" version="^2.18.2" location="./tools/php-cs-fixer.phar" copy="true" installed="2.18.2"/>
-  <phar name="martin-helmich/typo3-typoscript-lint" version="^2.4.1" location="./tools/typo3-typoscript-lint.phar" copy="true" installed="2.4.1"/>
+  <phar name="phar-io/phive" version="^0.14.5" location="./tools/phive" copy="true" installed="0.14.5"/>
+  <phar name="phpcpd" version="^6.0.3" location="./tools/phpcpd" copy="true" installed="6.0.3"/>
+  <phar name="phpcs" version="^3.5.8" location="./tools/phpcs" copy="true" installed="3.5.8"/>
+  <phar name="ergebnis/composer-normalize" version="^2.13.2" location="./tools/composer-normalize" copy="true" installed="2.13.2"/>
+  <phar name="friendsofphp/php-cs-fixer" version="^2.18.2" location="./tools/php-cs-fixer" copy="true" installed="2.18.2"/>
+  <phar name="martin-helmich/typo3-typoscript-lint" version="^2.4.1" location="./tools/typo3-typoscript-lint" copy="true" installed="2.4.1"/>
 </phive>
diff --git a/tools/composer-normalize.phar b/tools/composer-normalize
similarity index 100%
rename from tools/composer-normalize.phar
rename to tools/composer-normalize
diff --git a/tools/phive.phar b/tools/phive
similarity index 100%
rename from tools/phive.phar
rename to tools/phive
diff --git a/tools/php-cs-fixer.phar b/tools/php-cs-fixer
similarity index 100%
rename from tools/php-cs-fixer.phar
rename to tools/php-cs-fixer
diff --git a/tools/phpcpd.phar b/tools/phpcpd
similarity index 100%
rename from tools/phpcpd.phar
rename to tools/phpcpd
diff --git a/tools/phpcs.phar b/tools/phpcs
similarity index 100%
rename from tools/phpcs.phar
rename to tools/phpcs
diff --git a/tools/typo3-typoscript-lint.phar b/tools/typo3-typoscript-lint
similarity index 100%
rename from tools/typo3-typoscript-lint.phar
rename to tools/typo3-typoscript-lint