php-resta / resta-core

src/resta/Support/Utils.php

Spacing +73 added lines, -73 removed lines

@@ -11,12 +11,12 @@ 
     /**

      * @var array $bool

      */

-    private static $bool=[];

+    private static $bool = [];

 

     /**

      * @var array

      */

-    private static $recursiveArray= [];

+    private static $recursiveArray = [];

 

     /**

      * @return \DI\Container

@@ -34,10 +34,10 @@ 
      * @throws \DI\DependencyException

      * @throws \DI\NotFoundException

      */

-    public static function resolve($class=null)

+    public static function resolve($class = null)

     {

         //class resolve

-        if($class!==null){

+        if ($class!==null) {

             $container = self::callBuild();

             return $container->get($class);

         }

@@ -48,13 +48,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);

     }

@@ -78,10 +78,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);

     }

@@ -90,9 +90,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));

     }

 

     /**

@@ -100,16 +100,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);

     }

 

     /**

@@ -126,9 +126,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);

     }

 

     /**

@@ -136,9 +136,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));

     }

 

     /**

@@ -155,17 +155,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);

         }

 

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

@@ -205,15 +205,15 @@ 
      * @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");

         $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);

         }

 

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

@@ -228,9 +228,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]);

     }

 

     /**

@@ -239,10 +239,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)

             );

 

     }

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

     }

 

     /**

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

@@ -295,7 +295,7 @@ 
      */

     public static function slashToBackSlash($data)

     {

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

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

     }

 

     /**

@@ -303,11 +303,11 @@ 
      * @param null $key

      * @return null

      */

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

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

     {

-        $trace=debug_backtrace();

+        $trace = debug_backtrace();

 

-        if($key===null){

+        if ($key===null) {

             return $trace[$debug] ?? null;

         }

         return $trace[$debug][$key] ?? null;

@@ -322,13 +322,13 @@ 
     public  static function chmod_r($dir, $dirPermissions, $filePermissions)

     {

         $dp = opendir($dir);

-        while($file = readdir($dp)) {

-            if (($file == ".") || ($file == ".."))

+        while ($file = readdir($dp)) {

+            if (($file==".") || ($file==".."))

                 continue;

 

             $fullPath = $dir."/".$file;

 

-            if(is_dir($fullPath)) {

+            if (is_dir($fullPath)) {

                 chmod($fullPath, $dirPermissions);

                 self::chmod_r($fullPath, $dirPermissions, $filePermissions);

             } else {

@@ -344,7 +344,7 @@ 
      */

     public static function getServiceConf()

     {

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

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

             return core()->serviceConf;

         }

         return [];

@@ -360,17 +360,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);

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

     }

 

@@ -392,18 +392,18 @@ 
      * @param null $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];

                 }

 

@@ -436,7 +436,7 @@ 
      */

     public static function resolverClass($class)

     {

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

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

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

         }

 

@@ -448,8 +448,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();

     }

@@ -459,13 +459,13 @@ 
      * @param null $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;

             }

         }

src/resta/Exception/ExceptionTrace.php

Spacing +27 added lines, -27 removed lines

@@ -16,13 +16,13 @@ 
      * @param null $name

      * @param array $params

      */

-    public function __construct($app,$name=null,$params=array())

