@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | /** |
26 | 26 | * @var array |
27 | 27 | */ |
28 | - protected $stubList=array(); |
|
28 | + protected $stubList = array(); |
|
29 | 29 | |
30 | 30 | /** |
31 | 31 | * FileProcess constructor. |
@@ -41,10 +41,10 @@ discard block |
||
41 | 41 | * @param $data |
42 | 42 | * @return bool |
43 | 43 | */ |
44 | - public function dumpFile($file,$data) |
|
44 | + public function dumpFile($file, $data) |
|
45 | 45 | { |
46 | 46 | try { |
47 | - $this->fs->dumpFile($file,$data); |
|
47 | + $this->fs->dumpFile($file, $data); |
|
48 | 48 | return true; |
49 | 49 | } catch (IOExceptionInterface $exception) { |
50 | 50 | return false; |
@@ -56,21 +56,21 @@ discard block |
||
56 | 56 | * @param bool $status |
57 | 57 | * @return mixed |
58 | 58 | */ |
59 | - public function makeDirectory($data,$status=false) |
|
59 | + public function makeDirectory($data, $status = false) |
|
60 | 60 | { |
61 | - if($data->type=="project" && file_exists($data->project)){ |
|
61 | + if ($data->type=="project" && file_exists($data->project)) { |
|
62 | 62 | throw new \LogicException('This Project Is Already Available'); |
63 | 63 | } |
64 | - if(false===$status){ |
|
64 | + if (false===$status) { |
|
65 | 65 | |
66 | - if($data->type!=="project" && !file_exists($data->project)){ |
|
66 | + if ($data->type!=="project" && !file_exists($data->project)) { |
|
67 | 67 | throw new \LogicException('Project No'); |
68 | 68 | } |
69 | 69 | } |
70 | - foreach ($data->directory as $directory){ |
|
70 | + foreach ($data->directory as $directory) { |
|
71 | 71 | try { |
72 | - $this->fs->mkdir($directory,'0777'); |
|
73 | - chmod($directory,0777); |
|
72 | + $this->fs->mkdir($directory, '0777'); |
|
73 | + chmod($directory, 0777); |
|
74 | 74 | } catch (IOExceptionInterface $e) { |
75 | 75 | return "An error occurred while creating your directory at ".$e->getPath(); |
76 | 76 | } |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | public function setDirectory($directory) |
85 | 85 | { |
86 | 86 | try { |
87 | - $this->fs->mkdir($directory,'07777'); |
|
87 | + $this->fs->mkdir($directory, '07777'); |
|
88 | 88 | } catch (IOExceptionInterface $e) { |
89 | 89 | return "An error occurred while creating your directory at ".$e->getPath(); |
90 | 90 | } |
@@ -102,25 +102,25 @@ discard block |
||
102 | 102 | * @param $data |
103 | 103 | * @param array $complex |
104 | 104 | */ |
105 | - public function touch($data,$complex=array()) |
|
105 | + public function touch($data, $complex = array()) |
|
106 | 106 | { |
107 | - $this->data=$data; |
|
107 | + $this->data = $data; |
|
108 | 108 | |
109 | - if(isset($complex['stub']) && isset($this->data->argument['stub'])){ |
|
109 | + if (isset($complex['stub']) && isset($this->data->argument['stub'])) { |
|
110 | 110 | |
111 | 111 | $this->stubManager($complex); |
112 | 112 | } |
113 | 113 | |
114 | - $execArray=(count($this->stubList)) ? $this->stubList : $this->data->touch; |
|
114 | + $execArray = (count($this->stubList)) ? $this->stubList : $this->data->touch; |
|
115 | 115 | |
116 | - foreach ($execArray as $execution=>$touch){ |
|
116 | + foreach ($execArray as $execution=>$touch) { |
|
117 | 117 | |
118 | - if(!file_exists($touch) && $touch!==null){ |
|
118 | + if (!file_exists($touch) && $touch!==null) { |
|
119 | 119 | touch($touch); |
120 | 120 | |
121 | - $executionPath=$this->stubPath.'/'.$execution.'.stub'; |
|
122 | - if(file_exists($executionPath)){ |
|
123 | - $this->fopenprocess($executionPath,$touch,$data); |
|
121 | + $executionPath = $this->stubPath.'/'.$execution.'.stub'; |
|
122 | + if (file_exists($executionPath)) { |
|
123 | + $this->fopenprocess($executionPath, $touch, $data); |
|
124 | 124 | } |
125 | 125 | } |
126 | 126 | } |
@@ -129,37 +129,37 @@ discard block |
||
129 | 129 | /** |
130 | 130 | * @param array $complex |
131 | 131 | */ |
132 | - private function stubManager($complex=array()) |
|
132 | + private function stubManager($complex = array()) |
|
133 | 133 | { |
134 | - $stubStructure = explode("_",$complex['stub']); |
|
134 | + $stubStructure = explode("_", $complex['stub']); |
|
135 | 135 | $stubStructure[] = $this->data->argument['stub']; |
136 | 136 | |
137 | - $stubberDirectoryList=path()->stubs(); |
|
137 | + $stubberDirectoryList = path()->stubs(); |
|
138 | 138 | |
139 | - foreach ($stubStructure as $stubberDirectory){ |
|
139 | + foreach ($stubStructure as $stubberDirectory) { |
|
140 | 140 | |
141 | - $stubberDirectoryList=$stubberDirectoryList.'/'.$stubberDirectory; |
|
141 | + $stubberDirectoryList = $stubberDirectoryList.'/'.$stubberDirectory; |
|
142 | 142 | |
143 | 143 | $this->setDirectory($stubberDirectoryList); |
144 | 144 | } |
145 | 145 | |
146 | - foreach ($this->data->touch as $execution=>$executionFile){ |
|
146 | + foreach ($this->data->touch as $execution=>$executionFile) { |
|
147 | 147 | |
148 | - $executionArray=explode("/",$execution); |
|
148 | + $executionArray = explode("/", $execution); |
|
149 | 149 | |
150 | 150 | $executionStub = end($executionArray).''; |
151 | 151 | $this->stubList[$executionStub] = $executionFile; |
152 | 152 | $stubberFile = $stubberDirectoryList.'/'.$executionStub.'.stub'; |
153 | 153 | |
154 | - $originalPath=$this->stubPath.'/'.$execution.'.stub'; |
|
154 | + $originalPath = $this->stubPath.'/'.$execution.'.stub'; |
|
155 | 155 | |
156 | - if(!file_exists($stubberFile)){ |
|
156 | + if (!file_exists($stubberFile)) { |
|
157 | 157 | |
158 | - $this->fs->copy($originalPath,$stubberFile); |
|
158 | + $this->fs->copy($originalPath, $stubberFile); |
|
159 | 159 | } |
160 | 160 | } |
161 | 161 | |
162 | - $this->stubPath=$stubberDirectoryList; |
|
162 | + $this->stubPath = $stubberDirectoryList; |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | |
@@ -169,15 +169,15 @@ discard block |
||
169 | 169 | * @param $param |
170 | 170 | * @return bool |
171 | 171 | */ |
172 | - public function fopenprocess($executionPath,$path,$param) |
|
172 | + public function fopenprocess($executionPath, $path, $param) |
|
173 | 173 | { |
174 | 174 | $dt = fopen($executionPath, "r"); |
175 | 175 | $content = fread($dt, filesize($executionPath)); |
176 | 176 | fclose($dt); |
177 | 177 | |
178 | - foreach ($param->argument as $key=>$value){ |
|
178 | + foreach ($param->argument as $key=>$value) { |
|
179 | 179 | |
180 | - $content=str_replace("__".$key."__",$value,$content); |
|
180 | + $content = str_replace("__".$key."__", $value, $content); |
|
181 | 181 | } |
182 | 182 | |
183 | 183 | $dt = fopen($path, "w"); |
@@ -193,14 +193,14 @@ discard block |
||
193 | 193 | * @param $param |
194 | 194 | * @return bool |
195 | 195 | */ |
196 | - public function stubCopy($executionPath,$path,$param) |
|
196 | + public function stubCopy($executionPath, $path, $param) |
|
197 | 197 | { |
198 | 198 | $dt = fopen($executionPath, "r"); |
199 | 199 | $content = fread($dt, filesize($executionPath)); |
200 | 200 | fclose($dt); |
201 | 201 | |
202 | - foreach ($param->argument as $key=>$value){ |
|
203 | - $content=str_replace("__".$key."__",$value,$content); |
|
202 | + foreach ($param->argument as $key=>$value) { |
|
203 | + $content = str_replace("__".$key."__", $value, $content); |
|
204 | 204 | } |
205 | 205 | |
206 | 206 | $dt = fopen($path, "w"); |
@@ -214,9 +214,9 @@ discard block |
||
214 | 214 | * @param null $file |
215 | 215 | * @return mixed|null |
216 | 216 | */ |
217 | - public function callFile($file=null) |
|
217 | + public function callFile($file = null) |
|
218 | 218 | { |
219 | - if(file_exists($file)){ |
|
219 | + if (file_exists($file)) { |
|
220 | 220 | return require_once($file); |
221 | 221 | } |
222 | 222 | return null; |
@@ -228,9 +228,9 @@ discard block |
||
228 | 228 | * @param null|string $file |
229 | 229 | * @param null|string $data |
230 | 230 | */ |
231 | - public function writeFile($file=null,$data=null) |
|
231 | + public function writeFile($file = null, $data = null) |
|
232 | 232 | { |
233 | - if(!is_null($file) && !is_null($data)){ |
|
233 | + if (!is_null($file) && !is_null($data)) { |
|
234 | 234 | |
235 | 235 | $dt = fopen($file, "r"); |
236 | 236 | $content = fread($dt, filesize($file)); |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | public function create() |
36 | 36 | { |
37 | 37 | |
38 | - if(!file_exists(app()->path()->tests())){ |
|
38 | + if (!file_exists(app()->path()->tests())) { |
|
39 | 39 | $this->directory['test'] = app()->path()->tests(); |
40 | 40 | $this->file->makeDirectory($this); |
41 | 41 | } |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | $this->argument['testNamespace'] = ucfirst($this->argument['test']).'Test'; |
45 | 45 | $this->argument['projectName'] = strtolower($this->projectName()); |
46 | 46 | |
47 | - $this->touch['test/test']= app()->path()->tests().'/'.$this->argument['testNamespace'].'.php'; |
|
47 | + $this->touch['test/test'] = app()->path()->tests().'/'.$this->argument['testNamespace'].'.php'; |
|
48 | 48 | |
49 | 49 | |
50 | 50 | $this->file->touch($this); |
@@ -63,12 +63,12 @@ discard block |
||
63 | 63 | |
64 | 64 | $array = $xml->toArray(); |
65 | 65 | |
66 | - $new = (new PhpUnitManager($array))->add(strtolower($this->projectName()),'directory', |
|
67 | - str_replace(root.''.DIRECTORY_SEPARATOR,"",app()->path()->tests())); |
|
66 | + $new = (new PhpUnitManager($array))->add(strtolower($this->projectName()), 'directory', |
|
67 | + str_replace(root.''.DIRECTORY_SEPARATOR, "", app()->path()->tests())); |
|
68 | 68 | |
69 | 69 | $newDataXml = $xml->toXml($new); |
70 | 70 | |
71 | - app()->get('fileSystem')->writeFile($phpunit,$newDataXml); |
|
71 | + app()->get('fileSystem')->writeFile($phpunit, $newDataXml); |
|
72 | 72 | |
73 | 73 | echo $this->classical(' > phpunit.xml file has been updated'); |
74 | 74 | } |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | */ |
79 | 79 | public function run() |
80 | 80 | { |
81 | - $process = new Process(['vendor'.DIRECTORY_SEPARATOR.'bin'.DIRECTORY_SEPARATOR.'phpunit','--group',strtolower($this->projectName())]); |
|
81 | + $process = new Process(['vendor'.DIRECTORY_SEPARATOR.'bin'.DIRECTORY_SEPARATOR.'phpunit', '--group', strtolower($this->projectName())]); |
|
82 | 82 | $process->setTty(true); |
83 | 83 | |
84 | 84 | try { |
@@ -34,13 +34,13 @@ discard block |
||
34 | 34 | public function get() |
35 | 35 | { |
36 | 36 | // The config process class should not be null. |
37 | - if(self::$configProcessInstance!==null){ |
|
37 | + if (self::$configProcessInstance!==null) { |
|
38 | 38 | |
39 | 39 | //get config variables |
40 | 40 | $config = self::$config; |
41 | 41 | |
42 | 42 | // offset config variables to config process class |
43 | - self::$configProcessInstance->offsetSet('config',$config); |
|
43 | + self::$configProcessInstance->offsetSet('config', $config); |
|
44 | 44 | |
45 | 45 | //get config variable from config process class |
46 | 46 | return self::$configProcessInstance->get(); |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | * @param null|string $config |
76 | 76 | * @return Config |
77 | 77 | */ |
78 | - public static function macro($config=null) |
|
78 | + public static function macro($config = null) |
|
79 | 79 | { |
80 | 80 | /** @var Macro $macro */ |
81 | 81 | $macro = app()->get('macro'); |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | * @param null $config |
89 | 89 | * @return Config |
90 | 90 | */ |
91 | - public static function make($config=null) |
|
91 | + public static function make($config = null) |
|
92 | 92 | { |
93 | 93 | self::$config = $config; |
94 | 94 | self::$configProcessInstance = app()->resolve(ConfigProcess::class); |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | * @param array $data |
102 | 102 | * @return bool|mixed |
103 | 103 | */ |
104 | - public function set($data=array()) |
|
104 | + public function set($data = array()) |
|
105 | 105 | { |
106 | 106 | // receive the necessary config settings. |
107 | 107 | $configPath = path()->config(); |
@@ -109,12 +109,12 @@ discard block |
||
109 | 109 | $setConfigPath = $configPath.''.DIRECTORY_SEPARATOR.''.ucfirst($configArray).'.php'; |
110 | 110 | $getConfigWrap = Arr::wrap(config($configArray)); |
111 | 111 | |
112 | - foreach ($data as $value){ |
|
112 | + foreach ($data as $value) { |
|
113 | 113 | |
114 | 114 | // we check the config value not to be rewritten. |
115 | - if(!in_array($value,$getConfigWrap)){ |
|
116 | - $setData = '<?php return '.var_export(array_merge($getConfigWrap,$data), true).';'; |
|
117 | - return app()->resolve(FileProcess::class)->dumpFile($setConfigPath,$setData); |
|
115 | + if (!in_array($value, $getConfigWrap)) { |
|
116 | + $setData = '<?php return '.var_export(array_merge($getConfigWrap, $data), true).';'; |
|
117 | + return app()->resolve(FileProcess::class)->dumpFile($setConfigPath, $setData); |
|
118 | 118 | } |
119 | 119 | } |
120 | 120 | } |
@@ -14,9 +14,9 @@ |
||
14 | 14 | * |
15 | 15 | * @param null|string $path |
16 | 16 | */ |
17 | - public static function setPath($path=null) |
|
17 | + public static function setPath($path = null) |
|
18 | 18 | { |
19 | - if(!is_null($path)){ |
|
19 | + if (!is_null($path)) { |
|
20 | 20 | self::$requestPath = $path; |
21 | 21 | } |
22 | 22 | } |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | * @param bool $static |
34 | 34 | * @return bool |
35 | 35 | */ |
36 | - protected function checkMacroConditions($static=false) |
|
36 | + protected function checkMacroConditions($static = false) |
|
37 | 37 | { |
38 | 38 | return is_string($this->macro) && |
39 | 39 | Utils::isNamespaceExists($this->macro) && |
@@ -46,9 +46,9 @@ discard block |
||
46 | 46 | * @param bool $static |
47 | 47 | * @return bool |
48 | 48 | */ |
49 | - protected function checkMacroInstanceOf($static=false) |
|
49 | + protected function checkMacroInstanceOf($static = false) |
|
50 | 50 | { |
51 | - if($static){ |
|
51 | + if ($static) { |
|
52 | 52 | return true; |
53 | 53 | } |
54 | 54 | return $this->app->resolve($this->macro) instanceof MacroAbleContracts; |
@@ -61,11 +61,11 @@ discard block |
||
61 | 61 | * @param callable $callback |
62 | 62 | * @return mixed |
63 | 63 | */ |
64 | - public function get($method,callable $callback) |
|
64 | + public function get($method, callable $callback) |
|
65 | 65 | { |
66 | - if($this->isMacro){ |
|
66 | + if ($this->isMacro) { |
|
67 | 67 | |
68 | - if(method_exists($resolve = $this->app->resolve($this->macro),$method)){ |
|
68 | + if (method_exists($resolve = $this->app->resolve($this->macro), $method)) { |
|
69 | 69 | return $resolve->macro($this->class); |
70 | 70 | } |
71 | 71 | } |
@@ -89,11 +89,11 @@ discard block |
||
89 | 89 | * @param $class |
90 | 90 | * @return $this |
91 | 91 | */ |
92 | - public function isMacro($class,$static=false) |
|
92 | + public function isMacro($class, $static = false) |
|
93 | 93 | { |
94 | 94 | // if the macro class is a valid object, |
95 | 95 | // then this macro will return a boolean value if it has the specified methode. |
96 | - if($this->checkMacroConditions($static)){ |
|
96 | + if ($this->checkMacroConditions($static)) { |
|
97 | 97 | |
98 | 98 | $this->isMacro = true; |
99 | 99 | $this->class = $class; |
@@ -121,10 +121,10 @@ discard block |
||
121 | 121 | * @param $method |
122 | 122 | * @return mixed |
123 | 123 | */ |
124 | - public function with($macro,$concrete,$method=null) |
|
124 | + public function with($macro, $concrete, $method = null) |
|
125 | 125 | { |
126 | - if($this->macro === null){ |
|
127 | - return $this($macro)->isMacro($concrete)->get($method,function() use($concrete){ |
|
126 | + if ($this->macro===null) { |
|
127 | + return $this($macro)->isMacro($concrete)->get($method, function() use($concrete){ |
|
128 | 128 | return $concrete; |
129 | 129 | }); |
130 | 130 | } |
@@ -138,9 +138,9 @@ discard block |
||
138 | 138 | * @param $method |
139 | 139 | * @return mixed |
140 | 140 | */ |
141 | - public function withStatic($macro,$concrete) |
|
141 | + public function withStatic($macro, $concrete) |
|
142 | 142 | { |
143 | - return $this($macro)->isMacro($concrete,true)->get(null,is_callable($concrete) ? |
|
143 | + return $this($macro)->isMacro($concrete, true)->get(null, is_callable($concrete) ? |
|
144 | 144 | $concrete : function() use($concrete){ |
145 | 145 | return $concrete; |
146 | 146 | }); |
@@ -152,9 +152,9 @@ discard block |
||
152 | 152 | * @param null|string $macro |
153 | 153 | * @return $this |
154 | 154 | */ |
155 | - public function __invoke($macro=null) |
|
155 | + public function __invoke($macro = null) |
|
156 | 156 | { |
157 | - if($macro!==null){ |
|
157 | + if ($macro!==null) { |
|
158 | 158 | $this->macro = $macro; |
159 | 159 | } |
160 | 160 | return $this; |
@@ -10,9 +10,9 @@ discard block |
||
10 | 10 | /** |
11 | 11 | * @param array $data |
12 | 12 | */ |
13 | - public function exception($data=array()) |
|
13 | + public function exception($data = array()) |
|
14 | 14 | { |
15 | - if(!isset($data['project']) and !isset($data['version'])){ |
|
15 | + if (!isset($data['project']) and !isset($data['version'])) { |
|
16 | 16 | exception()->notFoundException('No Project or Version'); |
17 | 17 | } |
18 | 18 | |
@@ -21,17 +21,17 @@ discard block |
||
21 | 21 | |
22 | 22 | //If there is no project on the url |
23 | 23 | //we throw an exception |
24 | - if($data['project']===null OR !file_exists($appPath)){ |
|
24 | + if ($data['project']===null OR !file_exists($appPath)) { |
|
25 | 25 | exception()->notFoundException('No Project'); |
26 | 26 | } |
27 | 27 | |
28 | - if(!in_array($data['version'],UrlVersionIdentifier::supportedVersions())){ |
|
28 | + if (!in_array($data['version'], UrlVersionIdentifier::supportedVersions())) { |
|
29 | 29 | throw new DomainException('Version Number is not supported'); |
30 | 30 | } |
31 | 31 | |
32 | 32 | //If there is no endpoint on the url |
33 | 33 | //we throw an exception |
34 | - if($data['endpoint']===null){ |
|
34 | + if ($data['endpoint']===null) { |
|
35 | 35 | exception()->notFoundException('No Endpoint'); |
36 | 36 | } |
37 | 37 | } |
@@ -99,8 +99,7 @@ discard block |
||
99 | 99 | // in the application directory class. |
100 | 100 | if(Utils::isNamespaceExists($nameNamespace)){ |
101 | 101 | $callNamespace = new $nameNamespace; |
102 | - } |
|
103 | - else{ |
|
102 | + } else{ |
|
104 | 103 | |
105 | 104 | // if you do not have an exception in the application directory, |
106 | 105 | // this time we are looking for an exception in the core directory. |
@@ -133,8 +132,7 @@ discard block |
||
133 | 132 | //throw exception |
134 | 133 | if($msg===null){ |
135 | 134 | throw new $callNamespace; |
136 | - } |
|
137 | - else{ |
|
135 | + } else{ |
|
138 | 136 | throw new $callNamespace($msg); |
139 | 137 | } |
140 | 138 |
@@ -16,13 +16,13 @@ discard block |
||
16 | 16 | * @param null|string $name |
17 | 17 | * @param array $params |
18 | 18 | */ |
19 | - public function __construct($app,$name=null,$params=array()) |
|
19 | + public function __construct($app, $name = null, $params = array()) |
|
20 | 20 | { |
21 | 21 | parent::__construct($app); |
22 | 22 | |
23 | 23 | // we help the user to pull a special message from |
24 | 24 | // the translate section to be specified by the user for the exception. |
25 | - $this->exceptionTranslate($name,$params); |
|
25 | + $this->exceptionTranslate($name, $params); |
|
26 | 26 | |
27 | 27 | // for real file path with |
28 | 28 | // debug backtrace method are doing follow. |
@@ -35,13 +35,13 @@ discard block |
||
35 | 35 | * @param $name |
36 | 36 | * @param array $params |
37 | 37 | */ |
38 | - private function exceptionTranslate($name,$params=array()) |
|
38 | + private function exceptionTranslate($name, $params = array()) |
|
39 | 39 | { |
40 | - if($name!==null){ |
|
41 | - if(count($params)){ |
|
42 | - $this->app->register('exceptionTranslateParams',$name,$params); |
|
40 | + if ($name!==null) { |
|
41 | + if (count($params)) { |
|
42 | + $this->app->register('exceptionTranslateParams', $name, $params); |
|
43 | 43 | } |
44 | - $this->app->register('exceptionTranslate',$name); |
|
44 | + $this->app->register('exceptionTranslate', $name); |
|
45 | 45 | } |
46 | 46 | } |
47 | 47 | |
@@ -52,23 +52,23 @@ discard block |
||
52 | 52 | */ |
53 | 53 | public function debugBackTrace() |
54 | 54 | { |
55 | - foreach (debug_backtrace() as $key=>$value){ |
|
55 | + foreach (debug_backtrace() as $key=>$value) { |
|
56 | 56 | |
57 | - if(isset(debug_backtrace()[$key],debug_backtrace()[$key]['file'])) |
|
57 | + if (isset(debug_backtrace()[$key], debug_backtrace()[$key]['file'])) |
|
58 | 58 | { |
59 | - $this->app->register('exceptionFile',debug_backtrace()[$key]['file']); |
|
60 | - $this->app->register('exceptionLine',debug_backtrace()[$key]['line']); |
|
59 | + $this->app->register('exceptionFile', debug_backtrace()[$key]['file']); |
|
60 | + $this->app->register('exceptionLine', debug_backtrace()[$key]['line']); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | Dependencies::loadBootstrapperNeedsForException(); |
64 | 64 | |
65 | - if(isset($value['file']) && isset(core()->urlComponent)){ |
|
66 | - if(preg_match('@'.core()->urlComponent['project'].'|boot|providers@',$value['file'])){ |
|
65 | + if (isset($value['file']) && isset(core()->urlComponent)) { |
|
66 | + if (preg_match('@'.core()->urlComponent['project'].'|boot|providers@', $value['file'])) { |
|
67 | 67 | |
68 | 68 | $this->app->terminate('exceptionFile'); |
69 | 69 | $this->app->terminate('exceptionLine'); |
70 | - $this->app->register('exceptionFile',$value['file']); |
|
71 | - $this->app->register('exceptionLine',$value['line']); |
|
70 | + $this->app->register('exceptionFile', $value['file']); |
|
71 | + $this->app->register('exceptionLine', $value['line']); |
|
72 | 72 | |
73 | 73 | break; |
74 | 74 | } |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | */ |
82 | 82 | public function __get($name) |
83 | 83 | { |
84 | - $this->customException($name,null,debug_backtrace()); |
|
84 | + $this->customException($name, null, debug_backtrace()); |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | /** |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | * @param null|string $msg |
92 | 92 | * @param array $trace |
93 | 93 | */ |
94 | - public function customException($name,$msg=null,$trace=array()) |
|
94 | + public function customException($name, $msg = null, $trace = array()) |
|
95 | 95 | { |
96 | 96 | //We use the magic method for the exception and |
97 | 97 | //call the exception class in the application to get the instance. |
@@ -100,22 +100,22 @@ discard block |
||
100 | 100 | |
101 | 101 | // first, you are looking for an exception |
102 | 102 | // in the application directory class. |
103 | - if(Utils::isNamespaceExists($nameNamespace)){ |
|
103 | + if (Utils::isNamespaceExists($nameNamespace)) { |
|
104 | 104 | $callNamespace = new $nameNamespace; |
105 | 105 | } |
106 | - else{ |
|
106 | + else { |
|
107 | 107 | |
108 | 108 | // if you do not have an exception in the application directory, |
109 | 109 | // this time we are looking for an exception in the core directory. |
110 | 110 | $nameNamespace = __NAMESPACE__.'\\'.$nameException; |
111 | - if(Utils::isNamespaceExists($nameNamespace)){ |
|
111 | + if (Utils::isNamespaceExists($nameNamespace)) { |
|
112 | 112 | $callNamespace = new $nameNamespace; |
113 | 113 | } |
114 | 114 | } |
115 | 115 | |
116 | - if(isset($callNamespace)){ |
|
116 | + if (isset($callNamespace)) { |
|
117 | 117 | |
118 | - $traceForCustom = Utils::removeTrace($trace,self::removeExceptionFileItems); |
|
118 | + $traceForCustom = Utils::removeTrace($trace, self::removeExceptionFileItems); |
|
119 | 119 | |
120 | 120 | // we will set the information about the exception trace, |
121 | 121 | // and then bind it specifically to the event method. |
@@ -127,19 +127,19 @@ discard block |
||
127 | 127 | |
128 | 128 | |
129 | 129 | // we register the custom exception trace value with the global kernel object. |
130 | - $this->app->register('exceptiontrace',$customExceptionTrace); |
|
130 | + $this->app->register('exceptiontrace', $customExceptionTrace); |
|
131 | 131 | |
132 | 132 | //If the developer wants to execute an event when calling a special exception, |
133 | 133 | //we process the event method. |
134 | - if(method_exists($callNamespace,'event')){ |
|
134 | + if (method_exists($callNamespace, 'event')) { |
|
135 | 135 | $callNamespace->event($customExceptionTrace); |
136 | 136 | } |
137 | 137 | |
138 | 138 | //throw exception |
139 | - if($msg===null){ |
|
139 | + if ($msg===null) { |
|
140 | 140 | throw new $callNamespace; |
141 | 141 | } |
142 | - else{ |
|
142 | + else { |
|
143 | 143 | throw new $callNamespace($msg); |
144 | 144 | } |
145 | 145 | |
@@ -152,8 +152,8 @@ discard block |
||
152 | 152 | * @param $name |
153 | 153 | * @param array $arguments |
154 | 154 | */ |
155 | - public function __call($name, $arguments=array()) |
|
155 | + public function __call($name, $arguments = array()) |
|
156 | 156 | { |
157 | - $this->customException($name,current($arguments),debug_backtrace()); |
|
157 | + $this->customException($name, current($arguments), debug_backtrace()); |
|
158 | 158 | } |
159 | 159 | } |
160 | 160 | \ No newline at end of file |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | /** |
15 | 15 | * @var $type |
16 | 16 | */ |
17 | - public $type='project'; |
|
17 | + public $type = 'project'; |
|
18 | 18 | |
19 | 19 | /** |
20 | 20 | * @var array |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | /** |
32 | 32 | * @var $commandRule |
33 | 33 | */ |
34 | - public $commandRule=[]; |
|
34 | + public $commandRule = []; |
|
35 | 35 | |
36 | 36 | /** |
37 | 37 | * @method create |
@@ -45,15 +45,15 @@ discard block |
||
45 | 45 | $this->directory['projectDir'] = $this->projectPath(); |
46 | 46 | $this->argument['exceptionNamespace'] = app()->namespace()->exception(); |
47 | 47 | |
48 | - $recursiveDefaultDirectory = explode("\\",$this->argument['project']); |
|
48 | + $recursiveDefaultDirectory = explode("\\", $this->argument['project']); |
|
49 | 49 | $this->argument['applicationName'] = pos($recursiveDefaultDirectory); |
50 | 50 | $recursiveDefaultDirectory[] = 'V1'; |
51 | 51 | $recursiveDefaultDirectoryList = []; |
52 | 52 | |
53 | - foreach (array_slice($recursiveDefaultDirectory,1) as $defaultDirectory){ |
|
53 | + foreach (array_slice($recursiveDefaultDirectory, 1) as $defaultDirectory) { |
|
54 | 54 | |
55 | - $recursiveDefaultDirectoryList[]=$defaultDirectory; |
|
56 | - $this->directory[$defaultDirectory.'Path'] = $this->projectPath().''.implode("/",$recursiveDefaultDirectoryList); |
|
55 | + $recursiveDefaultDirectoryList[] = $defaultDirectory; |
|
56 | + $this->directory[$defaultDirectory.'Path'] = $this->projectPath().''.implode("/", $recursiveDefaultDirectoryList); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | //$this->directory['optionalDir'] = $this->optional(); |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | //$this->directory['sourceDir'] = $this->sourceDir(); |
80 | 80 | //$this->directory['sourceSupportDir'] = $this->sourceSupportDir(); |
81 | 81 | //$this->directory['sourceSupportTraitDir'] = $this->sourceSupportDir().'/Traits'; |
82 | - $this->directory['exceptionDir'] = app()->path()->exception(); |
|
82 | + $this->directory['exceptionDir'] = app()->path()->exception(); |
|
83 | 83 | |
84 | 84 | //set project directory |
85 | 85 | $this->file->makeDirectory($this); |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | $this->touch['app/gitignore'] = $this->projectPath().'/.gitignore'; |
131 | 131 | $this->touch['app/composer'] = $this->projectPath().'/composer.json'; |
132 | 132 | $this->touch['test/index'] = $this->storage().'/index.html'; |
133 | - $this->touch['exception/authenticate'] = $this->directory['exceptionDir'] .'/AuthenticateException.php'; |
|
133 | + $this->touch['exception/authenticate'] = $this->directory['exceptionDir'].'/AuthenticateException.php'; |
|
134 | 134 | |
135 | 135 | //set project touch |
136 | 136 | $this->file->touch($this); |
@@ -22,14 +22,14 @@ discard block |
||
22 | 22 | * @param ApplicationContracts $app |
23 | 23 | * @param array $result |
24 | 24 | */ |
25 | - public function __construct(ApplicationContracts $app,$result=array()) |
|
25 | + public function __construct(ApplicationContracts $app, $result = array()) |
|
26 | 26 | { |
27 | 27 | parent::__construct($app); |
28 | 28 | |
29 | 29 | $this->result = $result; |
30 | 30 | |
31 | - foreach($this->extender as $item){ |
|
32 | - if(method_exists($this,$item)){ |
|
31 | + foreach ($this->extender as $item) { |
|
32 | + if (method_exists($this, $item)) { |
|
33 | 33 | $this->{$item}(); |
34 | 34 | } |
35 | 35 | } |
@@ -44,8 +44,8 @@ discard block |
||
44 | 44 | { |
45 | 45 | // we will look at the requestExpected container value to show |
46 | 46 | // the expected values for the request object in the exception output. |
47 | - if(app()->has('requestExpected') && config('app.requestWithError')===true){ |
|
48 | - if($requestExpected = app()->get('requestExpected')){ |
|
47 | + if (app()->has('requestExpected') && config('app.requestWithError')===true) { |
|
48 | + if ($requestExpected = app()->get('requestExpected')) { |
|
49 | 49 | $this->result['request']['expected'] = $requestExpected; |
50 | 50 | } |
51 | 51 | } |