php-resta / resta-core

src/resta/Support/Arr.php

Spacing +45 added lines, -45 removed lines

@@ -45,7 +45,7 @@ 
         foreach ($array as $values) {

             if ($values instanceof Collection) {

                 $values = $values->all();

-            } elseif (! is_array($values)) {

+            } elseif (!is_array($values)) {

                 continue;

             }

             $results = array_merge($results, $values);

@@ -94,7 +94,7 @@ 
     {

         $results = [];

         foreach ($array as $key => $value) {

-            if (is_array($value) && ! empty($value)) {

+            if (is_array($value) && !empty($value)) {

                 $results = array_merge($results, static::dot($value, $prepend.$key.'.'));

             } else {

                 $results[$prepend.$key] = $value;

@@ -180,12 +180,12 @@ 
         $result = [];

         foreach ($array as $item) {

             $item = $item instanceof Collection ? $item->all() : $item;

-            if (! is_array($item)) {

+            if (!is_array($item)) {

                 $result[] = $item;

-            } elseif ($depth === 1) {

+            } elseif ($depth===1) {

                 $result = array_merge($result, array_values($item));

             } else {

-                $result = array_merge($result, static::flatten($item, $depth - 1));

+                $result = array_merge($result, static::flatten($item, $depth-1));

             }

         }

         return $result;

@@ -200,8 +200,8 @@ 
     public static function forget(&$array, $keys)

     {

         $original = &$array;

-        $keys = (array) $keys;

-        if (count($keys) === 0) {

+        $keys = (array)$keys;

+        if (count($keys)===0) {

             return;

         }

         foreach ($keys as $key) {

@@ -213,7 +213,7 @@ 
             $parts = explode('.', $key);

             // clean up before each pass

             $array = &$original;

-            while (count($parts) > 1) {

+            while (count($parts)>1) {

                 $part = array_shift($parts);

                 if (isset($array[$part]) && is_array($array[$part])) {

                     $array = &$array[$part];

@@ -234,7 +234,7 @@ 
      */

     public static function get($array, $key, $default = null)

     {

-        if (! static::accessible($array)) {

+        if (!static::accessible($array)) {

             return value($default);

         }

         if (is_null($key)) {

@@ -243,7 +243,7 @@ 
         if (static::exists($array, $key)) {

             return $array[$key];

         }

-        if (strpos($key, '.') === false) {

+        if (strpos($key, '.')===false) {

             return $array[$key] ?? value($default);

         }

         foreach (explode('.', $key) as $segment) {

@@ -267,11 +267,11 @@ 
         if (is_null($keys)) {

             return false;

         }

-        $keys = (array) $keys;

-        if (! $array) {

+        $keys = (array)$keys;

+        if (!$array) {

             return false;

         }

-        if ($keys === []) {

+        if ($keys===[]) {

             return false;

         }

         foreach ($keys as $key) {

@@ -300,7 +300,7 @@ 
     public static function isAssoc(array $array)

     {

         $keys = array_keys($array);

-        return array_keys($keys) !== $keys;

+        return array_keys($keys)!==$keys;

     }

     /**

      * Get a subset of the items from the given array.

@@ -311,7 +311,7 @@ 
      */

     public static function only($array, $keys)

     {

-        return array_intersect_key($array, array_flip((array) $keys));

+        return array_intersect_key($array, array_flip((array)$keys));

     }

     /**

      * Pluck an array of values from an array.

@@ -335,7 +335,7 @@ 
             } else {

                 $itemKey = data_get($item, $key);

                 if (is_object($itemKey) && method_exists($itemKey, '__toString')) {

-                    $itemKey = (string) $itemKey;

+                    $itemKey = (string)$itemKey;

                 }

                 $results[$itemKey] = $itemValue;

             }

@@ -368,7 +368,7 @@ 
         if (is_null($key)) {

             array_unshift($array, $value);

         } else {

-            $array = [$key => $value] + $array;

+            $array = [$key => $value]+$array;

         }

         return $array;

     }

@@ -399,7 +399,7 @@ 
     {

         $requested = is_null($number) ? 1 : $number;

         $count = count($array);

-        if ($requested > $count) {

+        if ($requested>$count) {

             throw new InvalidArgumentException(

                 "You requested {$requested} items, but there are only {$count} items available."

             );

@@ -407,12 +407,12 @@ 
         if (is_null($number)) {

             return $array[array_rand($array)];

         }

-        if ((int) $number === 0) {

+        if ((int)$number===0) {

             return [];

         }

         $keys = array_rand($array, $number);

         $results = [];

-        foreach ((array) $keys as $key) {

+        foreach ((array)$keys as $key) {

             $results[] = $array[$key];

         }

         return $results;

@@ -433,12 +433,12 @@ 
             return $array = $value;

         }

         $keys = explode('.', $key);

-        while (count($keys) > 1) {

+        while (count($keys)>1) {

             $key = array_shift($keys);

             // If the key doesn't exist at this depth, we will just create an empty array

             // to hold the next value, allowing us to create the arrays to hold final

             // values at the correct depth. Then we'll keep digging into the array.

-            if (! isset($array[$key]) || ! is_array($array[$key])) {

+            if (!isset($array[$key]) || !is_array($array[$key])) {

                 $array[$key] = [];

             }

             $array = &$array[$key];

@@ -459,7 +459,7 @@ 
             shuffle($array);

         } else {

             srand($seed);

-            usort($array, function () {

+            usort($array, function() {

                 return rand(-1, 1);

             });

         }

@@ -536,16 +536,16 @@ 
      * @param array $referenceArray

      * @return array

      */

-    public static function removeSameValues($removeArray=array(),$referenceArray=array())

+    public static function removeSameValues($removeArray = array(), $referenceArray = array())

     {

         $list = [];

 

-        foreach ($removeArray as $remove){

-            if(!in_array($remove,$referenceArray)){

-                $list[]=$remove;

+        foreach ($removeArray as $remove) {

+            if (!in_array($remove, $referenceArray)) {

+                $list[] = $remove;

             }

         }

-        return array_merge($referenceArray,$list);

+        return array_merge($referenceArray, $list);

     }

 

     /**

@@ -553,9 +553,9 @@ 
      * @param $key

      * @return null

      */

-    public static function isset($array,$key)

+    public static function isset($array, $key)

     {

-        if(isset($array[$key])){

+        if (isset($array[$key])) {

             return $array[$key];

         }

         return null;

@@ -566,13 +566,13 @@ 
      * @param null $withKey

      * @return bool

      */

-    public static function isArrayWithCount($array,$withKey=null)

+    public static function isArrayWithCount($array, $withKey = null)

     {

-        if($withKey===null){

+        if ($withKey===null) {

             return is_array($array) && count($array);

         }

 

-        return isset($array[$withKey]) && self::isArrayWithCount($array[$withKey],null);

+        return isset($array[$withKey]) && self::isArrayWithCount($array[$withKey], null);

     }

 

     /**

@@ -580,12 +580,12 @@ 
      * @param $array2

      * @return int

      */

-    public static function arrayDiffKey($array1,$array2)

+    public static function arrayDiffKey($array1, $array2)

     {

-        $forArray1 = array_diff_key($array1,$array2);

-        $forArray2 = array_diff_key($array2,$array1);

+        $forArray1 = array_diff_key($array1, $array2);

+        $forArray2 = array_diff_key($array2, $array1);

 

-        if(count($forArray1)=="0" && count($forArray2)=="0"){

+        if (count($forArray1)=="0" && count($forArray2)=="0") {

             return true;

         }

         return false;

@@ -597,12 +597,12 @@ 
      * @param $original

      * @param array $overwrite

      */

-    public static function overwriteWith($original,$overwrite=array())

+    public static function overwriteWith($original, $overwrite = array())

     {

-        foreach ($original as $key=>$item){

+        foreach ($original as $key=>$item) {

 

-            if(array_key_exists($key,$overwrite)){

-                array_splice($original,$key,0,$overwrite[$key]);

+            if (array_key_exists($key, $overwrite)) {

+                array_splice($original, $key, 0, $overwrite[$key]);

             }

         }

 

@@ -616,12 +616,12 @@ 
      * @param array $remove

      * @return array

      */

-    public static function removeKey($data,$remove=array())

+    public static function removeKey($data, $remove = array())

     {

         $list = [];

 

-        foreach($data as $key=>$value){

-            if(!in_array($key,$remove)){

+        foreach ($data as $key=>$value) {

+            if (!in_array($key, $remove)) {

                 $list[$key] = $value;

             }

         }

@@ -634,7 +634,7 @@ 
      * @param $key

      * @param $value

      */

-    public static function setNested($data=array(),$key,$value)

+    public static function setNested($data = array(), $key, $value)

     {

         dd($data);

     }

src/resta/Support/ArraySafe.php

Spacing +47 added lines, -47 removed lines

@@ -15,7 +15,7 @@ 
      *
      * @param array $data
      */
-    public function __construct( array $data = [] )
+    public function __construct(array $data = [])
     {
         $this->data = $data;
     }
@@ -26,16 +26,16 @@ 
      *
      * @return array|mixed|null
      */
-    public function safeGet( array $target, $indices )
+    public function safeGet(array $target, $indices)
     {
         $movingTarget = $target;
 
-        foreach ( $indices as $index )
+        foreach ($indices as $index)
         {
-            $isArray = is_array( $movingTarget ) || $movingTarget instanceof ArrayAccess;
-            if ( ! $isArray || ! isset( $movingTarget[ $index ] ) ) return NULL;
+            $isArray = is_array($movingTarget) || $movingTarget instanceof ArrayAccess;
+            if (!$isArray || !isset($movingTarget[$index])) return NULL;
 
-            $movingTarget = $movingTarget[ $index ];
+            $movingTarget = $movingTarget[$index];
         }
 
         return $movingTarget;
@@ -46,9 +46,9 @@ 
      *
      * @return array|mixed|null
      */
-    public function getKeys( array $keys )
+    public function getKeys(array $keys)
     {
-        return static::safeGet( $this->data, $keys );
+        return static::safeGet($this->data, $keys);
     }
 
     /**
@@ -60,9 +60,9 @@ 
      *
      * @return array|mixed|null
      */
-    public function get( $accessString )
+    public function get($accessString)
     {
-        return $this->getKeys( $this->parseDotNotation( $accessString ) );
+        return $this->getKeys($this->parseDotNotation($accessString));
     }
 
     /**
@@ -71,29 +71,29 @@ 
      *
      * @return $this
      */
-    public function set( $propString, $value )
+    public function set($propString, $value)
     {
         $movingTarget = &$this->data;
-        $keys         = $this->parseDotNotation( $propString );
-        $length       = count( $keys );
+        $keys         = $this->parseDotNotation($propString);
+        $length       = count($keys);
 
-        foreach ( $keys as $i => $key )
+        foreach ($keys as $i => $key)
         {
-            $lastKey = $i === $length - 1;
-            $isset   = isset( $movingTarget[ $key ] );
+            $lastKey = $i===$length-1;
+            $isset   = isset($movingTarget[$key]);
 
-            if ( $isset && ! $lastKey && ! is_array( $movingTarget[ $key ] ) )
+            if ($isset && !$lastKey && !is_array($movingTarget[$key]))
             {
-                throw new InvalidArgumentException( sprintf(
+                throw new InvalidArgumentException(sprintf(
                     "Attempted to set/access the property %s like an array, but is of type: %s",
                     $key,
-                    gettype( $movingTarget[ $key ] )
-                ) );
+                    gettype($movingTarget[$key])
+                ));
             }
 
-            if ( ! $isset || ! is_array( $movingTarget[ $key ] ) ) $movingTarget[ $key ] = [];
+            if (!$isset || !is_array($movingTarget[$key])) $movingTarget[$key] = [];
 
-            $movingTarget = &$movingTarget[ $key ];
+            $movingTarget = &$movingTarget[$key];
         }
 
         $movingTarget = $value;
@@ -106,9 +106,9 @@ 
      *
      * @return array
      */
-    protected function parseDotNotation( $string )
+    protected function parseDotNotation($string)
     {
-        return explode( '.', strval( $string ) );
+        return explode('.', strval($string));
     }
 
     /**
@@ -125,9 +125,9 @@ 
      *
      * @return string
      */
-    public function toJson( $options = 0, $depth = 512 )
+    public function toJson($options = 0, $depth = 512)
     {
-        return json_encode( $this, $options, $depth );
+        return json_encode($this, $options, $depth);
     }
 
     /**
@@ -135,9 +135,9 @@ 
      *
      * @return static
      */
-    public static function newFromArray( array $data )
+    public static function newFromArray(array $data)
     {
-        return new static( $data );
+        return new static($data);
     }
 
     /**
@@ -145,9 +145,9 @@ 
      *
      * @return static
      */
-    public static function newFromStdObject( \stdClass $data )
+    public static function newFromStdObject(\stdClass $data)
     {
-        return new static( json_decode( json_encode( $data ), TRUE ) );
+        return new static(json_decode(json_encode($data), TRUE));
     }
 
     /**
@@ -176,17 +176,17 @@ 
      * The return value will be casted to boolean if non-boolean was returned.
      * @since 5.0.0
      */
-    public function offsetExists( $offset )
+    public function offsetExists($offset)
     {
         $movingTarget = $this->data;
 
-        foreach ( $this->parseDotNotation( $offset ) as $i )
+        foreach ($this->parseDotNotation($offset) as $i)
         {
-            if ( ! isset( $movingTarget[ $i ] ) ) return FALSE;
-            $movingTarget = $movingTarget[ $i ];
+            if (!isset($movingTarget[$i])) return FALSE;
+            $movingTarget = $movingTarget[$i];
         }
 
-        return isset( $movingTarget );
+        return isset($movingTarget);
     }
 
     /**
@@ -200,9 +200,9 @@ 
      * @return mixed Can return all value types.
      * @since 5.0.0
      */
-    public function offsetGet( $offset )
+    public function offsetGet($offset)
     {
-        return $this->get( $offset );
+        return $this->get($offset);
     }
 
     /**
@@ -219,9 +219,9 @@ 
      * @return void
      * @since 5.0.0
      */
-    public function offsetSet( $offset, $value )
+    public function offsetSet($offset, $value)
     {
-        $this->set( $offset, $value );
+        $this->set($offset, $value);
     }
 
     /**
@@ -235,21 +235,21 @@ 
      * @return void
      * @since 5.0.0
      */
-    public function offsetUnset( $offset )
+    public function offsetUnset($offset)
     {
         $movingTarget = &$this->data;
-        $keys         = $this->parseDotNotation( $offset );
-        $length       = count( $keys );
+        $keys         = $this->parseDotNotation($offset);
+        $length       = count($keys);
 
-        foreach ( $keys as $i => $key )
+        foreach ($keys as $i => $key)
         {
-            if ( $i === $length - 1 )
+            if ($i===$length-1)
             {
-                unset( $movingTarget[ $key ] );
+                unset($movingTarget[$key]);
             }
             else
             {
-                $movingTarget = &$movingTarget[ $key ];
+                $movingTarget = &$movingTarget[$key];
             }
         }
     }
@@ -259,6 +259,6 @@ 
      */
     public function __toString()
     {
-        return json_encode( $this );
+        return json_encode($this);
     }
 }
\ No newline at end of file

Braces +10 added lines, -5 removed lines

@@ -33,7 +33,9 @@ 
         foreach ( $indices as $index )
         {
             $isArray = is_array( $movingTarget ) || $movingTarget instanceof ArrayAccess;
-            if ( ! $isArray || ! isset( $movingTarget[ $index ] ) ) return NULL;
+            if ( ! $isArray || ! isset( $movingTarget[ $index ] ) ) {

+                return NULL;

+            }

 
             $movingTarget = $movingTarget[ $index ];
         }
@@ -91,7 +93,9 @@ 
                 ) );
             }
 
-            if ( ! $isset || ! is_array( $movingTarget[ $key ] ) ) $movingTarget[ $key ] = [];
+            if ( ! $isset || ! is_array( $movingTarget[ $key ] ) ) {

+                $movingTarget[ $key ] = [];

+            }

 
             $movingTarget = &$movingTarget[ $key ];
         }
@@ -182,7 +186,9 @@ 
 
         foreach ( $this->parseDotNotation( $offset ) as $i )
         {
-            if ( ! isset( $movingTarget[ $i ] ) ) return FALSE;
+            if ( ! isset( $movingTarget[ $i ] ) ) {

+                return FALSE;

+            }

             $movingTarget = $movingTarget[ $i ];
         }
 
@@ -246,8 +252,7 @@ 
             if ( $i === $length - 1 )
             {
                 unset( $movingTarget[ $key ] );
-            }
-            else
+            } else
             {
                 $movingTarget = &$movingTarget[ $key ];
             }

src/resta/Support/JsonHandler.php

Spacing +27 added lines, -27 removed lines

@@ -24,11 +24,11 @@ 
      */
     private static function checkFile()
     {
-        $filePortions = explode(DIRECTORY_SEPARATOR,self::$file);
+        $filePortions = explode(DIRECTORY_SEPARATOR, self::$file);
         $pop = array_pop($filePortions);
 
-        if(file_exists(implode(DIRECTORY_SEPARATOR,$filePortions))
-            && preg_match('@[a-zA-Z0-9]+\.json@',$pop)){
+        if (file_exists(implode(DIRECTORY_SEPARATOR, $filePortions))
+            && preg_match('@[a-zA-Z0-9]+\.json@', $pop)) {
             return self::$file;
         }
 
@@ -44,8 +44,8 @@ 
     {
         $file = self::checkFile();
 
-        if(!file_exists($file)){
-            files()->put($file,self::encode([]));
+        if (!file_exists($file)) {
+            files()->put($file, self::encode([]));
         }
     }
 
@@ -57,7 +57,7 @@ 
      */
     public static function decode($data)
     {
-        return json_decode($data,1);
+        return json_decode($data, 1);
     }
 
     /**
@@ -69,26 +69,26 @@ 
      *
      * @throws FileNotFoundException
      */
-    public static function delete($key,$arrayKey=null)
+    public static function delete($key, $arrayKey = null)
     {
         $data = self::get();
 
-        if(is_null($arrayKey)){
+        if (is_null($arrayKey)) {
 
-            if(isset($data[$key])){
+            if (isset($data[$key])) {
                 unset($data[$key]);
-                files()->put(self::checkFile(),self::encode($data),true);
+                files()->put(self::checkFile(), self::encode($data), true);
                 return true;
             }
         }
 
         // if the data to be deleted
         // in json data contains a nested array data.
-        if(!is_null($arrayKey) && is_string($arrayKey)){
+        if (!is_null($arrayKey) && is_string($arrayKey)) {
 
-            if(isset($data[$key][$arrayKey])){
+            if (isset($data[$key][$arrayKey])) {
                 unset($data[$key][$arrayKey]);
-                files()->put(self::checkFile(),self::encode($data),true);
+                files()->put(self::checkFile(), self::encode($data), true);
                 return true;
             }
         }
@@ -104,7 +104,7 @@ 
      */
     public static function encode($data)
     {
-        return json_encode($data,JSON_PRETTY_PRINT);
+        return json_encode($data, JSON_PRETTY_PRINT);
     }
 
     /**
@@ -114,13 +114,13 @@ 
      *
      * @throws FileNotFoundException
      */
-    public static function get($key=null)
+    public static function get($key = null)
     {
         self::createIfNotFileExist();
 
         $data = self::decode(files()->get(self::checkFile()));
         
-        if(is_null($key)){
+        if (is_null($key)) {
             return $data;
         }
         
@@ -136,27 +136,27 @@ 
      *
      * @throws FileNotFoundException
      */
-    public static function set($key,$value)
+    public static function set($key, $value)
     {
         self::createIfNotFileExist();
         
         $file = self::get();
 
-        $dotted = explode('.',$key);
+        $dotted = explode('.', $key);
 
-        if(count($dotted)>1){
+        if (count($dotted)>1) {
             $arrayInstance = new ArraySafe(self::get());
-            $nestedArray = $arrayInstance->set('t.a.b','d')->toArray();
-            files()->put(self::checkFile(),self::encode($nestedArray));
+            $nestedArray = $arrayInstance->set('t.a.b', 'd')->toArray();
+            files()->put(self::checkFile(), self::encode($nestedArray));
         }
-        else{
+        else {
 
-            if(isset($file[$key]) && is_array($value)){
-                $file[$key] = array_merge($file[$key],$value);
-                files()->put(self::checkFile(),self::encode($file));
+            if (isset($file[$key]) && is_array($value)) {
+                $file[$key] = array_merge($file[$key], $value);
+                files()->put(self::checkFile(), self::encode($file));
             }
-            else{
-                files()->put(self::checkFile(),self::encode(array_merge($file,[$key=>$value])));
+            else {
+                files()->put(self::checkFile(), self::encode(array_merge($file, [$key=>$value])));
             }
         }
 

Braces +2 added lines, -4 removed lines

@@ -148,14 +148,12 @@
             $arrayInstance = new ArraySafe(self::get());
             $nestedArray = $arrayInstance->set('t.a.b','d')->toArray();
             files()->put(self::checkFile(),self::encode($nestedArray));
-        }
-        else{
+        } else{
 
             if(isset($file[$key]) && is_array($value)){
                 $file[$key] = array_merge($file[$key],$value);
                 files()->put(self::checkFile(),self::encode($file));
-            }
-            else{
+            } else{
                 files()->put(self::checkFile(),self::encode(array_merge($file,[$key=>$value])));
             }
         }

src/resta/Support/FileSystem.php

Spacing +22 added lines, -22 removed lines

@@ -130,7 +130,7 @@ 
         $path = realpath($path) ?: $path;
         $tempPath = tempnam(dirname($path), basename($path));
         // Fix permissions of tempPath because `tempnam()` creates it with permissions set to 0600...
-        chmod($tempPath, 0777 - umask());
+        chmod($tempPath, 0777-umask());
         file_put_contents($tempPath, $content);
         rename($tempPath, $path);
     }
@@ -189,7 +189,7 @@ 
         $success = true;
         foreach ($paths as $path) {
             try {
-                if (! @unlink($path)) {
+                if (!@unlink($path)) {
                     $success = false;
                 }
             } catch (ErrorException $e) {
@@ -232,7 +232,7 @@ 
      */
     public function link($target, $link)
     {
-        if (! windows_os()) {
+        if (!windows_os()) {
             return symlink($target, $link);
         }
         $mode = $this->isDirectory($target) ? 'J' : 'H';
@@ -393,7 +393,7 @@ 
     public function files($directory, $hidden = false)
     {
         return iterator_to_array(
-            Finder::create()->files()->ignoreDotFiles(! $hidden)->in($directory)->depth(0)->sortByName(),
+            Finder::create()->files()->ignoreDotFiles(!$hidden)->in($directory)->depth(0)->sortByName(),
             false
         );
     }
@@ -408,7 +408,7 @@ 
     public function allFiles($directory, $hidden = false)
     {
         return iterator_to_array(
-            Finder::create()->files()->ignoreDotFiles(! $hidden)->in($directory)->sortByName(),
+            Finder::create()->files()->ignoreDotFiles(!$hidden)->in($directory)->sortByName(),
             false
         );
     }
@@ -455,10 +455,10 @@ 
      */
     public function moveDirectory($from, $to, $overwrite = false)
     {
-        if ($overwrite && $this->isDirectory($to) && ! $this->deleteDirectory($to)) {
+        if ($overwrite && $this->isDirectory($to) && !$this->deleteDirectory($to)) {
             return false;
         }
-        return @rename($from, $to) === true;
+        return @rename($from, $to)===true;
     }
 
     /**
@@ -471,14 +471,14 @@ 
      */
     public function copyDirectory($directory, $destination, $options = null)
     {
-        if (! $this->isDirectory($directory)) {
+        if (!$this->isDirectory($directory)) {
             return false;
         }
         $options = $options ?: FilesystemIterator::SKIP_DOTS;
         // If the destination directory does not actually exist, we will go ahead and
         // create it recursively, which just gets the destination prepared to copy
         // the files over. Once we make the directory we'll proceed the copying.
-        if (! $this->isDirectory($destination)) {
+        if (!$this->isDirectory($destination)) {
             $this->makeDirectory($destination, 0777, true);
         }
         $items = new FilesystemIterator($directory, $options);
@@ -489,7 +489,7 @@ 
             $target = $destination.'/'.$item->getBasename();
             if ($item->isDir()) {
                 $path = $item->getPathname();
-                if (! $this->copyDirectory($path, $target, $options)) {
+                if (!$this->copyDirectory($path, $target, $options)) {
                     return false;
                 }
             }
@@ -497,7 +497,7 @@ 
             // location and keep looping. If for some reason the copy fails we'll bail out
             // and return false, so the developer is aware that the copy process failed.
             else {
-                if (! $this->copy($item->getPathname(), $target)) {
+                if (!$this->copy($item->getPathname(), $target)) {
                     return false;
                 }
             }
@@ -516,7 +516,7 @@ 
      */
     public function deleteDirectory($directory, $preserve = false)
     {
-        if (! $this->isDirectory($directory)) {
+        if (!$this->isDirectory($directory)) {
             return false;
         }
         $items = new FilesystemIterator($directory);
@@ -524,7 +524,7 @@ 
             // If the item is a directory, we can just recurse into the function and
             // delete that sub-directory otherwise we'll just delete the file and
             // keep iterating through each file until the directory is cleaned.
-            if ($item->isDir() && ! $item->isLink()) {
+            if ($item->isDir() && !$item->isLink()) {
                 $this->deleteDirectory($item->getPathname());
             }
             // If the item is just a file, we can go ahead and delete it since we're
@@ -534,7 +534,7 @@ 
                 $this->delete($item->getPathname());
             }
         }
-        if (! $preserve) {
+        if (!$preserve) {
             @rmdir($directory);
         }
         return true;
@@ -549,7 +549,7 @@ 
     public function deleteDirectories($directory)
     {
         $allDirectories = $this->directories($directory);
-        if (! empty($allDirectories)) {
+        if (!empty($allDirectories)) {
             foreach ($allDirectories as $directoryName) {
                 $this->deleteDirectory($directoryName);
             }
@@ -580,17 +580,17 @@ 
      */
     public function getAllFilesInDirectory($dir, $recursive = true, $basedir = '', $include_dirs = false)
     {
-        if ($dir == '') {return array();} else {$results = array(); $subresults = array();}
-        if (!is_dir($dir)) {$dir = dirname($dir);} // so a files path can be sent
-        if ($basedir == '') {$basedir = realpath($dir).DIRECTORY_SEPARATOR;}
+        if ($dir=='') {return array(); } else {$results = array(); $subresults = array(); }
+        if (!is_dir($dir)) {$dir = dirname($dir); } // so a files path can be sent
+        if ($basedir=='') {$basedir = realpath($dir).DIRECTORY_SEPARATOR; }
 
         $files = scandir($dir);
-        foreach ($files as $key => $value){
-            if ( ($value != '.') && ($value != '..') ) {
+        foreach ($files as $key => $value) {
+            if (($value!='.') && ($value!='..')) {
                 $path = realpath($dir.DIRECTORY_SEPARATOR.$value);
                 if (is_dir($path)) {
                     // optionally include directories in file list
-                    if ($include_dirs) {$subresults[] = str_replace($basedir, '', $path);}
+                    if ($include_dirs) {$subresults[] = str_replace($basedir, '', $path); }
                     // optionally get file list for all subdirectories
                     if ($recursive) {
                         $subdirresults = $this->getAllFilesInDirectory($path, $recursive, $basedir, $include_dirs);
@@ -603,7 +603,7 @@ 
             }
         }
         // merge the subarray to give the list of files then subdirectory files
-        if (count($subresults) > 0) {$results = array_merge($subresults, $results);}
+        if (count($subresults)>0) {$results = array_merge($subresults, $results); }
         return $results;
     }