php-resta / resta-core

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;
     }
 }
\ No newline at end of file

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/Exception/ErrorProvider.php

Braces +4 added lines, -8 removed lines

@@ -39,8 +39,7 @@ 
     {

         if($this->app->has('exceptiontrace')) {

             $this->data['status'] = (int)$this->app['exceptiontrace']['callNamespace']->getCode();

-        }

-        else {

+        } else {

             $this->data['status'] = (int)$this->exception::exceptionTypeCodes($this->data['errType']);

         }

     }

@@ -82,8 +81,7 @@ 
 

             //set as the success object is false

             $this->data['appExceptionSuccess'] = [];

-        }

-        else{

+        } else{

 

             //set as the success object is false

             $this->data['appExceptionSuccess'] = ['success'=>(bool)false,'status'=>$this->data['status']];

@@ -180,8 +178,7 @@ 
             $this->app->register('responseStatus',500);

 

 

-        }

-        else{

+        } else{

 

             $this->result = $this->getAppException($environment,$this->data['errStrReal']);

 

@@ -216,8 +213,7 @@ 
 

             echo json_encode($this->app->get('out')->outputFormatter($this->result));

             exit();

-        }

-        else{

+        } else{

             echo $restaOutHandle;

             exit();

         }

Spacing +60 added lines, -61 removed lines

