add rule factory configuration

Author: Gummibeer

src/Translatable/Validation/RuleFactory.php

@@ -2,6 +2,7 @@
 
 namespace Astrotomic\Translatable\Validation;
 
+use Illuminate\Contracts\Config\Repository;
 use InvalidArgumentException;
 use Astrotomic\Translatable\Locales;
 
@@ -30,16 +31,16 @@ class RuleFactory
      */
     protected $locales = null;
 
-    public function __construct(int $format = self::FORMAT_ARRAY, string $prefix = '%', string $suffix = '%')
+    public function __construct(Repository $config, ?int $format = null, ?string $prefix = null, ?string $suffix = null)
     {
-        $this->format = $format;
-        $this->prefix = $prefix;
-        $this->suffix = $suffix;
+        $this->format = $format ?? $config->get('translatable.rule_factory.format');
+        $this->prefix = $prefix ?? $config->get('translatable.rule_factory.prefix');
+        $this->suffix = $suffix ?? $config->get('translatable.rule_factory.suffix');
     }
 
-    public static function make(array $rules, int $format = self::FORMAT_ARRAY, string $prefix = '%', string $suffix = '%', ?array $locales = null): array
+    public static function make(array $rules, ?int $format = null, ?string $prefix = null, ?string $suffix = null, ?array $locales = null): array
     {
-        $factory = new static($format, $prefix, $suffix);
+        $factory = app()->make(static::class, compact('format', 'prefix', 'suffix'));
 
         $factory->setLocales($locales);
 

src/config/translatable.php

@@ -131,4 +131,19 @@
     |
      */
     'to_array_always_loads_translations' => true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Configure the default behavior of the rule factory
+    |--------------------------------------------------------------------------
+    | The default values used to control the behavior of the RuleFactory.
+    | Here you can set your own default format and delimiters for
+    | your whole app.
+     *
+     */
+    'rule_factory' => [
+        'format' => \Astrotomic\Translatable\Validation\RuleFactory::FORMAT_ARRAY,
+        'prefix' => '%',
+        'suffix' => '%',
+    ],
 ];

tests/ValidationTest.php

@@ -130,6 +130,30 @@ public function test_format_array_it_replaces_middle_key_with_custom_regex_delim
         ], RuleFactory::make($rules, RuleFactory::FORMAT_ARRAY, '$', '$'));
     }
 
+    public function test_format_array_it_uses_config_as_default()
+    {
+        app('config')->set('translatable.rule_factory', [
+            'format' => RuleFactory::FORMAT_ARRAY,
+            'prefix' => '{',
+            'suffix' => '}',
+        ]);
+
+        $rules = [
+            'title' => 'required',
+            '{content}' => 'required',
+            '%content%' => 'required',
+        ];
+
+        $this->assertEquals([
+            'title' => 'required',
+            '%content%' => 'required',
+            'en.content' => 'required',
+            'de.content' => 'required',
+            'de-DE.content' => 'required',
+            'de-AT.content' => 'required',
+        ], RuleFactory::make($rules));
+    }
+
     public function test_format_key_it_replaces_single_key()
     {
         $rules = [
@@ -178,6 +202,30 @@ public function test_format_key_it_replaces_middle_key()
         ], RuleFactory::make($rules, RuleFactory::FORMAT_KEY));
     }
 
+    public function test_format_key_it_uses_config_as_default()
+    {
+        app('config')->set('translatable.rule_factory', [
+            'format' => RuleFactory::FORMAT_KEY,
+            'prefix' => '{',
+            'suffix' => '}',
+        ]);
+
+        $rules = [
+            'title' => 'required',
+            '{content}' => 'required',
+            '%content%' => 'required',
+        ];
+
+        $this->assertEquals([
+            'title' => 'required',
+            '%content%' => 'required',
+            'content:en' => 'required',
+            'content:de' => 'required',
+            'content:de-DE' => 'required',
+            'content:de-AT' => 'required',
+        ], RuleFactory::make($rules));
+    }
+
     public function test_it_replaces_key_with_custom_locales()
     {
         $rules = [