php-resta / resta-core

src/resta/Exception/ErrorProvider.php

Spacing +65 added lines, -66 removed lines

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

     private function getStatusAccordingToExceptionTrace()

     {

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

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

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

         }

         else {

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

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

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

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

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

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

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

 

 

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

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

 

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

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

 

             //trace pattern

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

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

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

 

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

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

 

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

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

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

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

                 }

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

         }

 

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

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

 

             //set as the success object is false

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

         }

-        else{

+        else {

 

             //set as the success object is false

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

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

         }

     }

 

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

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

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

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

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

 

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

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

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

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

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

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

 

     }

 

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

      * @param null|string $errContext

      */

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

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

     {

         // in case of a deficiency,

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

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

         $this->getLangMessageForException();

 

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

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

 

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

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

@@ -163,40 +163,39 @@ 
 

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

 

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

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

 

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

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

             $vendorDirectory = $vd[0];

         }

 

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

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

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

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

         {

 

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

-                'An unexpected external error has occurred' :

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

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

 

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

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

 

 

             //Get or Set the HTTP response code

             http_response_code(500);

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

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

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

 

 

         }

-        else{

+        else {

 

-            if($environment=='production' && preg_match('@SQLSTATE@is',$this->data['errStrReal'])){

+            if ($environment=='production' && preg_match('@SQLSTATE@is', $this->data['errStrReal'])) {

                 $externalMessage = 'An unexpected external error has occurred';

             }

-            else{

+            else {

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

             }

 

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

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

 

             //Get or Set the HTTP response code

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

@@ -206,41 +205,41 @@ 
         // that is presented as an extra to the exception result set.

         $this->result = $this->getExceptionExtender();

 

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

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

 

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

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

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

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

         }

 

         //set json app exception

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

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

 

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

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

             $exceptionContainer = $this->app->get('exceptionContainer');

-            $exceptionContainer($this->result,$this->data['status']);

+            $exceptionContainer($this->result, $this->data['status']);

         }

 

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

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

             $exceptionExtenderContainer = $this->app->get('exceptionExtenderContainer');

             $this->result = $exceptionExtenderContainer($this->result);

         }

 

         $restaOutHandle = null;

 

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

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

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

         }

 

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

 

-        if($restaOutHandle===null){

+        if ($restaOutHandle===null) {

 

             //header set and symfony response call

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

 

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

         }

-        else{

+        else {

             echo $restaOutHandle;

         }

 

@@ -251,7 +250,7 @@ 
      * @param $environment

      * @return mixed

      */

-    private function getAppException($environment,$message)

+    private function getAppException($environment, $message)

     {

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

                 $this->data['errNo'],

@@ -271,7 +270,7 @@ 
     private function getExceptionExtender()

     {

         return  $this->app->resolve(

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

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

                 return ExceptionExtender::class;

             }),

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

@@ -289,13 +288,13 @@ 
 

         $this->inStackTrace($last_error);

 

-        if(!is_null($last_error)){

+        if (!is_null($last_error)) {

 

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

-                define('methodName',null);

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

+                define('methodName', null);

             }

 

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

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

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

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

             }

@@ -315,13 +314,13 @@ 
      */

     public function inStackTrace($error)

     {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

                 }

             }

         }

@@ -334,33 +333,33 @@ 
     {

         $clone = clone $this;

 

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

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

 

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

 

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

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

 

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

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

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

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

 

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

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

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

                     }

                 }

             }

 

-            if($langMessage!==null){

+            if ($langMessage!==null) {

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

             }

         }

 

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

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

             &&

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

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

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

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

 

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

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

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

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

                 }

             });

@@ -370,7 +369,7 @@ 
 

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

 

-        if($langMessage!==null){

+        if ($langMessage!==null) {

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

         }

     }

@@ -384,14 +383,14 @@ 
     {

         // catch exception via preg match

         // and then clear the Uncaught statement from inside.

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

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

 

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

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

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

         }

 

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

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

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

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

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

         }

 

@@ -411,7 +410,7 @@ 
     /**

      * @param null|string $lang

      */

-    public function setLang($lang=null)

+    public function setLang($lang = null)

     {

         $this->lang = $lang;

     }

src/resta/Router/Route.php

Spacing +38 added lines, -38 removed lines

@@ -43,13 +43,13 @@ 
      * @param $urlRoute

      * @return int|string

      */

-    public static function checkArrayEqual($patterns,$urlRoute)

