php-resta / resta-core

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

     }

 

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

src/resta/Console/Source/Worker/Worker.php

Braces +3 added lines, -1 removed lines

@@ -38,7 +38,9 @@
             $this->argument[$key] = ucfirst($key);

             $this->{$method}();

 

-            if($break) break;

+            if($break) {

+                break;

+            }

         }

         exit();

     }

Spacing +39 added lines, -39 removed lines

@@ -31,14 +31,14 @@ 
      * @param string $method

      * @param bool $break

      */

-    private function allWorkers($method='start',$break=false)

+    private function allWorkers($method = 'start', $break = false)

     {

-        foreach(app()->get('worker') as $key=>$item){

+        foreach (app()->get('worker') as $key=>$item) {

             $this->argument['worker'] = ucfirst($key);

             $this->argument[$key] = ucfirst($key);

             $this->{$method}();

 

-            if($break) break;

+            if ($break) break;

         }

         exit();

     }

@@ -48,22 +48,22 @@ 
      */

     public function start()

     {

-        if(is_null($this->argument['worker'])){

+        if (is_null($this->argument['worker'])) {

             $this->allWorkers();

             exit();

         }

 

         $workerName = $this->projectName().'-'.$this->argument['worker'];

         app()->terminate('WORKER');

-        app()->register('WORKER',$workerName);

+        app()->register('WORKER', $workerName);

         app()->terminate('PROJECT_NAME');

-        app()->register('PROJECT_NAME',strtolower($this->projectName()));

-        app()->register('WORKER_START',true);

-        app()->register('WORKER_STOP',false);

-        app()->register('WORKER_STATUS',false);

-        app()->register('WORKER_CLEAR',false);

+        app()->register('PROJECT_NAME', strtolower($this->projectName()));

+        app()->register('WORKER_START', true);

+        app()->register('WORKER_STOP', false);

+        app()->register('WORKER_STATUS', false);

+        app()->register('WORKER_CLEAR', false);

 

-        app()->resolve(WorkerManager::class,['args'=>$this->argument])->execute();

+        app()->resolve(WorkerManager::class, ['args'=>$this->argument])->execute();

     }

 

     /**

@@ -71,22 +71,22 @@ 
      */

     public function stop()

     {

-        if(is_null($this->argument['worker'])){

+        if (is_null($this->argument['worker'])) {

             $this->allWorkers('stop');

             exit();

         }

 

         $workerName = $this->projectName().'-'.$this->argument['worker'];

         app()->terminate('WORKER');

-        app()->register('WORKER',$workerName);

+        app()->register('WORKER', $workerName);

         app()->terminate('PROJECT_NAME');

-        app()->register('PROJECT_NAME',strtolower($this->projectName()));

-        app()->register('WORKER_START',false);

-        app()->register('WORKER_STOP',true);

-        app()->register('WORKER_STATUS',false);

-        app()->register('WORKER_CLEAR',false);

+        app()->register('PROJECT_NAME', strtolower($this->projectName()));

+        app()->register('WORKER_START', false);

+        app()->register('WORKER_STOP', true);

+        app()->register('WORKER_STATUS', false);

+        app()->register('WORKER_CLEAR', false);

 

-        app()->resolve(WorkerManager::class,['args'=>$this->argument])->execute();

+        app()->resolve(WorkerManager::class, ['args'=>$this->argument])->execute();

     }

 

     /**

@@ -94,20 +94,20 @@ 
      */

     public function status()

     {

-        if(!isset($this->argument['worker'])){

-            $this->allWorkers('status',true);

+        if (!isset($this->argument['worker'])) {

+            $this->allWorkers('status', true);

             exit();

         }

 

         $workerName = $this->projectName().'-'.$this->argument['worker'];

-        app()->register('WORKER',$workerName);

-        app()->register('PROJECT_NAME',strtolower($this->projectName()));

-        app()->register('WORKER_START',false);

-        app()->register('WORKER_STOP',false);

-        app()->register('WORKER_STATUS',true);

-        app()->register('WORKER_CLEAR',false);

-

-        app()->resolve(WorkerManager::class,['args'=>$this->argument])->execute();

+        app()->register('WORKER', $workerName);

+        app()->register('PROJECT_NAME', strtolower($this->projectName()));

+        app()->register('WORKER_START', false);

+        app()->register('WORKER_STOP', false);

+        app()->register('WORKER_STATUS', true);

+        app()->register('WORKER_CLEAR', false);

+

+        app()->resolve(WorkerManager::class, ['args'=>$this->argument])->execute();

     }

 

     /**

@@ -115,22 +115,22 @@ 
      */

     public function clear()

     {

-        if(is_null($this->argument['worker'])){

+        if (is_null($this->argument['worker'])) {

             $this->allWorkers('clear');

             exit();

         }

 

         $workerName = $this->projectName().'-'.$this->argument['worker'];

         app()->terminate('WORKER');

-        app()->register('WORKER',$workerName);

+        app()->register('WORKER', $workerName);

         app()->terminate('PROJECT_NAME');

-        app()->register('PROJECT_NAME',strtolower($this->projectName()));

-        app()->register('WORKER_START',false);

-        app()->register('WORKER_STOP',false);

-        app()->register('WORKER_STATUS',false);

-        app()->register('WORKER_CLEAR',true);

+        app()->register('PROJECT_NAME', strtolower($this->projectName()));

+        app()->register('WORKER_START', false);

+        app()->register('WORKER_STOP', false);

+        app()->register('WORKER_STATUS', false);

+        app()->register('WORKER_CLEAR', true);

 

-        app()->resolve(WorkerManager::class,['args'=>$this->argument])->execute();

+        app()->resolve(WorkerManager::class, ['args'=>$this->argument])->execute();

     }

 

     /**

@@ -138,7 +138,7 @@ 
      */

     public function create()

     {

-        if(!file_exists(app()->path()->workers())){

+        if (!file_exists(app()->path()->workers())) {

             $this->directory['worker'] = app()->path()->workers();

             $this->file->makeDirectory($this);

         }

@@ -147,7 +147,7 @@ 
         $this->argument['workerClass'] = ucfirst($this->argument['worker']).'';

         $this->argument['projectName'] = strtolower($this->projectName());

 

-        $this->touch['worker/worker']= app()->path()->workers().'/'.$this->argument['worker'].'.php';

+        $this->touch['worker/worker'] = app()->path()->workers().'/'.$this->argument['worker'].'.php';

 

 

         $this->file->touch($this);