@@ -17,7 +17,7 @@ |
||
| 17 | 17 | * @param $offset |
| 18 | 18 | * @param $value |
| 19 | 19 | */ |
| 20 | - final public function offsetSet($offset,$value) |
|
| 20 | + final public function offsetSet($offset, $value) |
|
| 21 | 21 | {
|
| 22 | 22 | $this->{$offset} = $value;
|
| 23 | 23 | } |
@@ -161,8 +161,7 @@ |
||
| 161 | 161 | |
| 162 | 162 | if($fromRoutes['namespace']===null){
|
| 163 | 163 | $namespace = Utils::getNamespace($fromRoutes['controller']).'\\'.$fromRoutesClass; |
| 164 | - } |
|
| 165 | - else{
|
|
| 164 | + } else{
|
|
| 166 | 165 | $namespace = Utils::getNamespace($fromRoutes['controller']).'\\'.$fromRoutes['namespace'].'\\'.$fromRoutesClass; |
| 167 | 166 | } |
| 168 | 167 | } |
@@ -56,8 +56,8 @@ discard block |
||
| 56 | 56 | */ |
| 57 | 57 | public function resolveMethod($method) |
| 58 | 58 | {
|
| 59 | - $method=str_replace(httpMethod(),'',$method); |
|
| 60 | - $method=str_replace(StaticPathModel::$methodPrefix,'',$method); |
|
| 59 | + $method = str_replace(httpMethod(), '', $method); |
|
| 60 | + $method = str_replace(StaticPathModel::$methodPrefix, '', $method); |
|
| 61 | 61 | return $method; |
| 62 | 62 | } |
| 63 | 63 | |
@@ -105,16 +105,16 @@ discard block |
||
| 105 | 105 | //If controller does not have a method after checking whether the method specified in the controller class exists, |
| 106 | 106 | //then by default we assign a default method value of indexAction. |
| 107 | 107 | //This value must match the class strictly, otherwise the controller can not be called |
| 108 | - if(method_exists($this->app['instanceController'],$this->getPrefixMethod())){
|
|
| 108 | + if (method_exists($this->app['instanceController'], $this->getPrefixMethod())) {
|
|
| 109 | 109 | |
| 110 | 110 | //method value as normal |
| 111 | - return $this->setViaDefine($this->getPrefixMethod(),$globalInstance); |
|
| 111 | + return $this->setViaDefine($this->getPrefixMethod(), $globalInstance); |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | //by default we assign a default method value of indexAction |
| 115 | 115 | //this value must be a method value automatically named indexAction |
| 116 | 116 | //if it does not come from the url discovery value |
| 117 | - return $this->setViaDefine($this->getPrefixIndexMethod(),$globalInstance); |
|
| 117 | + return $this->setViaDefine($this->getPrefixIndexMethod(), $globalInstance); |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | /** |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | {
|
| 126 | 126 | //If the path variables give values in the methods do we have a method name, |
| 127 | 127 | //we subtract this value from the route variables. |
| 128 | - return array_values(array_diff(core()->routeParameters,[$method])); |
|
| 128 | + return array_values(array_diff(core()->routeParameters, [$method])); |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | /** |
@@ -133,12 +133,12 @@ discard block |
||
| 133 | 133 | * @param $globalInstance Router |
| 134 | 134 | * @return mixed |
| 135 | 135 | */ |
| 136 | - private function setViaDefine($method,$globalInstance) |
|
| 136 | + private function setViaDefine($method, $globalInstance) |
|
| 137 | 137 | {
|
| 138 | 138 | // we are extracting httpMethod and prefix from |
| 139 | 139 | // the method variable so that we can extract the salt method name. |
| 140 | - $deleteHttp = str_replace(httpMethod(),'',$method); |
|
| 141 | - $methodName = str_replace(StaticPathModel::$methodPrefix,'',$deleteHttp); |
|
| 140 | + $deleteHttp = str_replace(httpMethod(), '', $method); |
|
| 141 | + $methodName = str_replace(StaticPathModel::$methodPrefix, '', $deleteHttp); |
|
| 142 | 142 | |
| 143 | 143 | //set as global method name |
| 144 | 144 | $globalInstance->setMethodNameViaDefine($methodName); |
@@ -156,19 +156,19 @@ discard block |
||
| 156 | 156 | $fromRoutes = Route::getRouteResolve(); |
| 157 | 157 | $namespace = null; |
| 158 | 158 | |
| 159 | - if(count($fromRoutes)){
|
|
| 160 | - $fromRoutesClass = (isset($fromRoutes['class'])) ? $fromRoutes['class'] : null; |
|
| 159 | + if (count($fromRoutes)) {
|
|
| 160 | + $fromRoutesClass = (isset($fromRoutes['class'])) ? $fromRoutes['class'] : null; |
|
| 161 | 161 | |
| 162 | - if($fromRoutes['namespace']===null){
|
|
| 162 | + if ($fromRoutes['namespace']===null) {
|
|
| 163 | 163 | $namespace = Utils::getNamespace($fromRoutes['controller']).'\\'.$fromRoutesClass; |
| 164 | 164 | } |
| 165 | - else{
|
|
| 165 | + else {
|
|
| 166 | 166 | $namespace = Utils::getNamespace($fromRoutes['controller']).'\\'.$fromRoutes['namespace'].'\\'.$fromRoutesClass; |
| 167 | 167 | } |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | //check namespace exists |
| 171 | - if(file_exists(Utils::getPathFromNamespace($namespace)) && Utils::isNamespaceExists($namespace)){
|
|
| 171 | + if (file_exists(Utils::getPathFromNamespace($namespace)) && Utils::isNamespaceExists($namespace)) {
|
|
| 172 | 172 | |
| 173 | 173 | // the controller classes are registered in the config controller. |
| 174 | 174 | // the controller class is not executed if it is not available here. |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | public function checkAutoService($instance) |
| 189 | 189 | {
|
| 190 | 190 | //If auto service is present, this auto service will be accepted as endpoint namespace. |
| 191 | - return $this->checkEndpointForAutoService()->getNamespaceForAutoService($instance,function(){
|
|
| 191 | + return $this->checkEndpointForAutoService()->getNamespaceForAutoService($instance, function() {
|
|
| 192 | 192 | exception()->notFoundException('Any endpoint is not available');
|
| 193 | 193 | }); |
| 194 | 194 | } |
@@ -200,19 +200,19 @@ discard block |
||
| 200 | 200 | {
|
| 201 | 201 | $configController = config('controller');
|
| 202 | 202 | |
| 203 | - if($configController===null |
|
| 203 | + if ($configController===null |
|
| 204 | 204 | OR !isset($configController[$this->endpoint()]) |
| 205 | - or !isset($configController[$this->endpoint()][$namespace])){
|
|
| 205 | + or !isset($configController[$this->endpoint()][$namespace])) {
|
|
| 206 | 206 | exception()->badFunctionCall('The request has not been saved in your configuration settings.');
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | $configController = $configController[$this->endpoint()][$namespace]; |
| 210 | 210 | |
| 211 | - if(isset($configController[environment()]) and $configController[environment()]===false){
|
|
| 211 | + if (isset($configController[environment()]) and $configController[environment()]===false) {
|
|
| 212 | 212 | exception()->domain('Sorry, this endpoint is not allowed to run for this environment.');
|
| 213 | 213 | } |
| 214 | 214 | |
| 215 | - if(isset($configController['all']) AND $configController['all']===false){
|
|
| 215 | + if (isset($configController['all']) AND $configController['all']===false) {
|
|
| 216 | 216 | exception()->domain('Sorry, this endpoint is never allowed to run.');
|
| 217 | 217 | } |
| 218 | 218 | } |
@@ -46,8 +46,7 @@ discard block |
||
| 46 | 46 | if(isset(core()->exceptiontrace)) |
| 47 | 47 | {
|
| 48 | 48 | $this->data['status'] = (int)core()->exceptiontrace['callNamespace']->getCode(); |
| 49 | - } |
|
| 50 | - else {
|
|
| 49 | + } else {
|
|
| 51 | 50 | |
| 52 | 51 | $this->data['status']=(int)$exception::exceptionTypeCodes($this->data['errType']); |
| 53 | 52 | } |
@@ -139,8 +138,7 @@ discard block |
||
| 139 | 138 | |
| 140 | 139 | //set as the success object is false |
| 141 | 140 | $this->data['appExceptionSuccess']=[]; |
| 142 | - } |
|
| 143 | - else{
|
|
| 141 | + } else{
|
|
| 144 | 142 | |
| 145 | 143 | //set as the success object is false |
| 146 | 144 | $this->data['appExceptionSuccess']=['success'=>(bool)false,'status'=>$this->data['status']]; |
@@ -176,8 +174,7 @@ discard block |
||
| 176 | 174 | $this->app->register('responseStatus',500);
|
| 177 | 175 | |
| 178 | 176 | |
| 179 | - } |
|
| 180 | - else{
|
|
| 177 | + } else{
|
|
| 181 | 178 | |
| 182 | 179 | $appException=$this->getAppException($environment,$this->data['errStrReal']); |
| 183 | 180 | |
@@ -210,8 +207,7 @@ discard block |
||
| 210 | 207 | |
| 211 | 208 | echo json_encode(core()->out->outputFormatter($appException)); |
| 212 | 209 | exit(); |
| 213 | - } |
|
| 214 | - else{
|
|
| 210 | + } else{
|
|
| 215 | 211 | echo $restaOutHandle; |
| 216 | 212 | exit(); |
| 217 | 213 | } |
@@ -321,8 +317,7 @@ discard block |
||
| 321 | 317 | |
| 322 | 318 | if($lang!==null){
|
| 323 | 319 | $langMessage=trans('exception.'.$lang);
|
| 324 | - } |
|
| 325 | - else{
|
|
| 320 | + } else{
|
|
| 326 | 321 | $langMessage=null; |
| 327 | 322 | } |
| 328 | 323 | |
@@ -352,8 +347,7 @@ discard block |
||
| 352 | 347 | |
| 353 | 348 | if($this->data['errType']==="Undefined"){
|
| 354 | 349 | $this->data['errStrReal']=$this->data['errStrReal']; |
| 355 | - } |
|
| 356 | - else{
|
|
| 350 | + } else{
|
|
| 357 | 351 | $this->data['errContext']['trace']=$this->data['errStrReal']; |
| 358 | 352 | } |
| 359 | 353 | } |
@@ -24,12 +24,12 @@ discard block |
||
| 24 | 24 | /** |
| 25 | 25 | * @var $data array |
| 26 | 26 | */ |
| 27 | - protected $data=array(); |
|
| 27 | + protected $data = array(); |
|
| 28 | 28 | |
| 29 | 29 | /** |
| 30 | 30 | * @return mixed|string |
| 31 | 31 | */ |
| 32 | - private function getEnvironmentStatus(){
|
|
| 32 | + private function getEnvironmentStatus() {
|
|
| 33 | 33 | |
| 34 | 34 | // application key, but if it has a null value |
| 35 | 35 | // then we move the environment value to the production environment. |
@@ -39,41 +39,41 @@ discard block |
||
| 39 | 39 | /** |
| 40 | 40 | * @return void|mixed |
| 41 | 41 | */ |
| 42 | - private function getStatusFromContext(){
|
|
| 42 | + private function getStatusFromContext() {
|
|
| 43 | 43 | |
| 44 | - $exception=$this->exception; |
|
| 44 | + $exception = $this->exception; |
|
| 45 | 45 | |
| 46 | - if(isset(core()->exceptiontrace)) |
|
| 46 | + if (isset(core()->exceptiontrace)) |
|
| 47 | 47 | {
|
| 48 | 48 | $this->data['status'] = (int)core()->exceptiontrace['callNamespace']->getCode(); |
| 49 | 49 | } |
| 50 | 50 | else {
|
| 51 | 51 | |
| 52 | - $this->data['status']=(int)$exception::exceptionTypeCodes($this->data['errType']); |
|
| 52 | + $this->data['status'] = (int)$exception::exceptionTypeCodes($this->data['errType']); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | $this->app->terminate('responseSuccess');
|
| 56 | 56 | $this->app->terminate('responseStatus');
|
| 57 | - $this->app->register('responseSuccess',(bool)false);
|
|
| 58 | - $this->app->register('responseStatus',$this->data['status']);
|
|
| 57 | + $this->app->register('responseSuccess', (bool)false);
|
|
| 58 | + $this->app->register('responseStatus', $this->data['status']);
|
|
| 59 | 59 | |
| 60 | 60 | |
| 61 | - $optionalException=str_replace("\\","\\\\",$this->app->namespace()->exception());
|
|
| 61 | + $optionalException = str_replace("\\", "\\\\", $this->app->namespace()->exception());
|
|
| 62 | 62 | |
| 63 | - if(preg_match('@'.$optionalException.'@is',$this->data['errType'])){
|
|
| 63 | + if (preg_match('@'.$optionalException.'@is', $this->data['errType'])) {
|
|
| 64 | 64 | |
| 65 | 65 | //linux test |
| 66 | - $trace=$this->data['errContext']['trace']; |
|
| 67 | - if(preg_match('@Stack trace:\n#0(.*)\n#1@is',$trace,$traceArray)){
|
|
| 68 | - $traceFile=str_replace(root,'',$traceArray[1]); |
|
| 69 | - if(preg_match('@(.*)\((\d+)\)@is',$traceFile,$traceResolve)){
|
|
| 70 | - $this->data['errFile']=$traceResolve[1]; |
|
| 71 | - $this->data['errLine']=(int)$traceResolve[2]; |
|
| 66 | + $trace = $this->data['errContext']['trace']; |
|
| 67 | + if (preg_match('@Stack trace:\n#0(.*)\n#1@is', $trace, $traceArray)) {
|
|
| 68 | + $traceFile = str_replace(root, '', $traceArray[1]); |
|
| 69 | + if (preg_match('@(.*)\((\d+)\)@is', $traceFile, $traceResolve)) {
|
|
| 70 | + $this->data['errFile'] = $traceResolve[1]; |
|
| 71 | + $this->data['errLine'] = (int)$traceResolve[2]; |
|
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | |
| 76 | - $this->data['errType']=class_basename($this->data['errType']); |
|
| 76 | + $this->data['errType'] = class_basename($this->data['errType']); |
|
| 77 | 77 | } |
| 78 | 78 | } |
| 79 | 79 | |
@@ -89,18 +89,18 @@ discard block |
||
| 89 | 89 | // in general we will use the exception class |
| 90 | 90 | // in the store/config directory to make it possible |
| 91 | 91 | // to change the user-based exceptions. |
| 92 | - $this->exception=StaticPathModel::$store.'\Config\Exception'; |
|
| 92 | + $this->exception = StaticPathModel::$store.'\Config\Exception'; |
|
| 93 | 93 | |
| 94 | 94 | //This function can be used for defining your own way of handling errors during runtime, |
| 95 | 95 | //for example in applications in which you need to do cleanup of data/files when a critical error happens, |
| 96 | 96 | //or when you need to trigger an error under certain conditions (using trigger_error()). |
| 97 | - set_error_handler([$this,'setErrorHandler']); |
|
| 97 | + set_error_handler([$this, 'setErrorHandler']); |
|
| 98 | 98 | |
| 99 | 99 | //Registers a callback to be executed after script execution finishes or exit() is called. |
| 100 | 100 | //Multiple calls to register_shutdown_function() can be made, and each will be called in the same order as |
| 101 | 101 | //they were registered. If you call exit() within one registered shutdown function, |
| 102 | 102 | //processing will stop completely and no other registered shutdown functions will be called. |
| 103 | - register_shutdown_function([$this,'fatalErrorShutdownHandler']); |
|
| 103 | + register_shutdown_function([$this, 'fatalErrorShutdownHandler']); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | /** |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | * @param null $errLine |
| 111 | 111 | * @param null $errContext |
| 112 | 112 | */ |
| 113 | - public function setErrorHandler($errNo=null, $errStr=null, $errFile=null, $errLine=null, $errContext=null) |
|
| 113 | + public function setErrorHandler($errNo = null, $errStr = null, $errFile = null, $errLine = null, $errContext = null) |
|
| 114 | 114 | {
|
| 115 | 115 | // in case of a deficiency, |
| 116 | 116 | // we need to boot our general needs to be needed for the exception. |
@@ -135,79 +135,78 @@ discard block |
||
| 135 | 135 | |
| 136 | 136 | $this->getStatusFromContext(); |
| 137 | 137 | |
| 138 | - if(is_array($meta=config('response.meta'))){
|
|
| 138 | + if (is_array($meta = config('response.meta'))) {
|
|
| 139 | 139 | |
| 140 | 140 | //set as the success object is false |
| 141 | - $this->data['appExceptionSuccess']=[]; |
|
| 141 | + $this->data['appExceptionSuccess'] = []; |
|
| 142 | 142 | } |
| 143 | - else{
|
|
| 143 | + else {
|
|
| 144 | 144 | |
| 145 | 145 | //set as the success object is false |
| 146 | - $this->data['appExceptionSuccess']=['success'=>(bool)false,'status'=>$this->data['status']]; |
|
| 146 | + $this->data['appExceptionSuccess'] = ['success'=>(bool)false, 'status'=>$this->data['status']]; |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | //get lang message for exception |
| 150 | 150 | $this->getLangMessageForException(); |
| 151 | 151 | |
| 152 | - if(property_exists(core(),'exceptiontrace')){
|
|
| 152 | + if (property_exists(core(), 'exceptiontrace')) {
|
|
| 153 | 153 | |
| 154 | - $customExceptionTrace=core()->exceptiontrace; |
|
| 155 | - $this->data['errFile']=$customExceptionTrace['file']; |
|
| 156 | - $this->data['errLine']=$customExceptionTrace['line']; |
|
| 154 | + $customExceptionTrace = core()->exceptiontrace; |
|
| 155 | + $this->data['errFile'] = $customExceptionTrace['file']; |
|
| 156 | + $this->data['errLine'] = $customExceptionTrace['line']; |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | $environment = $this->getEnvironmentStatus(); |
| 160 | 160 | |
| 161 | - $vendorDirectory = str_replace(root.''.DIRECTORY_SEPARATOR.'','',$this->data['errFile']); |
|
| 161 | + $vendorDirectory = str_replace(root.''.DIRECTORY_SEPARATOR.'', '', $this->data['errFile']); |
|
| 162 | 162 | |
| 163 | - if(Str::startsWith($vendorDirectory,'vendor') |
|
| 164 | - && Str::startsWith($vendorDirectory,'vendor/php-resta')===false) |
|
| 163 | + if (Str::startsWith($vendorDirectory, 'vendor') |
|
| 164 | + && Str::startsWith($vendorDirectory, 'vendor/php-resta')===false) |
|
| 165 | 165 | {
|
| 166 | 166 | $externalMessage = ($environment==="production") ? |
| 167 | - 'An unexpected external error has occurred' : |
|
| 168 | - $this->data['errStrReal']; |
|
| 167 | + 'An unexpected external error has occurred' : $this->data['errStrReal']; |
|
| 169 | 168 | |
| 170 | - $appException=$this->getAppException($environment,$externalMessage); |
|
| 169 | + $appException = $this->getAppException($environment, $externalMessage); |
|
| 171 | 170 | |
| 172 | 171 | |
| 173 | 172 | //Get or Set the HTTP response code |
| 174 | 173 | http_response_code(500); |
| 175 | 174 | $this->app->terminate('responseStatus');
|
| 176 | - $this->app->register('responseStatus',500);
|
|
| 175 | + $this->app->register('responseStatus', 500);
|
|
| 177 | 176 | |
| 178 | 177 | |
| 179 | 178 | } |
| 180 | - else{
|
|
| 179 | + else {
|
|
| 181 | 180 | |
| 182 | - $appException=$this->getAppException($environment,$this->data['errStrReal']); |
|
| 181 | + $appException = $this->getAppException($environment, $this->data['errStrReal']); |
|
| 183 | 182 | |
| 184 | 183 | //Get or Set the HTTP response code |
| 185 | 184 | http_response_code($this->data['status']); |
| 186 | 185 | } |
| 187 | 186 | |
| 188 | 187 | |
| 189 | - if($environment==="production"){
|
|
| 188 | + if ($environment==="production") {
|
|
| 190 | 189 | |
| 191 | - $productionLogMessage = $this->getAppException('local',$this->data['errStrReal']);
|
|
| 192 | - $this->app->register('productionLogMessage',core()->out->outputFormatter($productionLogMessage));
|
|
| 190 | + $productionLogMessage = $this->getAppException('local', $this->data['errStrReal']);
|
|
| 191 | + $this->app->register('productionLogMessage', core()->out->outputFormatter($productionLogMessage));
|
|
| 193 | 192 | } |
| 194 | 193 | |
| 195 | - if(app()->has('requestExpected') && config('app.requestWithError')===true){
|
|
| 194 | + if (app()->has('requestExpected') && config('app.requestWithError')===true) {
|
|
| 196 | 195 | $appException['request']['expected'] = app()->get('requestExpected');
|
| 197 | 196 | } |
| 198 | 197 | |
| 199 | 198 | |
| 200 | 199 | //set json app exception |
| 201 | - core()->routerResult=$appException; |
|
| 200 | + core()->routerResult = $appException; |
|
| 202 | 201 | |
| 203 | 202 | $restaOutHandle = null; |
| 204 | 203 | |
| 205 | - if(!defined('responseApp')){
|
|
| 204 | + if (!defined('responseApp')) {
|
|
| 206 | 205 | |
| 207 | - $restaOutHandle=core()->out->handle(); |
|
| 206 | + $restaOutHandle = core()->out->handle(); |
|
| 208 | 207 | } |
| 209 | 208 | |
| 210 | - if($restaOutHandle===null){
|
|
| 209 | + if ($restaOutHandle===null) {
|
|
| 211 | 210 | |
| 212 | 211 | //header set and symfony response call |
| 213 | 212 | header('Content-type:application/json;charset=utf-8');
|
@@ -215,7 +214,7 @@ discard block |
||
| 215 | 214 | echo json_encode(core()->out->outputFormatter($appException)); |
| 216 | 215 | exit(); |
| 217 | 216 | } |
| 218 | - else{
|
|
| 217 | + else {
|
|
| 219 | 218 | echo $restaOutHandle; |
| 220 | 219 | exit(); |
| 221 | 220 | } |
@@ -226,7 +225,7 @@ discard block |
||
| 226 | 225 | * @param $environment |
| 227 | 226 | * @return mixed |
| 228 | 227 | */ |
| 229 | - private function getAppException($environment,$message) |
|
| 228 | + private function getAppException($environment, $message) |
|
| 230 | 229 | {
|
| 231 | 230 | return $this->data['appExceptionSuccess']+$this->data['exception']::$environment( |
| 232 | 231 | $this->data['errNo'], |
@@ -244,18 +243,18 @@ discard block |
||
| 244 | 243 | public function fatalErrorShutdownHandler() |
| 245 | 244 | {
|
| 246 | 245 | //get fatal error |
| 247 | - $last_error =error_get_last(); |
|
| 246 | + $last_error = error_get_last(); |
|
| 248 | 247 | |
| 249 | 248 | $this->inStactTrace($last_error); |
| 250 | 249 | |
| 251 | - if($last_error!==null){
|
|
| 250 | + if ($last_error!==null) {
|
|
| 252 | 251 | |
| 253 | - if(!defined('methodName')){
|
|
| 252 | + if (!defined('methodName')) {
|
|
| 254 | 253 | |
| 255 | - define('methodName',null);
|
|
| 254 | + define('methodName', null);
|
|
| 256 | 255 | } |
| 257 | 256 | |
| 258 | - if(isset(core()->exceptionFile)){
|
|
| 257 | + if (isset(core()->exceptionFile)) {
|
|
| 259 | 258 | $last_error['file'] = core()->exceptionFile; |
| 260 | 259 | $last_error['line'] = core()->exceptionLine; |
| 261 | 260 | } |
@@ -275,12 +274,12 @@ discard block |
||
| 275 | 274 | */ |
| 276 | 275 | public function inStactTrace($error) |
| 277 | 276 | {
|
| 278 | - if(isset(core()->urlComponent)){
|
|
| 279 | - if(!preg_match('@'.core()->urlComponent['project'].'@',$error['file']) && !isset(core()->exceptionFile)){
|
|
| 280 | - if(preg_match('@ in\s(.*?)\n@is',$error['message'],$result)){
|
|
| 281 | - $errorMessage = explode(":",$result[1]);
|
|
| 282 | - $this->app->register('exceptionFile',$errorMessage[0]);
|
|
| 283 | - $this->app->register('exceptionLine',$errorMessage[1]);
|
|
| 277 | + if (isset(core()->urlComponent)) {
|
|
| 278 | + if (!preg_match('@'.core()->urlComponent['project'].'@', $error['file']) && !isset(core()->exceptionFile)) {
|
|
| 279 | + if (preg_match('@ in\s(.*?)\n@is', $error['message'], $result)) {
|
|
| 280 | + $errorMessage = explode(":", $result[1]);
|
|
| 281 | + $this->app->register('exceptionFile', $errorMessage[0]);
|
|
| 282 | + $this->app->register('exceptionLine', $errorMessage[1]);
|
|
| 284 | 283 | } |
| 285 | 284 | } |
| 286 | 285 | } |
@@ -289,78 +288,78 @@ discard block |
||
| 289 | 288 | /** |
| 290 | 289 | * @return void|mixed |
| 291 | 290 | */ |
| 292 | - private function getLangMessageForException(){
|
|
| 291 | + private function getLangMessageForException() {
|
|
| 293 | 292 | |
| 294 | 293 | $clone = clone $this; |
| 295 | 294 | |
| 296 | - if(property_exists(core(),'exceptionTranslate')){
|
|
| 295 | + if (property_exists(core(), 'exceptionTranslate')) {
|
|
| 297 | 296 | |
| 298 | - $langMessage=trans('exception.'.core()->exceptionTranslate);
|
|
| 297 | + $langMessage = trans('exception.'.core()->exceptionTranslate);
|
|
| 299 | 298 | |
| 300 | - if(!is_null($langMessage) && property_exists(core(),'exceptionTranslateParams')){
|
|
| 299 | + if (!is_null($langMessage) && property_exists(core(), 'exceptionTranslateParams')) {
|
|
| 301 | 300 | |
| 302 | - if(count(core()->exceptionTranslateParams[core()->exceptionTranslate])){
|
|
| 303 | - foreach (core()->exceptionTranslateParams[core()->exceptionTranslate] as $key=>$value){
|
|
| 304 | - $langMessage=preg_replace('@\('.$key.'\)@is',$value,$langMessage);
|
|
| 301 | + if (count(core()->exceptionTranslateParams[core()->exceptionTranslate])) {
|
|
| 302 | + foreach (core()->exceptionTranslateParams[core()->exceptionTranslate] as $key=>$value) {
|
|
| 303 | + $langMessage = preg_replace('@\('.$key.'\)@is', $value, $langMessage);
|
|
| 305 | 304 | } |
| 306 | 305 | } |
| 307 | 306 | } |
| 308 | 307 | |
| 309 | - if($langMessage!==null){
|
|
| 310 | - $this->data['errStrReal']=$langMessage; |
|
| 308 | + if ($langMessage!==null) {
|
|
| 309 | + $this->data['errStrReal'] = $langMessage; |
|
| 311 | 310 | } |
| 312 | 311 | } |
| 313 | 312 | |
| 314 | - if(class_exists($this->data['errorClassNamespace']) |
|
| 313 | + if (class_exists($this->data['errorClassNamespace']) |
|
| 315 | 314 | && |
| 316 | - (Str::startsWith($this->data['errorClassNamespace'],'App') |
|
| 317 | - || Str::startsWith($this->data['errorClassNamespace'],__NAMESPACE__))){
|
|
| 315 | + (Str::startsWith($this->data['errorClassNamespace'], 'App') |
|
| 316 | + || Str::startsWith($this->data['errorClassNamespace'], __NAMESPACE__))) {
|
|
| 318 | 317 | |
| 319 | 318 | ClosureDispatcher::bind($this->data['errorClassNamespace'])->call(function() use ($clone) {
|
| 320 | - if(property_exists($this,'lang')){
|
|
| 321 | - $clone->lang=$this->lang; |
|
| 319 | + if (property_exists($this, 'lang')) {
|
|
| 320 | + $clone->lang = $this->lang; |
|
| 322 | 321 | } |
| 323 | 322 | }); |
| 324 | 323 | } |
| 325 | 324 | |
| 326 | - $this->data['lang']=$lang=$clone->lang; |
|
| 325 | + $this->data['lang'] = $lang = $clone->lang; |
|
| 327 | 326 | |
| 328 | - if($lang!==null){
|
|
| 329 | - $langMessage=trans('exception.'.$lang);
|
|
| 327 | + if ($lang!==null) {
|
|
| 328 | + $langMessage = trans('exception.'.$lang);
|
|
| 330 | 329 | } |
| 331 | - else{
|
|
| 332 | - $langMessage=null; |
|
| 330 | + else {
|
|
| 331 | + $langMessage = null; |
|
| 333 | 332 | } |
| 334 | 333 | |
| 335 | 334 | |
| 336 | - if($langMessage!==null){
|
|
| 337 | - $this->data['errStrReal']=$langMessage; |
|
| 335 | + if ($langMessage!==null) {
|
|
| 336 | + $this->data['errStrReal'] = $langMessage; |
|
| 338 | 337 | } |
| 339 | 338 | } |
| 340 | 339 | |
| 341 | 340 | /** |
| 342 | 341 | * @return void|mixed |
| 343 | 342 | */ |
| 344 | - private function getUncaughtProcess(){
|
|
| 343 | + private function getUncaughtProcess() {
|
|
| 345 | 344 | |
| 346 | 345 | // catch exception via preg match |
| 347 | 346 | // and then clear the Uncaught statement from inside. |
| 348 | - if(preg_match('@(.*?):@is',$this->data['errStrReal'],$errArr)){
|
|
| 347 | + if (preg_match('@(.*?):@is', $this->data['errStrReal'], $errArr)) {
|
|
| 349 | 348 | |
| 350 | - $this->data['errType']=trim(str_replace('Uncaught','',$errArr[1]));
|
|
| 351 | - $this->data['errorClassNamespace']=$this->data['errType']; |
|
| 349 | + $this->data['errType'] = trim(str_replace('Uncaught', '', $errArr[1]));
|
|
| 350 | + $this->data['errorClassNamespace'] = $this->data['errType']; |
|
| 352 | 351 | } |
| 353 | 352 | |
| 354 | - if(preg_match('@Uncaught@is',$this->data['errStrReal'])
|
|
| 355 | - && preg_match('@(.*?):(.*?)\sin\s@is',$this->data['errStrReal'],$errStrRealArray)){
|
|
| 356 | - $this->data['errStrReal']=trim($errStrRealArray[2]); |
|
| 353 | + if (preg_match('@Uncaught@is', $this->data['errStrReal'])
|
|
| 354 | + && preg_match('@(.*?):(.*?)\sin\s@is', $this->data['errStrReal'], $errStrRealArray)) {
|
|
| 355 | + $this->data['errStrReal'] = trim($errStrRealArray[2]); |
|
| 357 | 356 | } |
| 358 | 357 | |
| 359 | - if($this->data['errType']==="Undefined"){
|
|
| 360 | - $this->data['errStrReal']=$this->data['errStrReal']; |
|
| 358 | + if ($this->data['errType']==="Undefined") {
|
|
| 359 | + $this->data['errStrReal'] = $this->data['errStrReal']; |
|
| 361 | 360 | } |
| 362 | - else{
|
|
| 363 | - $this->data['errContext']['trace']=$this->data['errStrReal']; |
|
| 361 | + else {
|
|
| 362 | + $this->data['errContext']['trace'] = $this->data['errStrReal']; |
|
| 364 | 363 | } |
| 365 | 364 | } |
| 366 | 365 | |
@@ -19,14 +19,14 @@ discard block |
||
| 19 | 19 | * @param $concrete |
| 20 | 20 | * @return mixed|void |
| 21 | 21 | */ |
| 22 | - public function addListener($eventName, $abstract,$concrete) |
|
| 22 | + public function addListener($eventName, $abstract, $concrete) |
|
| 23 | 23 | {
|
| 24 | - if(!isset($this->events[$eventName][strtolower($abstract)])){
|
|
| 24 | + if (!isset($this->events[$eventName][strtolower($abstract)])) {
|
|
| 25 | 25 | |
| 26 | 26 | $this->events[$eventName][strtolower($abstract)] = $concrete; |
| 27 | 27 | |
| 28 | 28 | //we save to kernel object value of the event-dispatcher |
| 29 | - $this->app->register('events',$eventName,$this->events[$eventName]);
|
|
| 29 | + $this->app->register('events', $eventName, $this->events[$eventName]);
|
|
| 30 | 30 | } |
| 31 | 31 | } |
| 32 | 32 | |
@@ -34,13 +34,13 @@ discard block |
||
| 34 | 34 | * @param array $subscriber |
| 35 | 35 | * @return mixed|void |
| 36 | 36 | */ |
| 37 | - public function addSubscriber($subscriber=array()) |
|
| 37 | + public function addSubscriber($subscriber = array()) |
|
| 38 | 38 | {
|
| 39 | 39 | // To take advantage of an existing event, |
| 40 | 40 | // you need to connect a listener to the dispatcher |
| 41 | 41 | // so that it can be notified when the event is dispatched. |
| 42 | 42 | // A call to the dispatcher's addListener() method associates any valid PHP callable to an event: |
| 43 | - $this->listen = array_merge($this->getListeners(),[$this->event=>['subscriber'=>$subscriber]]); |
|
| 43 | + $this->listen = array_merge($this->getListeners(), [$this->event=>['subscriber'=>$subscriber]]); |
|
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | |
@@ -21,19 +21,19 @@ discard block |
||
| 21 | 21 | * @param $event |
| 22 | 22 | * @param $events |
| 23 | 23 | */ |
| 24 | - protected function handlerDispatch($event,$events) |
|
| 24 | + protected function handlerDispatch($event, $events) |
|
| 25 | 25 | {
|
| 26 | 26 | $eventName = lcfirst(class_basename($event)); |
| 27 | 27 | |
| 28 | - if(isset($events[$eventName])){
|
|
| 28 | + if (isset($events[$eventName])) {
|
|
| 29 | 29 | |
| 30 | 30 | $listenerPath = app()->namespace()->optionalListeners(); |
| 31 | 31 | |
| 32 | - foreach($events[$eventName] as $listeners){
|
|
| 32 | + foreach ($events[$eventName] as $listeners) {
|
|
| 33 | 33 | |
| 34 | 34 | $listenerClass = $listenerPath.'\\'.ucfirst($listeners); |
| 35 | 35 | |
| 36 | - if(Utils::isNamespaceExists($listenerClass)){
|
|
| 36 | + if (Utils::isNamespaceExists($listenerClass)) {
|
|
| 37 | 37 | $this->app->resolve($listenerClass)->handle($event); |
| 38 | 38 | } |
| 39 | 39 | } |
@@ -47,11 +47,11 @@ discard block |
||
| 47 | 47 | * @param $eventName |
| 48 | 48 | * @return null |
| 49 | 49 | */ |
| 50 | - protected function handlerDispatchForString($event,$eventName) |
|
| 50 | + protected function handlerDispatchForString($event, $eventName) |
|
| 51 | 51 | {
|
| 52 | 52 | $listeners = $this->getListeners(); |
| 53 | 53 | |
| 54 | - if(isset($listeners[$event][$eventName])){
|
|
| 54 | + if (isset($listeners[$event][$eventName])) {
|
|
| 55 | 55 | return $listeners[$event][$eventName]; |
| 56 | 56 | } |
| 57 | 57 | |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | */ |
| 12 | 12 | public function getListeners() |
| 13 | 13 | {
|
| 14 | - if(isset($this->app['events'])){
|
|
| 14 | + if (isset($this->app['events'])) {
|
|
| 15 | 15 | return $this->app['events']; |
| 16 | 16 | } |
| 17 | 17 | return $this->listen; |
@@ -23,21 +23,21 @@ discard block |
||
| 23 | 23 | * @param $event |
| 24 | 24 | * @return mixed|void |
| 25 | 25 | */ |
| 26 | - public function dispatch($event,$eventName='default') |
|
| 26 | + public function dispatch($event, $eventName = 'default') |
|
| 27 | 27 | {
|
| 28 | 28 | //recorded events must be. |
| 29 | - if(isset($this->app['events'])){
|
|
| 29 | + if (isset($this->app['events'])) {
|
|
| 30 | 30 | |
| 31 | 31 | // in the logic of the events, |
| 32 | 32 | // the default keyi mandatory. |
| 33 | 33 | $events = $this->app['events']['events'] ?? ['default'=>[]]; |
| 34 | 34 | |
| 35 | - if(is_object($event)){
|
|
| 36 | - return $this->handlerDispatch($event,$events[$eventName]); |
|
| 35 | + if (is_object($event)) {
|
|
| 36 | + return $this->handlerDispatch($event, $events[$eventName]); |
|
| 37 | 37 | } |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - return $this->handlerDispatchForString($event,$eventName); |
|
| 40 | + return $this->handlerDispatchForString($event, $eventName); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | /** |
@@ -48,10 +48,10 @@ discard block |
||
| 48 | 48 | public function handle() |
| 49 | 49 | {
|
| 50 | 50 | //set constant event-dispatcher |
| 51 | - define('event-dispatcher',true);
|
|
| 51 | + define('event-dispatcher', true);
|
|
| 52 | 52 | |
| 53 | 53 | //we save to kernel object value of the event-dispatcher |
| 54 | - $this->addListener('events','default',$this->getListeners());
|
|
| 54 | + $this->addListener('events', 'default', $this->getListeners());
|
|
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | 57 | |
@@ -20,15 +20,15 @@ discard block |
||
| 20 | 20 | * @param callable $callback |
| 21 | 21 | * @return mixed |
| 22 | 22 | */ |
| 23 | - public function checkLoggerConfiguration($printer,callable $callback) |
|
| 23 | + public function checkLoggerConfiguration($printer, callable $callback) |
|
| 24 | 24 | {
|
| 25 | 25 | // logger service handler |
| 26 | - if(config('app.logger')){
|
|
| 27 | - return $this->logHandler($printer,'access',$this->getLoggerType()); |
|
| 26 | + if (config('app.logger')) {
|
|
| 27 | + return $this->logHandler($printer, 'access', $this->getLoggerType()); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | //return closure object with printer |
| 31 | - return call_user_func_array($callback,[$printer]); |
|
| 31 | + return call_user_func_array($callback, [$printer]); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | /** |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | public function handle() |
| 50 | 50 | {
|
| 51 | 51 | //set define for logger |
| 52 | - define('logger',true);
|
|
| 52 | + define('logger', true);
|
|
| 53 | 53 | |
| 54 | 54 | //we get the logger namespace value. |
| 55 | 55 | $loggerNamespace = app()->namespace()->logger(); |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | // if the logger file does not exist |
| 58 | 58 | // or request console is true |
| 59 | 59 | // we throw a domain exception. |
| 60 | - if(Utils::isNamespaceExists($loggerNamespace)){
|
|
| 60 | + if (Utils::isNamespaceExists($loggerNamespace)) {
|
|
| 61 | 61 | |
| 62 | 62 | //We are getting the path to |
| 63 | 63 | //the service log file in the project's version directory. |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | |
| 66 | 66 | // we send the resulting adapter property as |
| 67 | 67 | // a reference to the bind automatic instance class. |
| 68 | - $this->setLogger($appBase,$appBase->adapter,$this); |
|
| 68 | + $this->setLogger($appBase, $appBase->adapter, $this); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | } |
@@ -78,16 +78,16 @@ discard block |
||
| 78 | 78 | * @param string $type |
| 79 | 79 | * @return mixed |
| 80 | 80 | */ |
| 81 | - public function logHandler($printer,$file="access",$type='info') |
|
| 81 | + public function logHandler($printer, $file = "access", $type = 'info') |
|
| 82 | 82 | {
|
| 83 | - if(isset($this->app['log'])){
|
|
| 83 | + if (isset($this->app['log'])) {
|
|
| 84 | 84 | |
| 85 | 85 | //we get the log object that was previously assigned. |
| 86 | 86 | $log = $this->app['log']; |
| 87 | 87 | |
| 88 | 88 | $base = current($log); |
| 89 | 89 | |
| 90 | - if($this->adapter!==null){
|
|
| 90 | + if ($this->adapter!==null) {
|
|
| 91 | 91 | |
| 92 | 92 | $log = []; |
| 93 | 93 | $log[$this->adapter] = $base; |
@@ -99,17 +99,16 @@ discard block |
||
| 99 | 99 | // we call the method specified by the adapter in the service log class |
| 100 | 100 | // and log the application in the customized mode for the application. |
| 101 | 101 | // The service log class uses the monolog class. |
| 102 | - if(method_exists($base,$adapter=key($log))){
|
|
| 102 | + if (method_exists($base, $adapter = key($log))) {
|
|
| 103 | 103 | |
| 104 | 104 | // this is very important. |
| 105 | 105 | // in the production log messages, |
| 106 | 106 | // we have to get the production log message kernel variable |
| 107 | 107 | // in order not to show an external error to the user |
| 108 | 108 | $logOutput = (isset($this->app['productionLogMessage'])) ? |
| 109 | - $this->app['productionLogMessage'] : |
|
| 110 | - $printer; |
|
| 109 | + $this->app['productionLogMessage'] : $printer; |
|
| 111 | 110 | |
| 112 | - call_user_func_array([$base,$adapter],[$logOutput,$file,$type]); |
|
| 111 | + call_user_func_array([$base, $adapter], [$logOutput, $file, $type]); |
|
| 113 | 112 | } |
| 114 | 113 | |
| 115 | 114 | //printer back |
@@ -123,15 +122,15 @@ discard block |
||
| 123 | 122 | * |
| 124 | 123 | * @param mixed ...$params |
| 125 | 124 | */ |
| 126 | - public function setLogger(...$params){
|
|
| 125 | + public function setLogger(...$params) {
|
|
| 127 | 126 | |
| 128 | 127 | // params list |
| 129 | - [$base,$adapter,$loggerService] = $params; |
|
| 128 | + [$base, $adapter, $loggerService] = $params; |
|
| 130 | 129 | |
| 131 | 130 | // we take the adapter attribute for the log log |
| 132 | 131 | // from the service log class and save it to the kernel object. |
| 133 | - $this->app->register('logger',app()->namespace()->logger());
|
|
| 134 | - $this->app->register('loggerService',$loggerService);
|
|
| 135 | - $this->app->register('log',$adapter,$base);
|
|
| 132 | + $this->app->register('logger', app()->namespace()->logger());
|
|
| 133 | + $this->app->register('loggerService', $loggerService);
|
|
| 134 | + $this->app->register('log', $adapter, $base);
|
|
| 136 | 135 | } |
| 137 | 136 | } |
| 138 | 137 | \ No newline at end of file |
@@ -21,13 +21,13 @@ discard block |
||
| 21 | 21 | public function handle() |
| 22 | 22 | {
|
| 23 | 23 | //set define for encrypter |
| 24 | - define('encrypter',true);
|
|
| 24 | + define('encrypter', true);
|
|
| 25 | 25 | |
| 26 | 26 | //get encrypter file |
| 27 | 27 | $encrypterFile = path()->encrypterFile(); |
| 28 | 28 | |
| 29 | 29 | //throws an exception it there is no encrypter file |
| 30 | - if(!file_exists($encrypterFile)){
|
|
| 30 | + if (!file_exists($encrypterFile)) {
|
|
| 31 | 31 | exception()->domain('The Application key is invalid');
|
| 32 | 32 | } |
| 33 | 33 | |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | |
| 37 | 37 | //we are checking two values for key comparison.1.st separated value encryption |
| 38 | 38 | //key second separated value crypto closure value |
| 39 | - $appKey = explode("__",$appKeyFile['key']);
|
|
| 39 | + $appKey = explode("__", $appKeyFile['key']);
|
|
| 40 | 40 | |
| 41 | 41 | //we are assigning a singleton object |
| 42 | 42 | //so that we can use our application key in the project. |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | {
|
| 57 | 57 | //we are assigning a singleton object |
| 58 | 58 | //so that we can use our application key in the project. |
| 59 | - $this->app->register('applicationKey',current($key));
|
|
| 59 | + $this->app->register('applicationKey', current($key));
|
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | //check url parse data for exception |
| 19 | 19 | $this->url = $app->urlList; |
| 20 | 20 | |
| 21 | - if(is_null($app->getPath())){
|
|
| 21 | + if (is_null($app->getPath())) {
|
|
| 22 | 22 | $this->exception($this->url); |
| 23 | 23 | } |
| 24 | 24 | |