+    public static function checkArrayEqual($patterns, $urlRoute)

     {

         // calculates the equality difference between

         // the route pattern and the urlRoute value.

-        foreach ($patterns as $key=>$pattern){

+        foreach ($patterns as $key=>$pattern) {

 

-            if(Utils::isArrayEqual($pattern,$urlRoute)){

+            if (Utils::isArrayEqual($pattern, $urlRoute)) {

                 return $key;

             }

         }

@@ -68,7 +68,7 @@ 
     {

         $route = self::getRouteResolve();

 

-        if(isset($route['class'])){

+        if (isset($route['class'])) {

             return $route['class'];

         }

 

@@ -84,7 +84,7 @@ 
     {

         $route = self::getRouteResolve();

 

-        if(isset($route['method'])){

+        if (isset($route['method'])) {

             return $route['method'];

         }

 

@@ -100,7 +100,7 @@ 
     {

         $route = self::getRouteResolve();

 

-        if(isset($route['controller'],$route['namespace'])){

+        if (isset($route['controller'], $route['namespace'])) {

             return $route['controller'].'/'.$route['namespace'];

         }

 

@@ -117,17 +117,17 @@ 
         // get routes data and the resolving pattern

         // Both are interrelated.

         $routes = self::getRoutes();

-        $patternResolve = app()->resolve(RouteMatching::class,['route'=>new self()])->getPatternResolve();

+        $patternResolve = app()->resolve(RouteMatching::class, ['route'=>new self()])->getPatternResolve();

 

         // we set the route variables for the route assistant.

         self::updateRouteParameters($patternResolve);

 

         //if routes data is available in pattern resolve.

-        if(isset($routes['data'][$patternResolve])){

+        if (isset($routes['data'][$patternResolve])) {

 

             // if the incoming http value is

             // the same as the real request method, the data is processed.

-            if($routes['data'][$patternResolve]['http'] == strtolower(httpMethod)){

+            if ($routes['data'][$patternResolve]['http']==strtolower(httpMethod)) {

 

                 // we are set the solved pattern to a variable.

                 $resolve = $routes['data'][$patternResolve];

@@ -140,7 +140,7 @@ 
                     'http'          => httpMethod(),

                 ];

 

-                app()->register('routeResolvedData',$routeResolvedData);

+                app()->register('routeResolvedData', $routeResolvedData);

 

                 return $routeResolvedData;

             }

@@ -159,22 +159,22 @@ 
     {

         $list = [];

 

-        if(isset(static::$routes['pattern'][$patternResolvedKey])){

+        if (isset(static::$routes['pattern'][$patternResolvedKey])) {

 

             $routeParameters = static::$routes['pattern'][$patternResolvedKey];

             $route = route();

 

-            foreach($routeParameters as $key=>$param){

+            foreach ($routeParameters as $key=>$param) {

 

-                $param = Str::replaceWordArray(['{','}','?'],'',$param);

+                $param = Str::replaceWordArray(['{', '}', '?'], '', $param);

 

-                if(isset($route[$key])){

+                if (isset($route[$key])) {

                     $list[$param] = $route[$key];

                 }

             }

         }

 

-        app()->register('routeParams',$list);

+        app()->register('routeParams', $list);

     }

 

     /**

@@ -182,11 +182,11 @@ 
      *

      * @param bool $endpoint

      */

-    public function handle($endpoint=true)

+    public function handle($endpoint = true)

     {

         // we will record the path data for the route.

         // We set the routeMapper variables and the route path.

-        self::setPath(function(){

+        self::setPath(function() {

 

             // we are sending

             // the controller and routes.php path.

@@ -198,7 +198,7 @@ 
 

         // in the paths data,

         // we run the route mapper values ​​and the route files one by one.

-        foreach (self::$paths as $mapper=>$controller){

+        foreach (self::$paths as $mapper=>$controller) {

             core()->fileSystem->callFile($mapper);

         }

     }

@@ -209,11 +209,11 @@ 
      * @param callable $callback

      * @param bool $endpoint

      */

-    public static function setPath(callable $callback,$endpoint=true)

+    public static function setPath(callable $callback, $endpoint = true)

     {

         $routeDefinitor = call_user_func($callback);

 

-        if(isset($routeDefinitor['controllerPath']) && isset($routeDefinitor['routePath'])){

+        if (isset($routeDefinitor['controllerPath']) && isset($routeDefinitor['routePath'])) {

 

             //the route paths to be saved to the mappers static property.

             static::$mappers['routePaths'][] = $routeDefinitor['routePath'];

@@ -221,22 +221,22 @@ 
 

             // if there is endpoint,

             // then only that endpoint is transferred into the path

-            if(defined('endpoint') && $endpoint){

+            if (defined('endpoint') && $endpoint) {

 

                 $routeName      = endpoint.'Route.php';

                 $routeMapper    = $routeDefinitor['routePath'].''.DIRECTORY_SEPARATOR.''.$routeName;

 

-                if(file_exists($routeMapper) && !isset(static::$paths[$routeMapper])){

+                if (file_exists($routeMapper) && !isset(static::$paths[$routeMapper])) {

                     static::$paths[$routeMapper] = $routeDefinitor['controllerPath'];

                 }

             }

-            else{

+            else {

 

                 // if there is no endpoint,

                 // all files in the path of the route are transferred to path.

                 $allFilesInThatRoutePath = Utils::glob($routeDefinitor['routePath']);

 

-                foreach ($allFilesInThatRoutePath as $item){

+                foreach ($allFilesInThatRoutePath as $item) {

                     static::$paths[$item] = $routeDefinitor['controllerPath'];

                 }

             }

@@ -250,13 +250,13 @@ 
      * @param $function

      * @param null $controller

      */

-    public static function setRoute($params,$function,$controller=null)

+    public static function setRoute($params, $function, $controller = null)

     {

-        [$pattern,$route]   = $params;

-        [$class,$method]    = explode("@",$route);

+        [$pattern, $route]   = $params;

+        [$class, $method]    = explode("@", $route);

 

         $patternList = array_values(

-            array_filter(explode("/",$pattern),'strlen')

+            array_filter(explode("/", $pattern), 'strlen')

         );

 

         static::$routes['pattern'][] = $patternList;

@@ -266,7 +266,7 @@ 
             'http'          => $function,

             'controller'    => $controller,

             'namespace'     => static::$namespace,

-            'endpoint'      => strtolower(str_replace(StaticPathList::$controllerBundleName,'',static::$namespace))

+            'endpoint'      => strtolower(str_replace(StaticPathList::$controllerBundleName, '', static::$namespace))

         ];

     }

 

@@ -276,11 +276,11 @@ 
      * @param null $value

      * @return bool

      */

-    public static function isMatchVaribleRegexPattern($value=null)

+    public static function isMatchVaribleRegexPattern($value = null)

     {

         // determines if the variable that can be used

         // in the route file meets the regex rule.

-        return (preg_match('@\{(.*?)\}@is',$value)) ? true : false;

+        return (preg_match('@\{(.*?)\}@is', $value)) ? true : false;

     }

 

 

@@ -290,11 +290,11 @@ 
      * @param null $value

      * @return bool

      */

-    public static function isOptionalVaribleRegexPattern($value=null)

+    public static function isOptionalVaribleRegexPattern($value = null)

     {

         // determines if the variable that can be used

         // in the route file meets the regex rule.

-        return preg_match('@\{[a-z]+\?\}@is',$value) ? true : false;

+        return preg_match('@\{[a-z]+\?\}@is', $value) ? true : false;

     }

 

     /**

@@ -319,7 +319,7 @@ 
         $application->loadIfNotExistBoot(['middleware']);

         $middlewareProvider = $application['middleware'];

 

-        foreach($routeData as $key=>$data) {

+        foreach ($routeData as $key=>$data) {

 

             $middlewareProvider->setKeyOdds('endpoint', $data['endpoint']);

             $middlewareProvider->setKeyOdds('method', $data['method']);

@@ -332,7 +332,7 @@ 
             $afterMiddleware = $middlewareProvider->getShow();

 

             $endpoint = $data['endpoint'];

-            $controllerNamespace = Utils::getNamespace($data['controller'] . '/' . $data['namespace'] . '/' . $data['class']);

+            $controllerNamespace = Utils::getNamespace($data['controller'].'/'.$data['namespace'].'/'.$data['class']);

 

             $methodDocument = app()['reflection']($controllerNamespace)->reflectionMethodParams($data['method'])->document;

 

@@ -344,11 +344,11 @@ 
                 }

             }

 

-            $mappings[$key]['endpoint'] = $endpoint . '/' . implode("/", $routePattern[$key]);

+            $mappings[$key]['endpoint'] = $endpoint.'/'.implode("/", $routePattern[$key]);

             $mappings[$key]['http'] = $data['http'];

             $mappings[$key]['definition'] = $methodDefinition;

-            $mappings[$key]['before'] = implode(",",$beforeMiddleware);

-            $mappings[$key]['after'] = implode(",",$afterMiddleware);

+            $mappings[$key]['before'] = implode(",", $beforeMiddleware);

+            $mappings[$key]['after'] = implode(",", $afterMiddleware);

             $mappings[$key]['doc'] = 'not available';

 

         }