Skip to content

Commit

Permalink
Update .gitattributes and move ci-integration.sh to root of the project
Browse files Browse the repository at this point in the history
  • Loading branch information
kubawerlos committed Nov 13, 2019
1 parent 83460b5 commit d77b693
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 25 deletions.
39 changes: 17 additions & 22 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,31 +1,26 @@
# @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
*.json text whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4
*.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
2 changes: 1 addition & 1 deletion box.json.dist
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"KevinGH\\Box\\Compactor\\Php"
],
"files": [
"dev-tools/ci-integration.sh",
"ci-integration.sh",
"LICENSE"
],
"finder": [
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/Console/Command/HelpCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
]);
Expand Down
2 changes: 1 addition & 1 deletion tests/Smoke/CiIntegrationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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]}",
Expand Down

0 comments on commit d77b693

Please sign in to comment.