Merge pull request #13 from TheDragonCode/2.x

Andrey Helldar · web-flow · commit 3402384e3aee · 2022-04-21T01:46:43.000+03:00
Added `dragon-code/env-sync` 4 support
diff --git a/composer.json b/composer.json
@@ -26,15 +26,14 @@
     },
     "require": {
         "php": "^7.3 || ^8.0",
-        "dragon-code/env-sync": "^3.4.4",
+        "dragon-code/env-sync": "^3.4.4 || ^4.0",
         "illuminate/console": "^7.0 || ^8.0 || ^9.0",
         "illuminate/support": "^7.0 || ^8.0 || ^9.0"
     },
     "require-dev": {
-        "dragon-code/support": "^5.8",
         "mockery/mockery": "^1.3.1",
         "orchestra/testbench": "^5.0 || ^6.0 || ^7.0",
-        "phpunit/phpunit": "^9.0"
+        "phpunit/phpunit": "^9.5"
     },
     "minimum-stability": "stable",
     "prefer-stable": true,
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -3,7 +3,6 @@
 namespace Tests;
 
 use DragonCode\EnvSync\Frameworks\Laravel\ServiceProvider;
-use DragonCode\Support\Facades\Helpers\Filesystem\File;
 use Orchestra\Testbench\TestCase as BaseTestCase;
 use Tests\Concerns\Configurable;
 use Tests\Concerns\Files;
@@ -32,6 +31,8 @@ protected function clean(): void
 
     protected function deleteFiles(): void
     {
-        File::delete($this->targetPath());
+        if (file_exists($this->targetPath())) {
+            unlink($this->targetPath());
+        }
     }
 }
diff --git a/tests/Unit/WithEnvTest.php b/tests/Unit/WithEnvTest.php
@@ -5,7 +5,6 @@
 namespace Tests\Unit;
 
 use DragonCode\EnvSync\Frameworks\Laravel\Console\Sync;
-use DragonCode\Support\Facades\Helpers\Filesystem\File;
 use Tests\TestCase;
 
 class WithEnvTest extends TestCase
@@ -31,6 +30,6 @@ public function testWithEnv()
 
     protected function copyFixture()
     {
-        File::copy($this->path . '/sync-env', $this->targetPath());
+        copy($this->path . '/sync-env', $this->targetPath());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`namespace Tests;`
`4`	`4`
`5`	`5`	`use DragonCode\EnvSync\Frameworks\Laravel\ServiceProvider;`
`6`		`-use DragonCode\Support\Facades\Helpers\Filesystem\File;`
`7`	`6`	`use Orchestra\Testbench\TestCase as BaseTestCase;`
`8`	`7`	`use Tests\Concerns\Configurable;`
`9`	`8`	`use Tests\Concerns\Files;`
`@@ -32,6 +31,8 @@ protected function clean(): void`
`32`	`31`
`33`	`32`	`protected function deleteFiles(): void`
`34`	`33`	`{`
`35`		`- File::delete($this->targetPath());`
	`34`	`+ if (file_exists($this->targetPath())) {`
	`35`	`+ unlink($this->targetPath());`
	`36`	`+ }`
`36`	`37`	`}`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`namespace Tests\Unit;`
`6`	`6`
`7`	`7`	`use DragonCode\EnvSync\Frameworks\Laravel\Console\Sync;`
`8`		`-use DragonCode\Support\Facades\Helpers\Filesystem\File;`
`9`	`8`	`use Tests\TestCase;`
`10`	`9`
`11`	`10`	`class WithEnvTest extends TestCase`
`@@ -31,6 +30,6 @@ public function testWithEnv()`
`31`	`30`
`32`	`31`	`protected function copyFixture()`
`33`	`32`	`{`
`34`		`- File::copy($this->path . '/sync-env', $this->targetPath());`
	`33`	`+ copy($this->path . '/sync-env', $this->targetPath());`
`35`	`34`	`}`
`36`	`35`	`}`