@@ -37,7 +37,7 @@ 
      */

     private function getStatusAccordingToExceptionTrace()

     {

-        if($this->app->has('exceptiontrace')) {

+        if ($this->app->has('exceptiontrace')) {

             $this->data['status'] = (int)$this->app['exceptiontrace']['callNamespace']->getCode();

         }

         else {

@@ -54,21 +54,21 @@ 
 

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

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

-        $this->app->register('responseSuccess',(bool)false);

-        $this->app->register('responseStatus',$this->data['status']);

+        $this->app->register('responseSuccess', (bool)false);

+        $this->app->register('responseStatus', $this->data['status']);

 

 

-        $optionalException = str_replace("\\","\\\\",$this->app->namespace()->exception());

+        $optionalException = str_replace("\\", "\\\\", $this->app->namespace()->exception());

 

-        if(preg_match('@'.$optionalException.'@is',$this->data['errType'])){

+        if (preg_match('@'.$optionalException.'@is', $this->data['errType'])) {

 

             //trace pattern

             $trace = $this->data['errContext']['trace'];

-            if(preg_match('@Stack trace:\n#0(.*)\n#1@is',$trace,$traceArray)){

+            if (preg_match('@Stack trace:\n#0(.*)\n#1@is', $trace, $traceArray)) {

 

-                $traceFile = str_replace(root,'',$traceArray[1]);

+                $traceFile = str_replace(root, '', $traceArray[1]);

 

-                if(preg_match('@(.*)\((\d+)\)@is',$traceFile,$traceResolve)){

+                if (preg_match('@(.*)\((\d+)\)@is', $traceFile, $traceResolve)) {

                     $this->data['errFile'] = $traceResolve[1];

                     $this->data['errLine'] = (int)$traceResolve[2];

                 }

@@ -78,15 +78,15 @@ 
             $this->data['errType'] = class_basename($this->data['errType']);

         }

 

-        if(is_array($meta = config('response.meta'))){

+        if (is_array($meta = config('response.meta'))) {

 

             //set as the success object is false

             $this->data['appExceptionSuccess'] = [];

         }

-        else{

+        else {

 

             //set as the success object is false

-            $this->data['appExceptionSuccess'] = ['success'=>(bool)false,'status'=>$this->data['status']];

+            $this->data['appExceptionSuccess'] = ['success'=>(bool)false, 'status'=>$this->data['status']];

         }

     }

 

@@ -108,13 +108,13 @@ 
         //This function can be used for defining your own way of handling errors during runtime,

         //for example in applications in which you need to do cleanup of data/files when a critical error happens,

         //or when you need to trigger an error under certain conditions (using trigger_error()).

-        set_error_handler([$this,'setErrorHandler']);

+        set_error_handler([$this, 'setErrorHandler']);

 

         //Registers a callback to be executed after script execution finishes or exit() is called.

         //Multiple calls to register_shutdown_function() can be made, and each will be called in the same order as

         //they were registered. If you call exit() within one registered shutdown function,

         //processing will stop completely and no other registered shutdown functions will be called.

-        register_shutdown_function([$this,'fatalErrorShutdownHandler']);

+        register_shutdown_function([$this, 'fatalErrorShutdownHandler']);

 

     }

 

@@ -127,7 +127,7 @@ 
      * @param null|string $errLine

      * @param null|string $errContext

      */

-    public function setErrorHandler($errNo=null, $errStr=null, $errFile=null, $errLine=null, $errContext=null)

+    public function setErrorHandler($errNo = null, $errStr = null, $errFile = null, $errLine = null, $errContext = null)

     {

         // in case of a deficiency,

         // we need to boot our general needs to be needed for the exception.

@@ -154,7 +154,7 @@ 
         //get lang message for exception

         $this->getLangMessageForException();

 

-        if($this->app->has('exceptiontrace')){

+        if ($this->app->has('exceptiontrace')) {

 

             $customExceptionTrace   = $this->app['exceptiontrace'];

             $this->data['errFile']  = $customExceptionTrace['file'];

@@ -163,42 +163,41 @@ 
 

         $environment = $this->app->environment();

 

-        $vendorDirectory = str_replace(root.''.DIRECTORY_SEPARATOR.'','',$this->data['errFile']);

+        $vendorDirectory = str_replace(root.''.DIRECTORY_SEPARATOR.'', '', $this->data['errFile']);

 

-        if(preg_match('@vendor.*\.php@is',$vendorDirectory,$vd)){

+        if (preg_match('@vendor.*\.php@is', $vendorDirectory, $vd)) {

             $vendorDirectory = $vd[0];

         }

 

-        if(Str::startsWith($vendorDirectory,'vendor')

-            && Str::startsWith($vendorDirectory,'vendor/php-resta')===false)

+        if (Str::startsWith($vendorDirectory, 'vendor')

+            && Str::startsWith($vendorDirectory, 'vendor/php-resta')===false)

         {

 

             $externalMessage = ($environment==="production") ?

-                'An unexpected external error has occurred' :

-                $this->data['errStrReal'];

+                'An unexpected external error has occurred' : $this->data['errStrReal'];

 

-            $this->result = $this->getAppException($environment,$externalMessage);

+            $this->result = $this->getAppException($environment, $externalMessage);

 

 

             //Get or Set the HTTP response code

             http_response_code(500);

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

-            $this->app->register('responseStatus',500);

+            $this->app->register('responseStatus', 500);

 

 

         }

-        else{

+        else {

 

-            $this->result = $this->getAppException($environment,$this->data['errStrReal']);

+            $this->result = $this->getAppException($environment, $this->data['errStrReal']);

 

             //Get or Set the HTTP response code

             http_response_code($this->data['status']);

         }

 

-        if($environment==="production"){

+        if ($environment==="production") {

 

-            $productionLogMessage = $this->getAppException('local',$this->data['errStrReal']);

-            $this->app->register('productionLogMessage',$this->app->get('out')->outputFormatter($productionLogMessage));

+            $productionLogMessage = $this->getAppException('local', $this->data['errStrReal']);

+            $this->app->register('productionLogMessage', $this->app->get('out')->outputFormatter($productionLogMessage));

         }

 

         // exception extender The exception information

@@ -207,17 +206,17 @@ 
 

 

         //set json app exception

-        $this->app->register('routerResult',$this->result);

+        $this->app->register('routerResult', $this->result);

 

         $restaOutHandle = null;

 

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

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

             $restaOutHandle = $this->app->get('out')->handle();

         }

 

         header("HTTP/1.1 ".$this->data['status']);

 

-        if($restaOutHandle===null){

+        if ($restaOutHandle===null) {

 

             //header set and symfony response call

             header('Content-type:application/json;charset=utf-8');

@@ -225,7 +224,7 @@ 
             echo json_encode($this->app->get('out')->outputFormatter($this->result));

             exit();

         }

-        else{

+        else {

             echo $restaOutHandle;

             exit();

         }

@@ -235,7 +234,7 @@ 
      * @param $environment

      * @return mixed

      */

-    private function getAppException($environment,$message)

+    private function getAppException($environment, $message)

     {

         return $this->data['appExceptionSuccess']+$this->data['exception']::$environment(

                 $this->data['errNo'],

@@ -255,7 +254,7 @@ 
     private function getExceptionExtender()

     {

         return $this->app->resolve(

-            $this->app->get('macro')->call('exceptionExtender',function(){

+            $this->app->get('macro')->call('exceptionExtender', function() {

                 return ExceptionExtender::class;

             }),

             ['result'=>$this->result])->getResult();

@@ -273,13 +272,13 @@ 
 

         $this->inStackTrace($last_error);

 

-        if(!is_null($last_error)){

+        if (!is_null($last_error)) {

 

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

-                define('methodName',null);

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

+                define('methodName', null);

             }

 

-            if($this->app->has('exceptionFile')){

+            if ($this->app->has('exceptionFile')) {

                 $last_error['file'] = $this->app['exceptionFile'];

                 $last_error['line'] = $this->app['exceptionLine'];

             }

@@ -299,13 +298,13 @@ 
      */

     public function inStackTrace($error)

     {

-        if($this->app->has('urlComponent')){

-            if(!preg_match('@'.$this->app['urlComponent']['project'].'@',$error['file'])

-                && !$this->app->has('exceptionFile')){

-                if(preg_match('@ in\s(.*?)\n@is',$error['message'],$result)){

-                    $errorMessage = explode(":",$result[1]);

-                    $this->app->register('exceptionFile',$errorMessage[0]);

-                    $this->app->register('exceptionLine',$errorMessage[1]);

+        if ($this->app->has('urlComponent')) {

+            if (!preg_match('@'.$this->app['urlComponent']['project'].'@', $error['file'])

+                && !$this->app->has('exceptionFile')) {

+                if (preg_match('@ in\s(.*?)\n@is', $error['message'], $result)) {

+                    $errorMessage = explode(":", $result[1]);

+                    $this->app->register('exceptionFile', $errorMessage[0]);

+                    $this->app->register('exceptionLine', $errorMessage[1]);

                 }

             }

         }

@@ -318,33 +317,33 @@ 
     {

         $clone = clone $this;

 

-        if($this->app->has('exceptionTranslate')){

+        if ($this->app->has('exceptionTranslate')) {

 

             $langMessage = trans('exception.'.$this->app->get('exceptionTranslate'));

 

-            if(!is_null($langMessage) && $this->app->has('exceptionTranslateParams')){

+            if (!is_null($langMessage) && $this->app->has('exceptionTranslateParams')) {

 

-                if(count($this->app['exceptionTranslateParams'][$this->app['exceptionTranslate']])){

-                    foreach ($this->app['exceptionTranslateParams'][$this->app['exceptionTranslate']] as $key=>$value){

+                if (count($this->app['exceptionTranslateParams'][$this->app['exceptionTranslate']])) {

+                    foreach ($this->app['exceptionTranslateParams'][$this->app['exceptionTranslate']] as $key=>$value) {

 

                         $valueLangName = !is_null(trans('default.'.$value)) ? trans('default.'.$value) : $value;

-                        $langMessage = preg_replace('@\('.$key.'\)@is',$valueLangName,$langMessage);

+                        $langMessage = preg_replace('@\('.$key.'\)@is', $valueLangName, $langMessage);

                     }

                 }

             }

 

-            if($langMessage!==null){

+            if ($langMessage!==null) {

                 $this->data['errStrReal'] = $langMessage;

             }

         }

 

-        if(class_exists($this->data['errorClassNamespace'])

+        if (class_exists($this->data['errorClassNamespace'])

             &&

-            (Str::startsWith($this->data['errorClassNamespace'],'App')

-                || Str::startsWith($this->data['errorClassNamespace'],__NAMESPACE__))){

+            (Str::startsWith($this->data['errorClassNamespace'], 'App')

+                || Str::startsWith($this->data['errorClassNamespace'], __NAMESPACE__))) {

 

             ClosureDispatcher::bind($this->data['errorClassNamespace'])->call(function() use ($clone) {

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

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

                     $clone->setLang($this->lang);

                 }

             });

@@ -354,7 +353,7 @@ 
 

         $langMessage = (!is_null($this->data['lang'])) ? trans('exception.'.$this->data['lang']) : null;

 

-        if($langMessage!==null){

+        if ($langMessage!==null) {

             $this->data['errStrReal'] = $langMessage;

         }

     }

@@ -368,14 +367,14 @@ 
     {

         // catch exception via preg match

         // and then clear the Uncaught statement from inside.

-        if(preg_match('@(.*?):@is',$this->data['errStrReal'],$errArr)){

+        if (preg_match('@(.*?):@is', $this->data['errStrReal'], $errArr)) {

 

-            $this->data['errType'] = trim(str_replace('Uncaught','',$errArr[1]));

+            $this->data['errType'] = trim(str_replace('Uncaught', '', $errArr[1]));

             $this->data['errorClassNamespace'] = $this->data['errType'];

         }

 

-        if(preg_match('@Uncaught@is',$this->data['errStrReal'])

-            && preg_match('@(.*?):(.*?)\sin\s@is',$this->data['errStrReal'],$errStrRealArray)){

+        if (preg_match('@Uncaught@is', $this->data['errStrReal'])

+            && preg_match('@(.*?):(.*?)\sin\s@is', $this->data['errStrReal'], $errStrRealArray)) {

             $this->data['errStrReal'] = trim($errStrRealArray[2]);

         }

 

@@ -395,7 +394,7 @@ 
     /**

      * @param null|string $lang

      */

-    public function setLang($lang=null)

+    public function setLang($lang = null)

     {

         $this->lang = $lang;

     }

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}();

     }

 

src/resta/Worker/WorkerManager.php

Spacing +8 added lines, -8 removed lines

@@ -21,7 +21,7 @@ 
     public function execute()
     {
         //we check the presence of worker on container.
-        if($this->isWorkerAvailable()){
+        if ($this->isWorkerAvailable()) {
             $this->{$this->getApply()}();
         }
     }
@@ -35,7 +35,7 @@ 
     {
         $this->isWorkerClosure();
 
-        if($this->resolve instanceof \Closure){
+        if ($this->resolve instanceof \Closure) {
             $resolve = $this->resolve;
             echo $resolve($this->getData()).''.PHP_EOL;
             $this->pause();
@@ -51,7 +51,7 @@ 
     {
         $this->isWorkerObject();
 
-        if($this->resolve instanceof WorkerContracts){
+        if ($this->resolve instanceof WorkerContracts) {
             $this->resolve->handle();
             echo $this->getWorker().' Worker : Ok'.PHP_EOL;
             $this->pause($this->resolve->getSleep());
@@ -66,11 +66,11 @@ 
     public function isWorkerClosure()
     {
         //we check the presence of worker on container.
-        if($this->isWorkerAvailable()){
+        if ($this->isWorkerAvailable()) {
 
             // if worker comes as an object, this object will be executed.
             // worker can have a closure function.
-            if(is_callable($worker = $this->worker[$this->getWorker()])) {
+            if (is_callable($worker = $this->worker[$this->getWorker()])) {
                 $this->resolve = $worker;
             }
         }
@@ -84,12 +84,12 @@ 
     public function isWorkerObject()
     {
         //we check the presence of worker on container.
-        if($this->isWorkerAvailable()){
+        if ($this->isWorkerAvailable()) {
 
             // if worker comes as an object, this object will be executed.
             // worker can have a closure function.
-            if(!is_callable($worker = $this->worker[$this->getWorker()]) && Utils::isNamespaceExists($worker)) {
-                $this->resolve = $this->app->resolve($worker,['data'=>$this->getData()]);
+            if (!is_callable($worker = $this->worker[$this->getWorker()]) && Utils::isNamespaceExists($worker)) {
+                $this->resolve = $this->app->resolve($worker, ['data'=>$this->getData()]);
             }
         }
     }

src/resta/Worker/DefaultJob.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
      * @param ApplicationContracts $app
      * @param WorkerManagerContracts $worker
      */
-    public function __construct(ApplicationContracts $app,WorkerManagerContracts $worker)
+    public function __construct(ApplicationContracts $app, WorkerManagerContracts $worker)
     {
         parent::__construct($app);
 
@@ -32,7 +32,7 @@ 
      */
     public function execute()
     {
-        while(1){
+        while (1) {
             $this->worker->executeObject();
             $this->worker->executeClosure();
         }

src/resta/Worker/WorkerManagerAbstract.php

Braces +1 added lines, -2 removed lines

@@ -112,8 +112,7 @@
     {
         if(is_null($pause)){
             sleep($this->getPauseValue());
-        }
-        else{
+        } else{
             sleep($pause);
         }
     }

Spacing +14 added lines, -14 removed lines

@@ -25,15 +25,15 @@ 
      * @param ApplicationContracts $app
      * @param array $args
      */
-    public function __construct(ApplicationContracts $app, $args=array())
+    public function __construct(ApplicationContracts $app, $args = array())
     {
         parent::__construct($app);
 
-        if($this->app->runningInConsole()===false){
+        if ($this->app->runningInConsole()===false) {
             exception()->runtime('The worker can only be run as cli..');
         }
 
-        if($this->app->has('WORKER')===false){
+        if ($this->app->has('WORKER')===false) {
             exception()->runtime('The worker console manipulation for WORKER container value');
         }
 
@@ -49,7 +49,7 @@ 
      */
     public function getApply()
     {
-        if(isset($this->args['apply'])){
+        if (isset($this->args['apply'])) {
             return $this->args['apply'];
         }
 
@@ -63,7 +63,7 @@ 
      */
     public function getData()
     {
-        if(isset($this->args['data'])){
+        if (isset($this->args['data'])) {
             return $this->args['data'];
         }
 
@@ -77,7 +77,7 @@ 
      */
     public function getPauseValue()
     {
-        if(isset($this->args['pause'])){
+        if (isset($this->args['pause'])) {
             return $this->args['pause'];
         }
 
@@ -91,7 +91,7 @@ 
      */
     public function getWorker()
     {
-        if(isset($this->args['worker'],$this->worker[$worker = strtolower($this->args['worker'])])){
+        if (isset($this->args['worker'], $this->worker[$worker = strtolower($this->args['worker'])])) {
             return $worker;
         }
 
@@ -113,12 +113,12 @@ 
      *
      * @param null|\int $pause
      */
-    public function pause($pause=null)
+    public function pause($pause = null)
     {
-        if(is_null($pause)){
+        if (is_null($pause)) {
             sleep($this->getPauseValue());
         }
-        else{
+        else {
             sleep($pause);
         }
     }
@@ -132,16 +132,16 @@ 
      */
     public function __call($name, $arguments)
     {
-        $job = $this->app->get('macro')->call(strtolower($this->getApply()).'Job',function() use($name){
+        $job = $this->app->get('macro')->call(strtolower($this->getApply()).'Job', function() use($name){
             return __NAMESPACE__.'\\'.ucfirst($name).'Job';
         });
 
-        if(Utils::isNamespaceExists($job)){
+        if (Utils::isNamespaceExists($job)) {
 
             /** @var JobContracts $resolve */
-            $resolve = $this->app->resolve($job,['worker'=>$this]);
+            $resolve = $this->app->resolve($job, ['worker'=>$this]);
 
-            if($resolve instanceof JobContracts){
+            if ($resolve instanceof JobContracts) {
                 return $resolve->execute();
             }
         }