Merge pull request #34 from TheDragonCode/3.x

Fixed removal of secret keys of `env` file

Author: Andrey Helldar

src/Services/Compiler.php

@@ -27,11 +27,11 @@ public function __construct(Stringify $stringify, Config $config)
         $this->config    = $config;
     }
 
-    public function items(array $items, array $target = []): self
+    public function items(array $items, array $target = [], bool $secure = true): self
     {
-        $this->items = $this->map(
-            $this->filter($items, $target)
-        );
+        $filtered = $this->filter($items, $target);
+
+        $this->items = $this->map($filtered, $secure);
 
         return $this;
     }
@@ -69,14 +69,14 @@ protected function filter(array $items, array $target): array
         return $items;
     }
 
-    protected function map(array $items): array
+    protected function map(array $items, bool $secure): array
     {
         $result = [];
 
         foreach ($items as $key => $value) {
             $key = Str::upper($key);
 
-            $replaced = $this->replace($key, $value);
+            $replaced = $this->replace($key, $value, $secure);
 
             $result[$key] = $this->parseStringValue($replaced);
         }
@@ -117,9 +117,9 @@ protected function compile(array $items): string
         return trim($result) . $separator;
     }
 
-    protected function replace(string $key, $value)
+    protected function replace(string $key, $value, bool $secure)
     {
-        return $this->isForceHiding($key) ? null : $this->value($key, $value);
+        return $this->isForceHiding($key) && $secure ? null : $this->value($key, $value);
     }
 
     protected function isForceHiding(string $key): bool

src/Services/Syncer.php

@@ -89,11 +89,16 @@ protected function parsed(array $files): array
 
     protected function compiler(array $items, array $target = []): Compiler
     {
-        return $this->compiler->items($items, $target);
+        return $this->compiler->items($items, $target, $this->hasSecure());
     }
 
     protected function targetPath(): string
     {
         return rtrim($this->path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $this->filename;
     }
+
+    protected function hasSecure(): bool
+    {
+        return ! $this->sync;
+    }
 }

tests/Concerns/Files.php

@@ -10,11 +10,9 @@ trait Files
 
     protected $filename = '.env.example';
 
-    protected function expected(?string $path = null): string
+    protected function expected(): string
     {
-        $filename = $path ?: $this->fixture_expected;
-
-        return realpath(__DIR__ . '/../fixtures/expected/' . $filename);
+        return realpath(__DIR__ . '/../fixtures/expected/' . $this->fixture_expected);
     }
 
     protected function targetPath(): string

tests/Unit/MainTest.php

@@ -42,21 +42,6 @@ public function testStoring()
         $this->assertFileEquals($this->expected(), $this->targetPath());
     }
 
-    public function testSync()
-    {
-        $source = __DIR__ . '/../fixtures/source/.env.sync';
-        $target = __DIR__ . '/../fixtures/expected/expected-sync';
-
-        $service = $this->service();
-
-        $service->path($this->path);
-        $service->filename($this->filename, $source);
-
-        $service->store();
-
-        $this->assertFileEquals($this->expected('expected-sync'), $target);
-    }
-
     public function testCustomPathFailed()
     {
         $this->expectException(DirectoryNotFoundException::class);

tests/Unit/WithEnvTest.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit;
+
+use DragonCode\Support\Facades\Helpers\Filesystem\File;
+use Tests\TestCase;
+
+class WithEnvTest extends TestCase
+{
+    protected $fixture_expected = 'expected-sync';
+
+    protected $filename = '.env';
+
+    public function testSync()
+    {
+        $this->copyFixture();
+
+        $service = $this->service();
+
+        $service->path($this->path);
+        $service->filename($this->filename, true);
+
+        $service->store();
+
+        $this->assertFileExists($this->targetPath());
+        $this->assertFileEquals($this->expected(), $this->targetPath());
+    }
+
+    protected function copyFixture()
+    {
+        File::copy($this->path . '/.env.sync', $this->targetPath());
+    }
+}

tests/fixtures/expected/expected-sync

@@ -1,5 +1,11 @@
 APP_DEBUG=true
-APP_ENV=testing
-APP_KEY=
+APP_ENV=local
+APP_KEY=foo
 APP_NAME=Laravel
 APP_URL=https://example.com
+
+DB_CONNECTION=mysql
+DB_DATABASE=forge
+DB_HOST=qwerty
+DB_PASSWORD=root
+DB_USERNAME=root

tests/fixtures/source/.env.sync

@@ -1,9 +1,15 @@
 APP_DEBUG=true
-APP_ENV=testing
+APP_ENV=local
 APP_KEY=foo
 APP_NAME=Laravel
 APP_URL=https://example.com
 
+DB_CONNECTION=mysql
+DB_DATABASE=forge
+DB_HOST=qwerty
+DB_PASSWORD=root
+DB_USERNAME=root
+
 CUSTOM_KEY_1=
 CUSTOM_KEY_2=
 CUSTOM_KEY_3=

tests/fixtures/source/.gitignore

@@ -1 +1,2 @@
 .env.example
+.env