php-resta / resta-core

src/resta/Middleware/ExcludeMiddleware.php

Spacing +12 added lines, -12 removed lines

@@ -29,7 +29,7 @@ 
      * @param callable $callback

      * @return mixed

      */

-    public function exclude($middleware,callable $callback)

+    public function exclude($middleware, callable $callback)

     {

         $this->result = true;

 

@@ -41,7 +41,7 @@ 
 

         //if there is exclude method

         //in service middleware class

-        if($this->existMethod()){

+        if ($this->existMethod()) {

 

             //call exclude method

             /**

@@ -50,24 +50,24 @@ 
             $serviceMiddleware = $middleware['class'];

             $excludes = $serviceMiddleware->exclude();

 

-            foreach ($excludes as $excludeKey=>$excludeVal){

-                $this->excludeProcess($excludeKey,$excludeVal);

+            foreach ($excludes as $excludeKey=>$excludeVal) {

+                $this->excludeProcess($excludeKey, $excludeVal);

             }

         }

 

         //return true

-        return Utils::returnCallback($this->result,$callback);

+        return Utils::returnCallback($this->result, $callback);

     }

 

     /**

      * @param $excludeKey

      * @param $excludeVal

      */

-    private function excludeProcess($excludeKey,$excludeVal)

+    private function excludeProcess($excludeKey, $excludeVal)

     {

-        $this->excludeForAll($excludeKey,$excludeVal,function() use ($excludeKey,$excludeVal){

+        $this->excludeForAll($excludeKey, $excludeVal, function() use ($excludeKey, $excludeVal){

 

-            if($excludeKey == $this->excludeList['middleware']['middlewareName']){

+            if ($excludeKey==$this->excludeList['middleware']['middlewareName']) {

                 $this->result = true;

                 $this->inArrayExclude($excludeVal);

 

@@ -80,7 +80,7 @@ 
      */

     private function existMethod()

     {

-        return Utils::existMethod($this->excludeList['middleware']['class'],'exclude');

+        return Utils::existMethod($this->excludeList['middleware']['class'], 'exclude');

     }

 

     /**

@@ -88,8 +88,8 @@ 
      */

     private function inArrayExclude($exclude)

     {

-        foreach($exclude as $item){

-            if(in_array($item,$this->middleware['odds'])){

+        foreach ($exclude as $item) {

+            if (in_array($item, $this->middleware['odds'])) {

                 $this->result = false;

             }

         }

@@ -101,7 +101,7 @@ 
      * @param callable $callback

      * @return mixed

      */

-    private function excludeForAll($excludeKey,$excludeVal,callable $callback)

+    private function excludeForAll($excludeKey, $excludeVal, callable $callback)

     {

         return ($excludeKey=="all") ? $this->inArrayExclude($excludeVal) : call_user_func($callback);

     }

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

Spacing +22 added lines, -22 removed lines

@@ -15,7 +15,7 @@ 
     /**

      * @var $type

      */

-    public $type='project';

+    public $type = 'project';

 

     /**

      * @var array

@@ -32,7 +32,7 @@ 
     /**

      * @var $commandRule

      */

-    public $commandRule=[];

+    public $commandRule = [];

 

     /**

      * @method create

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

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

         $this->argument['resourcePath']         = app()->path()->appResourche();

-        $this->argument['testNamespace']             = app()->namespace()->tests();

+        $this->argument['testNamespace'] = app()->namespace()->tests();

 

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

@@ -99,11 +99,11 @@ 
         $this->touch['kernel/exception']            = $this->provider().'/ExceptionServiceProvider.php';

         $this->touch['kernel/response']             = $this->provider().'/ResponseServiceProvider.php';

         $this->touch['kernel/entity']               = $this->provider().'/EntityServiceProvider.php';

-        $this->touch['kernel/cache']               = $this->provider().'/CacheServiceProvider.php';

+        $this->touch['kernel/cache'] = $this->provider().'/CacheServiceProvider.php';

         $this->touch['kernel/authenticate']         = $this->provider().'/AuthenticateServiceProvider.php';

         $this->touch['kernel/role']                 = $this->provider().'/RoleServiceProvider.php';

         $this->touch['kernel/track']                = $this->provider().'/TrackServiceProvider.php';

-        $this->touch['test/testcase']              = $this->test().'/TestCase.php';

+        $this->touch['test/testcase'] = $this->test().'/TestCase.php';

         $this->touch['kernel/consoleevent']         = $this->provider().'/ConsoleEventServiceProvider.php';

         $this->touch['middleware/authenticate']     = $this->middleware().'/Authenticate.php';

         $this->touch['middleware/ratelimit']        = $this->middleware().'/RateLimit.php';

@@ -121,16 +121,16 @@ 
         $this->touch['resource/index']              = $this->resource().'/index.html';

         $this->touch['resource/index']              = $this->resource().'/'.StaticPathModel::$cache.'/index.html';

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

-        $this->touch['stub/cccrudapp']              = $this->directory['stubControllerCreateCrudFileDir'] .'/app.stub';

-        $this->touch['stub/cccrudconf']              = $this->directory['stubControllerCreateCrudFileDir'] .'/conf.stub';

-        $this->touch['stub/cccrudcontrollerfilecrud']              = $this->directory['stubControllerCreateCrudFileDir'] .'/controllerfilecrud.stub';

-        $this->touch['stub/cccruddeveloper']              = $this->directory['stubControllerCreateCrudFileDir'] .'/developer.stub';

-        $this->touch['stub/cccruddoc']              = $this->directory['stubControllerCreateCrudFileDir'] .'/doc.stub';

-        $this->touch['stub/cccruddummy']              = $this->directory['stubControllerCreateCrudFileDir'] .'/dummy.stub';

-        $this->touch['stub/cccrudroute']              = $this->directory['stubControllerCreateCrudFileDir'] .'/routecrud.stub';

-        $this->touch['stub/cccrudpolicy']              = $this->directory['stubControllerCreateCrudFileDir'] .'/policy.stub';

-        $this->touch['stub/cccrudreadme']              = $this->directory['stubControllerCreateCrudFileDir'] .'/readme.stub';

-        $this->touch['stub/cccrudresourceindex']              = $this->directory['stubControllerCreateCrudFileDir'] .'/resourceIndex.stub';

+        $this->touch['stub/cccrudapp']              = $this->directory['stubControllerCreateCrudFileDir'].'/app.stub';

+        $this->touch['stub/cccrudconf'] = $this->directory['stubControllerCreateCrudFileDir'].'/conf.stub';

+        $this->touch['stub/cccrudcontrollerfilecrud'] = $this->directory['stubControllerCreateCrudFileDir'].'/controllerfilecrud.stub';

+        $this->touch['stub/cccruddeveloper'] = $this->directory['stubControllerCreateCrudFileDir'].'/developer.stub';

+        $this->touch['stub/cccruddoc'] = $this->directory['stubControllerCreateCrudFileDir'].'/doc.stub';

+        $this->touch['stub/cccruddummy']              = $this->directory['stubControllerCreateCrudFileDir'].'/dummy.stub';

+        $this->touch['stub/cccrudroute']              = $this->directory['stubControllerCreateCrudFileDir'].'/routecrud.stub';

+        $this->touch['stub/cccrudpolicy']              = $this->directory['stubControllerCreateCrudFileDir'].'/policy.stub';

+        $this->touch['stub/cccrudreadme']              = $this->directory['stubControllerCreateCrudFileDir'].'/readme.stub';

+        $this->touch['stub/cccrudresourceindex'] = $this->directory['stubControllerCreateCrudFileDir'].'/resourceIndex.stub';

         $this->touch['config/hateoas']              = $this->config().'/Hateoas.php';

         //$this->touch['config/response']             = $this->config().'/Response.php';

         $this->touch['config/redis']                = $this->config().'/Redis.php';

@@ -154,9 +154,9 @@ 
         $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/noinput']           = $this->directory['exceptionDir'] .'/NoInputException.php';

-        $this->touch['helpers/general']              = $this->directory['helperDir'] .'/General.php';

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

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

+        $this->touch['helpers/general'] = $this->directory['helperDir'].'/General.php';

 

         //set project touch

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

src/resta/Console/ConsoleProvider.php

Spacing +23 added lines, -23 removed lines

@@ -27,13 +27,13 @@ 
     {

         // we check that they are in

         // the console to run the console commands in the kernel.

-        if(Utils::isNamespaceExists($this->consoleClassNamespace)){

+        if (Utils::isNamespaceExists($this->consoleClassNamespace)) {

             return call_user_func($callback);

         }

 

         // if the kernel console is not found

         // then we check the existence of the specific application command and run it if it is.

-        return (new CustomConsoleProcess($this->getConsoleArgumentsWithKey(),$this))->handle();

+        return (new CustomConsoleProcess($this->getConsoleArgumentsWithKey(), $this))->handle();

 

     }

 

@@ -43,29 +43,29 @@ 
      * @param array $args

      * @return void|mixed

      */

-    protected function consoleEventHandler($args=array())

+    protected function consoleEventHandler($args = array())

     {

-        if(isset($this->app['eventDispatcher'])){

+        if (isset($this->app['eventDispatcher'])) {

 

             $listeners = event()->getListeners();

 

-            if(isset($args['event']) && isset($listeners['console'])){

+            if (isset($args['event']) && isset($listeners['console'])) {

 

-                if(strtolower($args['event'])!=='default' && isset($listeners['console'][strtolower($args['event'])])){

+                if (strtolower($args['event'])!=='default' && isset($listeners['console'][strtolower($args['event'])])) {

 

                     $event = $listeners['console'][strtolower($args['event'])];

-                    return call_user_func_array($event,['app'=>$this->app,'args'=>$args,]);

+                    return call_user_func_array($event, ['app'=>$this->app, 'args'=>$args, ]);

                 }

             }

 

-            if(isset($listeners['console']['default'])){

+            if (isset($listeners['console']['default'])) {

                 

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

-                    $args = array_merge($args,$this->app->get('arguments'));

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

+                    $args = array_merge($args, $this->app->get('arguments'));

                 }

 

                 $event = $listeners['console']['default'];

-                return call_user_func_array($event,['args'=>$args,'app'=>$this->app]);

+                return call_user_func_array($event, ['args'=>$args, 'app'=>$this->app]);

             }

         }

 

@@ -83,9 +83,9 @@ 
 

         //If the console executor is a custom console application; in this case we look at the kernel directory inside the application.

         //If the console class is not available on the kernel of resta, then the system will run the command class in the application.

-        return $this->checkConsoleNamespace(function(){

+        return $this->checkConsoleNamespace(function() {

 

-            if($this->isRunnableKernelCommandList()){

+            if ($this->isRunnableKernelCommandList()) {

                 exception()->badMethodCall('this command is not runnable');

             }

 

@@ -93,10 +93,10 @@ 
             $consoleArguments = $this->getConsoleArgumentsWithKey();

 

             // we get the instance data of the kernel command class of the system.

-            $commander = (new $this->consoleClassNamespace($consoleArguments,$this));

+            $commander = (new $this->consoleClassNamespace($consoleArguments, $this));

 

             // we check the command rules of each command class.

-            $this->prepareCommander($commander,function($commander){

+            $this->prepareCommander($commander, function($commander) {

                 return $commander->{$this->getConsoleClassMethod()}();

             });

 

@@ -114,12 +114,12 @@ 
     public function handle()

     {

         //get is running console

-        if($this->app->runningInConsole()){

+        if ($this->app->runningInConsole()) {

 

             error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE);

 

             //run console process

-            if(count($this->getArguments())){

+            if (count($this->getArguments())) {

                 return $this->consoleProcess();

             }

 

@@ -135,24 +135,24 @@ 
      * @param callable $callback

      * @return mixed

      */

-    protected function prepareCommander(ConsoleOutputterContracts $commander,callable $callback)

+    protected function prepareCommander(ConsoleOutputterContracts $commander, callable $callback)

     {

         // closure binding custom command,move custom namespace as specific

         // call prepare commander firstly for checking command builder

-        $closureCommand = app()->resolve(ClosureDispatcher::class,['bind'=>$commander]);

+        $closureCommand = app()->resolve(ClosureDispatcher::class, ['bind'=>$commander]);

 

         //assign commander method name

         $closureCommand->prepareBind['methodName'] = $this->getConsoleClassMethod();

 

         $prepareCommander = $commander->prepareCommander($closureCommand);

 

-        if(!$prepareCommander['status']){

+        if (!$prepareCommander['status']) {

             echo $commander->exception($prepareCommander);

             die();

         }

 

         //callback custom console

-        return call_user_func_array($callback,[$commander]);

+        return call_user_func_array($callback, [$commander]);

     }

 

     /**

@@ -165,8 +165,8 @@ 
         $commandList = $this->app->commandList();

 

         //is runnable kernel command conditions

-        return !array_key_exists($this->consoleClassNamespace,$commandList) OR

-            (array_key_exists($this->consoleClassNamespace,$commandList) AND

+        return !array_key_exists($this->consoleClassNamespace, $commandList) OR

+            (array_key_exists($this->consoleClassNamespace, $commandList) AND

                 !$commandList[$this->consoleClassNamespace]['isRunnable']);

     }

 }
\ No newline at end of file

src/resta/Support/FileSystem.php

Spacing +25 added lines, -25 removed lines

@@ -130,7 +130,7 @@ 
         $path = realpath($path) ?: $path;
         $tempPath = tempnam(dirname($path), basename($path));
         // Fix permissions of tempPath because `tempnam()` creates it with permissions set to 0600...
-        chmod($tempPath, 0777 - umask());
+        chmod($tempPath, 0777-umask());
         file_put_contents($tempPath, $content);
         rename($tempPath, $path);
     }
@@ -189,7 +189,7 @@ 
         $success = true;
         foreach ($paths as $path) {
             try {
-                if (! @unlink($path)) {
+                if (!@unlink($path)) {
                     $success = false;
                 }
             } catch (ErrorException $e) {
@@ -232,7 +232,7 @@ 
      */
     public function link($target, $link)
     {
-        if (! windows_os()) {
+        if (!windows_os()) {
             return symlink($target, $link);
         }
         $mode = $this->isDirectory($target) ? 'J' : 'H';
@@ -393,7 +393,7 @@ 
     public function files($directory, $hidden = false)
     {
         return iterator_to_array(
-            Finder::create()->files()->ignoreDotFiles(! $hidden)->in($directory)->depth(0)->sortByName(),
+            Finder::create()->files()->ignoreDotFiles(!$hidden)->in($directory)->depth(0)->sortByName(),
             false
         );
     }
@@ -408,7 +408,7 @@ 
     public function allFiles($directory, $hidden = false)
     {
         return iterator_to_array(
-            Finder::create()->files()->ignoreDotFiles(! $hidden)->in($directory)->sortByName(),
+            Finder::create()->files()->ignoreDotFiles(!$hidden)->in($directory)->sortByName(),
             false
         );
     }
@@ -455,10 +455,10 @@ 
      */
     public function moveDirectory($from, $to, $overwrite = false)
     {
-        if ($overwrite && $this->isDirectory($to) && ! $this->deleteDirectory($to)) {
+        if ($overwrite && $this->isDirectory($to) && !$this->deleteDirectory($to)) {
             return false;
         }
-        return @rename($from, $to) === true;
+        return @rename($from, $to)===true;
     }
 
     /**
@@ -471,14 +471,14 @@ 
      */
     public function copyDirectory($directory, $destination, $options = null)
     {
-        if (! $this->isDirectory($directory)) {
+        if (!$this->isDirectory($directory)) {
             return false;
         }
         $options = $options ?: FilesystemIterator::SKIP_DOTS;
         // If the destination directory does not actually exist, we will go ahead and
         // create it recursively, which just gets the destination prepared to copy
         // the files over. Once we make the directory we'll proceed the copying.
-        if (! $this->isDirectory($destination)) {
+        if (!$this->isDirectory($destination)) {
             $this->makeDirectory($destination, 0777, true);
         }
         $items = new FilesystemIterator($directory, $options);
@@ -489,7 +489,7 @@ 
             $target = $destination.'/'.$item->getBasename();
             if ($item->isDir()) {
                 $path = $item->getPathname();
-                if (! $this->copyDirectory($path, $target, $options)) {
+                if (!$this->copyDirectory($path, $target, $options)) {
                     return false;
                 }
             }
@@ -497,7 +497,7 @@ 
             // location and keep looping. If for some reason the copy fails we'll bail out
             // and return false, so the developer is aware that the copy process failed.
             else {
-                if (! $this->copy($item->getPathname(), $target)) {
+                if (!$this->copy($item->getPathname(), $target)) {
                     return false;
                 }
             }
@@ -516,7 +516,7 @@ 
      */
     public function deleteDirectory($directory, $preserve = false)
     {
-        if (! $this->isDirectory($directory)) {
+        if (!$this->isDirectory($directory)) {
             return false;
         }
         $items = new FilesystemIterator($directory);
@@ -524,7 +524,7 @@ 
             // If the item is a directory, we can just recurse into the function and
             // delete that sub-directory otherwise we'll just delete the file and
             // keep iterating through each file until the directory is cleaned.
-            if ($item->isDir() && ! $item->isLink()) {
+            if ($item->isDir() && !$item->isLink()) {
                 $this->deleteDirectory($item->getPathname());
             }
             // If the item is just a file, we can go ahead and delete it since we're
@@ -534,7 +534,7 @@ 
                 $this->delete($item->getPathname());
             }
         }
-        if (! $preserve) {
+        if (!$preserve) {
             @rmdir($directory);
         }
         return true;
@@ -549,7 +549,7 @@ 
     public function deleteDirectories($directory)
     {
         $allDirectories = $this->directories($directory);
-        if (! empty($allDirectories)) {
+        if (!empty($allDirectories)) {
             foreach ($allDirectories as $directoryName) {
                 $this->deleteDirectory($directoryName);
             }
@@ -580,17 +580,17 @@ 
      */
     public function getAllFilesInDirectory($dir, $recursive = true, $basedir = '', $include_dirs = false)
     {
-        if ($dir == '') {return array();} else {$results = array(); $subresults = array();}
-        if (!is_dir($dir)) {$dir = dirname($dir);} // so a files path can be sent
-        if ($basedir == '') {$basedir = realpath($dir).DIRECTORY_SEPARATOR;}
+        if ($dir=='') {return array(); } else {$results = array(); $subresults = array(); }
+        if (!is_dir($dir)) {$dir = dirname($dir); } // so a files path can be sent
+        if ($basedir=='') {$basedir = realpath($dir).DIRECTORY_SEPARATOR; }
 
         $files = scandir($dir);
-        foreach ($files as $key => $value){
-            if ( ($value != '.') && ($value != '..') ) {
+        foreach ($files as $key => $value) {
+            if (($value!='.') && ($value!='..')) {
                 $path = realpath($dir.DIRECTORY_SEPARATOR.$value);
                 if (is_dir($path)) {
                     // optionally include directories in file list
-                    if ($include_dirs) {$subresults[] = str_replace($basedir, '', $path);}
+                    if ($include_dirs) {$subresults[] = str_replace($basedir, '', $path); }
                     // optionally get file list for all subdirectories
                     if ($recursive) {
                         $subdirresults = $this->getAllFilesInDirectory($path, $recursive, $basedir, $include_dirs);
@@ -603,7 +603,7 @@ 
             }
         }
         // merge the subarray to give the list of files then subdirectory files
-        if (count($subresults) > 0) {$results = array_merge($subresults, $results);}
+        if (count($subresults)>0) {$results = array_merge($subresults, $results); }
         return $results;
     }
 
@@ -625,15 +625,15 @@ 
      * @param $param
      * @return bool
      */
-    public function change($executionPath,$param)
+    public function change($executionPath, $param)
     {
         $dt = fopen($executionPath, "r");
         $content = fread($dt, filesize($executionPath));
         fclose($dt);
 
-        foreach ($param as $key=>$value){
+        foreach ($param as $key=>$value) {
 
-            $content=str_replace("".$key."",$value,$content);
+            $content = str_replace("".$key."", $value, $content);
         }
 
         $dt = fopen($executionPath, "w");

src/resta/Database/Migration/Src/Resource/PushManager/Pushing.php

Spacing +11 added lines, -11 removed lines

@@ -22,7 +22,7 @@ 
      */
     public function handle()
     {
-        foreach ($this->tableFilters() as $table=>$files){
+        foreach ($this->tableFilters() as $table=>$files) {
 
             $table = strtolower($table);
 
@@ -30,20 +30,20 @@ 
 
                 $checkMigrationMain = $this->schema->getConnection()->checkMigrationMain();
                 
-                if($checkMigrationMain===false && isset($this->tableFilters()['Migrations'][0])){
-                    $this->apply($this->tableFilters()['Migrations'][0],'migrations');
+                if ($checkMigrationMain===false && isset($this->tableFilters()['Migrations'][0])) {
+                    $this->apply($this->tableFilters()['Migrations'][0], 'migrations');
                 }
                 
-                $checkMigration = $this->schema->getConnection()->checkMigration($table,$file);
+                $checkMigration = $this->schema->getConnection()->checkMigration($table, $file);
                 
-                if(!$checkMigration){
+                if (!$checkMigration) {
 
-                    $getClassName = preg_replace('@(\d+)_@is','',$file);
+                    $getClassName = preg_replace('@(\d+)_@is', '', $file);
                     $className = $this->getClassName($getClassName);
 
                     require_once ($file);
 
-                    $capsule = new SchemaCapsule($this->config,$file,$table);
+                    $capsule = new SchemaCapsule($this->config, $file, $table);
 
                     $this->list[$table][] = (new $className)->up($capsule);
 
@@ -51,7 +51,7 @@ 
             }
         }
 
-        app()->register('arguments','connection',$this->schema->getConnection());
+        app()->register('arguments', 'connection', $this->schema->getConnection());
         return $this->processHandler();
     }
 
@@ -60,14 +60,14 @@ 
      * @param $table
      * @return mixed|string
      */
-    public function apply($file,$table)
+    public function apply($file, $table)
     {
-        $getClassName = preg_replace('@(\d+)_@is','',$file);
+        $getClassName = preg_replace('@(\d+)_@is', '', $file);
         $className = $this->getClassName($getClassName);
 
         require_once ($file);
 
-        $capsule = new SchemaCapsule($this->config,$file,$table);
+        $capsule = new SchemaCapsule($this->config, $file, $table);
 
         $this->list[$table][] = (new $className)->up($capsule);
 

src/resta/Contracts/ClientContract.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
      * @param null $default
      * @return mixed
      */
-    public function input($key, $default=null);
+    public function input($key, $default = null);
 
     /**
      * @param $key
@@ -45,7 +45,7 @@ 
      * @param $value
      * @return void
      */
-    public function set($key,$value);
+    public function set($key, $value);
 
     /**
      * @return mixed

src/resta/Client/ClientAnnotationManager.php

Spacing +62 added lines, -62 removed lines

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

      * @param $request

      */

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

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

     {

         parent::__construct($app);

 

@@ -41,7 +41,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);

@@ -66,18 +66,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($this->exceptionParams[$key]['name'].' input value is not valid as format ('.$data.')');

         }

-        else{

+        else {

             //catch exception

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

         }

@@ -90,23 +90,23 @@ 
      */

     private function getException($key)

     {

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

+        if (preg_match('@exception\((.*?)\)|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];

                     }

                 }

@@ -123,37 +123,37 @@ 
     {

         // with the method based regex annotation,

         // we check the rule definition for our requests.

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

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

+        if (preg_match('@regex\((.*?)\)|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){

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

 

-                        if(is_array($this->inputsValue)){

+                        if (is_array($this->inputsValue)) {

 

-                            foreach ($this->inputsValue as $inputsValueKey => $inputsValueItem){

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

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

+                            foreach ($this->inputsValue as $inputsValueKey => $inputsValueItem) {

+                                if (!preg_match('@'.$regex[1].'@is', $inputsValueItem)) {

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

                                 }

                             }

 

                         }

-                        else{

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

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

+                        else {

+                            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]);

                     }

                 }

             }

@@ -168,9 +168,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]);

                 }

             }

@@ -184,33 +184,33 @@ 
      */

     private function getRules($key)

     {

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

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

 

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

 

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

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

-                foreach($rules as $rule){

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

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

+                foreach ($rules as $rule) {

 

-                    $ruleExplode = explode('#',$rule);

+                    $ruleExplode = explode('#', $rule);

                     $rule = $ruleExplode[0];

 

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

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

-                            exception($rule,['key'=>$key.':'.$this->inputs[$key]])

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

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

+                            exception($rule, ['key'=>$key.':'.$this->inputs[$key]])

                                 ->invalidArgument($key.':'.$this->inputs[$key].' input value is not valid for '.$rule.' request rule');

                         }

                     }

 

                     //rule method

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

-                        $this->request->call(function() use($rule,$key,$ruleExplode){

-                            if(method_exists($this,$ruleMethod = '__rule'.ucfirst($rule))){

-                                if(isset($ruleExplode[1])){

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

+                        $this->request->call(function() use($rule, $key, $ruleExplode){

+                            if (method_exists($this, $ruleMethod = '__rule'.ucfirst($rule))) {

+                                if (isset($ruleExplode[1])) {

 

                                     $reValueList = [];

-                                    foreach (explode(',',$ruleExplode[1]) as $reValue){

-                                        $reValueExplode = explode('=',$reValue);

+                                    foreach (explode(',', $ruleExplode[1]) as $reValue) {

+                                        $reValueExplode = explode('=', $reValue);

                                         $reValueListKey = $reValueExplode[0];

                                         $reValueListValue = (isset($reValueExplode[1])) ? $reValueExplode[1] : null;

 

@@ -218,10 +218,10 @@ 
 

                                     }

 

-                                    $this->{$ruleMethod}($key,$this->inputs[$key],$reValueList);

+                                    $this->{$ruleMethod}($key, $this->inputs[$key], $reValueList);

                                 }

-                                else{

-                                    $this->{$ruleMethod}($key,$this->inputs[$key]);

+                                else {

+                                    $this->{$ruleMethod}($key, $this->inputs[$key]);

                                 }

 

                             }

@@ -229,27 +229,27 @@ 
                     }

                 }

             }

-            else{

+            else {

 

-                foreach ($this->inputs[$key] as $ikey=>$input){

+                foreach ($this->inputs[$key] as $ikey=>$input) {

 

-                    if(!is_array($input)){

-                        foreach($rules as $rule){

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

-                                if(!preg_match('@'.$requestRules[$rule].'@',$input)){

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

+                    if (!is_array($input)) {

+                        foreach ($rules as $rule) {

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

+                                if (!preg_match('@'.$requestRules[$rule].'@', $input)) {

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

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

                                 }

                             }

                         }

                     }

-                    else{

+                    else {

 

-                        foreach ($input as $ikey=>$item){

-                            foreach($rules as $rule){

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

-                                    if(!preg_match('@'.$requestRules[$rule].'@',$item)){

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

+                        foreach ($input as $ikey=>$item) {

+                            foreach ($rules as $rule) {

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

+                                    if (!preg_match('@'.$requestRules[$rule].'@', $item)) {

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

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

                                     }

                                 }

Braces +6 added lines, -12 removed lines

@@ -76,8 +76,7 @@ 
             //catch exception

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

                 ->unexpectedValue($this->exceptionParams[$key]['name'].' input value is not valid as format ('.$data.')');

-        }

-        else{

+        } else{

             //catch exception

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

         }

@@ -140,16 +139,14 @@ 
                                 }

                             }

 

-                        }

-                        else{

+                        } else{

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

@@ -219,8 +216,7 @@ 
                                     }

 

                                     $this->{$ruleMethod}($key,$this->inputs[$key],$reValueList);

-                                }

-                                else{

+                                } else{

                                     $this->{$ruleMethod}($key,$this->inputs[$key]);

                                 }

 

@@ -228,8 +224,7 @@ 
                         });

                     }

                 }

-            }

-            else{

+            } else{

 

                 foreach ($this->inputs[$key] as $ikey=>$input){

 

@@ -242,8 +237,7 @@ 
                                 }

                             }

                         }

-                    }

-                    else{

+                    } else{

 

                         foreach ($input as $ikey=>$item){

                             foreach($rules as $rule){