iriven / ConfigManager

ConfigManager.php

Indentation +23 added lines, -23 removed lines

@@ -11,18 +11,18 @@ 
 {
 const PHP_TAB = "\t";
     /**
-    * Chemin complet du fichier de configuration
-    */
+     * Chemin complet du fichier de configuration
+     */
     private $targetFile;
     private $Options = [];
     /**
-    * tableau multidimensionnel contenant les donnée de configuration, initialement
-    * chargées depuis le fichier
-    */
+     * tableau multidimensionnel contenant les donnée de configuration, initialement
+     * chargées depuis le fichier
+     */
     private $Config = [];
     /**
-    * processeurs de fichier pris en charge par l'application
-    */
+     * processeurs de fichier pris en charge par l'application
+     */
     private $availableDrivers = array('JSON', 'PHP','INI','YML');
 
     private $defaultSection = 'runtime';
@@ -48,11 +48,11 @@ 
             trigger_error($a->getMessage(),E_USER_ERROR);
         }
     }
- /**
-     * @param $section
-     * @param $item
-     * @return array|bool|mixed
-     */
+  /**
+   * @param $section
+   * @param $item
+   * @return array|bool|mixed
+   */
     public function get($section=null, $item=null)
     {
         if($item) $item = trim(strtolower($item));
@@ -81,12 +81,12 @@ 
         return $this->Config[$section][$item];
     }
 
- /**
-     * @param $section
-     * @param $item
-     * @param $value
-     * @return bool
-     */
+  /**
+   * @param $section
+   * @param $item
+   * @param $value
+   * @return bool
+   */
     public function set($section,$item=null,$value=null)
     { 
         ob_start();
@@ -97,7 +97,7 @@ 
             case 1:
                 if(!is_array($arguments[0])) return false;
                 $item=array_change_key_case($arguments[0], CASE_LOWER); $section=null; $value=null;	
-		break;
+    break;
             case 2:
                 if(is_array($arguments[0])) return false;
                 $_arg = strtolower(trim($arguments[0]));
@@ -216,9 +216,9 @@ 
             $Options['driver'] = strtoupper(pathinfo($Options['filename'], PATHINFO_EXTENSION));
         else
             $Options['filename']= $Options['filename'].'.'.strtolower($default['driver']);
-	     if(!in_array($Options['driver'],$this->availableDrivers))
+        if(!in_array($Options['driver'],$this->availableDrivers))
             throw new Exception('ERROR: driver "'.$Options['driver'].'" not supported');
-	    $this->Options = array_merge($default,$Options);
+      $this->Options = array_merge($default,$Options);
         return $this->Options;
     }
     /**
@@ -250,7 +250,7 @@ 
         }
         return $path;
     }
-	  /**
+    /**
      * @param array $options
      * @return mixed
      */
@@ -287,7 +287,7 @@ 
 /**
      * @return bool
      */
