Merge pull request #29 from TheDragonCode/3.x

Added character escaping

Author: Andrey Helldar

composer.json

@@ -30,7 +30,7 @@
     },
     "require": {
         "php": "^7.3 || ^8.0",
-        "dragon-code/support": "^5.7",
+        "dragon-code/support": "^5.8",
         "symfony/finder": "^4.0 || ^5.0 || ^6.0"
     },
     "require-dev": {

src/Services/Stringify.php

@@ -4,6 +4,7 @@
 
 use DragonCode\Support\Concerns\Makeable;
 use DragonCode\Support\Facades\Helpers\Boolean;
+use DragonCode\Support\Facades\Helpers\Str;
 
 class Stringify
 {
@@ -16,9 +17,11 @@ public function get($value): string
                 return $this->fromBool($value);
 
             case $this->isNumeric($value):
-            case $this->isString($value):
                 return $value;
 
+            case $this->isString($value):
+                return $this->fromString($value);
+
             default:
                 return '';
         }
@@ -43,4 +46,13 @@ public function fromBool(bool $value): string
     {
         return Boolean::convertToString($value);
     }
+
+    public function fromString(string $value): string
+    {
+        if (Str::contains($value, [' ', '#'])) {
+            return sprintf('"%s"', $value);
+        }
+
+        return $value;
+    }
 }

tests/fixtures/expected/expected

@@ -57,6 +57,7 @@ MAIL_LOG_CHANNEL=
 MAIL_MAILER=smtp
 MAIL_PASSWORD=
 MAIL_PORT=587
+MAIL_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
 MAIL_USERNAME=
 
 MEMCACHED_HOST=127.0.0.1

tests/fixtures/expected/expected-config

@@ -57,6 +57,7 @@ MAIL_LOG_CHANNEL=
 MAIL_MAILER=smtp
 MAIL_PASSWORD=
 MAIL_PORT=587
+MAIL_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
 MAIL_USERNAME=
 
 MEMCACHED_HOST=127.0.0.1

tests/fixtures/source/mail.php

@@ -58,7 +58,7 @@
 
         'sendmail' => [
             'transport' => 'sendmail',
-            'path'      => '/usr/sbin/sendmail -bs',
+            'path'      => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -t -i'),
         ],
 
         'log' => [