+    public function __construct($app, $name = null, $params = array())

     {

         parent::__construct($app);

 

         // we help the user to pull a special message from

         // the translate section to be specified by the user for the exception.

-        $this->exceptionTranslate($name,$params);

+        $this->exceptionTranslate($name, $params);

 

         // for real file path with

         // debug backtrace method are doing follow.

@@ -35,13 +35,13 @@ 
      * @param $name

      * @param array $params

      */

-    private function exceptionTranslate($name,$params=array())

+    private function exceptionTranslate($name, $params = array())

     {

-        if($name!==null){

-            if(count($params)){

-                $this->app->register('exceptionTranslateParams',$name,$params);

+        if ($name!==null) {

+            if (count($params)) {

+                $this->app->register('exceptionTranslateParams', $name, $params);

             }

-            $this->app->register('exceptionTranslate',$name);

+            $this->app->register('exceptionTranslate', $name);

         }

     }

 

@@ -52,23 +52,23 @@ 
      */

     public function debugBackTrace()

     {

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

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

 

-            if(isset(debug_backtrace()[$key],debug_backtrace()[$key]['file']))

+            if (isset(debug_backtrace()[$key], debug_backtrace()[$key]['file']))

             {

-                $this->app->register('exceptionFile',debug_backtrace()[$key]['file']);

-                $this->app->register('exceptionLine',debug_backtrace()[$key]['line']);

+                $this->app->register('exceptionFile', debug_backtrace()[$key]['file']);

+                $this->app->register('exceptionLine', debug_backtrace()[$key]['line']);

             }

 

             Dependencies::loadBootstrapperNeedsForException();

 

-            if(isset($value['file']) && isset(core()->urlComponent)){

-                if(preg_match('@'.core()->urlComponent['project'].'|boot|providers@',$value['file'])){

+            if (isset($value['file']) && isset(core()->urlComponent)) {

+                if (preg_match('@'.core()->urlComponent['project'].'|boot|providers@', $value['file'])) {

 

                     $this->app->terminate('exceptionFile');

                     $this->app->terminate('exceptionLine');

-                    $this->app->register('exceptionFile',$value['file']);

-                    $this->app->register('exceptionLine',$value['line']);

+                    $this->app->register('exceptionFile', $value['file']);

+                    $this->app->register('exceptionLine', $value['line']);

 

                     break;

                 }

@@ -81,7 +81,7 @@ 
      */

     public function __get($name)

     {

-        $this->customException($name,null,debug_backtrace());

+        $this->customException($name, null, debug_backtrace());

     }

 

     /**

@@ -91,7 +91,7 @@ 
      * @param null|string $msg

      * @param array $trace

      */

-    public function customException($name,$msg=null,$trace=array())

+    public function customException($name, $msg = null, $trace = array())

     {

         //We use the magic method for the exception and

         //call the exception class in the application to get the instance.

@@ -100,22 +100,22 @@ 
 

         // first, you are looking for an exception

         // in the application directory class.

-        if(Utils::isNamespaceExists($nameNamespace)){

+        if (Utils::isNamespaceExists($nameNamespace)) {

             $callNamespace = new $nameNamespace;

         }

-        else{

+        else {

 

             // if you do not have an exception in the application directory,

             // this time we are looking for an exception in the core directory.

             $nameNamespace = __NAMESPACE__.'\\'.$nameException;

-            if(Utils::isNamespaceExists($nameNamespace)){

+            if (Utils::isNamespaceExists($nameNamespace)) {

                 $callNamespace = new $nameNamespace;

             }

         }

 

-        if(isset($callNamespace)){

+        if (isset($callNamespace)) {

 

-            $traceForCustom = Utils::removeTrace($trace,self::removeExceptionFileItems);

+            $traceForCustom = Utils::removeTrace($trace, self::removeExceptionFileItems);

 

             // we will set the information about the exception trace,

             // and then bind it specifically to the event method.

@@ -127,19 +127,19 @@ 
 

 

             // we register the custom exception trace value with the global kernel object.

-            $this->app->register('exceptiontrace',$customExceptionTrace);

+            $this->app->register('exceptiontrace', $customExceptionTrace);

 

             //If the developer wants to execute an event when calling a special exception,

             //we process the event method.

-            if(method_exists($callNamespace,'event')){

+            if (method_exists($callNamespace, 'event')) {

                 $callNamespace->event($customExceptionTrace);

             }

 

             //throw exception

-            if($msg===null){

+            if ($msg===null) {

                 throw new $callNamespace;

             }

-            else{

+            else {

                 throw new $callNamespace($msg);

             }

 

@@ -154,6 +154,6 @@ 
      */

     public function __call($name, $arguments)

     {

-        $this->customException($name,current($arguments),debug_backtrace());

+        $this->customException($name, current($arguments), debug_backtrace());

     }

 }
\ No newline at end of file