php-resta / resta-core

src/resta/Console/Source/Model/Model.php

Spacing +16 added lines, -16 removed lines

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

      * @var $type

      */

-    public $type='model';

+    public $type = 'model';

 

     /**

      * @var array

@@ -32,17 +32,17 @@ 
     /**

      * @var $commandRule

      */

-    public $commandRule=['model','?table'];

+    public $commandRule = ['model', '?table'];

 

     /**

      * @method create

      * @return mixed

      */

-    public function create(){

+    public function create() {

 

         $this->argument['file'] = $this->argument['model'];

 

-        if(!isset($this->argument['table'])){

+        if (!isset($this->argument['table'])) {

             $this->argument['table'] = $this->argument['file'].'s';

         }

 

@@ -66,11 +66,11 @@ 
         $this->touch['model/builder']   = $this->directory['builderDir'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].'Builder.php';

         $this->touch['model/contract']  = $this->directory['contract'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].'Contract.php';

 

-        if(!file_exists($this->directory['helper'].''.DIRECTORY_SEPARATOR.'Scope.php')){

+        if (!file_exists($this->directory['helper'].''.DIRECTORY_SEPARATOR.'Scope.php')) {

             $this->touch['model/scope'] = $this->directory['helper'].''.DIRECTORY_SEPARATOR.'Scope.php';

         }

 

-        if(!file_exists($this->directory['helper'].''.DIRECTORY_SEPARATOR.'Event.php')){

+        if (!file_exists($this->directory['helper'].''.DIRECTORY_SEPARATOR.'Event.php')) {

             $this->touch['model/event'] = $this->directory['helper'].''.DIRECTORY_SEPARATOR.'Event.php';

         }

 

@@ -78,7 +78,7 @@ 
 

         $entityDir = $this->directory['modelDir'].''.DIRECTORY_SEPARATOR.'Entity';

 

-        if(!file_exists($entityDir)){

+        if (!file_exists($entityDir)) {

             files()->makeDirectory($entityDir);

         }

 

@@ -87,9 +87,9 @@ 
         $entityClass = $entityDir.''.DIRECTORY_SEPARATOR.''.$entityTableName.''.DIRECTORY_SEPARATOR.''.$entityTableName;

 

 

-        $generator = new Generator($entityDir,'EntityMap');

+        $generator = new Generator($entityDir, 'EntityMap');

 

-        if(!file_exists($entityDir.''.DIRECTORY_SEPARATOR.'EntityMap.php')){

+        if (!file_exists($entityDir.''.DIRECTORY_SEPARATOR.'EntityMap.php')) {

 

             //$this->setAnnotations();

             $generator->createClass();

@@ -99,7 +99,7 @@ 
 

         $entityMapNamespaceResolve = new $entityMapNamespace;

 

-        if(!method_exists($entityMapNamespaceResolve,strtolower($this->argument['table']))){

+        if (!method_exists($entityMapNamespaceResolve, strtolower($this->argument['table']))) {

 

             $generator->createClassUse([

                 Utils::getNamespace($entityClass)

@@ -129,15 +129,15 @@ 
 

 

         //set builder map

-        $generator = new Generator($this->directory['builderDir'],'BuilderMap');

+        $generator = new Generator($this->directory['builderDir'], 'BuilderMap');

 

-        if(!file_exists($this->directory['builderDir'].''.DIRECTORY_SEPARATOR.'BuilderMap.php')){

+        if (!file_exists($this->directory['builderDir'].''.DIRECTORY_SEPARATOR.'BuilderMap.php')) {

 

             $this->setAnnotations();

             $generator->createClass();

         }

 

-        if(!file_exists($this->touch['model/model'])){

+        if (!file_exists($this->touch['model/model'])) {

 

             $generator->createMethod([

                 strtolower($this->argument['file'])

@@ -158,7 +158,7 @@ 
         }

 

         //set project touch

-        $this->file->touch($this,[

+        $this->file->touch($this, [

             'stub'=>'Model_Create'

         ]);

 

@@ -169,11 +169,11 @@ 
     /**

      * @return bool

      */

-    private function setAnnotations(){

+    private function setAnnotations() {

 

         $entityMap = app()->path()->model().''.DIRECTORY_SEPARATOR.'Entity'.DIRECTORY_SEPARATOR.'EntityMap.php';

 

-        if(file_exists($entityMap)){

+        if (file_exists($entityMap)) {

 

             Utils::changeClass(path()->serviceAnnotations().'.php',

                 [

src/resta/Support/App.php

Spacing +42 added lines, -42 removed lines

@@ -24,29 +24,29 @@ 
      * @param $arg

      * @return mixed

      */

-    public static function annotationsLoaders($service,$arg)

+    public static function annotationsLoaders($service, $arg)

     {

         //factory runner

-        if($service=="factory"){

+        if ($service=="factory") {

             return self::factory();

         }

         //if $name starts with $needles for repository

-        if(Str::endsWith($service,'Repository')){

+        if (Str::endsWith($service, 'Repository')) {

             return self::repository($service);

         }

 

         //if $name starts with $needles for source

-        if(Str::endsWith($service,'Source')){

-            return self::source($service,$arg);

+        if (Str::endsWith($service, 'Source')) {

+            return self::source($service, $arg);

         }

 

         //if $name starts with $needles for model

-        if(Str::endsWith($service,'Builder')){

+        if (Str::endsWith($service, 'Builder')) {

             return self::Builder(ucfirst($service));

         }

 

 

-        if(method_exists(new self,$service)){

+        if (method_exists(new self, $service)) {

             return self::$service($arg);

         }

 

@@ -88,7 +88,7 @@ 
     private static function builder($service)

     {

         //we are making a namespace assignment for the builder.

-        $builder=app()->namespace()->builder().'\BuilderMap';

+        $builder = app()->namespace()->builder().'\BuilderMap';

 

         //we are getting builder instance.

         return app()->resolve($builder);

@@ -116,16 +116,16 @@ 
      * @param array $bind

      * @return mixed

      */

-    public function container($instance,$class,$bind=array())

+    public function container($instance, $class, $bind = array())

     {

-        if(!property_exists($instance->container(),$class)){

+        if (!property_exists($instance->container(), $class)) {

             throw new \InvalidArgumentException('container object false for ('.$class.') object');

         }

 

-        $container=$instance->container()->{$class};

+        $container = $instance->container()->{$class};

 

-        if(!is_array($instance->container()->{$class}) AND Utils::isNamespaceExists($container)){

-            return $instance->resolve($container,$bind);

+        if (!is_array($instance->container()->{$class}) AND Utils::isNamespaceExists($container)) {

+            return $instance->resolve($container, $bind);

         }

         return $instance->container()->{$class};

     }

@@ -135,8 +135,8 @@ 
      */

     public function createAppInstance($object)

     {

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

-            define('appInstance',(base64_encode(serialize($object))));

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

+            define('appInstance', (base64_encode(serialize($object))));

         }

     }

 

@@ -144,9 +144,9 @@ 
      * @param array $arg

      * @return mixed

      */

-    private static function date($arg=array())

+    private static function date($arg = array())

     {

-        $locale = (count($arg)=="0") ? config('app.locale','en') : current($arg);

+        $locale = (count($arg)=="0") ? config('app.locale', 'en') : current($arg);

 

         return app()->resolve(Date::class)->setLocale($locale);

     }

@@ -166,8 +166,8 @@ 
     {

         //we save an instance for the entire application

         //and add it to the helper file to be accessed from anywhere in the application.

-        if(!isset(self::$instance['appInstance'])){

-            self::$instance['appInstance']=unserialize(base64_decode(appInstance));

+        if (!isset(self::$instance['appInstance'])) {

+            self::$instance['appInstance'] = unserialize(base64_decode(appInstance));

             return self::$instance['appInstance'];

         }

         return self::$instance['appInstance'];

@@ -194,9 +194,9 @@ 
      */

     private static function queue()

     {

-        if(!isset(self::$instance['queue'])){

+        if (!isset(self::$instance['queue'])) {

 

-            self::$instance['queue']=(new Queue());

+            self::$instance['queue'] = (new Queue());

             return self::$instance['queue'];

 

         }

@@ -208,18 +208,18 @@ 
      * @param bool $namespace

      * @return string

      */

-    public static function repository($service,$namespace=false)

+    public static function repository($service, $namespace = false)

     {

         //I can get the repository name from the magic method as a salt repository,

         //after which we will edit it as an adapter namespace.

-        $repositoryName=ucfirst(preg_replace('@Repository@is','',$service));

+        $repositoryName = ucfirst(preg_replace('@Repository@is', '', $service));

 

         //If we then configure the name of the simple repository to be an adapter

         //then we will give the user an example of the adapter class in each repository call.

         $repositoryAdapterName  = $repositoryName.'Adapter';

         $repositoryNamespace    = app()->namespace()->repository().'\\'.$repositoryName.'\\'.$repositoryAdapterName;

 

-        if($namespace) return $repositoryNamespace;

+        if ($namespace) return $repositoryNamespace;

 

         //and eventually we conclude the adapter class of the repository package as an instance.

         return app()->resolve($repositoryNamespace)->adapter();

@@ -230,17 +230,17 @@ 
      * @param $arg

      * @return mixed

      */

-    private static function source($service,$arg)

+    private static function source($service, $arg)

     {

         //get Source path

-        $service=ucfirst($service);

-        $getCalledClass=str_replace('\\'.class_basename($arg[0]),'',get_class($arg[0]));

-        $getCalledClass=class_basename($getCalledClass);

+        $service = ucfirst($service);

+        $getCalledClass = str_replace('\\'.class_basename($arg[0]), '', get_class($arg[0]));

+        $getCalledClass = class_basename($getCalledClass);

 

-        $service=str_replace($getCalledClass,'',$service);

+        $service = str_replace($getCalledClass, '', $service);

 

         //run service for endpoint

-        $serviceSource=StaticPathModel::appSourceEndpoint().'\\'.$getCalledClass.'\\'.$service.'\Main';

+        $serviceSource = StaticPathModel::appSourceEndpoint().'\\'.$getCalledClass.'\\'.$service.'\Main';

         return app()->resolve($serviceSource);

     }

 

@@ -249,9 +249,9 @@ 
      */

     public static function redis()

     {

-        if(!isset(self::$instance['redis'])){

+        if (!isset(self::$instance['redis'])) {

 

-            self::$instance['redis']=(new Redis())->client();

+            self::$instance['redis'] = (new Redis())->client();

             return self::$instance['redis'];

 

         }

@@ -262,13 +262,13 @@ 
      * @param null $param

      * @return array|null|string

      */

-    public function route($param=null)

+    public function route($param = null)

     {

-        $kernel=self::getAppInstance()->kernel;

+        $kernel = self::getAppInstance()->kernel;

 

-        $saltRouteParameters=$kernel->routeParameters;

+        $saltRouteParameters = $kernel->routeParameters;

 

-        if($param===null){

+        if ($param===null) {

             return $saltRouteParameters;

         }

 

@@ -284,20 +284,20 @@ 
      * @param array $select

      * @return mixed|string

      */

-    public function translator($data,$select=array())

+    public function translator($data, $select = array())

     {

-        $lang=(new Lingua(path()->appLanguage()));

+        $lang = (new Lingua(path()->appLanguage()));

 

-        if(self::app()->has('locale')){

+        if (self::app()->has('locale')) {

             $defaultLocale = self::app()->get('locale');

         }

-        else{

+        else {

             $defaultLocale = config('app.locale');

         }

 

 

-        if(count($select)){

-            return $lang->include(['default'])->locale($defaultLocale)->get($data,$select);

+        if (count($select)) {

+            return $lang->include(['default'])->locale($defaultLocale)->get($data, $select);

         }

 

         return $lang->include(['default'])->locale($defaultLocale)->get($data);

Braces +4 added lines, -3 removed lines

@@ -219,7 +219,9 @@ 
         $repositoryAdapterName  = $repositoryName.'Adapter';

         $repositoryNamespace    = app()->namespace()->repository().'\\'.$repositoryName.'\\'.$repositoryAdapterName;

 

-        if($namespace) return $repositoryNamespace;

+        if($namespace) {

+            return $repositoryNamespace;

+        }

 

         //and eventually we conclude the adapter class of the repository package as an instance.

         return app()->resolve($repositoryNamespace)->adapter();

@@ -290,8 +292,7 @@ 
 

         if(self::app()->has('locale')){

             $defaultLocale = self::app()->get('locale');

-        }

-        else{

+        } else{

             $defaultLocale = config('app.locale');

         }

 

src/resta/Contracts/RequestContract.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
      * @param null $default
      * @return mixed
      */
-    public function input($key, $default=null);
+    public function input($key, $default = null);
 
     /**
      * @param $key

src/resta/Foundation/PathManager/StaticPathList.php

Spacing +50 added lines, -50 removed lines

@@ -7,251 +7,251 @@
     /**

      * @var string

      */

-    public static $appDefine='src';

+    public static $appDefine = 'src';

 

     /**

      * @var string

      */

-    public static $autoloadNamespace='App';

+    public static $autoloadNamespace = 'App';

 

     /**

      * @var string

      */

-    public static $projectPrefixGroup='Api';

+    public static $projectPrefixGroup = 'Api';

 

     /**

      * @var string

      */

-    public static $methodPrefix='Action';

+    public static $methodPrefix = 'Action';

 

     /**

      * @var string

      */

-    public static $callClassPrefix='Controller';

+    public static $callClassPrefix = 'Controller';

 

     /**

      * @var string

      */

-    public static $controllerBundleName='';

+    public static $controllerBundleName = '';

 

     /**

      * @var string

      */

-    public static $resourceInController='Resource';

+    public static $resourceInController = 'Resource';

 

     /**

      * @var string

      */

-    public static $configurationInController='Config';

+    public static $configurationInController = 'Config';

 

     /**

      * @var null

      */

-    public static $appPath=null;

+    public static $appPath = null;

 

     /**

      * @var string

      */

-    public static $kernel='Kernel';

+    public static $kernel = 'Kernel';

 

     /**

      * @var string

      */

-    public static $repository='Repository';

+    public static $repository = 'Repository';

 

     /**

      * @var string

      */

-    public static $listener='Listener';

+    public static $listener = 'Listener';

 

     /**

      * @var string

      */

-    public static $serviceAnnotations='ServiceAnnotationsManager';

+    public static $serviceAnnotations = 'ServiceAnnotationsManager';

 

     /**

      * @var string

      */

-    public static $serviceMiddleware='ServiceMiddlewareManager';

+    public static $serviceMiddleware = 'ServiceMiddlewareManager';

 

     /**

      * @var string

      */

-    public static $storage='Storage';

+    public static $storage = 'Storage';

 

     /**

      * @var string

      */

-    public static $controller='Controllers';

+    public static $controller = 'Controllers';

 

     /**

      * @var string

      */

-    public static $platform='__Platform';

+    public static $platform = '__Platform';

 

     /**

      * @var string

      */

-    public static $sourcePath='Source';

+    public static $sourcePath = 'Source';

 

     /**

      * @var string

      */

-    public static $sourceRequest='Client';

+    public static $sourceRequest = 'Client';

 

     /**

      * @var string

      */

-    public static $model='Model';

+    public static $model = 'Model';

 

     /**

      * @var string

      */

-    public static $builder='Builder';

+    public static $builder = 'Builder';

 

     /**

      * @var string

      */

-    public static $migration='Migrations';

+    public static $migration = 'Migrations';

 

     /**

      * @var string

      */

-    public static $config='Config';

+    public static $config = 'Config';

 

     /**

      * @var string

      */

-    public static $helpers='Helpers';

+    public static $helpers = 'Helpers';

 

     /**

      * @var string

      */

-    public static $test='Tests';

+    public static $test = 'Tests';

 

     /**

      * @var string

      */

-    public static $workers='Workers';

+    public static $workers = 'Workers';

 

 

     /**

      * @var string

      */

-    public static $optional='Optional';

+    public static $optional = 'Optional';

 

     /**

      * @var string

      */

-    public static $events='Events';

+    public static $events = 'Events';

 

     /**

      * @var string

      */

-    public static $listeners='Listeners';

+    public static $listeners = 'Listeners';

 

     /**

      * @var string

      */

-    public static $subscribers='Subscribers';

+    public static $subscribers = 'Subscribers';

 

     /**

      * @var string

      */

-    public static $exception='Exceptions';

+    public static $exception = 'Exceptions';

 

     /**

      * @var string

      */

-    public static $job='Job';

+    public static $job = 'Job';

 

 

     /**

      * @var string

      */

-    public static $webservice='Webservice';

+    public static $webservice = 'Webservice';

 

     /**

      * @var string

      */

-    public static $log='Log';

+    public static $log = 'Log';

 

     /**

      * @var string

      */

-    public static $resource='Resource';

+    public static $resource = 'Resource';

 

     /**

      * @var string

      */

-    public static $cache='Cache';

+    public static $cache = 'Cache';

 

     /**

      * @var string

      */

-    public static $language='Language';

+    public static $language = 'Language';

     /**

      * @var string

      */

-    public static $session='Session';

+    public static $session = 'Session';

 

     /**

      * @var string

      */

-    public static $middleware='Middleware';

+    public static $middleware = 'Middleware';

 

     /**

      * @var string

      */

-    public static $route='Routes';

+    public static $route = 'Routes';

 

     /**

      * @var string

      */

-    public static $request='Client';

+    public static $request = 'Client';

 

     /**

      * @var string

      */

-    public static $factory='Factory';

+    public static $factory = 'Factory';

 

     /**

      * @var string

      */

-    public static $node='Node';

+    public static $node = 'Node';

 

     /**

      * @var string

      */

-    public static $provider='Providers';

+    public static $provider = 'Providers';

 

     /**

      * @var string

      */

-    public static $once='Once';

+    public static $once = 'Once';

 

     /**

      * @var string

      */

-    public static $command='Command';

+    public static $command = 'Command';

 

     /**

      * @var string

      */

-    public static $stub='Stub';

+    public static $stub = 'Stub';

 

     /**

      * @var string

      */

-    public static $store='Store';

+    public static $store = 'Store';

 

     /**

      * @var string

      */

-    public static $boot='Boot';

+    public static $boot = 'Boot';

 

     /**

      * @var string

      */

-    public static $autoService='Autoservice';

+    public static $autoService = 'Autoservice';

 }
\ No newline at end of file

src/resta/Client/ClientAbstract.php

Spacing +5 added lines, -5 removed lines

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

     protected function getAutoGenerators()

     {

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

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

             return $this->auto_generators;

         }

         return [];

@@ -45,7 +45,7 @@ 
      */

     protected function getAutoGeneratorsDontOverwrite()

     {

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

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

             return $this->auto_generators_dont_overwrite;

         }

         return [];

@@ -59,7 +59,7 @@ 
      */

     protected function getClientObjects()

     {

-        return array_diff_key($this->getObjects(),['inputs'=>[]]);

+        return array_diff_key($this->getObjects(), ['inputs'=>[]]);

     }

 

     /**

@@ -69,7 +69,7 @@ 
      */

     protected function getGenerators()

     {

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

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

             return $this->generators;

         }

         return [];

@@ -83,7 +83,7 @@ 
      */

     protected function getGeneratorsDontOverwrite()

     {

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

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

             return $this->generators_dont_overwrite;

         }

         return [];

src/resta/Client/Client.php

Braces +2 added lines, -4 removed lines

@@ -237,8 +237,7 @@ 
                 if(!isset($this->inputs[$generator])){

                     $this->{$generator} = $this->{$generatorMethodName}();

                     $this->inputs[$generator] = $this->{$generatorMethodName}();

-                }

-                else {

+                } else {

 

                     if($this->checkProperties('auto_generators_dont_overwrite')

                         && in_array($generator,$this->getAutoGeneratorsDontOverwrite())){

@@ -395,8 +394,7 @@ 
                     $keyMethod              = $this->{$method}();

                     $this->inputs[$key][]   = $keyMethod;

                 }

-            }

-            else{

+            } else{

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

                     $keyMethod = $this->{$method}();

                     $this->inputs[$key] = $keyMethod;

Spacing +58 added lines, -58 removed lines

@@ -46,7 +46,7 @@ 
      *

      * @throws ReflectionExceptionAlias

      */

-    public function __construct($clientData=null)

+    public function __construct($clientData = null)

     {

         //reflection process

         $this->reflection = app()['reflection']($this);

@@ -69,25 +69,25 @@ 
     private function autoValidate($validate)

     {

         //we get the values ​​to auto-validate.

-        foreach ($this->{$validate} as $object=>$datas){

+        foreach ($this->{$validate} as $object=>$datas) {

 

             // the auto-validate value must necessarily represent a class.

             // otherwise auto-validate is not used.

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

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

                 $getObjectInstance = app()->resolve($object);

 

                 // we get the index values,

                 // which are called methods of the auto-validate value that represents the class.

-                foreach ($datas as $dataKey=>$data){

+                foreach ($datas as $dataKey=>$data) {

 

                     // if the methods of the auto-validate class resolved by the container resolve method apply,

                     // the process of auto-validate automatic implementation will be completed.

-                    if(is_numeric($dataKey) && method_exists($getObjectInstance,$data)){

-                        if(isset($this->origin[$data])){

-                            if(!is_array($this->origin[$data])){

+                    if (is_numeric($dataKey) && method_exists($getObjectInstance, $data)) {

+                        if (isset($this->origin[$data])) {

+                            if (!is_array($this->origin[$data])) {

                                 $this->origin[$data] = array($this->origin[$data]);

                             }

-                            foreach ($this->origin[$data] as $originData){

+                            foreach ($this->origin[$data] as $originData) {

                                 $getObjectInstance->{$data}($originData);

                             }

                         }

@@ -106,15 +106,15 @@ 
     {

         // expected method is executed.

         // this method is a must for http method values to be found in this property.

-        if($this->checkProperties('capsule')){

+        if ($this->checkProperties('capsule')) {

 

             $caret = $this->capsuleCaret();

 

-            foreach($this->inputs as $input=>$value){

+            foreach ($this->inputs as $input=>$value) {

 

-                if(isset($caret[$input]) || (

-                        $this->checkProperties('capsule') && !in_array($input,$this->capsule)

-                    )){

+                if (isset($caret[$input]) || (

+                        $this->checkProperties('capsule') && !in_array($input, $this->capsule)

+                    )) {

                     exception('capsuleRequestException')

                         ->overflow('The '.$input.' value cannot be sent.');

                 }

@@ -131,15 +131,15 @@ 
     {

         $caret = [];

 

-        foreach($this->inputs as $input=>$item){

-            if(in_array('@'.$input,$this->capsule)){

+        foreach ($this->inputs as $input=>$item) {

+            if (in_array('@'.$input, $this->capsule)) {

                 $caret[$input] = $item;

             }

         }

 

         foreach ($this->capsule as $item) {

-            if(preg_match('#@.*#is',$item)){

-                $this->capsule = array_diff($this->capsule,[$item]);

+            if (preg_match('#@.*#is', $item)) {

+                $this->capsule = array_diff($this->capsule, [$item]);

             }

         }

 

@@ -158,15 +158,15 @@ 
 

         // Determines which HTTP method

         // the request object will be exposed to.

-        if($this->checkProperties('http')){

+        if ($this->checkProperties('http')) {

 

             // if the current http method does not exist

             // in the http object, the exception will be thrown.

-            if(!in_array($method,$this->http)){

+            if (!in_array($method, $this->http)) {

 

                 //exception batMethodCall

                 exception()->badMethodCall(

-                    'Invalid http method process for '.class_basename($this).'.That is accepted http methods ['.implode(",",$this->http).'] ');

+                    'Invalid http method process for '.class_basename($this).'.That is accepted http methods ['.implode(",", $this->http).'] ');

             }

         }

     }

@@ -181,7 +181,7 @@ 
     {

         // from the properties of the object properties to

         // the existing variables, control the array and at least one element.

-        return (property_exists($this,$properties)

+        return (property_exists($this, $properties)

             && is_array($this->{$properties}) && count($this->{$properties})) ? true : false;

     }

 

@@ -194,7 +194,7 @@ 
     {

         // we are saving the expected values ​​for the request in container.

         // this record can be returned in exception information.

-        app()->register('requestExpected',$this->expected);

+        app()->register('requestExpected', $this->expected);

     }

 

     /**

@@ -206,15 +206,15 @@ 
     public function except($except)

     {

         // the except parameter is a callable value.

-        if(is_callable($except)){

-            $call = call_user_func_array($except,[$this]);

+        if (is_callable($except)) {

+            $call = call_user_func_array($except, [$this]);

             $except = $call;

         }

 

         // except with the except exceptions property

         // and then assigning them to the inputs property.

-        $this->except = array_merge($this->except,$except);

-        $this->inputs = array_diff_key($this->inputs,array_flip($this->except));

+        $this->except = array_merge($this->except, $except);

+        $this->inputs = array_diff_key($this->inputs, array_flip($this->except));

 

         return $this;

     }

@@ -228,27 +228,27 @@ 
     {

         // expected method is executed.

         // this method is a must for http method values to be found in this property.

-        if($this->checkProperties('expected')){

+        if ($this->checkProperties('expected')) {

 

             // if the expected values are not found in the inputs array,

             // the exception will be thrown.

-            foreach ($this->expected as $expected){

+            foreach ($this->expected as $expected) {

 

                 $expectedValues = [];

 

                 // mandatory expected data for each key can be separated by | operator.

                 // this is evaluated as "or".

-                foreach($expectedData = explode("|",$expected) as $inputs){

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

+                foreach ($expectedData = explode("|", $expected) as $inputs) {

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

                         $expectedValues[] = $inputs;

                     }

                 }

 

                 // if the expectedData and expectedValues ​​

                 // array are numerically equal to the expected key, the exception is thrown.

-                if(count($expectedData)===count($expectedValues)){

+                if (count($expectedData)===count($expectedValues)) {

                     exception($expected)

-                        ->unexpectedValue('You absolutely have to send the value '.implode(" or ",$expectedValues).' for request object');

+                        ->unexpectedValue('You absolutely have to send the value '.implode(" or ", $expectedValues).' for request object');

                 }

             }

         }

@@ -263,17 +263,17 @@ 
     {

         // check the presence of the generator object

         // and operate the generator over this object.

-        if($this->checkProperties('auto_generators')){

+        if ($this->checkProperties('auto_generators')) {

             $generators = $this->getAutoGenerators();

         }

 

         // check the presence of the generator object

         // and operate the generator over this object.

-        if($this->checkProperties('generators')){

-            $generators = array_merge(isset($generators) ? $generators: [],$this->getGenerators());

+        if ($this->checkProperties('generators')) {

+            $generators = array_merge(isset($generators) ? $generators : [], $this->getGenerators());

         }

 

-        if(isset($generators)){

+        if (isset($generators)) {

             $this->generatorMethod($generators);

         }

     }

@@ -288,30 +288,30 @@ 
     private function generatorMethod($generators)

     {

         //generator array object

-        foreach ($generators as $generator){

+        foreach ($generators as $generator) {

 

             //generator method name

             $generatorMethodName = $generator.'Generator';

 

             // if the generator method is present,

             // the fake value is assigned.

-            if(method_exists($this,$generatorMethodName)){

+            if (method_exists($this, $generatorMethodName)) {

 

                 //fake registration

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

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

                     $this->{$generator} = $this->{$generatorMethodName}();

                     $this->inputs[$generator] = $this->{$generatorMethodName}();

                 }

                 else {

 

-                    if($this->checkProperties('auto_generators_dont_overwrite')

-                        && in_array($generator,$this->getAutoGeneratorsDontOverwrite())){

+                    if ($this->checkProperties('auto_generators_dont_overwrite')

+                        && in_array($generator, $this->getAutoGeneratorsDontOverwrite())) {

                         $this->{$generator} = $this->{$generatorMethodName}();

                         $this->inputs[$generator] = $this->{$generatorMethodName}();

                     }

 

-                    if($this->checkProperties('generators_dont_overwrite')

-                        && in_array($generator,$this->getGeneratorsDontOverwrite())){

+                    if ($this->checkProperties('generators_dont_overwrite')

+                        && in_array($generator, $this->getGeneratorsDontOverwrite())) {

                         $this->{$generator} = $this->{$generatorMethodName}();

                         $this->inputs[$generator] = $this->{$generatorMethodName}();

                     }

@@ -358,7 +358,7 @@ 
     {

         // we use the http method to write

         // the values to the inputs and origin properties.

-        foreach($this->clientData as $key=>$value){

+        foreach ($this->clientData as $key=>$value) {

 

             //inputs and origin properties

             $this->inputs[$key] = $value;

@@ -405,9 +405,9 @@ 
 

         // we update the input values ​​after

         // we receive and check the saved objects.

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

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

 

-            if(isset($clientObjects['origin'][$key])){

+            if (isset($clientObjects['origin'][$key])) {

 

                 $this->{$key} = $clientObjects['origin'][$key];

                 $this->inputs[$key] = $this->{$key};

@@ -434,11 +434,11 @@ 
 

         // the request update to be performed using

         // the method name to be used with the http method.

-        $this->setRequestInputs($requestMethod,$key);

+        $this->setRequestInputs($requestMethod, $key);

 

         // the request update to be performed using

         // the method name to be used without the http method.

-        $this->setRequestInputs($key,$key);

+        $this->setRequestInputs($key, $key);

     }

 

     /**

@@ -449,28 +449,28 @@ 
      *

      * @throws ReflectionExceptionAlias

      */

-    private function setRequestInputs($method,$key)

+    private function setRequestInputs($method, $key)

     {

-        if(method_exists($this,$method) && $this->reflection->reflectionMethodParams($method)->isProtected){

+        if (method_exists($this, $method) && $this->reflection->reflectionMethodParams($method)->isProtected) {

 

             //check annotations for method

-            $annotation = app()->resolve(ClientAnnotationManager::class,['request'=>$this]);

-            $annotation->annotation($method,$key);

+            $annotation = app()->resolve(ClientAnnotationManager::class, ['request'=>$this]);

+            $annotation->annotation($method, $key);

 

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

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

 

                 $inputKeys = $this->inputs[$key];

 

                 $this->inputs[$key] = [];

-                foreach ($inputKeys as $input){

+                foreach ($inputKeys as $input) {

 

                     $this->{$key}           = $input;

                     $keyMethod              = $this->{$method}();

                     $this->inputs[$key][]   = $keyMethod;

                 }

             }

-            else{

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

+            else {

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

                     $keyMethod = $this->{$method}();

                     $this->inputs[$key] = $keyMethod;

                 }

@@ -488,8 +488,8 @@ 
     {

         // the auto object validate property is the property

         // where all of your request values ​​are automatically validated.

-        if(property_exists($this,'autoObjectValidate')

-            && is_array($this->autoObjectValidate) && count($this->autoObjectValidate)){

+        if (property_exists($this, 'autoObjectValidate')

+            && is_array($this->autoObjectValidate) && count($this->autoObjectValidate)) {

             $this->autoValidate('autoObjectValidate');

         }

     }

src/resta/Client/ClientAnnotationManager.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');

                         }

                     }

Braces +2 added lines, -4 removed lines

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

             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.')');

         }

@@ -128,8 +127,7 @@ 
                             $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])){

src/resta/Client/ClientAnnotationAbstract.php

Spacing +2 added lines, -2 removed lines

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

      * @return mixed

      */

-    abstract function annotation($method,$key);

+    abstract function annotation($method, $key);

 

     /**

      * get input values from request object

@@ -52,7 +52,7 @@ 
      *

      * @param $reflection

      */

-    public function setReflection($reflection){

+    public function setReflection($reflection) {

 

         $this->request = ClosureDispatcher::bind($reflection);

     }

src/resta/Client/ClientHttpManager.php

Spacing +2 added lines, -2 removed lines

@@ -33,9 +33,9 @@
     {

         $inputs = $this->app->get($this->method);

 

-        $content = json_decode($this->app['request']->getContent(),1);

+        $content = json_decode($this->app['request']->getContent(), 1);

 

-        if(is_array($inputs) && count($inputs)){

+        if (is_array($inputs) && count($inputs)) {

             return $inputs;

         }