php-resta / resta-core

src/resta/Url/UrlParseException.php

Spacing +5 added lines, -5 removed lines

@@ -10,9 +10,9 @@ 
     /**

      * @param array $data

      */

-    public function exception($data=array())

+    public function exception($data = array())

     {

-        if(!isset($data['project']) and !isset($data['version'])){

+        if (!isset($data['project']) and !isset($data['version'])) {

             exception()->notFoundException('No Project or Version');

         }

 

@@ -21,17 +21,17 @@ 
 

         //If there is no project on the url

         //we throw an exception

-        if($data['project']===null OR !file_exists($appPath)){

+        if ($data['project']===null OR !file_exists($appPath)) {

             exception()->notFoundException('No Project');

         }

 

-        if(!in_array($data['version'],UrlVersionIdentifier::supportedVersions())){

+        if (!in_array($data['version'], UrlVersionIdentifier::supportedVersions())) {

             throw new DomainException('Version Number is not supported');

         }

 

         //If there is no endpoint on the url

         //we throw an exception

-        if($data['endpoint']===null){

+        if ($data['endpoint']===null) {

             exception()->notFoundException('No Endpoint');

         }

     }

src/resta/Exception/ExceptionTrace.php

Braces +2 added lines, -4 removed lines

@@ -99,8 +99,7 @@ 
         // in the application directory class.

         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.

@@ -133,8 +132,7 @@ 
             //throw exception

             if($msg===null){

                 throw new $callNamespace;

-            }

-            else{

+            } else{

                 throw new $callNamespace($msg);

             }

 

Spacing +28 added lines, -28 removed lines

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

             }

 

@@ -152,8 +152,8 @@ 
      * @param $name

      * @param array $arguments

      */

-    public function __call($name, $arguments=array())

+    public function __call($name, $arguments = array())

     {

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

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

     }

 }
\ No newline at end of file

src/resta/Console/ConsoleArguments.php

Spacing +11 added lines, -11 removed lines

@@ -16,7 +16,7 @@ 
     public function getArguments()

     {

         //if there is no arguments constant

-        if(!defined('arguments'))  define ('arguments',['api']);

+        if (!defined('arguments'))  define('arguments', ['api']);

 

         //get psr standard console arguments

         return core()->consoleArguments = Utils::upperCase(arguments);

@@ -49,7 +49,7 @@ 
      */

     public function getConsoleClassRealArguments()

     {

-        return array_slice($this->getArguments(),2);

+        return array_slice($this->getArguments(), 2);

     }

 

     /**

@@ -65,19 +65,19 @@ 
         $listKey = [];

         $listKey['project'] = null;

 

-        if(property_exists($this,'consoleClassNamespace')){

+        if (property_exists($this, 'consoleClassNamespace')) {

             $listKey['class'] = strtolower(class_basename($this->consoleClassNamespace));

             $listKey['classMethod'] = strtolower($this->getConsoleClassMethod());

         }

 

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

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

 

-            if($key=="0"){

+            if ($key=="0") {

                 $listKey['project'] = $value;

             }

-            else{

+            else {

 

-                $colonExplode = explode(":",$value);

+                $colonExplode = explode(":", $value);

                 $listKey[strtolower($colonExplode[0])] = ucfirst($colonExplode[1]);

             }

         }

@@ -109,14 +109,14 @@ 
 

         $this->getConsoleArgumentsWithKey();

 

-        if(isset($arguments[2])){

+        if (isset($arguments[2])) {

             $app = $arguments[2];

         }

 

-        if(!defined('group')){

-            define('group',StaticPathList::$projectPrefixGroup);

+        if (!defined('group')) {

+            define('group', StaticPathList::$projectPrefixGroup);

         }

 

-        if(!defined('app') and isset($arguments[2])) define('app',isset($app) ? $app : null);

+        if (!defined('app') and isset($arguments[2])) define('app', isset($app) ? $app : null);

     }

 }
\ No newline at end of file

Braces +7 added lines, -4 removed lines

@@ -16,7 +16,9 @@ 
     public function getArguments()

     {

         //if there is no arguments constant

-        if(!defined('arguments'))  define ('arguments',['api']);

+        if(!defined('arguments')) {

+            define ('arguments',['api']);

+        }

 

         //get psr standard console arguments

         return core()->consoleArguments = Utils::upperCase(arguments);

@@ -74,8 +76,7 @@ 
 

             if($key=="0"){

                 $listKey['project'] = $value;

-            }

-            else{

+            } else{

 

                 $colonExplode = explode(":",$value);

                 $listKey[strtolower($colonExplode[0])] = ucfirst($colonExplode[1]);

@@ -117,6 +118,8 @@ 
             define('group',StaticPathList::$projectPrefixGroup);

         }

 

-        if(!defined('app') and isset($arguments[2])) define('app',isset($app) ? $app : null);

+        if(!defined('app') and isset($arguments[2])) {

+            define('app',isset($app) ? $app : null);

+        }

     }

 }
\ No newline at end of file

src/resta/Contracts/ConsoleOutputterContracts.php

Spacing +1 added lines, -1 removed lines

@@ -14,6 +14,6 @@
      * @param array $commander

      * @return mixed

      */

-    public function exception($commander=array());

+    public function exception($commander = array());

 

 }
\ No newline at end of file

src/resta/Support/Utils.php

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];

                 }

 

