php-resta / resta-core

src/resta/Console/Source/Test/Test.php

Spacing +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
     public function create()

     {

 

-        if(!file_exists(app()->path()->tests())){

+        if (!file_exists(app()->path()->tests())) {

             $this->directory['test'] = app()->path()->tests();

             $this->file->makeDirectory($this);

         }

@@ -44,7 +44,7 @@ 
         $this->argument['testNamespace'] = ucfirst($this->argument['test']).'Test';

         $this->argument['projectName'] = strtolower($this->projectName());

 

-        $this->touch['test/test']= app()->path()->tests().'/'.$this->argument['testNamespace'].'.php';

+        $this->touch['test/test'] = app()->path()->tests().'/'.$this->argument['testNamespace'].'.php';

 

 

         $this->file->touch($this);

@@ -63,12 +63,12 @@ 
 

         $array = $xml->toArray();

 

-        $new = (new PhpUnitManager($array))->add(strtolower($this->projectName()),'directory',

-            str_replace(root.''.DIRECTORY_SEPARATOR,"",app()->path()->tests()));

+        $new = (new PhpUnitManager($array))->add(strtolower($this->projectName()), 'directory',

+            str_replace(root.''.DIRECTORY_SEPARATOR, "", app()->path()->tests()));

 

         $newDataXml = $xml->toXml($new);

 

-        app()->get('fileSystem')->writeFile($phpunit,$newDataXml);

+        app()->get('fileSystem')->writeFile($phpunit, $newDataXml);

 

         echo $this->classical(' > phpunit.xml file has been updated');

     }

@@ -78,7 +78,7 @@ 
      */

     public function run()

     {

-        $process = new Process(['vendor'.DIRECTORY_SEPARATOR.'bin'.DIRECTORY_SEPARATOR.'phpunit','--group',strtolower($this->projectName())]);

+        $process = new Process(['vendor'.DIRECTORY_SEPARATOR.'bin'.DIRECTORY_SEPARATOR.'phpunit', '--group', strtolower($this->projectName())]);

         $process->setTty(true);

 

         try {

src/resta/Config/Config.php

Spacing +9 added lines, -9 removed lines

@@ -34,13 +34,13 @@ 
     public function get()

     {

         // The config process class should not be null.

-        if(self::$configProcessInstance!==null){

+        if (self::$configProcessInstance!==null) {

 

             //get config variables

             $config = self::$config;

 

             // offset config variables to config process class

-            self::$configProcessInstance->offsetSet('config',$config);

+            self::$configProcessInstance->offsetSet('config', $config);

 

             //get config variable from config process class

             return self::$configProcessInstance->get();

@@ -75,7 +75,7 @@ 
      * @param null|string $config

      * @return Config

      */

-    public static function macro($config=null)

+    public static function macro($config = null)

     {

         /** @var Macro $macro */

         $macro = app()->get('macro');

@@ -88,7 +88,7 @@ 
      * @param null $config

      * @return Config

      */

-    public static function make($config=null)

+    public static function make($config = null)

     {

         self::$config = $config;

         self::$configProcessInstance = app()->resolve(ConfigProcess::class);

@@ -101,7 +101,7 @@ 
      * @param array $data

      * @return bool|mixed

      */

-    public function set($data=array())

+    public function set($data = array())

     {

         // receive the necessary config settings.

         $configPath     = path()->config();

@@ -109,12 +109,12 @@ 
         $setConfigPath  = $configPath.''.DIRECTORY_SEPARATOR.''.ucfirst($configArray).'.php';

         $getConfigWrap  = Arr::wrap(config($configArray));

 

-        foreach ($data as $value){

+        foreach ($data as $value) {

 

             // we check the config value not to be rewritten.

-            if(!in_array($value,$getConfigWrap)){

-                $setData = '<?php return '.var_export(array_merge($getConfigWrap,$data), true).';';

-                return app()->resolve(FileProcess::class)->dumpFile($setConfigPath,$setData);

+            if (!in_array($value, $getConfigWrap)) {

+                $setData = '<?php return '.var_export(array_merge($getConfigWrap, $data), true).';';

+                return app()->resolve(FileProcess::class)->dumpFile($setConfigPath, $setData);

             }

         }

     }

src/resta/Support/BootStaticManager.php

Spacing +2 added lines, -2 removed lines

@@ -14,9 +14,9 @@
      *

      * @param null|string $path

      */

-    public static function setPath($path=null)

+    public static function setPath($path = null)

     {

-        if(!is_null($path)){

+        if (!is_null($path)) {

             self::$requestPath = $path;

         }

     }

src/resta/Support/Macro.php

Spacing +15 added lines, -15 removed lines

@@ -33,7 +33,7 @@ 
      * @param bool $static

      * @return bool

      */

-    protected function checkMacroConditions($static=false)

+    protected function checkMacroConditions($static = false)

     {

         return is_string($this->macro) &&

             Utils::isNamespaceExists($this->macro) &&

@@ -46,9 +46,9 @@ 
      * @param bool $static

      * @return bool

      */

-    protected function checkMacroInstanceOf($static=false)

+    protected function checkMacroInstanceOf($static = false)

     {

-        if($static){

+        if ($static) {

             return true;

         }

         return $this->app->resolve($this->macro) instanceof MacroAbleContracts;

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

      * @return mixed

      */

-    public function get($method,callable $callback)

+    public function get($method, callable $callback)

     {

-        if($this->isMacro){

+        if ($this->isMacro) {

 

-            if(method_exists($resolve = $this->app->resolve($this->macro),$method)){

+            if (method_exists($resolve = $this->app->resolve($this->macro), $method)) {

                 return $resolve->macro($this->class);

             }

         }

@@ -89,11 +89,11 @@ 
      * @param $class

      * @return $this

      */

-    public function isMacro($class,$static=false)

+    public function isMacro($class, $static = false)

     {

         // if the macro class is a valid object,

         // then this macro will return a boolean value if it has the specified methode.

-        if($this->checkMacroConditions($static)){

+        if ($this->checkMacroConditions($static)) {

 

             $this->isMacro  = true;

             $this->class    = $class;

@@ -121,10 +121,10 @@ 
      * @param $method

      * @return mixed

      */

-    public function with($macro,$concrete,$method=null)

+    public function with($macro, $concrete, $method = null)

     {

-        if($this->macro === null){

-            return $this($macro)->isMacro($concrete)->get($method,function() use($concrete){

+        if ($this->macro===null) {

+            return $this($macro)->isMacro($concrete)->get($method, function() use($concrete){

                 return $concrete;

             });

         }

@@ -138,9 +138,9 @@ 
      * @param $method

      * @return mixed

      */

-    public function withStatic($macro,$concrete)

+    public function withStatic($macro, $concrete)

     {

-        return $this($macro)->isMacro($concrete,true)->get(null,is_callable($concrete) ?

+        return $this($macro)->isMacro($concrete, true)->get(null, is_callable($concrete) ?

             $concrete : function() use($concrete){

                 return $concrete;

             });

@@ -152,9 +152,9 @@ 
      * @param null|string $macro

      * @return $this

      */

-    public function __invoke($macro=null)

+    public function __invoke($macro = null)

     {

-        if($macro!==null){

+        if ($macro!==null) {

             $this->macro = $macro;

         }

         return $this;

src/resta/Url/UrlParseException.php

Spacing +5 added lines, -5 removed lines

@@ -10,9 +10,9 @@ 
     /**

      * @param array $data

      */

-    public function exception($data=array())

+    public function exception($data = array())

     {

-        if(!isset($data['project']) and !isset($data['version'])){

+        if (!isset($data['project']) and !isset($data['version'])) {

             exception()->notFoundException('No Project or Version');

         }

 

@@ -21,17 +21,17 @@ 
 

         //If there is no project on the url

         //we throw an exception

-        if($data['project']===null OR !file_exists($appPath)){

+        if ($data['project']===null OR !file_exists($appPath)) {

             exception()->notFoundException('No Project');

         }

 

-        if(!in_array($data['version'],UrlVersionIdentifier::supportedVersions())){

+        if (!in_array($data['version'], UrlVersionIdentifier::supportedVersions())) {

             throw new DomainException('Version Number is not supported');

         }

 

         //If there is no endpoint on the url

         //we throw an exception

-        if($data['endpoint']===null){

+        if ($data['endpoint']===null) {

             exception()->notFoundException('No Endpoint');

         }

     }

src/resta/Exception/ExceptionTrace.php

Braces +2 added lines, -4 removed lines

@@ -99,8 +99,7 @@ 
         // in the application directory class.

         if(Utils::isNamespaceExists($nameNamespace)){

             $callNamespace = new $nameNamespace;

-        }

-        else{

+        } else{

 

             // if you do not have an exception in the application directory,

             // this time we are looking for an exception in the core directory.

@@ -133,8 +132,7 @@ 
             //throw exception

             if($msg===null){

                 throw new $callNamespace;

-            }

-            else{

+            } else{

                 throw new $callNamespace($msg);

             }

 

Spacing +28 added lines, -28 removed lines

@@ -16,13 +16,13 @@ 
      * @param null|string $name

      * @param array $params

      */

-    public function __construct($app,$name=null,$params=array())

+    public function __construct($app, $name = null, $params = array())

     {

         parent::__construct($app);

 

         // we help the user to pull a special message from

         // the translate section to be specified by the user for the exception.

-        $this->exceptionTranslate($name,$params);

+        $this->exceptionTranslate($name, $params);

 

         // for real file path with

         // debug backtrace method are doing follow.

@@ -35,13 +35,13 @@ 
      * @param $name

      * @param array $params

      */

-    private function exceptionTranslate($name,$params=array())

+    private function exceptionTranslate($name, $params = array())

     {

-        if($name!==null){

-            if(count($params)){

-                $this->app->register('exceptionTranslateParams',$name,$params);

+        if ($name!==null) {

+            if (count($params)) {

+                $this->app->register('exceptionTranslateParams', $name, $params);

             }

-            $this->app->register('exceptionTranslate',$name);

+            $this->app->register('exceptionTranslate', $name);

         }

     }

 

@@ -52,23 +52,23 @@ 
      */

     public function debugBackTrace()

     {

-        foreach (debug_backtrace() as $key=>$value){

+        foreach (debug_backtrace() as $key=>$value) {

 

-            if(isset(debug_backtrace()[$key],debug_backtrace()[$key]['file']))

+            if (isset(debug_backtrace()[$key], debug_backtrace()[$key]['file']))

             {

-                $this->app->register('exceptionFile',debug_backtrace()[$key]['file']);

-                $this->app->register('exceptionLine',debug_backtrace()[$key]['line']);

+                $this->app->register('exceptionFile', debug_backtrace()[$key]['file']);

+                $this->app->register('exceptionLine', debug_backtrace()[$key]['line']);

             }

 

             Dependencies::loadBootstrapperNeedsForException();

 

-            if(isset($value['file']) && isset(core()->urlComponent)){

-                if(preg_match('@'.core()->urlComponent['project'].'|boot|providers@',$value['file'])){

+            if (isset($value['file']) && isset(core()->urlComponent)) {

+                if (preg_match('@'.core()->urlComponent['project'].'|boot|providers@', $value['file'])) {

 

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

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

-                    $this->app->register('exceptionFile',$value['file']);

-                    $this->app->register('exceptionLine',$value['line']);

+                    $this->app->register('exceptionFile', $value['file']);

+                    $this->app->register('exceptionLine', $value['line']);

 

                     break;

                 }

@@ -81,7 +81,7 @@ 
      */

     public function __get($name)

     {

-        $this->customException($name,null,debug_backtrace());

+        $this->customException($name, null, debug_backtrace());

     }

 

     /**

@@ -91,7 +91,7 @@ 
      * @param null|string $msg

      * @param array $trace

      */

-    public function customException($name,$msg=null,$trace=array())

+    public function customException($name, $msg = null, $trace = array())

     {

         //We use the magic method for the exception and

         //call the exception class in the application to get the instance.

@@ -100,22 +100,22 @@ 
 

         // first, you are looking for an exception

         // in the application directory class.

-        if(Utils::isNamespaceExists($nameNamespace)){

+        if (Utils::isNamespaceExists($nameNamespace)) {

             $callNamespace = new $nameNamespace;

         }

-        else{

+        else {

 

             // if you do not have an exception in the application directory,

             // this time we are looking for an exception in the core directory.

             $nameNamespace = __NAMESPACE__.'\\'.$nameException;

-            if(Utils::isNamespaceExists($nameNamespace)){

+            if (Utils::isNamespaceExists($nameNamespace)) {

                 $callNamespace = new $nameNamespace;

             }

         }

 

-        if(isset($callNamespace)){

+        if (isset($callNamespace)) {

 

-            $traceForCustom = Utils::removeTrace($trace,self::removeExceptionFileItems);

+            $traceForCustom = Utils::removeTrace($trace, self::removeExceptionFileItems);

 

             // we will set the information about the exception trace,

             // and then bind it specifically to the event method.

@@ -127,19 +127,19 @@ 
 

 

             // we register the custom exception trace value with the global kernel object.

-            $this->app->register('exceptiontrace',$customExceptionTrace);

+            $this->app->register('exceptiontrace', $customExceptionTrace);

 

             //If the developer wants to execute an event when calling a special exception,

             //we process the event method.

-            if(method_exists($callNamespace,'event')){

+            if (method_exists($callNamespace, 'event')) {

                 $callNamespace->event($customExceptionTrace);

             }

 

             //throw exception

-            if($msg===null){

+            if ($msg===null) {

                 throw new $callNamespace;

             }

-            else{

+            else {

                 throw new $callNamespace($msg);

             }

 

@@ -152,8 +152,8 @@ 
      * @param $name

      * @param array $arguments

      */

-    public function __call($name, $arguments=array())

+    public function __call($name, $arguments = array())

     {

-        $this->customException($name,current($arguments),debug_backtrace());

+        $this->customException($name, current($arguments), debug_backtrace());

     }

 }
\ No newline at end of file

src/resta/Console/Source/Project/Project.php

Spacing +8 added lines, -8 removed lines

@@ -14,7 +14,7 @@ 
     /**

      * @var $type

      */

-    public $type='project';

+    public $type = 'project';

 

     /**

      * @var array

@@ -31,7 +31,7 @@ 
     /**

      * @var $commandRule

      */

-    public $commandRule=[];

+    public $commandRule = [];

 

     /**

      * @method create

@@ -45,15 +45,15 @@ 
         $this->directory['projectDir']          = $this->projectPath();

         $this->argument['exceptionNamespace']   = app()->namespace()->exception();

 

-        $recursiveDefaultDirectory = explode("\\",$this->argument['project']);

+        $recursiveDefaultDirectory = explode("\\", $this->argument['project']);

         $this->argument['applicationName'] = pos($recursiveDefaultDirectory);

         $recursiveDefaultDirectory[] = 'V1';

         $recursiveDefaultDirectoryList = [];

 

-        foreach (array_slice($recursiveDefaultDirectory,1) as $defaultDirectory){

+        foreach (array_slice($recursiveDefaultDirectory, 1) as $defaultDirectory) {

 

-            $recursiveDefaultDirectoryList[]=$defaultDirectory;

-            $this->directory[$defaultDirectory.'Path'] = $this->projectPath().''.implode("/",$recursiveDefaultDirectoryList);

+            $recursiveDefaultDirectoryList[] = $defaultDirectory;

+            $this->directory[$defaultDirectory.'Path'] = $this->projectPath().''.implode("/", $recursiveDefaultDirectoryList);

         }

 

         //$this->directory['optionalDir'] = $this->optional();

@@ -79,7 +79,7 @@ 
         //$this->directory['sourceDir']               = $this->sourceDir();

         //$this->directory['sourceSupportDir']        = $this->sourceSupportDir();

         //$this->directory['sourceSupportTraitDir']   = $this->sourceSupportDir().'/Traits';

-        $this->directory['exceptionDir']            = app()->path()->exception();

+        $this->directory['exceptionDir'] = app()->path()->exception();

 

         //set project directory

         $this->file->makeDirectory($this);

@@ -130,7 +130,7 @@ 
         $this->touch['app/gitignore']               = $this->projectPath().'/.gitignore';

         $this->touch['app/composer']                = $this->projectPath().'/composer.json';

         $this->touch['test/index']                  = $this->storage().'/index.html';

-        $this->touch['exception/authenticate']      = $this->directory['exceptionDir'] .'/AuthenticateException.php';

+        $this->touch['exception/authenticate']      = $this->directory['exceptionDir'].'/AuthenticateException.php';

 

         //set project touch

         $this->file->touch($this);

src/resta/Exception/ExceptionExtender.php

Spacing +5 added lines, -5 removed lines

@@ -22,14 +22,14 @@ 
      * @param ApplicationContracts $app
      * @param array $result
      */
-    public function __construct(ApplicationContracts $app,$result=array())
+    public function __construct(ApplicationContracts $app, $result = array())
     {
         parent::__construct($app);
 
         $this->result = $result;
 
-        foreach($this->extender as $item){
-            if(method_exists($this,$item)){
+        foreach ($this->extender as $item) {
+            if (method_exists($this, $item)) {
                 $this->{$item}();
             }
         }
@@ -44,8 +44,8 @@ 
     {
         // we will look at the requestExpected container value to show
         // the expected values ​​for the request object in the exception output.
-        if(app()->has('requestExpected') && config('app.requestWithError')===true){
-            if($requestExpected = app()->get('requestExpected')){
+        if (app()->has('requestExpected') && config('app.requestWithError')===true) {
+            if ($requestExpected = app()->get('requestExpected')) {
                 $this->result['request']['expected'] = $requestExpected;
             }
         }

src/resta/Exception/ErrorProvider.php

Spacing +74 added lines, -75 removed lines

@@ -48,34 +48,34 @@ 
     {

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

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

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

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

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

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

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

                 }

             }

 

@@ -83,15 +83,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']];

         }

     }

 

@@ -113,13 +113,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']);

     }

 

     /**

@@ -131,7 +131,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.

@@ -158,7 +158,7 @@ 
         //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'];

@@ -167,38 +167,37 @@ 
 

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

 

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

 

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

+            $this->result = $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));

         }

 

         // exception extender The exception information

@@ -211,11 +210,11 @@ 
 

         $restaOutHandle = null;

 

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

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

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

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

         }

 

-        if($restaOutHandle===null){

+        if ($restaOutHandle===null) {

 

             //header set and symfony response call

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

@@ -223,7 +222,7 @@ 
             echo json_encode(core()->out->outputFormatter($this->result));

             exit();

         }

-        else{

+        else {

             echo $restaOutHandle;

             exit();

         }

@@ -233,7 +232,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'],

@@ -268,13 +267,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(isset(core()->exceptionFile)){

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

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

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

             }

@@ -294,12 +293,12 @@ 
      */

     public function inStackTrace($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]);

                 }

             }

         }

@@ -312,48 +311,48 @@ 
     {

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

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

-                    $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;

         }

     }

 

@@ -366,22 +365,22 @@ 
     {

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

         }

     }

 

Braces +6 added lines, -12 removed lines

@@ -51,8 +51,7 @@ 
         if(isset(core()->exceptiontrace))

         {

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

-        }

-        else {

+        } else {

 

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

         }

@@ -87,8 +86,7 @@ 
 

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

@@ -185,8 +183,7 @@ 
             $this->app->register('responseStatus',500);

 

 

-        }

-        else{

+        } else{

 

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

 

@@ -222,8 +219,7 @@ 
 

             echo json_encode(core()->out->outputFormatter($this->result));

             exit();

-        }

-        else{

+        } else{

             echo $restaOutHandle;

             exit();

         }

@@ -346,8 +342,7 @@ 
 

         if($lang!==null){

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

-        }

-        else{

+        } else{

             $langMessage=null;

         }

 

@@ -379,8 +374,7 @@ 
 

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

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

-        }

-        else{

+        } else{

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

         }

     }