@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | /** |
15 | 15 | * @var $type |
16 | 16 | */ |
17 | - public $type='auto-service'; |
|
17 | + public $type = 'auto-service'; |
|
18 | 18 | |
19 | 19 | /** |
20 | 20 | * @var array |
@@ -26,24 +26,24 @@ discard block |
||
26 | 26 | /** |
27 | 27 | * @var $commandRule |
28 | 28 | */ |
29 | - protected $commandRule=[]; |
|
29 | + protected $commandRule = []; |
|
30 | 30 | |
31 | 31 | /** |
32 | 32 | * @method create |
33 | 33 | * @return mixed |
34 | 34 | */ |
35 | - public function create(){ |
|
35 | + public function create() { |
|
36 | 36 | |
37 | - $autoDirectory=explode("\\",$this->argument['project']); |
|
37 | + $autoDirectory = explode("\\", $this->argument['project']); |
|
38 | 38 | |
39 | - $this->argument['autoservice']=$autoDirectory[0]; |
|
39 | + $this->argument['autoservice'] = $autoDirectory[0]; |
|
40 | 40 | |
41 | 41 | $this->argument['methodPrefix'] = StaticPathModel::$methodPrefix; |
42 | - $this->directory['path'] = $this->autoService().'/'.$autoDirectory[0]; |
|
42 | + $this->directory['path'] = $this->autoService().'/'.$autoDirectory[0]; |
|
43 | 43 | |
44 | - $this->file->makeDirectory($this,true); |
|
44 | + $this->file->makeDirectory($this, true); |
|
45 | 45 | |
46 | - $this->touch['service/autoendpoint'] = $this->directory['path'].'/'.$autoDirectory[0].'Service.php'; |
|
46 | + $this->touch['service/autoendpoint'] = $this->directory['path'].'/'.$autoDirectory[0].'Service.php'; |
|
47 | 47 | |
48 | 48 | $this->file->touch($this); |
49 | 49 |
@@ -100,8 +100,7 @@ |
||
100 | 100 | true |
101 | 101 | ]); |
102 | 102 | } |
103 | - } |
|
104 | - else{ |
|
103 | + } else{ |
|
105 | 104 | |
106 | 105 | $this->table->addRow([ |
107 | 106 | ++$counter, |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | /** |
17 | 17 | * @var $type |
18 | 18 | */ |
19 | - public $type='route'; |
|
19 | + public $type = 'route'; |
|
20 | 20 | |
21 | 21 | /** |
22 | 22 | * @var array |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | /** |
34 | 34 | * @var $commandRule |
35 | 35 | */ |
36 | - public $commandRule=[]; |
|
36 | + public $commandRule = []; |
|
37 | 37 | |
38 | 38 | /** |
39 | 39 | * @return bool |
@@ -42,24 +42,24 @@ discard block |
||
42 | 42 | |
43 | 43 | echo $this->info('All Route Controller Lists :'); |
44 | 44 | |
45 | - $this->table->setHeaders(['no','endpoint','http','method','definition','beforeMiddleware','afterMiddleware','routeCache','doc','status']); |
|
45 | + $this->table->setHeaders(['no', 'endpoint', 'http', 'method', 'definition', 'beforeMiddleware', 'afterMiddleware', 'routeCache', 'doc', 'status']); |
|
46 | 46 | |
47 | 47 | $routes = Router::getRoutes(); |
48 | 48 | $routeData = isset($routes['data']) ? $routes['data'] : []; |
49 | 49 | $routePattern = isset($routes['pattern']) ? $routes['pattern'] : []; |
50 | 50 | |
51 | - $counter=0; |
|
51 | + $counter = 0; |
|
52 | 52 | |
53 | 53 | $application = app(); |
54 | 54 | |
55 | 55 | $application->loadIfNotExistBoot(['middleware']); |
56 | 56 | $middlewareProvider = $application['middleware']; |
57 | 57 | |
58 | - foreach($routeData as $key=>$data){ |
|
58 | + foreach ($routeData as $key=>$data) { |
|
59 | 59 | |
60 | - $middlewareProvider->setKeyOdds('endpoint',$data['endpoint']); |
|
61 | - $middlewareProvider->setKeyOdds('method',$data['method']); |
|
62 | - $middlewareProvider->setKeyOdds('http',$data['http']); |
|
60 | + $middlewareProvider->setKeyOdds('endpoint', $data['endpoint']); |
|
61 | + $middlewareProvider->setKeyOdds('method', $data['method']); |
|
62 | + $middlewareProvider->setKeyOdds('http', $data['http']); |
|
63 | 63 | |
64 | 64 | $middlewareProvider->handleMiddlewareProcess(); |
65 | 65 | $beforeMiddleware = $middlewareProvider->getShow(); |
@@ -76,22 +76,22 @@ discard block |
||
76 | 76 | $reflection = app()['reflection']($controllerNamespace); |
77 | 77 | $methodDocument = $reflection->reflectionMethodParams($data['method'])->document; |
78 | 78 | |
79 | - $isRouteCache = ($reflection->isAvailableMethodDocument($data['method'],'cache')) ? |
|
79 | + $isRouteCache = ($reflection->isAvailableMethodDocument($data['method'], 'cache')) ? |
|
80 | 80 | 'available' : ''; |
81 | 81 | |
82 | 82 | $methodDefinition = ''; |
83 | 83 | |
84 | - if(preg_match('@#define:(.*?)\n@is',$methodDocument,$definition)){ |
|
85 | - if(isset($definition[1])){ |
|
84 | + if (preg_match('@#define:(.*?)\n@is', $methodDocument, $definition)) { |
|
85 | + if (isset($definition[1])) { |
|
86 | 86 | $methodDefinition = rtrim($definition[1]); |
87 | 87 | } |
88 | 88 | } |
89 | 89 | |
90 | - $endpointData = $endpoint.'/'.implode("/",$routePattern[$key]); |
|
90 | + $endpointData = $endpoint.'/'.implode("/", $routePattern[$key]); |
|
91 | 91 | |
92 | - if(isset($this->argument['filter'])){ |
|
92 | + if (isset($this->argument['filter'])) { |
|
93 | 93 | |
94 | - if(preg_match('@'.$this->argument['filter'].'@is',$endpointData)){ |
|
94 | + if (preg_match('@'.$this->argument['filter'].'@is', $endpointData)) { |
|
95 | 95 | |
96 | 96 | $this->table->addRow([ |
97 | 97 | ++$counter, |
@@ -100,8 +100,8 @@ discard block |
||
100 | 100 | //$controllerNamespace, |
101 | 101 | $data['method'], |
102 | 102 | $methodDefinition, |
103 | - implode(",",$beforeMiddleware), |
|
104 | - implode(",",$afterMiddleware), |
|
103 | + implode(",", $beforeMiddleware), |
|
104 | + implode(",", $afterMiddleware), |
|
105 | 105 | $isRouteCache, |
106 | 106 | '', |
107 | 107 | '', |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | ]); |
110 | 110 | } |
111 | 111 | } |
112 | - else{ |
|
112 | + else { |
|
113 | 113 | |
114 | 114 | $this->table->addRow([ |
115 | 115 | ++$counter, |
@@ -118,8 +118,8 @@ discard block |
||
118 | 118 | //$controllerNamespace, |
119 | 119 | $data['method'], |
120 | 120 | $methodDefinition, |
121 | - implode(",",$beforeMiddleware), |
|
122 | - implode(",",$afterMiddleware), |
|
121 | + implode(",", $beforeMiddleware), |
|
122 | + implode(",", $afterMiddleware), |
|
123 | 123 | $isRouteCache, |
124 | 124 | '', |
125 | 125 | true |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | /** |
16 | 16 | * @var $type |
17 | 17 | */ |
18 | - public $type='request'; |
|
18 | + public $type = 'request'; |
|
19 | 19 | |
20 | 20 | /** |
21 | 21 | * @var array |
@@ -32,15 +32,15 @@ discard block |
||
32 | 32 | /** |
33 | 33 | * @var $commandRule |
34 | 34 | */ |
35 | - public $commandRule=['request']; |
|
35 | + public $commandRule = ['request']; |
|
36 | 36 | |
37 | 37 | /** |
38 | 38 | * @method create |
39 | 39 | * @return mixed |
40 | 40 | */ |
41 | - public function create(){ |
|
41 | + public function create() { |
|
42 | 42 | |
43 | - $request=$this->argument['request']; |
|
43 | + $request = $this->argument['request']; |
|
44 | 44 | |
45 | 45 | |
46 | 46 | $this->directory['requestCreate'] = path()->request(); |
@@ -50,12 +50,12 @@ discard block |
||
50 | 50 | //set project directory |
51 | 51 | $this->file->makeDirectory($this); |
52 | 52 | |
53 | - if(!file_exists($this->directory['requestCreate'].'/Request.php')){ |
|
53 | + if (!file_exists($this->directory['requestCreate'].'/Request.php')) { |
|
54 | 54 | $this->touch['source/request'] = $this->directory['requestCreate'].'/Request.php'; |
55 | 55 | $this->touch['source/requestGenerator'] = $this->directory['requestCreate'].'/RequestGenerator.php'; |
56 | 56 | } |
57 | 57 | |
58 | - if(!file_exists($this->directory['requestCreate'].'/RequestProvider.php')){ |
|
58 | + if (!file_exists($this->directory['requestCreate'].'/RequestProvider.php')) { |
|
59 | 59 | $this->touch['source/requestProvider'] = $this->directory['requestCreate'].'/RequestProvider.php'; |
60 | 60 | } |
61 | 61 |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | /** |
14 | 14 | * @var $type |
15 | 15 | */ |
16 | - public $type='command'; |
|
16 | + public $type = 'command'; |
|
17 | 17 | |
18 | 18 | /** |
19 | 19 | * @var array |
@@ -25,13 +25,13 @@ discard block |
||
25 | 25 | /** |
26 | 26 | * @var $commandRule |
27 | 27 | */ |
28 | - protected $commandRule=['command']; |
|
28 | + protected $commandRule = ['command']; |
|
29 | 29 | |
30 | 30 | /** |
31 | 31 | * @method create |
32 | 32 | * @return mixed |
33 | 33 | */ |
34 | - public function create(){ |
|
34 | + public function create() { |
|
35 | 35 | |
36 | 36 | $this->directory['commandDir'] = path()->command(); |
37 | 37 | $this->argument['commandNamespace'] = app()->namespace()->command(); |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | //set project directory |
41 | 41 | $this->file->makeDirectory($this); |
42 | 42 | |
43 | - $this->touch['command/file'] = $this->directory['commandDir'].'/'.$this->argument['command'].'.php'; |
|
43 | + $this->touch['command/file'] = $this->directory['commandDir'].'/'.$this->argument['command'].'.php'; |
|
44 | 44 | |
45 | 45 | $this->file->touch($this); |
46 | 46 |
@@ -155,8 +155,7 @@ |
||
155 | 155 | |
156 | 156 | if(isset($this->argument['group'])){ |
157 | 157 | $argument=current($dataParse).''.$seperate.''.$this->argument['group']; |
158 | - } |
|
159 | - else{ |
|
158 | + } else{ |
|
160 | 159 | $argument=current($dataParse); |
161 | 160 | } |
162 | 161 |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | * @param $argument |
64 | 64 | * @param $app |
65 | 65 | */ |
66 | - public function __construct($argument,$app) { |
|
66 | + public function __construct($argument, $app) { |
|
67 | 67 | |
68 | 68 | // Set up shell colors |
69 | 69 | $this->foreground_colors['black'] = '0;30'; |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | $this->table = new \console_table(); |
100 | 100 | |
101 | 101 | |
102 | - if(isset($this->argument['project'])){ |
|
102 | + if (isset($this->argument['project'])) { |
|
103 | 103 | |
104 | 104 | $this->argument['repositoryNamespace'] = app()->namespace()->repository(); |
105 | 105 | $this->argument['modelNamespace'] = app()->namespace()->model(); |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | $this->argument['project'] = $this->argument['project'].'\\'.StaticPathList::$projectPrefixGroup; |
111 | 111 | |
112 | 112 | |
113 | - $this->project = StaticPathModel::appPath().'/'.str_replace('\\','/',$this->argument['project']); |
|
113 | + $this->project = StaticPathModel::appPath().'/'.str_replace('\\', '/', $this->argument['project']); |
|
114 | 114 | |
115 | 115 | |
116 | 116 | } |
@@ -127,11 +127,11 @@ discard block |
||
127 | 127 | return array_keys($this->background_colors); |
128 | 128 | } |
129 | 129 | |
130 | - public function ReadStdin($prompt=null, $valid_inputs=null, $default = '') { |
|
131 | - while(!isset($input) || (is_array($valid_inputs) && !in_array($input, $valid_inputs)) || ($valid_inputs == 'is_file' && !is_file($input))) { |
|
130 | + public function ReadStdin($prompt = null, $valid_inputs = null, $default = '') { |
|
131 | + while (!isset($input) || (is_array($valid_inputs) && !in_array($input, $valid_inputs)) || ($valid_inputs=='is_file' && !is_file($input))) { |
|
132 | 132 | echo $this->input($prompt); |
133 | 133 | $input = strtolower(trim(fgets(STDIN))); |
134 | - if(empty($input) && !empty($default)) { |
|
134 | + if (empty($input) && !empty($default)) { |
|
135 | 135 | $input = $default; |
136 | 136 | } |
137 | 137 | } |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | * @param array $commander |
143 | 143 | * @return mixed|string |
144 | 144 | */ |
145 | - public function exception($commander=array()){ |
|
145 | + public function exception($commander = array()) { |
|
146 | 146 | return $this->error('[['.$commander['argument'].']] parameter is missing for commander'); |
147 | 147 | } |
148 | 148 | |
@@ -151,15 +151,15 @@ discard block |
||
151 | 151 | * @param string $seperate |
152 | 152 | * @return mixed|string |
153 | 153 | */ |
154 | - public function checkGroupArgument($data,$seperate="\\"){ |
|
154 | + public function checkGroupArgument($data, $seperate = "\\") { |
|
155 | 155 | |
156 | - $dataParse=explode("\\",$data); |
|
156 | + $dataParse = explode("\\", $data); |
|
157 | 157 | |
158 | - if(isset($this->argument['group'])){ |
|
159 | - $argument=current($dataParse).''.$seperate.''.$this->argument['group']; |
|
158 | + if (isset($this->argument['group'])) { |
|
159 | + $argument = current($dataParse).''.$seperate.''.$this->argument['group']; |
|
160 | 160 | } |
161 | - else{ |
|
162 | - $argument=current($dataParse); |
|
161 | + else { |
|
162 | + $argument = current($dataParse); |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | return $argument; |
@@ -168,12 +168,12 @@ discard block |
||
168 | 168 | /** |
169 | 169 | * @param $string |
170 | 170 | */ |
171 | - public function consoleLogger($string,$level) |
|
171 | + public function consoleLogger($string, $level) |
|
172 | 172 | { |
173 | - if(config('app')!==null && config('app.consoleLogger')){ |
|
173 | + if (config('app')!==null && config('app.consoleLogger')) { |
|
174 | 174 | |
175 | 175 | logger('console')->{$level}([ |
176 | - 'argument' => implode(" ",core()->consoleArguments), |
|
176 | + 'argument' => implode(" ", core()->consoleArguments), |
|
177 | 177 | 'result' => $string, |
178 | 178 | ]); |
179 | 179 | } |
@@ -20,12 +20,12 @@ discard block |
||
20 | 20 | * @method bindConsoleShared |
21 | 21 | * @return array |
22 | 22 | */ |
23 | - private function bindConsoleShared(){ |
|
23 | + private function bindConsoleShared() { |
|
24 | 24 | |
25 | 25 | //We assign the values assigned to the console object to the bindings array. |
26 | 26 | //The console object represents the classes to be bound for the kernel object console. |
27 | 27 | //if the array returns false on an if condition, the array will be automatically detected as empty. |
28 | - if(isset($this->app['consoleShared']) and is_array($this->app['consoleShared'])){ |
|
28 | + if (isset($this->app['consoleShared']) and is_array($this->app['consoleShared'])) { |
|
29 | 29 | return $this->app['consoleShared']; |
30 | 30 | } |
31 | 31 | return []; |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | * @param $container |
37 | 37 | * @return void |
38 | 38 | */ |
39 | - public function bindForAppCommand($object,$container){ |
|
39 | + public function bindForAppCommand($object, $container) { |
|
40 | 40 | |
41 | 41 | //We need a definition of the application name from the data supplied with the console variables. |
42 | 42 | //The specified app variable is important to us in the command that is run in the application. |
@@ -54,8 +54,8 @@ discard block |
||
54 | 54 | //we send the value to the bind method without callback after checking the bind object to be loaded for the console. |
55 | 55 | //This is the value found in the bindings variable. |
56 | 56 | //Thus, we get the binding objects required for the console independently of the http method installation. |
57 | - if(isset($this->bindings[$object])){ |
|
58 | - $this->app->{$appresolve}($object,$this->bindings[$object]); |
|
57 | + if (isset($this->bindings[$object])) { |
|
58 | + $this->app->{$appresolve}($object, $this->bindings[$object]); |
|
59 | 59 | } |
60 | 60 | } |
61 | 61 | |
@@ -64,25 +64,25 @@ discard block |
||
64 | 64 | * @param $callback |
65 | 65 | * @param $container |
66 | 66 | */ |
67 | - public function console($object,$callback,$container){ |
|
67 | + public function console($object, $callback, $container) { |
|
68 | 68 | |
69 | 69 | //If the console argument is an operator that exists in the resta kernel, |
70 | 70 | //we run a callback method to check it. The bindings for the custom application commander will be run. |
71 | - $this->bindForAppCommand($object,$container); |
|
71 | + $this->bindForAppCommand($object, $container); |
|
72 | 72 | |
73 | 73 | //closure object |
74 | 74 | $callBackResolve = Utils::callbackProcess($callback); |
75 | 75 | |
76 | 76 | // if the callbackresolve variable represents a class, |
77 | 77 | // we directly register it's resolved status to the container object. |
78 | - if(Utils::isNamespaceExists($callBackResolve)){ |
|
79 | - $this->app->register($object,$this->app->resolve(Utils::callbackProcess($callback))); |
|
78 | + if (Utils::isNamespaceExists($callBackResolve)) { |
|
79 | + $this->app->register($object, $this->app->resolve(Utils::callbackProcess($callback))); |
|
80 | 80 | } |
81 | - else{ |
|
81 | + else { |
|
82 | 82 | |
83 | 83 | // if callbackresolve doesn't represent a class, |
84 | 84 | // we're register it's no resolved status. |
85 | - $this->app->register($object,Utils::callbackProcess($callback)); |
|
85 | + $this->app->register($object, Utils::callbackProcess($callback)); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 |
@@ -77,8 +77,7 @@ |
||
77 | 77 | // we directly register it's resolved status to the container object. |
78 | 78 | if(Utils::isNamespaceExists($callBackResolve)){ |
79 | 79 | $this->app->register($object,$this->app->resolve(Utils::callbackProcess($callback))); |
80 | - } |
|
81 | - else{ |
|
80 | + } else{ |
|
82 | 81 | |
83 | 82 | // if callbackresolve doesn't represent a class, |
84 | 83 | // we're register it's no resolved status. |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | function convert($string, $colored = true) |
218 | 218 | { |
219 | 219 | static $conversions = array ( // static so the array doesn't get built |
220 | - // everytime |
|
220 | + // everytime |
|
221 | 221 | // %y - yellow, and so on... {{{ |
222 | 222 | '%y' => array('color' => 'yellow'), |
223 | 223 | '%g' => array('color' => 'green' ), |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | $string = str_replace('%%', '% ', $string); |
261 | 261 | foreach ($conversions as $key => $value) { |
262 | 262 | $string = str_replace($key, Console_Color::color($value), |
263 | - $string); |
|
263 | + $string); |
|
264 | 264 | } |
265 | 265 | $string = str_replace('% ', '%', $string); |
266 | 266 |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | */ |
33 | 33 | |
34 | 34 | |
35 | -$GLOBALS['_CONSOLE_COLOR_CODES'] = array ( |
|
35 | +$GLOBALS['_CONSOLE_COLOR_CODES'] = array( |
|
36 | 36 | 'color' => array( |
37 | 37 | 'black' => 30, |
38 | 38 | 'red' => 31, |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | $color = @$color['color']; |
113 | 113 | } |
114 | 114 | |
115 | - if ($color == 'reset') { |
|
115 | + if ($color=='reset') { |
|
116 | 116 | return "\033[0m"; |
117 | 117 | } |
118 | 118 | |
@@ -216,37 +216,37 @@ discard block |
||
216 | 216 | */ |
217 | 217 | function convert($string, $colored = true) |
218 | 218 | { |
219 | - static $conversions = array ( // static so the array doesn't get built |
|
219 | + static $conversions = array( // static so the array doesn't get built |
|
220 | 220 | // everytime |
221 | 221 | // %y - yellow, and so on... {{{ |
222 | 222 | '%y' => array('color' => 'yellow'), |
223 | - '%g' => array('color' => 'green' ), |
|
224 | - '%b' => array('color' => 'blue' ), |
|
225 | - '%r' => array('color' => 'red' ), |
|
223 | + '%g' => array('color' => 'green'), |
|
224 | + '%b' => array('color' => 'blue'), |
|
225 | + '%r' => array('color' => 'red'), |
|
226 | 226 | '%p' => array('color' => 'purple'), |
227 | 227 | '%m' => array('color' => 'purple'), |
228 | - '%c' => array('color' => 'cyan' ), |
|
229 | - '%w' => array('color' => 'grey' ), |
|
230 | - '%k' => array('color' => 'black' ), |
|
231 | - '%n' => array('color' => 'reset' ), |
|
232 | - '%Y' => array('color' => 'yellow', 'style' => 'light'), |
|
233 | - '%G' => array('color' => 'green', 'style' => 'light'), |
|
234 | - '%B' => array('color' => 'blue', 'style' => 'light'), |
|
235 | - '%R' => array('color' => 'red', 'style' => 'light'), |
|
236 | - '%P' => array('color' => 'purple', 'style' => 'light'), |
|
237 | - '%M' => array('color' => 'purple', 'style' => 'light'), |
|
238 | - '%C' => array('color' => 'cyan', 'style' => 'light'), |
|
239 | - '%W' => array('color' => 'grey', 'style' => 'light'), |
|
240 | - '%K' => array('color' => 'black', 'style' => 'light'), |
|
241 | - '%N' => array('color' => 'reset', 'style' => 'light'), |
|
228 | + '%c' => array('color' => 'cyan'), |
|
229 | + '%w' => array('color' => 'grey'), |
|
230 | + '%k' => array('color' => 'black'), |
|
231 | + '%n' => array('color' => 'reset'), |
|
232 | + '%Y' => array('color' => 'yellow', 'style' => 'light'), |
|
233 | + '%G' => array('color' => 'green', 'style' => 'light'), |
|
234 | + '%B' => array('color' => 'blue', 'style' => 'light'), |
|
235 | + '%R' => array('color' => 'red', 'style' => 'light'), |
|
236 | + '%P' => array('color' => 'purple', 'style' => 'light'), |
|
237 | + '%M' => array('color' => 'purple', 'style' => 'light'), |
|
238 | + '%C' => array('color' => 'cyan', 'style' => 'light'), |
|
239 | + '%W' => array('color' => 'grey', 'style' => 'light'), |
|
240 | + '%K' => array('color' => 'black', 'style' => 'light'), |
|
241 | + '%N' => array('color' => 'reset', 'style' => 'light'), |
|
242 | 242 | '%3' => array('background' => 'yellow'), |
243 | - '%2' => array('background' => 'green' ), |
|
244 | - '%4' => array('background' => 'blue' ), |
|
245 | - '%1' => array('background' => 'red' ), |
|
243 | + '%2' => array('background' => 'green'), |
|
244 | + '%4' => array('background' => 'blue'), |
|
245 | + '%1' => array('background' => 'red'), |
|
246 | 246 | '%5' => array('background' => 'purple'), |
247 | - '%6' => array('background' => 'cyan' ), |
|
248 | - '%7' => array('background' => 'grey' ), |
|
249 | - '%0' => array('background' => 'black' ), |
|
247 | + '%6' => array('background' => 'cyan'), |
|
248 | + '%7' => array('background' => 'grey'), |
|
249 | + '%0' => array('background' => 'black'), |
|
250 | 250 | // Don't use this, I can't stand flashing text |
251 | 251 | '%F' => array('style' => 'blink'), |
252 | 252 | '%U' => array('style' => 'underline'), |
@@ -66,7 +66,9 @@ |
||
66 | 66 | { |
67 | 67 | $list = []; |
68 | 68 | |
69 | - if(!is_array($rules)) $rules = []; |
|
69 | + if(!is_array($rules)) { |
|
70 | + $rules = []; |
|
71 | + } |
|
70 | 72 | |
71 | 73 | foreach ($rules as $key=>$rule){ |
72 | 74 |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | */ |
20 | 20 | public function prepareCommander($commander) |
21 | 21 | { |
22 | - $commander=$commander->call(function() use($commander){ |
|
22 | + $commander = $commander->call(function() use($commander){ |
|
23 | 23 | |
24 | 24 | return [ |
25 | 25 | 'commandRule' => $this->commandRule, |
@@ -37,16 +37,15 @@ discard block |
||
37 | 37 | */ |
38 | 38 | protected function resolveParameters($commander) |
39 | 39 | { |
40 | - if(isset($commander['commandRule'][$commander['method']])){ |
|
41 | - $methodCommanderRule = $commander['commandRule'][$commander['method']]; |
|
40 | + if (isset($commander['commandRule'][$commander['method']])) { |
|
41 | + $methodCommanderRule = $commander['commandRule'][$commander['method']]; |
|
42 | 42 | } |
43 | 43 | |
44 | - $commandRule = (isset($methodCommanderRule)) ? $methodCommanderRule : |
|
45 | - $this->getDefaultCommandRules($commander['commandRule']); |
|
44 | + $commandRule = (isset($methodCommanderRule)) ? $methodCommanderRule : $this->getDefaultCommandRules($commander['commandRule']); |
|
46 | 45 | |
47 | - foreach ($commandRule as $key=>$value){ |
|
48 | - if(!preg_match('@\?.+@is',$value)){ |
|
49 | - if(!isset($commander['arguments'][$value]) OR $commander['arguments'][$value]==""){ |
|
46 | + foreach ($commandRule as $key=>$value) { |
|
47 | + if (!preg_match('@\?.+@is', $value)) { |
|
48 | + if (!isset($commander['arguments'][$value]) OR $commander['arguments'][$value]=="") { |
|
50 | 49 | return [ |
51 | 50 | 'status'=>false, |
52 | 51 | 'argument'=>$value, |
@@ -68,12 +67,12 @@ discard block |
||
68 | 67 | { |
69 | 68 | $list = []; |
70 | 69 | |
71 | - if(!is_array($rules)) $rules = []; |
|
70 | + if (!is_array($rules)) $rules = []; |
|
72 | 71 | |
73 | - foreach ($rules as $key=>$rule){ |
|
72 | + foreach ($rules as $key=>$rule) { |
|
74 | 73 | |
75 | - if(!is_array($rules[$key])){ |
|
76 | - $list[$key]=$rule; |
|
74 | + if (!is_array($rules[$key])) { |
|
75 | + $list[$key] = $rule; |
|
77 | 76 | } |
78 | 77 | } |
79 | 78 |
@@ -12,15 +12,15 @@ discard block |
||
12 | 12 | |
13 | 13 | public function projectPath() |
14 | 14 | { |
15 | - if($this->project===null){ |
|
15 | + if ($this->project===null) { |
|
16 | 16 | throw new \InvalidArgumentException('Project name is invalid'); |
17 | 17 | } |
18 | - return StaticPathModel::projectPath(Str::slashToBackSlash(StaticPathList::$projectPrefixGroup),$this->project); |
|
18 | + return StaticPathModel::projectPath(Str::slashToBackSlash(StaticPathList::$projectPrefixGroup), $this->project); |
|
19 | 19 | } |
20 | 20 | |
21 | - public function projectName(){ |
|
21 | + public function projectName() { |
|
22 | 22 | |
23 | - $projectParse=explode("\\",$this->argument['project']); |
|
23 | + $projectParse = explode("\\", $this->argument['project']); |
|
24 | 24 | return current($projectParse); |
25 | 25 | } |
26 | 26 | /** |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | /** |
35 | 35 | * @return mixed |
36 | 36 | */ |
37 | - public function storage(){ |
|
37 | + public function storage() { |
|
38 | 38 | |
39 | 39 | return $this->projectPath().''.StaticPathModel::$storage; |
40 | 40 | } |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | /** |
43 | 43 | * @return mixed |
44 | 44 | */ |
45 | - public function version(){ |
|
45 | + public function version() { |
|
46 | 46 | |
47 | 47 | return $this->project.'/'.UrlVersionIdentifier::version(); |
48 | 48 | } |
@@ -51,18 +51,18 @@ discard block |
||
51 | 51 | /** |
52 | 52 | * @return mixed |
53 | 53 | */ |
54 | - public function controller(){ |
|
54 | + public function controller() { |
|
55 | 55 | |
56 | - $this->argument['controller']=StaticPathModel::$controller; |
|
56 | + $this->argument['controller'] = StaticPathModel::$controller; |
|
57 | 57 | return $this->version().'/'.$this->argument['controller']; |
58 | 58 | } |
59 | 59 | |
60 | 60 | /** |
61 | 61 | * @return mixed |
62 | 62 | */ |
63 | - public function platform(){ |
|
63 | + public function platform() { |
|
64 | 64 | |
65 | - $this->argument['platform']=StaticPathModel::$platform; |
|
65 | + $this->argument['platform'] = StaticPathModel::$platform; |
|
66 | 66 | return $this->version().'/'.$this->argument['platform']; |
67 | 67 | } |
68 | 68 | |
@@ -70,9 +70,9 @@ discard block |
||
70 | 70 | /** |
71 | 71 | * @return mixed |
72 | 72 | */ |
73 | - public function model(){ |
|
73 | + public function model() { |
|
74 | 74 | |
75 | - $this->argument['model']=StaticPathModel::$model; |
|
75 | + $this->argument['model'] = StaticPathModel::$model; |
|
76 | 76 | return $this->version().'/'.StaticPathModel::$model; |
77 | 77 | } |
78 | 78 | |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | /** |
81 | 81 | * @return mixed |
82 | 82 | */ |
83 | - public function builder(){ |
|
83 | + public function builder() { |
|
84 | 84 | |
85 | 85 | return $this->model().'/'.StaticPathModel::$builder; |
86 | 86 | } |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | /** |
90 | 90 | * @return mixed |
91 | 91 | */ |
92 | - public function migration(){ |
|
92 | + public function migration() { |
|
93 | 93 | |
94 | 94 | return $this->version().'/'.StaticPathModel::$migration; |
95 | 95 | } |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | /** |
99 | 99 | * @return mixed |
100 | 100 | */ |
101 | - public function config(){ |
|
101 | + public function config() { |
|
102 | 102 | |
103 | 103 | return $this->version().'/'.StaticPathModel::$config; |
104 | 104 | } |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | /** |
107 | 107 | * @return mixed |
108 | 108 | */ |
109 | - public function test(){ |
|
109 | + public function test() { |
|
110 | 110 | |
111 | 111 | return $this->projectPath().'/'.StaticPathModel::$test; |
112 | 112 | } |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | /** |
116 | 116 | * @return mixed |
117 | 117 | */ |
118 | - public function optional(){ |
|
118 | + public function optional() { |
|
119 | 119 | |
120 | 120 | return $this->version().'/'.StaticPathModel::$optional; |
121 | 121 | } |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | /** |
124 | 124 | * @return mixed |
125 | 125 | */ |
126 | - public function events(){ |
|
126 | + public function events() { |
|
127 | 127 | |
128 | 128 | return $this->optional().'/'.StaticPathModel::$events; |
129 | 129 | } |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | /** |
132 | 132 | * @return mixed |
133 | 133 | */ |
134 | - public function listeners(){ |
|
134 | + public function listeners() { |
|
135 | 135 | |
136 | 136 | return $this->optional().'/'.StaticPathModel::$listeners; |
137 | 137 | } |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | /** |
141 | 141 | * @return mixed |
142 | 142 | */ |
143 | - public function sourceDir(){ |
|
143 | + public function sourceDir() { |
|
144 | 144 | |
145 | 145 | return $this->optional().'/'.StaticPathModel::$sourcePath; |
146 | 146 | } |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | /** |
149 | 149 | * @return mixed |
150 | 150 | */ |
151 | - public function sourceEndpointDir(){ |
|
151 | + public function sourceEndpointDir() { |
|
152 | 152 | |
153 | 153 | return $this->optional().'/'.StaticPathModel::$sourcePath.'/Endpoint'; |
154 | 154 | } |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | /** |
158 | 158 | * @return mixed |
159 | 159 | */ |
160 | - public function sourceRequestDir(){ |
|
160 | + public function sourceRequestDir() { |
|
161 | 161 | |
162 | 162 | return $this->optional().'/'.StaticPathModel::$sourceRequest; |
163 | 163 | } |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | /** |
166 | 166 | * @return mixed |
167 | 167 | */ |
168 | - public function sourceSupportDir(){ |
|
168 | + public function sourceSupportDir() { |
|
169 | 169 | |
170 | 170 | return $this->optional().'/'.StaticPathModel::$sourcePath.'/Support'; |
171 | 171 | } |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | /** |
175 | 175 | * @return mixed |
176 | 176 | */ |
177 | - public function repository(){ |
|
177 | + public function repository() { |
|
178 | 178 | |
179 | 179 | return path()->repository(); |
180 | 180 | } |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | /** |
183 | 183 | * @return mixed |
184 | 184 | */ |
185 | - public function listener(){ |
|
185 | + public function listener() { |
|
186 | 186 | |
187 | 187 | return $this->optional().'/'.StaticPathModel::$listener; |
188 | 188 | } |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | /** |
192 | 192 | * @return mixed |
193 | 193 | */ |
194 | - public function job(){ |
|
194 | + public function job() { |
|
195 | 195 | |
196 | 196 | return $this->optional().'/'.StaticPathModel::$job; |
197 | 197 | } |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | /** |
201 | 201 | * @return mixed |
202 | 202 | */ |
203 | - public function webservice(){ |
|
203 | + public function webservice() { |
|
204 | 204 | |
205 | 205 | return $this->projectPath().'/'.StaticPathModel::$webservice; |
206 | 206 | } |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | /** |
210 | 210 | * @return mixed |
211 | 211 | */ |
212 | - public function log(){ |
|
212 | + public function log() { |
|
213 | 213 | |
214 | 214 | return $this->storage().'/'.StaticPathModel::$log; |
215 | 215 | } |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | /** |
218 | 218 | * @return mixed |
219 | 219 | */ |
220 | - public function language(){ |
|
220 | + public function language() { |
|
221 | 221 | |
222 | 222 | return $this->storage().'/'.StaticPathModel::$language; |
223 | 223 | } |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | /** |
227 | 227 | * @return mixed |
228 | 228 | */ |
229 | - public function resource(){ |
|
229 | + public function resource() { |
|
230 | 230 | |
231 | 231 | return $this->storage().'/'.StaticPathModel::$resource; |
232 | 232 | } |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | /** |
236 | 236 | * @return mixed |
237 | 237 | */ |
238 | - public function session(){ |
|
238 | + public function session() { |
|
239 | 239 | |
240 | 240 | return $this->storage().'/'.StaticPathModel::$session; |
241 | 241 | } |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | /** |
245 | 245 | * @return mixed |
246 | 246 | */ |
247 | - public function middleware(){ |
|
247 | + public function middleware() { |
|
248 | 248 | |
249 | 249 | return $this->version().'/'.StaticPathModel::$middleware; |
250 | 250 | } |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | /** |
253 | 253 | * @return mixed |
254 | 254 | */ |
255 | - public function factory(){ |
|
255 | + public function factory() { |
|
256 | 256 | |
257 | 257 | return $this->version().'/'.StaticPathModel::$factory; |
258 | 258 | } |
@@ -261,7 +261,7 @@ discard block |
||
261 | 261 | /** |
262 | 262 | * @return mixed |
263 | 263 | */ |
264 | - public function node(){ |
|
264 | + public function node() { |
|
265 | 265 | |
266 | 266 | return $this->kernel().'/'.StaticPathModel::$node; |
267 | 267 | } |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | /** |
271 | 271 | * @return mixed |
272 | 272 | */ |
273 | - public function once(){ |
|
273 | + public function once() { |
|
274 | 274 | |
275 | 275 | return $this->kernel().'/'.StaticPathModel::$once; |
276 | 276 | } |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | /** |
279 | 279 | * @return mixed |
280 | 280 | */ |
281 | - public function command(){ |
|
281 | + public function command() { |
|
282 | 282 | |
283 | 283 | return $this->optional().'/'.StaticPathModel::$command; |
284 | 284 | } |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | /** |
288 | 288 | * @return mixed |
289 | 289 | */ |
290 | - public function stub(){ |
|
290 | + public function stub() { |
|
291 | 291 | |
292 | 292 | return $this->kernel().'/'.StaticPathModel::$stub; |
293 | 293 | } |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | /** |
296 | 296 | * @return mixed |
297 | 297 | */ |
298 | - public function provider(){ |
|
298 | + public function provider() { |
|
299 | 299 | |
300 | 300 | return $this->kernel().'/'.StaticPathModel::$provider; |
301 | 301 | } |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | /** |
305 | 305 | * @return mixed |
306 | 306 | */ |
307 | - public function autoService(){ |
|
307 | + public function autoService() { |
|
308 | 308 | |
309 | 309 | return root.'/'.StaticPathModel::$appDefine.'/'.strtolower(StaticPathModel::$store).'/'.StaticPathModel::$autoService; |
310 | 310 | } |