Spacing +60 added lines, -60 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 [];

@@ -309,18 +309,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];

                 }

 

@@ -336,7 +336,7 @@ 
      */

     public static function resolverClass($class)

     {

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

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

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

         }

 

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

     }

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

             }

         }

src/resta/Exception/ExceptionExtender.php

Spacing +5 added lines, -5 removed lines

@@ -22,14 +22,14 @@ 
      * @param ApplicationContracts $app
      * @param array $result
      */
-    public function __construct(ApplicationContracts $app,$result=array())
+    public function __construct(ApplicationContracts $app, $result = array())
     {
         parent::__construct($app);
 
         $this->result = $result;
 
-        foreach($this->extender as $item){
-            if(method_exists($this,$item)){
+        foreach ($this->extender as $item) {
+            if (method_exists($this, $item)) {
                 $this->{$item}();
             }
         }
@@ -54,8 +54,8 @@ 
     {
         // we will look at the requestExpected container value to show
         // the expected values ​​for the request object in the exception output.
-        if($this->app->has('requestExpected') && config('app.requestWithError')===true){
-            if($requestExpected = $this->app->get('requestExpected')){
+        if ($this->app->has('requestExpected') && config('app.requestWithError')===true) {
+            if ($requestExpected = $this->app->get('requestExpected')) {
                 $this->result['request']['expected'] = $requestExpected;
             }
         }

src/resta/Container/ContainerInstanceResolver.php

Spacing +5 added lines, -5 removed lines

@@ -25,26 +25,26 @@
      * @param null|string $name

      * @return array

      */

-    public function container($name=null)

+    public function container($name = null)

     {

         //check container value for kernel

-        if(isset($this->instances['container'])){

+        if (isset($this->instances['container'])) {

 

             // if methoda is a null parameter,

             // then we send direct container values.

-            if(is_null($name)){

+            if (is_null($name)) {

                 return (array)$this->instances['container'];

             }

 

             // if there is an existing value in the container as the method parameter,

             // we send this value directly in the container.

-            if(isset($this->container()[$name])){

+            if (isset($this->container()[$name])) {

                 return $this->container()[$name];

             }

 

             // if there is no $name value in the container as the method parameter,

             // we check this value directly in the core object.

-            if(property_exists(core(),$name)){

+            if (property_exists(core(), $name)) {

                 return core()->{$name};

             }

 

src/resta/Support/Macro.php

Spacing +18 added lines, -18 removed lines

@@ -32,15 +32,15 @@ 
      * @param callable $callback

      * @return mixed|null

      */

-    public function call($macro,callable $callback)

+    public function call($macro, callable $callback)

     {

-        if(!is_null($macro)){

+        if (!is_null($macro)) {

 

             //get macro class from kernel macros

             $macroCall = config('kernel.macros.'.$macro);

 

             //if macroCall class is available and an object.

-            if(!is_null($macroCall) && Utils::isNamespaceExists($macroCall)){

+            if (!is_null($macroCall) && Utils::isNamespaceExists($macroCall)) {

                 return $macroCall;

             }

         }

@@ -54,7 +54,7 @@ 
      * @param bool $static

      * @return bool

      */

-    protected function checkMacroConditions($static=false)

+    protected function checkMacroConditions($static = false)

     {

         return is_string($this->macro) &&

             Utils::isNamespaceExists($this->macro) &&

@@ -67,9 +67,9 @@ 
      * @param bool $static

      * @return bool

      */

-    protected function checkMacroInstanceOf($static=false)

+    protected function checkMacroInstanceOf($static = false)

     {

-        if($static){

+        if ($static) {

             return true;

         }

         return $this->app->resolve($this->macro) instanceof MacroAbleContracts;

@@ -82,11 +82,11 @@ 
      * @param callable $callback

      * @return mixed

      */

-    public function get($method,callable $callback)

+    public function get($method, callable $callback)

     {

-        if($this->isMacro){

+        if ($this->isMacro) {

 

-            if(method_exists($resolve = $this->app->resolve($this->macro),$method)){

+            if (method_exists($resolve = $this->app->resolve($this->macro), $method)) {

                 return $resolve->macro($this->class);

             }

         }

@@ -110,11 +110,11 @@ 
      * @param $class

      * @return $this

      */

-    public function isMacro($class,$static=false)

+    public function isMacro($class, $static = false)

     {

         // if the macro class is a valid object,

         // then this macro will return a boolean value if it has the specified methode.

-        if($this->checkMacroConditions($static)){

+        if ($this->checkMacroConditions($static)) {

 

             $this->isMacro  = true;

             $this->class    = $class;

@@ -142,10 +142,10 @@ 
      * @param $method

      * @return mixed

      */

-    public function with($macro,$concrete,$method=null)

+    public function with($macro, $concrete, $method = null)

     {

-        if($this->macro === null){

-            return $this($macro)->isMacro($concrete)->get($method,function() use($concrete){

+        if ($this->macro===null) {

+            return $this($macro)->isMacro($concrete)->get($method, function() use($concrete){

                 return $concrete;

             });

         }

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

      * @return mixed

      */

-    public function withStatic($macro,$concrete)

+    public function withStatic($macro, $concrete)

     {

-        return $this($macro)->isMacro($concrete,true)->get(null,is_callable($concrete) ?

+        return $this($macro)->isMacro($concrete, true)->get(null, is_callable($concrete) ?

             $concrete : function() use($concrete){

                 return $concrete;

             });

@@ -173,9 +173,9 @@ 
      * @param null|string $macro

      * @return $this

      */

-    public function __invoke($macro=null)

+    public function __invoke($macro = null)

     {

-        if($macro!==null){

+        if ($macro!==null) {

             $this->macro = $macro;

         }

         return $this;

src/resta/Foundation/PathManager/StaticPathRepository.php

Spacing +35 added lines, -35 removed lines

@@ -12,9 +12,9 @@ 
      * @param null $app

      * @return string

      */

-    public function app($app=null)

+    public function app($app = null)

     {

-        $app=($app===null) ? $this->appDetector() : $app;

+        $app = ($app===null) ? $this->appDetector() : $app;

         return StaticPathModel::appPath().''.DIRECTORY_SEPARATOR.''.Str::slashToBackSlash($app);

     }

 

@@ -38,7 +38,7 @@ 
      * @param null $app

      * @return string

      */

-    public function appCall($app=null)

+    public function appCall($app = null)

     {

         return $this->appVersion($app).''.DIRECTORY_SEPARATOR.''.StaticPathList::$controller;

     }

@@ -56,9 +56,9 @@ 
      * @param null $app

      * @return string

      */

-    public function appConfig($app=null)

+    public function appConfig($app = null)

     {

-        if(isset(core()->paths['config'])){

+        if (isset(core()->paths['config'])) {

             return core()->paths['config'];

         }

         return $this->appVersion($app).''.DIRECTORY_SEPARATOR.''.StaticPathList::$config;

@@ -68,7 +68,7 @@ 
      * @param null $app

      * @return string

      */

-    public function appHelpers($app=null)

+    public function appHelpers($app = null)

     {

         return $this->appVersion($app).''.DIRECTORY_SEPARATOR.''.StaticPathList::$helpers;

     }

@@ -101,7 +101,7 @@ 
      * @param null $app

      * @return mixed

      */

-    public function appFactory($app=null)

+    public function appFactory($app = null)

     {

         return $this->appVersion($app).''.DIRECTORY_SEPARATOR.''.StaticPathList::$factory;

     }

@@ -111,7 +111,7 @@ 
      */

     public function appKernel()

     {

-        $kernel     = $this->app().''.DIRECTORY_SEPARATOR.''.StaticPathList::$kernel;

+        $kernel = $this->app().''.DIRECTORY_SEPARATOR.''.StaticPathList::$kernel;

 

         return $kernel;

     }

@@ -121,7 +121,7 @@ 
      */

     public function appProvider()

     {

-        $kernel     = $this->app().''.DIRECTORY_SEPARATOR.''.StaticPathList::$kernel.''.DIRECTORY_SEPARATOR.''.StaticPathList::$provider;

+        $kernel = $this->app().''.DIRECTORY_SEPARATOR.''.StaticPathList::$kernel.''.DIRECTORY_SEPARATOR.''.StaticPathList::$provider;

 

         return $kernel;

     }

@@ -146,7 +146,7 @@ 
      * @param null $app

      * @return mixed

      */

-    public function appLogger($app=null)

+    public function appLogger($app = null)

     {

         return $this->appVersion($app).''.DIRECTORY_SEPARATOR.'ServiceLogManager';

     }

@@ -155,7 +155,7 @@ 
      * @param null $app

      * @return mixed

      */

-    public function appMiddleware($app=null)

+    public function appMiddleware($app = null)

     {

         return $this->appVersion($app).''.DIRECTORY_SEPARATOR.''.StaticPathList::$middleware;

     }

@@ -164,7 +164,7 @@ 
      * @param null $app

      * @return mixed

      */

-    public function appMigration($app=null)

+    public function appMigration($app = null)

     {

         return $this->appVersion($app).''.DIRECTORY_SEPARATOR.''.StaticPathList::$migration;

     }

@@ -173,7 +173,7 @@ 
      * @param null $app

      * @return mixed

      */

-    public function appModel($app=null)

+    public function appModel($app = null)

     {

         return $this->appVersion($app).''.DIRECTORY_SEPARATOR.''.StaticPathList::$model;

     }

@@ -182,7 +182,7 @@ 
      * @param null $app

      * @return mixed

      */

-    public function appException($app=null)

+    public function appException($app = null)

     {

         return $this->appVersion().''.DIRECTORY_SEPARATOR.''.StaticPathList::$exception;

     }

@@ -191,7 +191,7 @@ 
      * @param null $app

      * @return mixed

      */

-    public function appOptionalEvents($app=null)

+    public function appOptionalEvents($app = null)

     {

         return $this->appVersion().''.DIRECTORY_SEPARATOR.''.StaticPathList::$events;

     }

@@ -200,7 +200,7 @@ 
      * @param null $app

      * @return mixed

      */

-    public function appOptionalJob($app=null)

+    public function appOptionalJob($app = null)

     {

         return $this->appVersion($app).''.DIRECTORY_SEPARATOR.''.StaticPathList::$optional.''.DIRECTORY_SEPARATOR.''.StaticPathList::$job;

     }

@@ -209,7 +209,7 @@ 
      * @param null $app

      * @return mixed

      */

-    public function appOptionalListeners($app=null)

+    public function appOptionalListeners($app = null)

     {

         return $this->appVersion().''.DIRECTORY_SEPARATOR.''.StaticPathList::$listeners;

     }

@@ -218,7 +218,7 @@ 
      * @param null $app

      * @return mixed

      */

-    public function appOptionalSubscribers($app=null)

+    public function appOptionalSubscribers($app = null)

     {

         return $this->appVersion().''.DIRECTORY_SEPARATOR.''.StaticPathList::$listeners.''.DIRECTORY_SEPARATOR.''.StaticPathList::$subscribers;

     }

@@ -236,7 +236,7 @@ 
      */

     public function appRepository()

     {

-        $repository     = $this->app().''.DIRECTORY_SEPARATOR.''.StaticPathList::$repository;

+        $repository = $this->app().''.DIRECTORY_SEPARATOR.''.StaticPathList::$repository;

 

         return $repository;

     }

@@ -253,7 +253,7 @@ 
      * @param null $app

      * @return mixed

      */

-    public function appOptionalSource($app=null)

+    public function appOptionalSource($app = null)

     {

         return $this->appVersion($app).''.DIRECTORY_SEPARATOR.''.StaticPathList::$optional.''.DIRECTORY_SEPARATOR.''.StaticPathList::$sourcePath;

     }

@@ -262,7 +262,7 @@ 
      * @param null $app

      * @return mixed

      */

-    public function appOptionalWebservice($app=null)

+    public function appOptionalWebservice($app = null)

     {

         return $this->appVersion($app).''.DIRECTORY_SEPARATOR.''.StaticPathList::$optional.''.DIRECTORY_SEPARATOR.''.StaticPathList::$webservice;

     }

@@ -279,7 +279,7 @@ 
      * @param null $app

      * @return mixed

      */

-    public function appServiceAnnotations($app=null)

+    public function appServiceAnnotations($app = null)

     {

         return $this->appVersion($app).''.DIRECTORY_SEPARATOR.''.StaticPathList::$serviceAnnotations;

     }

@@ -288,7 +288,7 @@ 
      * @param null $app

      * @return mixed

      */

-    public function appServiceContainer($app=null)

+    public function appServiceContainer($app = null)

     {

         return $this->appVersion($app).''.DIRECTORY_SEPARATOR.'ServiceContainerController';

     }

@@ -297,7 +297,7 @@ 
      * @param null $app

      * @return mixed

      */

-    public function appServiceEventDispatcher($app=null)

+    public function appServiceEventDispatcher($app = null)

     {

         return $this->appVersion($app).''.DIRECTORY_SEPARATOR.'ServiceEventDispatcherManager';

     }

@@ -306,7 +306,7 @@ 
      * @param null $app

      * @return mixed

      */

-    public function appServiceMiddleware($app=null)

+    public function appServiceMiddleware($app = null)

     {

         return $this->appVersion($app).''.DIRECTORY_SEPARATOR.''.StaticPathList::$serviceMiddleware;

     }

@@ -333,9 +333,9 @@ 
      * @param null $app

      * @return mixed

      */

-    public function appVersion($app=null)

+    public function appVersion($app = null)

     {

-        if(defined('app')){

+        if (defined('app')) {

 

             $prefixGroup = Str::slashToBackSlash(StaticPathList::$projectPrefixGroup);

 

@@ -379,19 +379,19 @@ 
      * @param bool $bool

      * @return mixed

      */

-    public function controller($controller=null,$bool=false)

+    public function controller($controller = null, $bool = false)

     {

         $namespaceController = ($controller===null) ? app()->namespace()->controller()

-            : app()->namespace()->controller($controller,true);

+            : app()->namespace()->controller($controller, true);

 

-        if($bool){

-            $namespaceControllerExplode = explode("\\",$namespaceController);

+        if ($bool) {

+            $namespaceControllerExplode = explode("\\", $namespaceController);

             array_pop($namespaceControllerExplode);

 

-            $namespaceController = implode("\\",$namespaceControllerExplode);

+            $namespaceController = implode("\\", $namespaceControllerExplode);

         }

 

-        return Utils::getPathFromNamespace($namespaceController,false);

+        return Utils::getPathFromNamespace($namespaceController, false);

     }

 

     /**

@@ -415,9 +415,9 @@ 
      * @param $arg

      * @return mixed

      */

-    public function __call($name,$arg)

+    public function __call($name, $arg)

     {

-        $appCall='app'.ucfirst($name);

+        $appCall = 'app'.ucfirst($name);

         return $this->{$appCall}();

     }