php-resta / resta-core

src/resta/Provider/ServiceProvider.php

Spacing +36 added lines, -36 removed lines

@@ -26,11 +26,11 @@ 
      *

      * @throws FileNotFoundException

      */

-    private function applyProvider($key,$provider,$method='register')

+    private function applyProvider($key, $provider, $method = 'register')

     {

         // If the provider classes are a real object

         // we will run them.

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

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

 

             // after determining whether the register or boot methods

             // we are running the provider.

@@ -38,13 +38,13 @@ 
             $providerInstance = $this->app->resolve($provider);

 

             //we need to do method check for provider.

-            if(method_exists($providerInstance,$method)){

+            if (method_exists($providerInstance, $method)) {

                 $providerInstance->{$method}();

 

-                if($method=="register"){

+                if ($method=="register") {

                     /** @scrutinizer ignore-call */

-                    $this->app->register('loadedProviders',$key,$provider);

-                    $this->deferrableProvider($providerInstance,$provider);

+                    $this->app->register('loadedProviders', $key, $provider);

+                    $this->deferrableProvider($providerInstance, $provider);

                 }

             }

         }

@@ -58,48 +58,48 @@ 
      *

      * @throws FileNotFoundException

      */

-    private function deferrableProvider($providerInstance,$provider)

+    private function deferrableProvider($providerInstance, $provider)

     {

-        if($providerInstance instanceof DeferrableProvider && file_exists(serviceJson())){

+        if ($providerInstance instanceof DeferrableProvider && file_exists(serviceJson())) {

             $deferrableProvides = $providerInstance->provides();

 

             foreach ($deferrableProvides as $deferrableProvide) {

-                if($this->app->has($deferrableProvide)){

+                if ($this->app->has($deferrableProvide)) {

                     JsonHandler::$file = serviceJson();

                     $serviceJson = JsonHandler::get();

 

-                    if(!isset($serviceJson['providers'][$provider])){

-                        JsonHandler::set('providers-deferrable-classes',[

+                    if (!isset($serviceJson['providers'][$provider])) {

+                        JsonHandler::set('providers-deferrable-classes', [

                             $provider => true

                         ]);

 

                         $container = $this->app->get($deferrableProvide);

 

-                        if(!is_array($container)){

+                        if (!is_array($container)) {

 

-                            if($container instanceof \Closure){

-                                JsonHandler::set('container',[

+                            if ($container instanceof \Closure) {

+                                JsonHandler::set('container', [

                                     $deferrableProvide => SuperClosure::set($container)

                                 ]);

 

-                                JsonHandler::set('container-format',[

+                                JsonHandler::set('container-format', [

                                     $deferrableProvide => 'closure'

                                 ]);

                             }

-                            else{

-                                JsonHandler::set('container',[

+                            else {

+                                JsonHandler::set('container', [

                                     $deferrableProvide => $container

                                 ]);

 

-                                JsonHandler::set('container-format',[

+                                JsonHandler::set('container-format', [

                                     $deferrableProvide => 'string'

                                 ]);

                             }

 

                         }

-                        else{

+                        else {

                             foreach ($container as $containerKey=>$containerItem) {

-                                JsonHandler::set('container',[

+                                JsonHandler::set('container', [

                                     $deferrableProvide.'.'.$containerKey => SuperClosure::set($containerItem)

                                 ]);

                             }

@@ -118,12 +118,12 @@ 
      */

     private function assignerLoadedProvidersInitialCoreValue()

     {

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

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

 

             // for loaded providers,

             // we register an empty array for the container object.

             /** @scrutinizer ignore-call */

-            $this->app->register('loadedProviders',[]);

+            $this->app->register('loadedProviders', []);

         }

     }

 

@@ -138,7 +138,7 @@ 
         /** @scrutinizer ignore-call */

         $providers = $this->app->serviceProviders();

 

-        if(count($providers)){

+        if (count($providers)) {

             $this->providers = $providers;

         }

 

@@ -152,7 +152,7 @@ 
      */

     public function handle()

     {

-        define ('serviceprovider',true);

+        define('serviceprovider', true);

 

         //check providers and resolve

         $this->resolveProviders($this->getServiceProviders());

@@ -165,7 +165,7 @@ 
      *

      * @throws FileNotFoundException

      */

-    public function resolveProviders($providers=array())

+    public function resolveProviders($providers = array())

     {

         // for loaded providers,

         // we register an empty array for the container object.

@@ -174,36 +174,36 @@ 
         $serviceJson = [];

 

         //first we are running register methods of provider classes.

-        foreach($providers as $key=>$provider){

+        foreach ($providers as $key=>$provider) {

 

-            if(file_exists(serviceJson())){

+            if (file_exists(serviceJson())) {

                 JsonHandler::$file = serviceJson();

                 $serviceJson = JsonHandler::get();

             }

 

             // providers can only be installed once.

             // apply providers and register for kernel

-            if(!isset($this->app['loadedProviders'][$key])){

+            if (!isset($this->app['loadedProviders'][$key])) {

 

-                if(is_array($provider) && isset($provider['status']) && $provider['status']){

-                    if(!isset($serviceJson['providers-deferrable-classes'][$provider['class']])){

-                        $this->applyProvider($key,$provider['class']);

+                if (is_array($provider) && isset($provider['status']) && $provider['status']) {

+                    if (!isset($serviceJson['providers-deferrable-classes'][$provider['class']])) {

+                        $this->applyProvider($key, $provider['class']);

                     }

 

                 }

-                else{

-                    $this->applyProvider($key,$provider);

+                else {

+                    $this->applyProvider($key, $provider);

                 }

 

             }

         }

 

         //then we are running boot methods of provider classes.

-        foreach($providers as $key=>$provider){

+        foreach ($providers as $key=>$provider) {

 

             //if the providers register is already booted.

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

-                $this->applyProvider($key,$provider,'boot');

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

+                $this->applyProvider($key, $provider, 'boot');

             }

         }

     }

Braces +3 added lines, -6 removed lines

@@ -85,8 +85,7 @@ 
                                 JsonHandler::set('container-format',[

                                     $deferrableProvide => 'closure'

                                 ]);

-                            }

-                            else{

+                            } else{

                                 JsonHandler::set('container',[

                                     $deferrableProvide => $container

                                 ]);

@@ -96,8 +95,7 @@ 
                                 ]);

                             }

 

-                        }

-                        else{

+                        } else{

                             foreach ($container as $containerKey=>$containerItem) {

                                 JsonHandler::set('container',[

                                     $deferrableProvide.'.'.$containerKey => SuperClosure::set($containerItem)

@@ -190,8 +188,7 @@ 
                         $this->applyProvider($key,$provider['class']);

                     }

 

-                }

-                else{

+                } else{

                     $this->applyProvider($key,$provider);

                 }

 

src/resta/Container/ContainerClosureResolver.php

Spacing +3 added lines, -3 removed lines

@@ -18,12 +18,12 @@
      */
     public static function get($key)
     {
-        if(file_exists(serviceJson())){
+        if (file_exists(serviceJson())) {
             JsonHandler::$file = serviceJson();
             $serviceJson = JsonHandler::get();
 
-            if(isset($serviceJson['container'][$key])){
-                if($serviceJson['container-format'][$key]=='string'){
+            if (isset($serviceJson['container'][$key])) {
+                if ($serviceJson['container-format'][$key]=='string') {
                     return $serviceJson['container'][$key];
                 }
                 return SuperClosure::get($serviceJson['container'][$key]);

src/resta/Authenticate/AuthenticateResponse.php

Spacing +7 added lines, -7 removed lines

@@ -24,7 +24,7 @@ 
     {

         // if the status value is true,

         // we send output generated from the token value.

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

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

             $this->setAuthenticateSuccess(true);

             return true;

         }

@@ -40,7 +40,7 @@ 
     {

         // if the status value is true,

         // we send output generated from the token value.

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

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

             return true;

         }

 

@@ -53,11 +53,11 @@ 
      */

     protected function getResult()

     {

-        $result= [];

+        $result = [];

 

         // if the status value is true,

         // we send output generated from the token value.

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

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

             $result['message']                  = 'token success';

             $result['token']                    = $this->params['token'];

 

@@ -78,12 +78,12 @@ 
      *

      * @param bool $value

      */

-    private function setAuthenticateSuccess($value=true)

+    private function setAuthenticateSuccess($value = true)

     {

-        if(app()->has('authenticateSuccess')){

+        if (app()->has('authenticateSuccess')) {

             app()->terminate('authenticateSuccess');

         }

 

-        app()->register('authenticateSuccess',$value);

+        app()->register('authenticateSuccess', $value);

     }

 }
\ No newline at end of file

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

Spacing +11 added lines, -11 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

@@ -46,17 +46,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();

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

@@ -97,11 +97,11 @@ 
         $this->touch['kernel/app']                  = $this->provider().'/AppServiceProvider.php';

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

         $this->touch['kernel/exception']            = $this->provider().'/ExceptionServiceProvider.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';

@@ -142,7 +142,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/Client/ClientAnnotationManager.php

Spacing +52 added lines, -52 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\((.*?)\)\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];

                     }

                 }

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

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

+                    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,42 +184,42 @@ 
      */

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

-                    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]) && !is_array($this->inputs[$key])) {

+                foreach ($rules as $rule) {

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

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

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

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

                         }

                     }

                 }

             }

-            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($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($item.' input value is not valid for '.$rule.' request rule');

                                     }

                                 }

Braces +5 added lines, -10 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])){

@@ -198,8 +195,7 @@ 
                         }

                     }

                 }

-            }

-            else{

+            } else{

 

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

 

@@ -212,8 +208,7 @@ 
                                 }

                             }

                         }

-                    }

-                    else{

+                    } else{

 

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

                             foreach($rules as $rule){