glorand / laravel-model-settings

src/Managers/AbstractSettingsManager.php

Indentation +25 added lines, -25 removed lines

@@ -140,13 +140,13 @@ 
         }
 
         foreach ($paths as $path) {
-        	// Get default value
-	        $defaultValue = null;
-	        if(is_array($default)){
-		        $defaultValue = Arr::get($default, $path);
-	        }else{
-	        	$defaultValue = $default;
-	        }
+            // Get default value
+            $defaultValue = null;
+            if(is_array($default)){
+                $defaultValue = Arr::get($default, $path);
+            }else{
+                $defaultValue = $default;
+            }
             Arr::set($array, $path, Arr::get($allFlattened, $path, $defaultValue));
         }
 
@@ -172,29 +172,29 @@ 
         return $this->apply($settings);
     }
 
-	/**
-	 *
-	 */
+    /**
+     *
+     */
     protected function forgetEmpty(&$settings, $path) {
-    	// Forget path if it is empty
-	    if(!Arr::get($settings, $path)){
-		    Arr::forget($settings, $path);
-	    }else{
-	    	return;
-	    }
+        // Forget path if it is empty
+        if(!Arr::get($settings, $path)){
+            Arr::forget($settings, $path);
+        }else{
+            return;
+        }
 
-    	// Get path as array
-    	$paths = explode('.', $path);
+        // Get path as array
+        $paths = explode('.', $path);
 
-    	// remove last path
-	    array_pop($paths);
+        // remove last path
+        array_pop($paths);
 
-	    // Return if it was the last
-	    if(count($paths) === 0){
-	    	return;
-	    }
+        // Return if it was the last
+        if(count($paths) === 0){
+            return;
+        }
 
-	    $this->forgetEmpty($settings, implode('.', $paths));
+        $this->forgetEmpty($settings, implode('.', $paths));
     }
 
     /**

Spacing +8 added lines, -8 removed lines

@@ -58,9 +58,9 @@ 
             // only re-run if nested array is associative (key-based)
             // cannot use pre-shipped Arr:dot method
             if (is_array($value) && static::isAssoc($value) && !empty($value)) {
-                $results = array_merge($results, static::dotFlatten($value, $prepend.$key.'.'));
+                $results = array_merge($results, static::dotFlatten($value, $prepend . $key . '.'));
             } else {
-                $results[$prepend.$key] = $value;
+                $results[$prepend . $key] = $value;
             }
         }
         return $results;
@@ -73,7 +73,7 @@ 
     public function all(): array
     {
         if (config('model_settings.settings_cache_all') && !($this instanceof RedisSettingsManager)) {
-            return Cache::remember($this->getAllSettingsCacheKey(), now()->addDay(), function () {
+            return Cache::remember($this->getAllSettingsCacheKey(), now()->addDay(), function() {
                 return $this->getMultiple(null);
             });
         }
@@ -142,9 +142,9 @@ 
         foreach ($paths as $path) {
         	// Get default value
 	        $defaultValue = null;
-	        if(is_array($default)){
+	        if (is_array($default)) {
 		        $defaultValue = Arr::get($default, $path);
-	        }else{
+	        } else {
 	        	$defaultValue = $default;
 	        }
             Arr::set($array, $path, Arr::get($allFlattened, $path, $defaultValue));
@@ -177,9 +177,9 @@ 
 	 */
     protected function forgetEmpty(&$settings, $path) {
     	// Forget path if it is empty
-	    if(!Arr::get($settings, $path)){
+	    if (!Arr::get($settings, $path)) {
 		    Arr::forget($settings, $path);
-	    }else{
+	    } else {
 	    	return;
 	    }
 
@@ -190,7 +190,7 @@ 
 	    array_pop($paths);
 
 	    // Return if it was the last
-	    if(count($paths) === 0){
+	    if (count($paths) === 0) {
 	    	return;
 	    }
 

Braces +5 added lines, -3 removed lines

@@ -42,7 +42,9 @@ 
      */
     public static function isAssoc(array $arr)
     {
-        if (array() === $arr) return false;
+        if (array() === $arr) {
+            return false;
+        }
         return array_keys($arr) !== range(0, count($arr) - 1);
     }
 
@@ -144,7 +146,7 @@ 
 	        $defaultValue = null;
 	        if(is_array($default)){
 		        $defaultValue = Arr::get($default, $path);
-	        }else{
+	        } else{
 	        	$defaultValue = $default;
 	        }
             Arr::set($array, $path, Arr::get($allFlattened, $path, $defaultValue));
@@ -179,7 +181,7 @@ 
     	// Forget path if it is empty
 	    if(!Arr::get($settings, $path)){
 		    Arr::forget($settings, $path);
-	    }else{
+	    } else{
 	    	return;
 	    }