caffeina-core / core

classes/Options.php

Spacing +19 added lines, -19 removed lines

@@ -18,11 +18,11 @@ 
 	 * @param  string $filepath The path of the PHP config file
 	 * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
 	 */
-	public static function loadPHP($filepath,$prefix_path=null){
+	public static function loadPHP($filepath, $prefix_path = null) {
 		ob_start();
 		$results = include($filepath);
 		ob_end_clean();
-		if($results) static::loadArray($results,$prefix_path);
+		if ($results) static::loadArray($results, $prefix_path);
 	}
 
 	/**
@@ -30,9 +30,9 @@ 
 	 * @param  string $filepath The path of the INI config file
 	 * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
 	 */
-	public static function loadINI($filepath,$prefix_path=null){
-		$results = parse_ini_file($filepath,true);
-		if($results) static::loadArray($results,$prefix_path);
+	public static function loadINI($filepath, $prefix_path = null) {
+		$results = parse_ini_file($filepath, true);
+		if ($results) static::loadArray($results, $prefix_path);
 	}
 
 	/**
@@ -40,10 +40,10 @@ 
 	 * @param  string $filepath The path of the JSON config file
 	 * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
 	 */
-	public static function loadJSON($filepath,$prefix_path=null){
+	public static function loadJSON($filepath, $prefix_path = null) {
 		$data = file_get_contents($filepath);
-		$results = $data?json_decode($data,true):[];
-		if($results) static::loadArray($results,$prefix_path);
+		$results = $data ? json_decode($data, true) : [];
+		if ($results) static::loadArray($results, $prefix_path);
 	}
 
 	/**
@@ -51,10 +51,10 @@ 
 	 * @param  array $array The array to load
 	 * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
 	 */
-	public static function loadArray(array $array,$prefix_path=null){
+	public static function loadArray(array $array, $prefix_path = null) {
 		if (is_array($array)) {
-			if ($prefix_path){
-				static::set($prefix_path,$array);
+			if ($prefix_path) {
+				static::set($prefix_path, $array);
 			} else {
 				static::merge($array);
 			}
@@ -67,22 +67,22 @@ 
    * @param  string $envname The filename for the ENV file (Default to `.env`)
    * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
    */
-  public static function loadENV($dir,$envname='.env',$prefix_path=null){
-    $dir = rtrim($dir,'/');
+  public static function loadENV($dir, $envname = '.env', $prefix_path = null) {
+    $dir = rtrim($dir, '/');
     $results = [];
-    foreach(file("$dir/$envname", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) as $line){
+    foreach (file("$dir/$envname", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) as $line) {
       $line = trim($line);
-      if ($line[0]=='#' || strpos($line,'=')===false) continue;
-      list($key,$value) = explode('=',$line,2);
+      if ($line[0] == '#' || strpos($line, '=') === false) continue;
+      list($key, $value) = explode('=', $line, 2);
       $key   = trim(str_replace(['export ', "'", '"'], '', $key));
-      $value = stripslashes(trim($value,'"'));
-      $results[$key] = preg_replace_callback('/\${([a-zA-Z0-9_]+)}/',function($m) use (&$results){
+      $value = stripslashes(trim($value, '"'));
+      $results[$key] = preg_replace_callback('/\${([a-zA-Z0-9_]+)}/', function($m) use (&$results){
         return isset($results[$m[1]]) ? $results[$m[1]] : '';
       },$value);
       putenv("$key={$results[$key]}");
       $_ENV[$key] = $results[$key];
     }
-    if($results) static::loadArray($results,$prefix_path);
+    if ($results) static::loadArray($results, $prefix_path);
   }
 
 }

Braces +23 added lines, -13 removed lines

@@ -18,11 +18,13 @@ 
 	 * @param  string $filepath The path of the PHP config file
 	 * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
 	 */
-	public static function loadPHP($filepath,$prefix_path=null){
+	public static function loadPHP($filepath,$prefix_path=null) {
 		ob_start();
 		$results = include($filepath);
 		ob_end_clean();
-		if($results) static::loadArray($results,$prefix_path);
+		if($results) {
+		  static::loadArray($results,$prefix_path);
+		}
 	}
 
 	/**
@@ -30,9 +32,11 @@ 
 	 * @param  string $filepath The path of the INI config file
 	 * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
 	 */
-	public static function loadINI($filepath,$prefix_path=null){
+	public static function loadINI($filepath,$prefix_path=null) {
 		$results = parse_ini_file($filepath,true);
-		if($results) static::loadArray($results,$prefix_path);
+		if($results) {
+		  static::loadArray($results,$prefix_path);
+		}
 	}
 
 	/**
@@ -40,10 +44,12 @@ 
 	 * @param  string $filepath The path of the JSON config file
 	 * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
 	 */
-	public static function loadJSON($filepath,$prefix_path=null){
+	public static function loadJSON($filepath,$prefix_path=null) {
 		$data = file_get_contents($filepath);
 		$results = $data?json_decode($data,true):[];
-		if($results) static::loadArray($results,$prefix_path);
+		if($results) {
+		  static::loadArray($results,$prefix_path);
+		}
 	}
 
 	/**
@@ -51,9 +57,9 @@ 
 	 * @param  array $array The array to load
 	 * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
 	 */
-	public static function loadArray(array $array,$prefix_path=null){
+	public static function loadArray(array $array,$prefix_path=null) {
 		if (is_array($array)) {
-			if ($prefix_path){
+			if ($prefix_path) {
 				static::set($prefix_path,$array);
 			} else {
 				static::merge($array);
@@ -67,22 +73,26 @@ 
    * @param  string $envname The filename for the ENV file (Default to `.env`)
    * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
    */
-  public static function loadENV($dir,$envname='.env',$prefix_path=null){
+  public static function loadENV($dir,$envname='.env',$prefix_path=null) {
     $dir = rtrim($dir,'/');
     $results = [];
-    foreach(file("$dir/$envname", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) as $line){
+    foreach(file("$dir/$envname", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) as $line) {
       $line = trim($line);
-      if ($line[0]=='#' || strpos($line,'=')===false) continue;
+      if ($line[0]=='#' || strpos($line,'=')===false) {
+        continue;
+      }
       list($key,$value) = explode('=',$line,2);
       $key   = trim(str_replace(['export ', "'", '"'], '', $key));
       $value = stripslashes(trim($value,'"'));
-      $results[$key] = preg_replace_callback('/\${([a-zA-Z0-9_]+)}/',function($m) use (&$results){
+      $results[$key] = preg_replace_callback('/\${([a-zA-Z0-9_]+)}/',function($m) use (&$results) {
         return isset($results[$m[1]]) ? $results[$m[1]] : '';
       },$value);
       putenv("$key={$results[$key]}");
       $_ENV[$key] = $results[$key];
     }
-    if($results) static::loadArray($results,$prefix_path);
+    if($results) {
+      static::loadArray($results,$prefix_path);
+    }
   }
 
 }