-     private function Save()
+      private function Save()
     {
         if( !is_writeable( $this->targetFile ) ) @chmod($this->targetFile,0775);
         $content = null;

Spacing +83 added lines, -83 removed lines

@@ -23,7 +23,7 @@ 
     /**
     * processeurs de fichier pris en charge par l'application
     */
-    private $availableDrivers = array('JSON', 'PHP','INI','YML');
+    private $availableDrivers = array('JSON', 'PHP', 'INI', 'YML');
 
     private $defaultSection = 'runtime';
 
@@ -32,20 +32,20 @@ 
      * @param $location
      * @throws \Exception
      */
-    public function __construct( $filename, $location=null )
+    public function __construct($filename, $location = null)
     {
         $numargs = func_num_args();
         try
         {
-            if($numargs > 2)
+            if ($numargs > 2)
                 throw new Exception('SETUP ERROR: configuration manager can accept only up to 2 parameters,'.$numargs.' given!');
-            $this->configureOptions($filename,$location);
+            $this->configureOptions($filename, $location);
             $this->parseConfiguration($this->Options);
             return $this;
         }
-        catch(Exception $a)
+        catch (Exception $a)
         {
-            trigger_error($a->getMessage(),E_USER_ERROR);
+            trigger_error($a->getMessage(), E_USER_ERROR);
         }
     }
  /**
@@ -53,31 +53,31 @@ 
      * @param $item
      * @return array|bool|mixed
      */
-    public function get($section=null, $item=null)
+    public function get($section = null, $item = null)
     {
-        if($item) $item = trim(strtolower($item));
-        if($section) $section = trim(strtolower($section));
-        if(!count($this->Config)) return false;
-        if(!$section or !strlen($section)) return $this->Config;
-        if($section AND $item)
+        if ($item) $item = trim(strtolower($item));
+        if ($section) $section = trim(strtolower($section));
+        if (!count($this->Config)) return false;
+        if (!$section or !strlen($section)) return $this->Config;
+        if ($section AND $item)
         {
-            if(!isset($this->Config[$section]))
+            if (!isset($this->Config[$section]))
             {
                 $key = $item;
                 $item = $section;
                 $section = $this->defaultSection;
-                if(!isset($this->Config[$section][$item][$key]))
+                if (!isset($this->Config[$section][$item][$key]))
                     return false;
                 return $this->Config[$section][$item][$key];
             }
         }
-        elseif(!$item or !strlen($item))
+        elseif (!$item or !strlen($item))
         {
             $item = $section;
-            if(isset($this->Config[$item])) return $this->Config[$item];
+            if (isset($this->Config[$item])) return $this->Config[$item];
             $section = $this->defaultSection;
         }
-        if(!isset($this->Config[$section][$item])) return false;
+        if (!isset($this->Config[$section][$item])) return false;
         return $this->Config[$section][$item];
     }
 
@@ -87,53 +87,53 @@ 
      * @param $value
      * @return bool
      */
-    public function set($section,$item=null,$value=null)
+    public function set($section, $item = null, $value = null)
     { 
         ob_start();
         $numarg = func_num_args();
-        $arguments=func_get_args();
-        switch($numarg)
+        $arguments = func_get_args();
+        switch ($numarg)
         {
             case 1:
-                if(!is_array($arguments[0])) return false;
-                $item=array_change_key_case($arguments[0], CASE_LOWER); $section=null; $value=null;	
+                if (!is_array($arguments[0])) return false;
+                $item = array_change_key_case($arguments[0], CASE_LOWER); $section = null; $value = null;	
 		break;
             case 2:
-                if(is_array($arguments[0])) return false;
+                if (is_array($arguments[0])) return false;
                 $_arg = strtolower(trim($arguments[0]));
-                if(is_array($arguments[1])){ $section=$_arg; $item =array_change_key_case($arguments[1], CASE_LOWER);$value=null;}
-                else {$item = $_arg;$value=$arguments[1];$section=null;}
+                if (is_array($arguments[1])) { $section = $_arg; $item = array_change_key_case($arguments[1], CASE_LOWER); $value = null; }
+                else {$item = $_arg; $value = $arguments[1]; $section = null; }
                 break;
             default:
                 break;
         }
-        $section = $section? trim(strtolower($section)) : $this->defaultSection;
-        if(!is_array($item))
+        $section = $section ? trim(strtolower($section)) : $this->defaultSection;
+        if (!is_array($item))
         {
-            if(!$value) return false;
-            $item=trim(strtolower($item));
-            if(!isset($this->Config[$section][$item]) or !is_array($this->Config[$section][$item])):
-                $this->Config[$section][$item]=$value;
+            if (!$value) return false;
+            $item = trim(strtolower($item));
+            if (!isset($this->Config[$section][$item]) or !is_array($this->Config[$section][$item])):
+                $this->Config[$section][$item] = $value;
             else:
-                if(!is_array($value)) $value = array($value);
-                $this->Config[$section][$item] = array_merge($this->Config[$section][$item],$value);
+                if (!is_array($value)) $value = array($value);
+                $this->Config[$section][$item] = array_merge($this->Config[$section][$item], $value);
             endif;
         }
         else
         {
-            if($value) return false;
+            if ($value) return false;
             $item = array_change_key_case($item, CASE_LOWER);
             $sectionsize = count($this->Config[$section]);
             $itemsize = count($item);
-            if($sectionsize)
+            if ($sectionsize)
             {
-                if($itemsize=='1')
+                if ($itemsize == '1')
                 {
-                    if(isset($this->Config[$section][key($item)]))
-                        $this->Config[$section][key($item)] = array_merge($this->Config[$section][key($item)],$item[key($item)]);
-                    else if(!is_numeric(key($item))) $this->Config[$section][key($item)]=$item[key($item)];
+                    if (isset($this->Config[$section][key($item)]))
+                        $this->Config[$section][key($item)] = array_merge($this->Config[$section][key($item)], $item[key($item)]);
+                    else if (!is_numeric(key($item))) $this->Config[$section][key($item)] = $item[key($item)];
                 }
-                else $this->Config[$section] = array_merge($this->Config[$section],$item);
+                else $this->Config[$section] = array_merge($this->Config[$section], $item);
             }
             else $this->Config[$section] = $item;
         }
@@ -146,30 +146,30 @@ 
      * @param $item
      * @return bool
      */
-    public function del($section, $item=null)
+    public function del($section, $item = null)
     {
         $section = trim(strtolower($section));
-        if($item and strlen($item))
+        if ($item and strlen($item))
         {
             $item = trim(strtolower($item));
-            if(!isset($this->Config[$section]))
+            if (!isset($this->Config[$section]))
             {
                 $key = $item;
                 $item = $section;
                 $section = $this->defaultSection;
-                if(isset($this->Config[$section][$item][$key]))
+                if (isset($this->Config[$section][$item][$key]))
                 {
-                    $itemSize=count($this->Config[$section][$item]);
-                    if($itemSize>1) unset($this->Config[$section][$item][$key]);
+                    $itemSize = count($this->Config[$section][$item]);
+                    if ($itemSize > 1) unset($this->Config[$section][$item][$key]);
                     else unset($this->Config[$section]);
                 }
             }
             else
             {
-                $sectionSize=count($this->Config[$section]);
-                if(isset($this->Config[$section][$item]))
+                $sectionSize = count($this->Config[$section]);
+                if (isset($this->Config[$section][$item]))
                 {
-                    if($sectionSize>1) unset($this->Config[$section][$item]);
+                    if ($sectionSize > 1) unset($this->Config[$section][$item]);
                     else unset($this->Config[$section]);
                 }
             } 
@@ -177,13 +177,13 @@ 
         else
         {
             $item = $section;
-            if(!isset($this->Config[$item]))
+            if (!isset($this->Config[$item]))
             {
                 $section = $this->defaultSection;
                 $defaultSectionSize = count($this->Config[$section]);
-                if(isset($this->Config[$section][$item]))
+                if (isset($this->Config[$section][$item]))
                 {
-                    if($defaultSectionSize>1) unset($this->Config[$section][$item]);
+                    if ($defaultSectionSize > 1) unset($this->Config[$section][$item]);
                     else unset($this->Config[$section]);
                 }
             }
@@ -196,29 +196,29 @@ 
      * @param $location
      * @return array|bool
      */
-    private function configureOptions($file,$location=null){
-        if(!is_string($file) or ($location and !is_string($location)))
+    private function configureOptions($file, $location = null) {
+        if (!is_string($file) or ($location and !is_string($location)))
             throw new Exception('SETUP ERROR: configuration manager can accept string only parameters');
-        $default=[
+        $default = [
             'driver' => 'PHP',
             'filename' => null,
             'directory' => __DIR__,
         ];
         $Options = [];
-        if($location)
-            $Options['directory']=rtrim($this->normalize($location),DIRECTORY_SEPARATOR);
-        else{
-            if(basename($file)!==$file)
-                $Options['directory']= rtrim($this->normalize(pathinfo($file,PATHINFO_DIRNAME)),DIRECTORY_SEPARATOR);
+        if ($location)
+            $Options['directory'] = rtrim($this->normalize($location), DIRECTORY_SEPARATOR);
+        else {
+            if (basename($file) !== $file)
+                $Options['directory'] = rtrim($this->normalize(pathinfo($file, PATHINFO_DIRNAME)), DIRECTORY_SEPARATOR);
         }
         $Options['filename'] = basename($file);
-        if(strpos($Options['filename'],'.')!==false)
+        if (strpos($Options['filename'], '.') !== false)
             $Options['driver'] = strtoupper(pathinfo($Options['filename'], PATHINFO_EXTENSION));
         else
-            $Options['filename']= $Options['filename'].'.'.strtolower($default['driver']);
-	     if(!in_array($Options['driver'],$this->availableDrivers))
+            $Options['filename'] = $Options['filename'].'.'.strtolower($default['driver']);
+	     if (!in_array($Options['driver'], $this->availableDrivers))
             throw new Exception('ERROR: driver "'.$Options['driver'].'" not supported');
-	    $this->Options = array_merge($default,$Options);
+	    $this->Options = array_merge($default, $Options);
         return $this->Options;
     }
     /**
@@ -228,7 +228,7 @@ 
      */
     private function normalize($path, $relativeTo = null) {
         $path = rtrim(preg_replace('#[/\\\\]+#', DIRECTORY_SEPARATOR, $path), DIRECTORY_SEPARATOR);
-        $isAbsolute = stripos(PHP_OS, 'win')===0 ? preg_match('/^[A-Za-z]+:/', $path): !strncmp($path, DIRECTORY_SEPARATOR, 1);
+        $isAbsolute = stripos(PHP_OS, 'win') === 0 ? preg_match('/^[A-Za-z]+:/', $path) : !strncmp($path, DIRECTORY_SEPARATOR, 1);
         if (!$isAbsolute)
         {
             if (!$relativeTo) $relativeTo = getcwd();
@@ -241,7 +241,7 @@ 
         while (end($parts) !== false)
         {
             array_pop($parts);
-            $attempt = stripos(PHP_OS, 'win')===0 ? implode(DIRECTORY_SEPARATOR, $parts): DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $parts);
+            $attempt = stripos(PHP_OS, 'win') === 0 ? implode(DIRECTORY_SEPARATOR, $parts) : DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $parts);
             if ($realpaths = realpath($attempt))
             {
                 $path = $realpaths.substr($path, strlen($attempt));
@@ -254,14 +254,14 @@ 
      * @param array $options
      * @return mixed
      */
-    private function parseConfiguration($options=[])
+    private function parseConfiguration($options = [])
     {
 
         try
         {  $this->targetFile = $this->normalize($options['directory'].DIRECTORY_SEPARATOR.$options['filename']);
-            if(!file_exists($this->targetFile))
-                file_put_contents($this->targetFile,'',LOCK_EX);
-            switch($this->Options['driver'])
+            if (!file_exists($this->targetFile))
+                file_put_contents($this->targetFile, '', LOCK_EX);
+            switch ($this->Options['driver'])
             {
                 case 'JSON':
                     $this->Config = unserialize(json_decode(file_get_contents($this->targetFile), true));
@@ -270,17 +270,17 @@ 
                     $this->Config = parse_ini_file($this->targetFile, true);
                     break;
                 case 'YML':
-                    $ndocs=0;
-                    $this->Config = yaml_parse_file($this->targetFile,0,$ndocs);
+                    $ndocs = 0;
+                    $this->Config = yaml_parse_file($this->targetFile, 0, $ndocs);
                     break;
                 default:
-                    if(!$this->Config = include $this->targetFile) $this->Config = [];
+                    if (!$this->Config = include $this->targetFile) $this->Config = [];
                     break;
             }
         }
-        catch(Exception $b)
+        catch (Exception $b)
         {
-            trigger_error($b->getMessage(),E_USER_ERROR);
+            trigger_error($b->getMessage(), E_USER_ERROR);
         }
         return $this->Config;
     }
@@ -289,9 +289,9 @@ 
      */
      private function Save()
     {
-        if( !is_writeable( $this->targetFile ) ) @chmod($this->targetFile,0775);
+        if (!is_writeable($this->targetFile)) @chmod($this->targetFile, 0775);
         $content = null;
-        switch($this->Options['driver'])
+        switch ($this->Options['driver'])
         {
             case 'JSON':
                 $content .= json_encode(serialize($this->Config));
@@ -300,28 +300,28 @@ 
                 $content .= '; @file generator: Iriven France Php "'.get_class($this).'" Class'.PHP_EOL;
                 $content .= '; @Last Update: '.date('Y-m-d H:i:s').PHP_EOL;
                 $content .= PHP_EOL;
-                foreach($this->Config as $section => $array)
+                foreach ($this->Config as $section => $array)
                 {
                     is_array($array) or $array = array($array);
-                    $content .= '[' . $section . ']'.PHP_EOL;
-                    foreach( $array as $key => $value )
+                    $content .= '['.$section.']'.PHP_EOL;
+                    foreach ($array as $key => $value)
                         $content .= PHP_TAB.$key.' = '.$value.PHP_EOL;
                     $content .= PHP_EOL;
                 }
                 break;
             case 'YML':
-                $content .= yaml_emit ($this->Config, YAML_UTF8_ENCODING , YAML_LN_BREAK );
+                $content .= yaml_emit($this->Config, YAML_UTF8_ENCODING, YAML_LN_BREAK);
                 break;
             default:
                 $content .= '<?php'.PHP_EOL;
                 $content .= 'return ';
-                $content .= var_export($this->Config, true) . ';';
+                $content .= var_export($this->Config, true).';';
                 $content = preg_replace('/array\s+\(/', '[', $content);
                 $content = preg_replace('/,(\s+)\)/', '$1]', $content);
                 break;
         }
         file_put_contents($this->targetFile, $content, LOCK_EX);
-        @chmod($this->targetFile,0644);
+        @chmod($this->targetFile, 0644);
         return true;
     }
     /**

Braces +110 added lines, -64 removed lines

@@ -37,13 +37,13 @@ 
         $numargs = func_num_args();
         try
         {
-            if($numargs > 2)
-                throw new Exception('SETUP ERROR: configuration manager can accept only up to 2 parameters,'.$numargs.' given!');
+            if($numargs > 2) {
+                            throw new Exception('SETUP ERROR: configuration manager can accept only up to 2 parameters,'.$numargs.' given!');
+            }
             $this->configureOptions($filename,$location);
             $this->parseConfiguration($this->Options);
             return $this;
-        }
-        catch(Exception $a)
+        } catch(Exception $a)
         {
             trigger_error($a->getMessage(),E_USER_ERROR);
         }
@@ -55,10 +55,18 @@ 
      */
     public function get($section=null, $item=null)
     {
-        if($item) $item = trim(strtolower($item));
-        if($section) $section = trim(strtolower($section));
-        if(!count($this->Config)) return false;
-        if(!$section or !strlen($section)) return $this->Config;
+        if($item) {
+          $item = trim(strtolower($item));
+        }
+        if($section) {
+          $section = trim(strtolower($section));
+        }
+        if(!count($this->Config)) {
+          return false;
+        }
+        if(!$section or !strlen($section)) {
+          return $this->Config;
+        }
         if($section AND $item)
         {
             if(!isset($this->Config[$section]))
@@ -66,18 +74,22 @@ 
                 $key = $item;
                 $item = $section;
                 $section = $this->defaultSection;
-                if(!isset($this->Config[$section][$item][$key]))
-                    return false;
+                if(!isset($this->Config[$section][$item][$key])) {
+                                    return false;
+                }
                 return $this->Config[$section][$item][$key];
             }
-        }
-        elseif(!$item or !strlen($item))
+        } elseif(!$item or !strlen($item))
         {
             $item = $section;
-            if(isset($this->Config[$item])) return $this->Config[$item];
+            if(isset($this->Config[$item])) {
+              return $this->Config[$item];
+            }
             $section = $this->defaultSection;
         }
-        if(!isset($this->Config[$section][$item])) return false;
+        if(!isset($this->Config[$section][$item])) {
+          return false;
+        }
         return $this->Config[$section][$item];
     }
 
@@ -95,14 +107,17 @@ 
         switch($numarg)
         {
             case 1:
-                if(!is_array($arguments[0])) return false;
+                if(!is_array($arguments[0])) {
+                  return false;
+                }
                 $item=array_change_key_case($arguments[0], CASE_LOWER); $section=null; $value=null;	
 		break;
             case 2:
-                if(is_array($arguments[0])) return false;
+                if(is_array($arguments[0])) {
+                  return false;
+                }
                 $_arg = strtolower(trim($arguments[0]));
-                if(is_array($arguments[1])){ $section=$_arg; $item =array_change_key_case($arguments[1], CASE_LOWER);$value=null;}
-                else {$item = $_arg;$value=$arguments[1];$section=null;}
+                if(is_array($arguments[1])){ $section=$_arg; $item =array_change_key_case($arguments[1], CASE_LOWER);$value=null;} else {$item = $_arg;$value=$arguments[1];$section=null;}
                 break;
             default:
                 break;
@@ -110,18 +125,23 @@ 
         $section = $section? trim(strtolower($section)) : $this->defaultSection;
         if(!is_array($item))
         {
-            if(!$value) return false;
+            if(!$value) {
+              return false;
+            }
             $item=trim(strtolower($item));
             if(!isset($this->Config[$section][$item]) or !is_array($this->Config[$section][$item])):
                 $this->Config[$section][$item]=$value;
-            else:
+            else {
+              :
                 if(!is_array($value)) $value = array($value);
+            }
                 $this->Config[$section][$item] = array_merge($this->Config[$section][$item],$value);
             endif;
-        }
-        else
+        } else
         {
-            if($value) return false;
+            if($value) {
+              return false;
+            }
             $item = array_change_key_case($item, CASE_LOWER);
             $sectionsize = count($this->Config[$section]);
             $itemsize = count($item);
@@ -129,13 +149,17 @@ 
             {
                 if($itemsize=='1')
                 {
-                    if(isset($this->Config[$section][key($item)]))
-                        $this->Config[$section][key($item)] = array_merge($this->Config[$section][key($item)],$item[key($item)]);
-                    else if(!is_numeric(key($item))) $this->Config[$section][key($item)]=$item[key($item)];
+                    if(isset($this->Config[$section][key($item)])) {
+                                            $this->Config[$section][key($item)] = array_merge($this->Config[$section][key($item)],$item[key($item)]);
+                    } else if(!is_numeric(key($item))) {
+                      $this->Config[$section][key($item)]=$item[key($item)];
+                    }
+                } else {
+                  $this->Config[$section] = array_merge($this->Config[$section],$item);
                 }
-                else $this->Config[$section] = array_merge($this->Config[$section],$item);
+            } else {
+              $this->Config[$section] = $item;
             }
-            else $this->Config[$section] = $item;
         }
         $re = $this->Save();
         ob_end_clean();
@@ -160,21 +184,25 @@ 
                 if(isset($this->Config[$section][$item][$key]))
                 {
                     $itemSize=count($this->Config[$section][$item]);
-                    if($itemSize>1) unset($this->Config[$section][$item][$key]);
-                    else unset($this->Config[$section]);
+                    if($itemSize>1) {
+                      unset($this->Config[$section][$item][$key]);
+                    } else {
+                      unset($this->Config[$section]);
+                    }
                 }
-            }
-            else
+            } else
             {
                 $sectionSize=count($this->Config[$section]);
                 if(isset($this->Config[$section][$item]))
                 {
-                    if($sectionSize>1) unset($this->Config[$section][$item]);
-                    else unset($this->Config[$section]);
+                    if($sectionSize>1) {
+                      unset($this->Config[$section][$item]);
+                    } else {
+                      unset($this->Config[$section]);
+                    }
                 }
             } 
-        }
-        else
+        } else
         {
             $item = $section;
             if(!isset($this->Config[$item]))
@@ -183,11 +211,15 @@ 
                 $defaultSectionSize = count($this->Config[$section]);
                 if(isset($this->Config[$section][$item]))
                 {
-                    if($defaultSectionSize>1) unset($this->Config[$section][$item]);
-                    else unset($this->Config[$section]);
+                    if($defaultSectionSize>1) {
+                      unset($this->Config[$section][$item]);
+                    } else {
+                      unset($this->Config[$section]);
+                    }
                 }
+            } else {
+              unset($this->Config[$item]);
             }
-            else unset($this->Config[$item]);
         }
         return $this->Save();
     }
@@ -197,27 +229,31 @@ 
      * @return array|bool
      */
     private function configureOptions($file,$location=null){
-        if(!is_string($file) or ($location and !is_string($location)))
-            throw new Exception('SETUP ERROR: configuration manager can accept string only parameters');
+        if(!is_string($file) or ($location and !is_string($location))) {
+                    throw new Exception('SETUP ERROR: configuration manager can accept string only parameters');
+        }
         $default=[
             'driver' => 'PHP',
             'filename' => null,
             'directory' => __DIR__,
         ];
         $Options = [];
-        if($location)
-            $Options['directory']=rtrim($this->normalize($location),DIRECTORY_SEPARATOR);
-        else{
-            if(basename($file)!==$file)
-                $Options['directory']= rtrim($this->normalize(pathinfo($file,PATHINFO_DIRNAME)),DIRECTORY_SEPARATOR);
+        if($location) {
+                    $Options['directory']=rtrim($this->normalize($location),DIRECTORY_SEPARATOR);
+        } else{
+            if(basename($file)!==$file) {
+                            $Options['directory']= rtrim($this->normalize(pathinfo($file,PATHINFO_DIRNAME)),DIRECTORY_SEPARATOR);
+            }
         }
         $Options['filename'] = basename($file);
-        if(strpos($Options['filename'],'.')!==false)
-            $Options['driver'] = strtoupper(pathinfo($Options['filename'], PATHINFO_EXTENSION));
-        else
-            $Options['filename']= $Options['filename'].'.'.strtolower($default['driver']);
-	     if(!in_array($Options['driver'],$this->availableDrivers))
-            throw new Exception('ERROR: driver "'.$Options['driver'].'" not supported');
+        if(strpos($Options['filename'],'.')!==false) {
+                    $Options['driver'] = strtoupper(pathinfo($Options['filename'], PATHINFO_EXTENSION));
+        } else {
+                    $Options['filename']= $Options['filename'].'.'.strtolower($default['driver']);
+        }
+	     if(!in_array($Options['driver'],$this->availableDrivers)) {
+	                 throw new Exception('ERROR: driver "'.$Options['driver'].'" not supported');
+	     }
 	    $this->Options = array_merge($default,$Options);
         return $this->Options;
     }
@@ -231,12 +267,17 @@ 
         $isAbsolute = stripos(PHP_OS, 'win')===0 ? preg_match('/^[A-Za-z]+:/', $path): !strncmp($path, DIRECTORY_SEPARATOR, 1);
         if (!$isAbsolute)
         {
-            if (!$relativeTo) $relativeTo = getcwd();
+            if (!$relativeTo) {
+              $relativeTo = getcwd();
+            }
             $path = $relativeTo.DIRECTORY_SEPARATOR.$path;
         }
-        if (is_link($path) and ($parentPath = realpath(dirname($path))))
-            return $parentPath.DIRECTORY_SEPARATOR.$path;
-        if ($realpath = realpath($path))  return $realpath;
+        if (is_link($path) and ($parentPath = realpath(dirname($path)))) {
+                    return $parentPath.DIRECTORY_SEPARATOR.$path;
+        }
+        if ($realpath = realpath($path)) {
+          return $realpath;
+        }
         $parts = explode(DIRECTORY_SEPARATOR, trim($path, DIRECTORY_SEPARATOR));
         while (end($parts) !== false)
         {
@@ -259,8 +300,9 @@ 
 
         try
         {  $this->targetFile = $this->normalize($options['directory'].DIRECTORY_SEPARATOR.$options['filename']);
-            if(!file_exists($this->targetFile))
-                file_put_contents($this->targetFile,'',LOCK_EX);
+            if(!file_exists($this->targetFile)) {
+                            file_put_contents($this->targetFile,'',LOCK_EX);
+            }
             switch($this->Options['driver'])
             {
                 case 'JSON':
@@ -274,11 +316,12 @@ 
                     $this->Config = yaml_parse_file($this->targetFile,0,$ndocs);
                     break;
                 default:
-                    if(!$this->Config = include $this->targetFile) $this->Config = [];
+                    if(!$this->Config = include $this->targetFile) {
+                      $this->Config = [];
+                    }
                     break;
             }
-        }
-        catch(Exception $b)
+        } catch(Exception $b)
         {
             trigger_error($b->getMessage(),E_USER_ERROR);
         }
@@ -289,7 +332,9 @@ 
      */
      private function Save()
     {
-        if( !is_writeable( $this->targetFile ) ) @chmod($this->targetFile,0775);
+        if( !is_writeable( $this->targetFile ) ) {
+          @chmod($this->targetFile,0775);
+        }
         $content = null;
         switch($this->Options['driver'])
         {
@@ -304,8 +349,9 @@ 
                 {
                     is_array($array) or $array = array($array);
                     $content .= '[' . $section . ']'.PHP_EOL;
-                    foreach( $array as $key => $value )
-                        $content .= PHP_TAB.$key.' = '.$value.PHP_EOL;
+                    foreach( $array as $key => $value ) {
+                                            $content .= PHP_TAB.$key.' = '.$value.PHP_EOL;
+                    }
                     $content .= PHP_EOL;
                 }
                 break;