php-resta / resta-core

src/resta/Request/RequestAnnotationManager.php

Spacing +34 added lines, -34 removed lines

@@ -21,7 +21,7 @@ 
      * @param ApplicationContracts $app

      * @param $request

      */

-    public function __construct(ApplicationContracts $app,$request)

+    public function __construct(ApplicationContracts $app, $request)

     {

         parent::__construct($app);

 

@@ -37,7 +37,7 @@ 
      * @param $key

      * @return mixed|void

      */

-    public function annotation($method,$key)

+    public function annotation($method, $key)

     {

         //set annotation value with getting reflection

         $reflection = $this->getReflection('reflection')->reflectionMethodParams($method);

@@ -62,18 +62,18 @@ 
      * @param string $key

      * @param null|string $data

      */

-    private function catchException($key,$data)

+    private function catchException($key, $data)

     {

-        if(isset($this->exceptionParams[$key])){

+        if (isset($this->exceptionParams[$key])) {

 

             //get key params for exception params

             $keyParams = ($this->exceptionParams[$key]['params']) ?? [];

 

             //catch exception

-            exception($this->exceptionParams[$key]['name'],$keyParams)

+            exception($this->exceptionParams[$key]['name'], $keyParams)

                 ->unexpectedValue($key.' input value is not valid as format ('.$data.')');

         }

-        else{

+        else {

             //catch exception

             exception()->unexpectedValue($key.' input value is not valid as format ('.$data.')');

         }

@@ -86,23 +86,23 @@ 
      */

     private function getException($key)

     {

-        if(preg_match('@exception\((.*?)\)\r\n@is',$this->annotation,$exception)){

+        if (preg_match('@exception\((.*?)\)\r\n@is', $this->annotation, $exception)) {

 

-            $exceptionSpaceExplode = explode(" ",$exception[1]);

+            $exceptionSpaceExplode = explode(" ", $exception[1]);

 

-            foreach ($exceptionSpaceExplode as $exceptions){

-                $exceptionsDotExplode = explode(":",$exceptions);

+            foreach ($exceptionSpaceExplode as $exceptions) {

+                $exceptionsDotExplode = explode(":", $exceptions);

                 $this->exceptionParams[$key][$exceptionsDotExplode[0]] = $exceptionsDotExplode[1];

             }

 

-            if(isset($this->exceptionParams[$key]['params'])){

+            if (isset($this->exceptionParams[$key]['params'])) {

 

-                $paramsCommaExplode = explode(",",$this->exceptionParams[$key]['params']);

+                $paramsCommaExplode = explode(",", $this->exceptionParams[$key]['params']);

                 unset($this->exceptionParams[$key]['params']);

 

-                foreach ($paramsCommaExplode as $params){

-                    $paramsEqualExplode = explode("=",$params);

-                    if(isset($paramsEqualExplode[0]) && isset($paramsEqualExplode[1])){

+                foreach ($paramsCommaExplode as $params) {

+                    $paramsEqualExplode = explode("=", $params);

+                    if (isset($paramsEqualExplode[0]) && isset($paramsEqualExplode[1])) {

                         $this->exceptionParams[$key]['params'][$paramsEqualExplode[0]] = $paramsEqualExplode[1];

                     }

                 }

@@ -119,24 +119,24 @@ 
     {

         // with the method based regex annotation,

         // we check the rule definition for our requests.

-        if(preg_match('@regex\((.*?)\)\r\n@is',$this->annotation,$regex)){

-            if(isset($this->inputs[$key])){

+        if (preg_match('@regex\((.*?)\)\r\n@is', $this->annotation, $regex)) {

+            if (isset($this->inputs[$key])) {

 

                 // for the definition of rules,

                 // our inputs can be array and in this case we offer array option for user comfort.

-                if(is_array($this->inputs[$key])){

+                if (is_array($this->inputs[$key])) {

 

-                    foreach ($this->inputs[$key] as $this->inputsKey => $this->inputsValue){

-                        if(!preg_match('@'.$regex[1].'@is',$this->inputsValue)){

-                            $this->catchException($key,$regex[1]);

+                    foreach ($this->inputs[$key] as $this->inputsKey => $this->inputsValue) {

+                        if (!preg_match('@'.$regex[1].'@is', $this->inputsValue)) {

+                            $this->catchException($key, $regex[1]);

                         }

                     }

                 }

-                else{

+                else {

 

                     // we control the regex rule that evaluates when only string arrives.

-                    if(!preg_match('@'.$regex[1].'@is',$this->inputs[$key])){

-                        $this->catchException($key,$regex[1]);

+                    if (!preg_match('@'.$regex[1].'@is', $this->inputs[$key])) {

+                        $this->catchException($key, $regex[1]);

                     }

                 }

             }

@@ -151,9 +151,9 @@ 
      */

     private function getRemove($key)

     {

-        if(preg_match('@remove\((.*?)\)\r\n@is',$this->annotation,$remove)){

-            if(isset($this->inputs[$key])){

-                if(preg_match('@'.$remove[1].'@is',$this->inputs[$key])){

+        if (preg_match('@remove\((.*?)\)\r\n@is', $this->annotation, $remove)) {

+            if (isset($this->inputs[$key])) {

+                if (preg_match('@'.$remove[1].'@is', $this->inputs[$key])) {

                     unset($this->inputs[$key]);

                 }

             }

@@ -167,16 +167,16 @@ 
      */

     private function getRules($key)

     {

-        if(preg_match('@rule\((.*?)\)\r\n@is',$this->annotation,$rule)){

+        if (preg_match('@rule\((.*?)\)\r\n@is', $this->annotation, $rule)) {

 

             $requestRules = $this->getReflection('rules');

 

-            $rules = explode(":",$rule[1]);

-            if(isset($this->inputs[$key])){

-                foreach($rules as $rule){

-                    if(isset($requestRules[$rule])){

-                        if(!preg_match('@'.$requestRules[$rule].'@',$this->inputs[$key])){

-                            exception($rule,['key'=>$key])

+            $rules = explode(":", $rule[1]);

+            if (isset($this->inputs[$key])) {

+                foreach ($rules as $rule) {

+                    if (isset($requestRules[$rule])) {

+                        if (!preg_match('@'.$requestRules[$rule].'@', $this->inputs[$key])) {

+                            exception($rule, ['key'=>$key])

                                 ->invalidArgument($key.' input value is not valid for '.$rule.' request rule');

                         }

                     }

src/resta/Exception/ErrorProvider.php

Spacing +89 added lines, -90 removed lines

@@ -24,12 +24,12 @@ 
     /**

      * @var $data array

      */

-    protected $data=array();

+    protected $data = array();

 

     /**

      * @return mixed|string

      */

-    private function getEnvironmentStatus(){

+    private function getEnvironmentStatus() {

 

         // application key, but if it has a null value

         // then we move the environment value to the production environment.

@@ -39,41 +39,41 @@ 
     /**

      * @return void|mixed

      */

-    private function getStatusFromContext(){

+    private function getStatusFromContext() {

 

-        $exception=$this->exception;

+        $exception = $this->exception;

 

-        if(isset(core()->exceptiontrace))

+        if (isset(core()->exceptiontrace))

         {

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

         }

         else {

 

-            $this->data['status']=(int)$exception::exceptionTypeCodes($this->data['errType']);

+            $this->data['status'] = (int)$exception::exceptionTypeCodes($this->data['errType']);

         }

 

         $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'])) {

 

             //linux test

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

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

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

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

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

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

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

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

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

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

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

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

                 }

             }

 

 

-            $this->data['errType']=class_basename($this->data['errType']);

+            $this->data['errType'] = class_basename($this->data['errType']);

         }

     }

 

@@ -89,18 +89,18 @@ 
         // in general we will use the exception class

         // in the store/config directory to make it possible

         // to change the user-based exceptions.

-        $this->exception=StaticPathModel::$store.'\Config\Exception';

+        $this->exception = StaticPathModel::$store.'\Config\Exception';

 

         //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']);

     }

 

     /**

@@ -110,7 +110,7 @@ 
      * @param null $errLine

      * @param null $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.

@@ -135,79 +135,78 @@ 
 

         $this->getStatusFromContext();

 

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

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

 

             //set as the success object is false

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

+            $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']];

         }

 

         //get lang message for exception

         $this->getLangMessageForException();

 

-        if(property_exists(core(),'exceptiontrace')){

+        if (property_exists(core(), 'exceptiontrace')) {

 

-            $customExceptionTrace=core()->exceptiontrace;

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

-            $this->data['errLine']=$customExceptionTrace['line'];

+            $customExceptionTrace = core()->exceptiontrace;

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

+            $this->data['errLine'] = $customExceptionTrace['line'];

         }

 

         $environment = $this->getEnvironmentStatus();

 

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

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

 

-        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'];

 

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

+            $appException = $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 {

 

-            $appException=$this->getAppException($environment,$this->data['errStrReal']);

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

 

             //Get or Set the HTTP response code

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

         }

 

 

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

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

 

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

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

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

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

         }

 

-        if(app()->has('requestExpected') && config('app.requestWithError')===true){

+        if (app()->has('requestExpected') && config('app.requestWithError')===true) {

             $appException['request']['expected'] = app()->get('requestExpected');

         }

 

 

         //set json app exception

-        core()->routerResult=$appException;

+        core()->routerResult = $appException;

 

         $restaOutHandle = null;

 

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

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

 

-            $restaOutHandle=core()->out->handle();

+            $restaOutHandle = core()->out->handle();

         }

 

-        if($restaOutHandle===null){

+        if ($restaOutHandle===null) {

 

             //header set and symfony response call

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

@@ -215,7 +214,7 @@ 
             echo json_encode(core()->out->outputFormatter($appException));

             exit();

         }

-        else{

+        else {

             echo $restaOutHandle;

             exit();

         }

@@ -226,7 +225,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'],

@@ -244,18 +243,18 @@ 
     public function fatalErrorShutdownHandler()

     {

         //get fatal error

-        $last_error =error_get_last();

+        $last_error = error_get_last();

 

         $this->inStactTrace($last_error);

 

-        if($last_error!==null){

+        if ($last_error!==null) {

 

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

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

 

-                define('methodName',null);

+                define('methodName', null);

             }

 

-            if(isset(core()->exceptionFile)){

+            if (isset(core()->exceptionFile)) {

                 $last_error['file'] = core()->exceptionFile;

                 $last_error['line'] = core()->exceptionLine;

             }

@@ -275,12 +274,12 @@ 
      */

     public function inStactTrace($error)

     {

-        if(isset(core()->urlComponent)){

-            if(!preg_match('@'.core()->urlComponent['project'].'@',$error['file']) && !isset(core()->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 (isset(core()->urlComponent)) {

+            if (!preg_match('@'.core()->urlComponent['project'].'@', $error['file']) && !isset(core()->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]);

                 }

             }

         }

@@ -289,76 +288,76 @@ 
     /**

      * @return void|mixed

      */

-    private function getLangMessageForException(){

+    private function getLangMessageForException() {

 

         $clone = clone $this;

 

-        if(property_exists(core(),'exceptionTranslate')){

+        if (property_exists(core(), 'exceptionTranslate')) {

 

-            $langMessage=trans('exception.'.core()->exceptionTranslate);

+            $langMessage = trans('exception.'.core()->exceptionTranslate);

 

-            if(!is_null($langMessage) && property_exists(core(),'exceptionTranslateParams')){

+            if (!is_null($langMessage) && property_exists(core(), 'exceptionTranslateParams')) {

 

-                if(count(core()->exceptionTranslateParams[core()->exceptionTranslate])){

-                    foreach (core()->exceptionTranslateParams[core()->exceptionTranslate] as $key=>$value){

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

+                if (count(core()->exceptionTranslateParams[core()->exceptionTranslate])) {

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

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

                     }

                 }

             }

 

-            if($langMessage!==null){

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

+            if ($langMessage!==null) {

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

             }

         }

 

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

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

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

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

 

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

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

-                    $clone->lang=$this->lang;

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

+                    $clone->lang = $this->lang;

                 }

             });

         }

 

-        $this->data['lang']=$lang=$clone->lang;

+        $this->data['lang'] = $lang = $clone->lang;

 

-        if($lang!==null){

-            $langMessage=trans('exception.'.$lang);

+        if ($lang!==null) {

+            $langMessage = trans('exception.'.$lang);

         }

-        else{

-            $langMessage=null;

+        else {

+            $langMessage = null;

         }

 

 

-        if($langMessage!==null){

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

+        if ($langMessage!==null) {

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

         }

     }

 

     /**

      * @return void|mixed

      */

-    private function getUncaughtProcess(){

+    private function getUncaughtProcess() {

 

         // 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['errorClassNamespace']=$this->data['errType'];

+            $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)){

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

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

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

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

         }

 

-        if($this->data['errType']==="Undefined"){

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

+        if ($this->data['errType']==="Undefined") {

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

         }

-        else{

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

+        else {

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

         }

     }