diff --git a/monorepo/scripts/FileFormatter.php b/monorepo/scripts/FileFormatter.php index 7586e158192..6a3545d1dfc 100644 --- a/monorepo/scripts/FileFormatter.php +++ b/monorepo/scripts/FileFormatter.php @@ -73,6 +73,13 @@ protected function run(): void /** Normalization */ + // Remove global function imports from tests + if (str_ends_with($filename, 'Test.php')) { + if (str_starts_with($line, 'use function') && ! str_contains($line, '\\')) { + continue; + } + } + // Remove multiple empty lines if (in_array(Settings::TrimMultipleEmptyLines, $this->settings)) { if (trim($line) == '' && trim($last_line) == '') { diff --git a/packages/framework/tests/Feature/Commands/PublishViewsCommandTest.php b/packages/framework/tests/Feature/Commands/PublishViewsCommandTest.php index 1539183333a..190823910b0 100644 --- a/packages/framework/tests/Feature/Commands/PublishViewsCommandTest.php +++ b/packages/framework/tests/Feature/Commands/PublishViewsCommandTest.php @@ -8,8 +8,6 @@ use Hyde\Testing\TestCase; use Illuminate\Support\Facades\File; -use function is_dir; - /** * @covers \Hyde\Console\Commands\PublishViewsCommand */ diff --git a/packages/framework/tests/Feature/ConfigurableSourceRootsFeatureTest.php b/packages/framework/tests/Feature/ConfigurableSourceRootsFeatureTest.php index 1fa0cd671bd..0e86d7b822d 100644 --- a/packages/framework/tests/Feature/ConfigurableSourceRootsFeatureTest.php +++ b/packages/framework/tests/Feature/ConfigurableSourceRootsFeatureTest.php @@ -4,18 +4,12 @@ namespace Hyde\Framework\Testing\Feature; -use function app; -use function config; -use function file_put_contents; - use Hyde\Framework\HydeServiceProvider; use Hyde\Hyde; use Hyde\Pages\MarkdownPage; use Hyde\Testing\TestCase; use Illuminate\Support\Facades\File; -use function mkdir; - /** * Test the overall functionality of the configurable source roots feature. * diff --git a/packages/framework/tests/Feature/HydeExtensionFeatureTest.php b/packages/framework/tests/Feature/HydeExtensionFeatureTest.php index b33a38f43cf..6ed83dd5793 100644 --- a/packages/framework/tests/Feature/HydeExtensionFeatureTest.php +++ b/packages/framework/tests/Feature/HydeExtensionFeatureTest.php @@ -20,8 +20,6 @@ use InvalidArgumentException; use stdClass; -use function app; - /** * Tests the Extensions API Feature on a higher level to ensure the components work together. * diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php index e350de913c2..d48d22933cb 100644 --- a/packages/framework/tests/Feature/HydeServiceProviderTest.php +++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php @@ -4,13 +4,6 @@ namespace Hyde\Framework\Testing\Feature; -use function app; -use function array_map; -use function basename; -use function config; -use function get_class; -use function glob; - use Hyde\Console\ConsoleServiceProvider; use Hyde\Framework\HydeServiceProvider; use Hyde\Framework\Services\AssetService; @@ -25,8 +18,6 @@ use Hyde\Testing\TestCase; use Illuminate\Support\Facades\Artisan; -use function method_exists; - /** * @covers \Hyde\Framework\HydeServiceProvider * @covers \Hyde\Framework\Concerns\RegistersFileLocations diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php index a6c2a18501b..a36346e4d53 100644 --- a/packages/framework/tests/Feature/NavigationMenuTest.php +++ b/packages/framework/tests/Feature/NavigationMenuTest.php @@ -6,10 +6,6 @@ use BadMethodCallException; use Hyde\Support\Models\Route; - -use function collect; -use function config; - use Hyde\Foundation\Facades\Routes; use Hyde\Framework\Features\Navigation\DropdownNavItem; use Hyde\Framework\Features\Navigation\NavigationMenu; diff --git a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php index a44ffcd9df2..0ee6fdec3bd 100644 --- a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php +++ b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php @@ -4,17 +4,11 @@ namespace Hyde\Framework\Testing\Feature\Services; -use function app; -use function config; - use Hyde\Framework\Features\Documentation\SemanticDocumentationArticle; use Hyde\Pages\DocumentationPage; use Hyde\Testing\TestCase; use Illuminate\Support\HtmlString; -use function str_replace; -use function view; - /** * @covers \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle */ diff --git a/packages/framework/tests/Feature/SidebarViewTest.php b/packages/framework/tests/Feature/SidebarViewTest.php index 44840e6440e..005b2421062 100644 --- a/packages/framework/tests/Feature/SidebarViewTest.php +++ b/packages/framework/tests/Feature/SidebarViewTest.php @@ -12,12 +12,6 @@ use Illuminate\Contracts\View\View; use Throwable; -use function config; -use function file_put_contents; -use function realpath; -use function view; -use function e; - /** * Very high level test of the sidebar views and their combinations of layouts. * diff --git a/packages/framework/tests/Feature/TypedConfigFacadeTest.php b/packages/framework/tests/Feature/TypedConfigFacadeTest.php index 2f0afd3e26a..b313dc2d738 100644 --- a/packages/framework/tests/Feature/TypedConfigFacadeTest.php +++ b/packages/framework/tests/Feature/TypedConfigFacadeTest.php @@ -9,8 +9,6 @@ use TypeError; use stdClass; -use function config; - /** * @covers \Hyde\Facades\Config */ diff --git a/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php b/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php index 587857d2a8b..c263016b94f 100644 --- a/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php +++ b/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php @@ -9,9 +9,6 @@ use Hyde\Foundation\Facades\Routes; use Hyde\Framework\Actions\StaticPageBuilder; use Hyde\Framework\Actions\CreatesNewMarkdownPostFile; - -use function config; - use Hyde\Framework\Concerns\InteractsWithDirectories; use Hyde\Hyde; use Hyde\Testing\TestCase; diff --git a/packages/framework/tests/Unit/SchemaContractsTest.php b/packages/framework/tests/Unit/SchemaContractsTest.php index 9f9f6d1205a..270c1f2ce5a 100644 --- a/packages/framework/tests/Unit/SchemaContractsTest.php +++ b/packages/framework/tests/Unit/SchemaContractsTest.php @@ -13,17 +13,6 @@ use Hyde\Testing\UnitTestCase; use Illuminate\Support\Str; -use function array_filter; -use function array_map; -use function array_merge; -use function array_values; -use function basename; -use function defined; -use function file_get_contents; -use function glob; -use function is_subclass_of; -use function substr_count; - /** * A state test to ensure the schemas can't be changed without breaking the tests. * This requires contributors to consider the impact of their changes as schema changes are rarely backwards compatible. diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php index 8d60759d23e..3e6fa630c6c 100644 --- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php +++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php @@ -4,19 +4,12 @@ namespace Hyde\Framework\Testing\Unit\Views; -use function array_merge; - use Hyde\Framework\Factories\FeaturedImageFactory; use Hyde\Framework\Features\Blogging\Models\FeaturedImage; use Hyde\Markdown\Models\FrontMatter; use Hyde\Pages\MarkdownPost; use Hyde\Testing\TestCase; -use function str_replace; -use function strip_tags; -use function trim; -use function view; - /** * @see resources/views/components/post/image.blade.php */ diff --git a/packages/framework/tests/Unit/Views/StylesComponentViewTest.php b/packages/framework/tests/Unit/Views/StylesComponentViewTest.php index 36a30f7c2b9..bfe078d00f1 100644 --- a/packages/framework/tests/Unit/Views/StylesComponentViewTest.php +++ b/packages/framework/tests/Unit/Views/StylesComponentViewTest.php @@ -5,9 +5,6 @@ namespace Hyde\Framework\Testing\Unit\Views; use Hyde\Facades\Filesystem; - -use function config; - use Hyde\Facades\Asset; use Hyde\Hyde; use Hyde\Support\Facades\Render; diff --git a/packages/publications/tests/Feature/CreatesNewPublicationPageTest.php b/packages/publications/tests/Feature/CreatesNewPublicationPageTest.php index d0642669a7a..b46b1d22808 100644 --- a/packages/publications/tests/Feature/CreatesNewPublicationPageTest.php +++ b/packages/publications/tests/Feature/CreatesNewPublicationPageTest.php @@ -17,8 +17,6 @@ use Hyde\Publications\Concerns\PublicationFieldTypes; use Hyde\Publications\Actions\CreatesNewPublicationPage; -use function file_get_contents; - /** * @covers \Hyde\Publications\Actions\CreatesNewPublicationPage */ diff --git a/packages/publications/tests/Feature/CreatesNewPublicationTypeTest.php b/packages/publications/tests/Feature/CreatesNewPublicationTypeTest.php index a2cf634badc..5cba3ccd7bc 100644 --- a/packages/publications/tests/Feature/CreatesNewPublicationTypeTest.php +++ b/packages/publications/tests/Feature/CreatesNewPublicationTypeTest.php @@ -4,8 +4,6 @@ namespace Hyde\Publications\Testing\Feature; -use function file_get_contents; - use Hyde\Facades\Filesystem; use Hyde\Hyde; use Hyde\Publications\Actions\CreatesNewPublicationType; diff --git a/packages/publications/tests/Feature/MakePublicationCommandTest.php b/packages/publications/tests/Feature/MakePublicationCommandTest.php index 67d73162436..bbc40ca7be5 100644 --- a/packages/publications/tests/Feature/MakePublicationCommandTest.php +++ b/packages/publications/tests/Feature/MakePublicationCommandTest.php @@ -4,18 +4,12 @@ namespace Hyde\Publications\Testing\Feature; -use function array_merge; -use function file_get_contents; -use function file_put_contents; - use Hyde\Facades\Filesystem; use Hyde\Hyde; use Hyde\Publications\Commands\Helpers\InputStreamHandler; use Hyde\Testing\TestCase; use Illuminate\Support\Carbon; -use function json_encode; - /** * @covers \Hyde\Publications\Commands\MakePublicationCommand * @covers \Hyde\Publications\Actions\CreatesNewPublicationPage diff --git a/packages/publications/tests/Feature/PublicationPageCompilerTest.php b/packages/publications/tests/Feature/PublicationPageCompilerTest.php index 93ee701f37f..e8e692e2dbd 100644 --- a/packages/publications/tests/Feature/PublicationPageCompilerTest.php +++ b/packages/publications/tests/Feature/PublicationPageCompilerTest.php @@ -12,11 +12,6 @@ use Hyde\Support\Facades\Render; use Hyde\Testing\TestCase; -use function file_get_contents; -use function file_put_contents; -use function json_decode; -use function json_encode; - /** * @covers \Hyde\Publications\Actions\PublicationPageCompiler */ diff --git a/packages/publications/tests/Feature/PublicationPageTest.php b/packages/publications/tests/Feature/PublicationPageTest.php index bad633352a1..e9caeb1a5de 100644 --- a/packages/publications/tests/Feature/PublicationPageTest.php +++ b/packages/publications/tests/Feature/PublicationPageTest.php @@ -10,8 +10,6 @@ use Hyde\Support\Models\Route; use Hyde\Testing\TestCase; -use function file_put_contents; - /** * @covers \Hyde\Publications\Pages\PublicationPage */ diff --git a/packages/publications/tests/Feature/PublicationServiceTest.php b/packages/publications/tests/Feature/PublicationServiceTest.php index 491b44e12f7..15ce71666ba 100644 --- a/packages/publications/tests/Feature/PublicationServiceTest.php +++ b/packages/publications/tests/Feature/PublicationServiceTest.php @@ -12,8 +12,6 @@ use Hyde\Testing\TestCase; use Illuminate\Support\Collection; -use function file_put_contents; - /** * @covers \Hyde\Publications\Publications * @covers \Hyde\Publications\PublicationsExtension diff --git a/packages/publications/tests/Feature/PublicationTypeTest.php b/packages/publications/tests/Feature/PublicationTypeTest.php index 89dced119dd..145f2316e98 100644 --- a/packages/publications/tests/Feature/PublicationTypeTest.php +++ b/packages/publications/tests/Feature/PublicationTypeTest.php @@ -17,9 +17,6 @@ use Illuminate\Support\ItemNotFoundException; use RuntimeException; -use function array_merge; -use function array_reverse; - /** * @covers \Hyde\Publications\Models\PublicationType */ diff --git a/packages/publications/tests/Feature/SeedPublicationCommandTest.php b/packages/publications/tests/Feature/SeedPublicationCommandTest.php index ac147794c41..b501889b642 100644 --- a/packages/publications/tests/Feature/SeedPublicationCommandTest.php +++ b/packages/publications/tests/Feature/SeedPublicationCommandTest.php @@ -4,8 +4,6 @@ namespace Hyde\Publications\Testing\Feature; -use function glob; - use Hyde\Hyde; use Hyde\Publications\Models\PublicationType; use Hyde\Testing\TestCase; diff --git a/packages/publications/tests/Feature/StaticSiteBuilderPublicationModuleTest.php b/packages/publications/tests/Feature/StaticSiteBuilderPublicationModuleTest.php index f54e3b5b164..e6ecc092a57 100644 --- a/packages/publications/tests/Feature/StaticSiteBuilderPublicationModuleTest.php +++ b/packages/publications/tests/Feature/StaticSiteBuilderPublicationModuleTest.php @@ -13,9 +13,6 @@ use Hyde\Publications\Concerns\PublicationFieldTypes; use Hyde\Publications\Actions\CreatesNewPublicationType; -use function range; -use function collect; - /** * Tests that publication pages are compiled properly when building the static site. * diff --git a/packages/publications/tests/Feature/ValidatePublicationsCommandTest.php b/packages/publications/tests/Feature/ValidatePublicationsCommandTest.php index 1709f085b83..e2a81d4f7fc 100644 --- a/packages/publications/tests/Feature/ValidatePublicationsCommandTest.php +++ b/packages/publications/tests/Feature/ValidatePublicationsCommandTest.php @@ -4,8 +4,6 @@ namespace Hyde\Publications\Testing\Feature; -use function file_put_contents; - use Hyde\Hyde; use Hyde\Publications\Models\PublicationType; use Hyde\Testing\TestCase; diff --git a/packages/publications/tests/Feature/ValidatingCommandTest.php b/packages/publications/tests/Feature/ValidatingCommandTest.php index b9afd740b97..2c828d4127b 100644 --- a/packages/publications/tests/Feature/ValidatingCommandTest.php +++ b/packages/publications/tests/Feature/ValidatingCommandTest.php @@ -12,9 +12,6 @@ use Mockery; use PHPUnit\Framework\ExpectationFailedException; use RuntimeException; - -use function str_starts_with; - use Symfony\Component\Console\Question\ChoiceQuestion; /**