Merge pull request #8 from msztorc/pquote-fix

url quote - fix

Author: msztorc

.gitignore

@@ -5,3 +5,4 @@ vendor/
 tests/.env
 phpunit.xml
 .php_cs.cache
+.phpunit.result.cache

.php-cs-fixer.cache

@@ -131,6 +131,20 @@ public function deleteVariable(string $key, bool $write = true): bool
         return true;
     }
 
+    private function _preg_quote_except(string $str, string $exclude, ?string $delimiter = null): string
+    {
+        $str = preg_quote($str, $delimiter);
+        $from = [];
+        $to = [];
+
+        for ($i = 0; $i < strlen($exclude); $i++) {
+            $from[] = '\\' . $exclude[$i];
+            $to[] = $exclude[$i];
+        }
+
+        return (count($from) && count($to)) ? str_replace($from, $to, $str) : $str;
+    }
+
     /**
      * Check and prepare value to be safe
      * @param string $value
@@ -142,7 +156,7 @@ private function _prepareValue(string $value): string
             $value = '"' . $value . '"';
         }
 
-        return preg_quote($value);
+        return $this->_preg_quote_except($value, ':.');
     }
 
     private function _stripQuotes(string $value): string

src/Env.php

@@ -138,4 +138,17 @@ public function testEnvDelAll(): void
                 ->assertExitCode(0);
         }
     }
+
+    public function testUrls(): void
+    {
+        $app_url = 'https://mywebsite.com';
+
+        $this->artisan('env:set', ['key' => 'APP_URL' .'=' .$app_url])
+            ->expectsOutput("Environment variable with key 'APP_URL' has been set to '{$app_url}'")
+            ->assertExitCode(0);
+
+        $this->artisan('env:get', ['key' => 'APP_URL'])
+            ->expectsOutput($app_url)
+            ->assertExitCode(0);
+    }
 }

tests/EnvArtisanTest.php

@@ -199,4 +199,13 @@ public function testEnvDelAll(): void
             unset($env);
         }
     }
+
+    public function testUrls(): void
+    {
+        $env = new Env();
+        $app_url = 'https://mywebsite.com';
+        $env->setValue('APP_URL', $app_url);
+        $ver_value = $env->getValue('APP_URL');
+        $this->assertEquals($app_url, $ver_value);
+    }
 }