From d77b693d41d196729abb10c9d5f05c10bad0c128 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Wer=C5=82os?= <werlos@gmail.com>
Date: Wed, 13 Nov 2019 22:00:08 +0100
Subject: [PATCH] Update .gitattributes and move ci-integration.sh to root of
 the project

---
 .gitattributes                                | 39 ++++++++-----------
 box.json.dist                                 |  2 +-
 .../ci-integration.sh => ci-integration.sh    |  0
 src/Console/Command/HelpCommand.php           |  2 +-
 tests/Smoke/CiIntegrationTest.php             |  2 +-
 5 files changed, 20 insertions(+), 25 deletions(-)
 rename dev-tools/ci-integration.sh => ci-integration.sh (100%)

diff --git a/.gitattributes b/.gitattributes
index 6b8e4eea1e9..ed28764d9bc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,26 +1,21 @@
 # @TODO 3.0 replace following `tests/... export-ignore` with single `tests/ export-ignore`
-tests/**/*Test.php export-ignore
-tests/AbstractDoctrineAnnotationFixerTestCase.php export-ignore
-tests/Differ/AbstractDifferTestCase.php export-ignore
-tests/Fixtures/ export-ignore
-tests/Linter/AbstractLinterTestCase.php export-ignore
-tests/Report/AbstractReporterTestCase.php export-ignore
-tests/Test/AbstractFixerWithAliasedOptionsTestCase.php export-ignore
-tests/Test/AbstractTransformerTestCase.php export-ignore
+/tests/**/*Test.php export-ignore
+/tests/AbstractDoctrineAnnotationFixerTestCase.php export-ignore
+/tests/Differ/AbstractDifferTestCase.php export-ignore
+/tests/Fixtures/ export-ignore
+/tests/Linter/AbstractLinterTestCase.php export-ignore
+/tests/Report/AbstractReporterTestCase.php export-ignore
+/tests/Test/AbstractFixerWithAliasedOptionsTestCase.php export-ignore
+/tests/Test/AbstractTransformerTestCase.php export-ignore
 
-.appveyor.yml export-ignore
-.circleci/ export-ignore
-.composer-require-checker.json export-ignore
-.editorconfig export-ignore
-.gitattributes export-ignore
-.github/ export-ignore
-.gitignore export-ignore
-.travis.yml export-ignore
-benchmark.sh export-ignore
-box.json export-ignore
-check_trailing_spaces.sh export-ignore
-phpmd.xml export-ignore
-phpunit.xml.dist export-ignore
+/dev-tools export-ignore
+/.* export-ignore
+/benchmark.sh export-ignore
+/box.json.dist export-ignore
+/check_trailing_spaces.sh export-ignore
+/phpmd.xml export-ignore
+/phpstan.neon export-ignore
+/phpunit.xml.dist export-ignore
 
 *       text=auto eol=lf
 *.php   text whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4 diff=php
@@ -28,4 +23,4 @@ phpunit.xml.dist export-ignore
 *.yml   text whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4
 *.md    text whitespace=blank-at-eol,blank-at-eof
 *.rst   text whitespace=blank-at-eol,blank-at-eof
-tests/Fixtures/**/* -text
+/tests/Fixtures/**/* -text
diff --git a/box.json.dist b/box.json.dist
index f9867a6fe06..e4102debea2 100644
--- a/box.json.dist
+++ b/box.json.dist
@@ -7,7 +7,7 @@
         "KevinGH\\Box\\Compactor\\Php"
     ],
     "files": [
-        "dev-tools/ci-integration.sh",
+        "ci-integration.sh",
         "LICENSE"
     ],
     "finder": [
diff --git a/dev-tools/ci-integration.sh b/ci-integration.sh
similarity index 100%
rename from dev-tools/ci-integration.sh
rename to ci-integration.sh
diff --git a/src/Console/Command/HelpCommand.php b/src/Console/Command/HelpCommand.php
index 70a3fb2f777..12afe7ecc03 100644
--- a/src/Console/Command/HelpCommand.php
+++ b/src/Console/Command/HelpCommand.php
@@ -284,7 +284,7 @@ public static function getHelpCopy()
             ),
             '%%%CI_INTEGRATION%%%' => implode("\n", array_map(
                 static function ($line) { return '    $ '.$line; },
-                \array_slice(file(__DIR__.'/../../../dev-tools/ci-integration.sh', FILE_IGNORE_NEW_LINES), 3)
+                \array_slice(file(__DIR__.'/../../../ci-integration.sh', FILE_IGNORE_NEW_LINES), 3)
             )),
             '%%%FIXERS_DETAILS%%%' => self::getFixersHelp(),
         ]);
diff --git a/tests/Smoke/CiIntegrationTest.php b/tests/Smoke/CiIntegrationTest.php
index 7413a2ffe9f..63f54ccde9e 100644
--- a/tests/Smoke/CiIntegrationTest.php
+++ b/tests/Smoke/CiIntegrationTest.php
@@ -103,7 +103,7 @@ public function testIntegration(
             $caseCommands
         ));
 
-        $integrationScript = explode("\n", str_replace('vendor/bin/', './../../../', file_get_contents(__DIR__.'/../../dev-tools/ci-integration.sh')));
+        $integrationScript = explode("\n", str_replace('vendor/bin/', './../../../', file_get_contents(__DIR__.'/../../ci-integration.sh')));
         $steps = [
             "COMMIT_RANGE=\"master..{$branchName}\"",
             "{$integrationScript[3]}\n{$integrationScript[4]}",