php-resta / resta-core

src/resta/Support/Utils.php

Spacing +67 added lines, -67 removed lines

@@ -16,13 +16,13 @@ 
      * @param bool $shift

      * @return array

      */

-    public static function upperCase($argument,$shift=true)

+    public static function upperCase($argument, $shift = true)

     {

-        if($shift){

+        if ($shift) {

             array_shift($argument);

         }

 

-        return array_map(function($argument){

+        return array_map(function($argument) {

             return ucfirst($argument);

         },$argument);

     }

@@ -46,10 +46,10 @@ 
      */

     public static function strtolower($argument)

     {

-        if(!is_array($argument)){

+        if (!is_array($argument)) {

             return strtolower($argument);

         }

-        return array_map(function($argument){

+        return array_map(function($argument) {

             return strtolower($argument);

         },$argument);

     }

@@ -58,9 +58,9 @@ 
      * @param array $data

      * @return string

      */

-    public static function generatorNamespace($data=array())

+    public static function generatorNamespace($data = array())

     {

-        return str_replace('.php','',implode("\\",$data));

+        return str_replace('.php', '', implode("\\", $data));

     }

 

     /**

@@ -68,16 +68,16 @@ 
      * @param bool $extension

      * @return mixed

      */

-    public static function getPathFromNamespace($class,$extension=true)

+    public static function getPathFromNamespace($class, $extension = true)

     {

-        if($extension){

-            $default=root.'/'.str_replace("\\","/",$class).'.php';

+        if ($extension) {

+            $default = root.'/'.str_replace("\\", "/", $class).'.php';

         }

-        else{

-            $default=root.'/'.str_replace("\\","/",$class).'';

+        else {

+            $default = root.'/'.str_replace("\\", "/", $class).'';

         }

 

-        return str_replace("/App",'/src/app',$default);

+        return str_replace("/App", '/src/app', $default);

     }

 

     /**

@@ -94,9 +94,9 @@ 
      * @param $method

      * @return bool

      */

-    public static function existMethod($class,$method)

+    public static function existMethod($class, $method)

     {

-        return method_exists($class,$method);

+        return method_exists($class, $method);

     }

 

     /**

@@ -104,9 +104,9 @@ 
      * @param $second

      * @return bool

      */

-    public static function isArrayEqual($first,$second)

+    public static function isArrayEqual($first, $second)

     {

-        return (count( $first ) == count( $second ) && !array_diff( $first, $second ));

+        return (count($first)==count($second) && !array_diff($first, $second));

     }

 

     /**

@@ -123,17 +123,17 @@ 
      * @param bool $filename

      * @return array

      */

-    public static function glob($path,$filename=false)

+    public static function glob($path, $filename = false)

     {

         $configList = [];

 

         foreach (glob($path.'/*.php') as $config) {

 

-            $configArray=str_replace(".php","",explode("/",$config));

-            $configList[end($configArray)]=$config;

+            $configArray = str_replace(".php", "", explode("/", $config));

+            $configList[end($configArray)] = $config;

         }

 

-        if($filename===true){

+        if ($filename===true) {

             return array_keys($configList);

         }

 

@@ -162,7 +162,7 @@ 
      * @param string $seperator

      * @return mixed

      */

-    public static function getJustClassName($namespace,$seperator="\\")

+    public static function getJustClassName($namespace, $seperator = "\\")

     {

         $path = explode($seperator, $namespace);

         return array_pop($path);

@@ -173,23 +173,23 @@ 
      * @param array $param

      * @return bool

      */

-    public static function changeClass($class,$param=array())

+    public static function changeClass($class, $param = array())

     {

-        $executionPath=$class;

+        $executionPath = $class;

         $dt = fopen($executionPath, "r");

 

-        if($dt!==false){

+        if ($dt!==false) {

 

             $content = fread($dt, filesize($executionPath));

             fclose($dt);

 

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

-                $content=str_replace($key,$value,$content);

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

+                $content = str_replace($key, $value, $content);

             }

 

             $forWrite = fopen($executionPath, "w");

 

-            if($forWrite!==false){

+            if ($forWrite!==false) {

                 fwrite($forWrite, $content);

                 fclose($forWrite);

 

@@ -205,9 +205,9 @@ 
      * @param $callback

      * @return mixed

      */

-    public static function returnCallback($data,$callback)

+    public static function returnCallback($data, $callback)

     {

-        return call_user_func_array($callback,[$data]);

+        return call_user_func_array($callback, [$data]);

     }

 

     /**

@@ -216,10 +216,10 @@ 
      */

     public static function getNamespace($namespace)

     {

-        $rootDelete=str_replace(root.''.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'','',$namespace);

+        $rootDelete = str_replace(root.''.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'', '', $namespace);

 

         return 'App\\'.self::generatorNamespace(

-                explode(''.DIRECTORY_SEPARATOR.'',$rootDelete)

+                explode(''.DIRECTORY_SEPARATOR.'', $rootDelete)

             );

 

     }

@@ -230,7 +230,7 @@ 
      */

     public static function callbackProcess($callback)

     {

-        return (is_callable($callback)) ? call_user_func_array($callback,[app()]) : $callback;

+        return (is_callable($callback)) ? call_user_func_array($callback, [app()]) : $callback;

     }

 

     /**

@@ -238,29 +238,29 @@ 
      * @param $array2

      * @return bool

      */

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

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

     {

-        if(count($array1)!==count($array2)) self::$bool[]=false;

+        if (count($array1)!==count($array2)) self::$bool[] = false;

 

-        foreach ($array1 as $array1_key=>$array1_value){

+        foreach ($array1 as $array1_key=>$array1_value) {

 

-            if(!is_array($array1_value)){

-                if(!array_key_exists($array1_key,$array2)) self::$bool[]=false;

+            if (!is_array($array1_value)) {

+                if (!array_key_exists($array1_key, $array2)) self::$bool[] = false;

             }

-            else{

-                if(!array_key_exists($array1_key,$array2)) self::$bool[]=false;

+            else {

+                if (!array_key_exists($array1_key, $array2)) self::$bool[] = false;

 

-                if(!isset($array2[$array1_key]) OR !is_array($array2[$array1_key])) $array2[$array1_key]=[];

+                if (!isset($array2[$array1_key]) OR !is_array($array2[$array1_key])) $array2[$array1_key] = [];

 

-                if(isset($array1_value[0])) $array1_value=$array1_value[0];

+                if (isset($array1_value[0])) $array1_value = $array1_value[0];

 

-                if(isset($array2[$array1_key][0])) $array2[$array1_key]=$array2[$array1_key][0];

+                if (isset($array2[$array1_key][0])) $array2[$array1_key] = $array2[$array1_key][0];

 

-                self::array_diff_key_recursive($array1_value,$array2[$array1_key]);

+                self::array_diff_key_recursive($array1_value, $array2[$array1_key]);

             }

         }

 

-        if(in_array(false,self::$bool)){

+        if (in_array(false, self::$bool)) {

             return false;

         }

         return true;

@@ -272,7 +272,7 @@ 
      */

     public static function slashToBackSlash($data)

     {

-        return str_replace("/","\\",$data);

+        return str_replace("/", "\\", $data);

     }

 

     /**

@@ -282,11 +282,11 @@ 
      * @param null|string $key

      * @return mixed

      */

-    public static function trace($debug=0,$key=null)

+    public static function trace($debug = 0, $key = null)

     {

         $trace = debug_backtrace();

 

-        if($key===null){

+        if ($key===null) {

             return $trace[$debug] ?? null;

         }

 

@@ -298,7 +298,7 @@ 
      */

     public static function getServiceConf()

     {

-        if(property_exists(core(),'serviceConf') && defined('methodName')){

+        if (property_exists(core(), 'serviceConf') && defined('methodName')) {

             return core()->serviceConf;

         }

         return [];

@@ -314,17 +314,17 @@ 
      */

     public static 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 = self::getAllFilesInDirectory($path, $recursive, $basedir, $include_dirs);

@@ -337,7 +337,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;

     }

 

@@ -346,18 +346,18 @@ 
      * @param null|string $reelPath

      * @return array

      */

-    public static function getPathWithPhpExtension($files,$reelPath=null)

+    public static function getPathWithPhpExtension($files, $reelPath = null)

     {

         $pathWithPhpList = [];

 

-        foreach ($files as $file){

+        foreach ($files as $file) {

 

-            if(preg_match('@(.*).php@is',$file,$pathWithPhp)){

+            if (preg_match('@(.*).php@is', $file, $pathWithPhp)) {

 

-                if($reelPath===null){

+                if ($reelPath===null) {

                     $pathWithPhpList[] = $pathWithPhp[0];

                 }

-                else{

+                else {

                     $pathWithPhpList[] = $reelPath.'/'.$pathWithPhp[0];

                 }

 

@@ -390,7 +390,7 @@ 
      */

     public static function resolverClass($class)

     {

-        if(self::isNamespaceExists($class)){

+        if (self::isNamespaceExists($class)) {

             return app()->resolve($class);

         }

 

@@ -402,8 +402,8 @@ 
      */

     public static function getRequestPathInfo()

     {

-        if(is_null(BootStaticManager::getRequestPath())){

-            return explode("/",request()->getPathInfo());

+        if (is_null(BootStaticManager::getRequestPath())) {

+            return explode("/", request()->getPathInfo());

         }

         return BootStaticManager::getRequestPath();

     }

@@ -413,13 +413,13 @@ 
      * @param null|string $remove

      * @return array

      */

-    public static function removeTrace($trace,$remove=null)

+    public static function removeTrace($trace, $remove = null)

     {

         $list = [];

 

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

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

 

-            if(isset($item['file']) && !preg_match('@'.$remove.'@',$item['file'])){

+            if (isset($item['file']) && !preg_match('@'.$remove.'@', $item['file'])) {

                 $list[$key] = $item;

             }

         }

Braces +21 added lines, -12 removed lines

@@ -72,8 +72,7 @@ 
     {

         if($extension){

             $default=root.'/'.str_replace("\\","/",$class).'.php';

-        }

-        else{

+        } else{

             $default=root.'/'.str_replace("\\","/",$class).'';

         }

 

@@ -240,21 +239,32 @@ 
      */

     public static function array_diff_key_recursive ($array1, $array2)

     {

-        if(count($array1)!==count($array2)) self::$bool[]=false;

+        if(count($array1)!==count($array2)) {

+            self::$bool[]=false;

+        }

 

         foreach ($array1 as $array1_key=>$array1_value){

 

             if(!is_array($array1_value)){

-                if(!array_key_exists($array1_key,$array2)) self::$bool[]=false;

-            }

-            else{

-                if(!array_key_exists($array1_key,$array2)) self::$bool[]=false;

+                if(!array_key_exists($array1_key,$array2)) {

+                    self::$bool[]=false;

+                }

+            } else{

+                if(!array_key_exists($array1_key,$array2)) {

+                    self::$bool[]=false;

+                }

 

-                if(!isset($array2[$array1_key]) OR !is_array($array2[$array1_key])) $array2[$array1_key]=[];

+                if(!isset($array2[$array1_key]) OR !is_array($array2[$array1_key])) {

+                    $array2[$array1_key]=[];

+                }

 

-                if(isset($array1_value[0])) $array1_value=$array1_value[0];

+                if(isset($array1_value[0])) {

+                    $array1_value=$array1_value[0];

+                }

 

-                if(isset($array2[$array1_key][0])) $array2[$array1_key]=$array2[$array1_key][0];

+                if(isset($array2[$array1_key][0])) {

+                    $array2[$array1_key]=$array2[$array1_key][0];

+                }

 

                 self::array_diff_key_recursive($array1_value,$array2[$array1_key]);

             }

@@ -356,8 +366,7 @@ 
 

                 if($reelPath===null){

                     $pathWithPhpList[] = $pathWithPhp[0];

-                }

-                else{

+                } else{

                     $pathWithPhpList[] = $reelPath.'/'.$pathWithPhp[0];

                 }