Merge branch 'master' into l9support

Author: saqueib

src/Setting/AppSettings.php

@@ -13,7 +13,7 @@ class AppSettings
     /**
      * @var SettingStorage
      */
-    private $settingStorage;
+    protected $settingStorage;
 
     /**
      * AppSettings constructor.
@@ -22,16 +22,35 @@ class AppSettings
      */
     public function __construct(SettingStorage $settingStorage)
     {
-        $groupName = $this->getSettingsGroupName();
+        $this->setSettingStorage($settingStorage);
+    }
+
+    /**
+     * Sets the settings storage.
+     *
+     * @param SettingStorage $settingStorage
+     */
+    public function setSettingStorage(SettingStorage $settingStorage)
+    {
+        $this->settingStorage = $settingStorage;
 
+        $groupName = $this->getSettingsGroupName();
         if( $groupName && is_callable($groupName) ) {
             $groupName = $this->runCallback($groupName, 'setting_group', null);
-            $this->settingStorage = $settingStorage->group($groupName);
-        } else {
-            $this->settingStorage = $settingStorage;
+            $this->setStorageGroup($groupName);
         }
     }
 
+    /**
+     * Sets the current storage group.
+     *
+     * @param string $groupName
+     */
+    public function setStorageGroup($groupName)
+    {
+        $this->settingStorage->group($groupName);
+    }
+
     /**
      * Get all the settings from storage
      *
@@ -214,7 +233,7 @@ public function getValidationRules()
      * @param bool $out
      * @return bool|int|mixed|string
      */
-    private function castValue($dataType, $value, $out = false)
+    protected function castValue($dataType, $value, $out = false)
     {
         switch ($dataType) {
             case 'array':
@@ -285,7 +304,7 @@ protected function cleanUpSettings($allDefinedSettings)
      * @param $out
      * @return array|mixed|string
      */
-    private function castToArray($value, $out)
+    protected function castToArray($value, $out)
     {
         if ($out) {
             return empty($value) ? [] : json_decode($value, true);
@@ -301,7 +320,7 @@ private function castToArray($value, $out)
      * @param $request Request
      * @return string|null
      */
-    private function uploadFile($setting, $request)
+    protected function uploadFile($setting, $request)
     {
         $settingName = Arr::get($setting, 'name');
 
@@ -337,7 +356,7 @@ private function uploadFile($setting, $request)
      * @param $oldFile
      * @param $disk
      */
-    private function deleteFile($oldFile, $disk): void
+    protected function deleteFile($oldFile, $disk): void
     {
         if ($oldFile && Storage::disk($disk)->exists($oldFile)) {
             Storage::disk($disk)->delete($oldFile);

src/config/app_settings.php

@@ -64,6 +64,12 @@
     // Any middleware you want to run on above route
     'middleware' => [],
 
+    // Route Names
+    'route_names' => [
+        'index' => 'settings.index',
+        'store' => 'settings.store',
+    ],
+    
     // View settings
     'setting_page_view' => 'app_settings::settings_page',
     'flash_partial' => 'app_settings::_flash',

src/routes/web.php

@@ -3,6 +3,6 @@
 Route::group([
     'middleware' => array_merge(['web'], config('app_settings.middleware', []))
 ], function () {
-    Route::get(config('app_settings.url'), config('app_settings.controller').'@index');
-    Route::post(config('app_settings.url'), config('app_settings.controller').'@store');
+    Route::get(config('app_settings.url'), config('app_settings.controller').'@index')->name(config('app_settings.route_names.index'));
+    Route::post(config('app_settings.url'), config('app_settings.controller').'@store')->name(config('app_settings.route_names.store'));
 });