bug #1014 hiding php8 file so it doesn't throw autoloading warning (weaverryan)

weaverryan · weaverryan · commit ccb0d5599cb0 · 2021-11-16T19:11:29.000-05:00
This PR was merged into the 1.0-dev branch. Discussion ---------- hiding php8 file so it doesn't throw autoloading warning Fixes #1013 The contents of this odd file need to live in a separate file so that PHP 7 can parse `MigrationDiffFilteredOutput.php` without encountering a syntax error on the `string|iterable` type. If anyone can suggest a nicer solution, I'm all ears :). Commits ------- 583c67e hiding php8 file so it doesn't throw autoloading warning
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -11,7 +11,6 @@
     ->exclude('fixtures')
     // the PHP template files are a bit special
     ->notName('*.tpl.php')
-    ->notPath('src/Console/MigrationDiffFilteredOutput_php8.php')
 ;
 
 return (new PhpCsFixer\Config())
diff --git a/src/Console/MigrationDiffFilteredOutput.php b/src/Console/MigrationDiffFilteredOutput.php
@@ -42,7 +42,7 @@ public function setDecorated($decorated)
         }
     }
 } else {
-    require __DIR__.'/MigrationDiffFilteredOutput_php8.php';
+    require __DIR__.'/MigrationDiffFilteredOutput_php8';
 }
 
 trait BaseMakerMigrationDiffFilteredOuputTrait
diff --git a/src/Console/MigrationDiffFilteredOutput_php8 b/src/Console/MigrationDiffFilteredOutput_php8

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`->exclude('fixtures')`
`12`	`12`	`// the PHP template files are a bit special`
`13`	`13`	`->notName('*.tpl.php')`
`14`		`- ->notPath('src/Console/MigrationDiffFilteredOutput_php8.php')`
`15`	`14`	`;`
`16`	`15`
`17`	`16`	`return (new PhpCsFixer\Config())`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function setDecorated($decorated)`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`} else {`
`45`		`- require __DIR__.'/MigrationDiffFilteredOutput_php8.php';`
	`45`	`+ require __DIR__.'/MigrationDiffFilteredOutput_php8';`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`trait BaseMakerMigrationDiffFilteredOuputTrait`