Merge pull request #1582 from hydephp/remove-global-function-imports-…

…from-tests Remove global function imports from tests
hydephp · Feb 22, 2024 · f68daaf · f68daaf
2 parents a6bcd95 + a97f942
commit f68daaf
Show file tree

Hide file tree

Showing 24 changed files with 7 additions and 93 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -12,9 +12,6 @@
 use Mockery;
 use PHPUnit\Framework\ExpectationFailedException;
 use RuntimeException;
-
-use function str_starts_with;
-
 use Symfony\Component\Console\Question\ChoiceQuestion;
 
 /**