refactor: revert FileSystemMock property

Author: RGO230

tests/Support/ControllerGeneratorTest/ControllerGeneratorMockTrait.php

@@ -11,22 +11,26 @@ trait ControllerGeneratorMockTrait
 
     public function mockFilesystemWithoutRoutesFile(): void
     {
-        $this->fileSystemMock->routes = [];
+        $fileSystemMock = new FileSystemMock;
+        $fileSystemMock->services = [
+            'PostService.php' => $this->mockPhpFileContent(),
+        ];
+        $fileSystemMock->controllers = [];
 
-        $this->fileSystemMock->setStructure();
+        $fileSystemMock->setStructure();
     }
 
     public function mockFilesystem(): void
     {
-        $this->fileSystemMock = new FileSystemMock;
-        $this->fileSystemMock->services = [
+        $fileSystemMock = new FileSystemMock;
+        $fileSystemMock->services = [
             'PostService.php' => $this->mockPhpFileContent(),
         ];
-        $this->fileSystemMock->controllers = [];
-        $this->fileSystemMock->routes = [
+        $fileSystemMock->controllers = [];
+        $fileSystemMock->routes = [
             'api.php' => $this->mockPhpFileContent(),
         ];
 
-        $this->fileSystemMock->setStructure();
+        $fileSystemMock->setStructure();
     }
 }

tests/Support/Factory/FactoryMockTrait.php

@@ -17,22 +17,24 @@ public function mockFactoryGenerator(array ...$functionCalls): void
 
     public function mockFileSystemWithoutPostModel(): void
     {
-        $this->fileSystemMock->models = [
+        $fileSystemMock = new FileSystemMock();
+
+        $fileSystemMock->models = [
             'User.php' => $this->mockPhpFileContent(),
         ];
 
-        $this->fileSystemMock->setStructure();
+        $fileSystemMock->setStructure();
     }
 
     public function mockFilesystem(): void
     {
-        $this->fileSystemMock = new FileSystemMock();
+        $fileSystemMock = new FileSystemMock();
 
-        $this->fileSystemMock->models = [
+        $fileSystemMock->models = [
             'Post.php' => $this->mockPhpFileContent(),
             'User.php' => $this->mockPhpFileContent(),
         ];
 
-        $this->fileSystemMock->setStructure();
+        $fileSystemMock->setStructure();
     }
 }

tests/Support/GeneratorMockTrait.php

@@ -9,8 +9,6 @@ trait GeneratorMockTrait
 {
     use MockTrait;
 
-    protected FileSystemMock $fileSystemMock;
-
     public function mockNativeGeneratorFunctions(...$functionCalls): void
     {
         $this->mockNativeFunction('\RonasIT\Support\Generators', $functionCalls);

tests/Support/Model/ModelMockTrait.php

@@ -12,22 +12,24 @@ trait ModelMockTrait
 
     public function mockFileSystemWithoutCommentModel(): void
     {
-        $this->fileSystemMock->models = [
+        $fileSystemMock = new FileSystemMock;
+
+        $fileSystemMock->models = [
             'User.php' => file_get_contents(getcwd() . '/tests/Support/Models/WelcomeBonus.php'),
         ];
 
-        $this->fileSystemMock->setStructure();
+        $fileSystemMock->setStructure();
     }
 
     public function mockFilesystem(): void
     {
-        $this->fileSystemMock = new FileSystemMock;
+        $fileSystemMock = new FileSystemMock;
 
-        $this->fileSystemMock->models = [
+        $fileSystemMock->models = [
             'Comment.php' => file_get_contents(getcwd() . '/tests/Support/Models/WelcomeBonus.php'),
             'User.php' => file_get_contents(getcwd() . '/tests/Support/Models/WelcomeBonus.php'),
         ];
 
-        $this->fileSystemMock->setStructure();
+        $fileSystemMock->setStructure();
     }
 }

tests/Support/NovaResourceGeneratorTest/NovaResourceGeneratorMockTrait.php

@@ -14,13 +14,13 @@ trait NovaResourceGeneratorMockTrait
 
     public function mockFilesystem(): void
     {
-        $this->fileSystemMock = new FileSystemMock;
-        $this->fileSystemMock->novaModels = [];
-        $this->fileSystemMock->models = [
+        $fileSystemMock = new FileSystemMock;
+        $fileSystemMock->novaModels = [];
+        $fileSystemMock->models = [
             'Post.php' => $this->mockPhpFileContent(),
         ];
 
-        $this->fileSystemMock->setStructure();
+        $fileSystemMock->setStructure();
     }
 
     public function mockGettingModelInstance(): void
@@ -41,8 +41,10 @@ public function mockGettingModelInstance(): void
 
     public function mockFileSystemWithoutPostModel(): void
     {
-        $this->fileSystemMock->models = null;
+        $fileSystemMock = new FileSystemMock;
 
-        $this->fileSystemMock->setStructure();
+        $fileSystemMock->models = null;
+
+        $fileSystemMock->setStructure();
     }
 }

tests/Support/NovaTestGeneratorTest/NovaTestGeneratorMockTrait.php

@@ -19,27 +19,27 @@ public function mockNovaRequestClassCall(): void
 
     public function mockFilesystem(): void
     {
-        $this->fileSystemMock = new FileSystemMock;
+        $fileSystemMock = new FileSystemMock;
 
-        $this->fileSystemMock->novaActions = [
+        $fileSystemMock->novaActions = [
             'PublishPostAction.php' => $this->mockPhpFileContent(),
             'ArchivePostAction.php' => $this->mockPhpFileContent(),
             'BlockCommentAction.php' => $this->mockPhpFileContent(),
             'UnPublishPostAction.txt' => 'text',
         ];
 
-        $this->fileSystemMock->novaModels = [
+        $fileSystemMock->novaModels = [
             'WelcomeBonusResource.php' => $this->mockPhpFileContent(),
         ];
 
-        $this->fileSystemMock->models = [
+        $fileSystemMock->models = [
             'WelcomeBonus.php' => $this->mockPhpFileContent(),
         ];
 
-        $this->fileSystemMock->testFixtures = [
+        $fileSystemMock->testFixtures = [
             'NovaWelcomeBonusTest' => []
         ];
 
-        $this->fileSystemMock->setStructure();
+        $fileSystemMock->setStructure();
     }
 }

tests/Support/Repository/RepositoryMockTrait.php

@@ -11,12 +11,12 @@ trait RepositoryMockTrait
 
     public function mockFilesystem(): void
     {
-        $this->fileSystemMock = new FileSystemMock;
+        $fileSystemMock = new FileSystemMock;
 
-        $this->fileSystemMock->models = [
+        $fileSystemMock->models = [
             'Post.php' => $this->mockPhpFileContent(),
         ];
 
-        $this->fileSystemMock->setStructure();
+        $fileSystemMock->setStructure();
     }
 }

tests/Support/Translation/TranslationMockTrait.php

@@ -11,19 +11,21 @@ trait TranslationMockTrait
 
     public function mockFilesystem(): void
     {
-        $this->fileSystemMock = new FileSystemMock();
+        $fileSystemMock = new FileSystemMock();
 
-        $this->fileSystemMock->translations = [];
+        $fileSystemMock->translations = [];
 
-        $this->fileSystemMock->setStructure();
+        $fileSystemMock->setStructure();
     }
 
     public function mockFilesystemForAppend(): void
     {
         $validation = file_get_contents(getcwd() . '/tests/Support/Translation/validation_without_exceptions.php');
 
-        $this->fileSystemMock->translations = ['validation.php' => $validation];
+        $fileSystemMock = new FileSystemMock();
 
-        $this->fileSystemMock->setStructure();
+        $fileSystemMock->translations = ['validation.php' => $validation];
+
+        $fileSystemMock->setStructure();
     }
 }