Inspection of "device token fix" - php-resta/resta-core - Measure and Improve Code Quality continuously with Scrutinizer

Test Failed

Push — master ( ba32c2...afae9d )

by Php Easy Api

created 2019-11-27 09:52 UTC

Status

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -7,11 +7,11 @@
 block discarded – undo
     /**
      * @return void
      */
-    public function command() : void ;
+    public function command() : void;
 
     /**
      * @param ScheduleInterface $schedule
      * @return void
      */
-    public function when(ScheduleInterface $schedule) : void ;
+    public function when(ScheduleInterface $schedule) : void;
 }
\ No newline at end of file

Please login to merge, or discard this patch.

src/resta/Foundation/PathManager/StaticPathList.php 1 patch

Spacing +51 added lines, -51 removed lines patch added patch discarded remove patch

@@ -7,256 +7,256 @@
 block discarded – undo
     /**
      * @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 $schedule='Schedule';
+    public static $schedule = 'Schedule';
 
 
     /**
      * @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

Please login to merge, or discard this patch.

src/resta/Console/Source/Track/Track.php 2 patches

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -29,15 +29,15 @@  discard block
 block discarded – undo
      */
     public function log()
     {
-        if(app()->has('track.path')){
+        if (app()->has('track.path')) {
             $trackPath = app()->get('track.path');
             $logger = $trackPath($this->argument);
         }
-        else{
+        else {
             $logger = app()->path()->appLog().''.DIRECTORY_SEPARATOR.''.date('Y').''.DIRECTORY_SEPARATOR.''.date('m').''.DIRECTORY_SEPARATOR.''.date('d').'-access.log';
         }
 
-        if(!file_exists($logger)){
+        if (!file_exists($logger)) {
             echo 'No requests for a log tracker have been detected yet.';
             echo PHP_EOL;
             exit();
@@ -53,18 +53,18 @@  discard block
 block discarded – undo
         while (!feof($proc))
         {
             $result = fread($proc, 4096);
-            if(preg_match('@\{(.*)\}@',$result,$output)){
-                $outputArray = json_decode($output[0],1);
+            if (preg_match('@\{(.*)\}@', $result, $output)) {
+                $outputArray = json_decode($output[0], 1);
 
                 $outputArray['trackNumber'] = ++$number;
 
-                if(app()->has('track.log')){
+                if (app()->has('track.log')) {
 
                     $track = app()->get('track.log');
-                    echo $track($outputArray,$this->argument);
+                    echo $track($outputArray, $this->argument);
                 }
             }
-            else{
+            else {
                 echo $result;
             }
             @ flush();

Please login to merge, or discard this patch.

Braces +2 added lines, -4 removed lines patch added patch discarded remove patch

@@ -32,8 +32,7 @@  discard block
 block discarded – undo
         if(app()->has('track.path')){
             $trackPath = app()->get('track.path');
             $logger = $trackPath($this->argument);
-        }
-        else{
+        } else{
             $logger = app()->path()->appLog().''.DIRECTORY_SEPARATOR.''.date('Y').''.DIRECTORY_SEPARATOR.''.date('m').''.DIRECTORY_SEPARATOR.''.date('d').'-access.log';
         }
 
@@ -63,8 +62,7 @@  discard block
 block discarded – undo
                     $track = app()->get('track.log');
                     echo $track($outputArray,$this->argument);
                 }
-            }
-            else{
+            } else{
                 echo $result;
             }
             @ flush();

Please login to merge, or discard this patch.

src/resta/Support/SuperClosure.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -16,7 +16,7 @@  discard block
 block discarded – undo
      */
     public static function getInstance()
     {
-        if(is_null(self::$singleton)){
+        if (is_null(self::$singleton)) {
             self::$singleton = new Serializer();
         }
 
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
 
     public static function set($data)
     {
-        if(is_callable($data)){
+        if (is_callable($data)) {
             return self::getInstance()->serialize($data);
         }
         return self::getInstance()->serialize(function() use ($data){

Please login to merge, or discard this patch.

src/resta/Authenticate/Resource/AuthLoginCredentialsManager.php 1 patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -31,7 +31,7 @@  discard block
 block discarded – undo
      * @param $credentials
      * @param null|AuthLoginManager $manager
      */
-    public function __construct($credentials,$manager)
+    public function __construct($credentials, $manager)
     {
         //get credentials as default
         $this->credentials = $credentials;
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
         //get credential hash
         $this->setCredentialHash();
 
-        if($this->manager->getUsing()===false){
+        if ($this->manager->getUsing()===false) {
 
             // the request object will help you process
             // the credentials and get them correctly.
@@ -92,13 +92,13 @@  discard block
 block discarded – undo
      */
     public function getRequest()
     {
-        if(!is_null($clientProvider = $this->manager->getAuth()->provider('client'))){
+        if (!is_null($clientProvider = $this->manager->getAuth()->provider('client'))) {
             return $clientProvider();
         }
 
         $request = $this->manager->getAuth()->getRequest();
 
-        if($request=='Default'){
+        if ($request=='Default') {
             return new AuthenticateRequest($this);
         }
 
@@ -126,8 +126,8 @@  discard block
 block discarded – undo
     private function setCredentialHash()
     {
         //set credential hash
-        if(count($this->credentials)){
-            $this->credentialHash = md5(sha1(implode("|",$this->credentials)));
+        if (count($this->credentials)) {
+            $this->credentialHash = md5(sha1(implode("|", $this->credentials)));
         }
     }
 }
\ No newline at end of file

Please login to merge, or discard this patch.

src/resta/Authenticate/AuthenticateRequest.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -44,7 +44,7 @@
 block discarded – undo
         $this->credentials = $credentials;
 
         //credentials loop for expected property
-        foreach ($this->credentials->get() as $credential){
+        foreach ($this->credentials->get() as $credential) {
             $this->capsule[] = $credential;
             $this->expected[] = $credential;
         }

Please login to merge, or discard this patch.

src/resta/Client/ClientHttpManager.php 2 patches

Braces +6 added lines, -3 removed lines patch added patch discarded remove patch

@@ -84,8 +84,9 @@  discard block
 block discarded – undo
 
         /* Read the data 1 KB at a time
            and write to the file */
-        while ($chunk = fread($putdata, 1024))
-            $raw_data .= $chunk;
+        while ($chunk = fread($putdata, 1024)) {
+                    $raw_data .= $chunk;
+        }
 
         /* Close the streams */
         fclose($putdata);
@@ -105,7 +106,9 @@  discard block
 block discarded – undo
 
         foreach ($parts as $part) {
             // If this is the last part, break
-            if ($part == "--\r\n") break;
+            if ($part == "--\r\n") {
+                break;
+            }
 
             // Separate content from headers
             $part = ltrim($part, "\r\n");

Please login to merge, or discard this patch.

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -38,26 +38,26 @@  discard block
 block discarded – undo
      */
     public function resolve()
     {
-        if($this->app->has('clientReset')){
+        if ($this->app->has('clientReset')) {
             $this->app->terminate('clientReset');
             return [];
         }
 
         $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)) {
 
-            if(isset($inputs[$this->client->getClientName()])){
+            if (isset($inputs[$this->client->getClientName()])) {
                 return $inputs[$this->client->getClientName()];
             }
             return $inputs;
         }
 
-        if(is_array($content)){
+        if (is_array($content)) {
 
-            if(isset($content[$this->client->getClientName()])){
+            if (isset($content[$this->client->getClientName()])) {
                 return $content[$this->client->getClientName()];
             }
             return $content;
@@ -65,8 +65,8 @@  discard block
 block discarded – undo
 
         $this->inputVars();
 
-        if(is_array($GLOBALS[ '_PUT' ])){
-            return $GLOBALS[ '_PUT' ];
+        if (is_array($GLOBALS['_PUT'])) {
+            return $GLOBALS['_PUT'];
         }
 
         return [];
@@ -96,9 +96,9 @@  discard block
 block discarded – undo
         // Fetch content and determine boundary
         $boundary = substr($raw_data, 0, strpos($raw_data, "\r\n"));
 
-        if(empty($boundary)){
-            parse_str($raw_data,$data);
-            $GLOBALS[ '_PUT' ] = $data;
+        if (empty($boundary)) {
+            parse_str($raw_data, $data);
+            $GLOBALS['_PUT'] = $data;
             return;
         }
 
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
 
         foreach ($parts as $part) {
             // If this is the last part, break
-            if ($part == "--\r\n") break;
+            if ($part=="--\r\n") break;
 
             // Separate content from headers
             $part = ltrim($part, "\r\n");
@@ -135,10 +135,10 @@  discard block
 block discarded – undo
                 list(, $type, $name) = $matches;
 
                 //Parse File
-                if( isset($matches[4]) )
+                if (isset($matches[4]))
                 {
                     //if labeled the same as previous, skip
-                    if( isset( $_FILES[ $matches[ 2 ] ] ) )
+                    if (isset($_FILES[$matches[2]]))
                     {
                         continue;
                     }
@@ -147,16 +147,16 @@  discard block
 block discarded – undo
                     $filename = $matches[4];
 
                     //get tmp name
-                    $filename_parts = pathinfo( $filename );
-                    $tmp_name = tempnam( ini_get('upload_tmp_dir'), $filename_parts['filename']);
+                    $filename_parts = pathinfo($filename);
+                    $tmp_name = tempnam(ini_get('upload_tmp_dir'), $filename_parts['filename']);
 
                     //populate $_FILES with information, size may be off in multibyte situation
                     /** @noinspection PhpUndefinedVariableInspection */
-                    $_FILES[ $matches[ 2 ] ] = array(
+                    $_FILES[$matches[2]] = array(
                         'error'=>0,
                         'name'=>$filename,
                         'tmp_name'=>$tmp_name,
-                        'size'=>strlen( $body ),
+                        'size'=>strlen($body),
                         'type'=>$value
                     );
 
@@ -166,12 +166,12 @@  discard block
 block discarded – undo
                 //Parse Field
                 else
                 {
-                    $data[$name] = substr($body, 0, strlen($body) - 2);
+                    $data[$name] = substr($body, 0, strlen($body)-2);
                 }
             }
 
         }
-        $GLOBALS[ '_PUT' ] = $data;
+        $GLOBALS['_PUT'] = $data;
         return;
     }
 

Please login to merge, or discard this patch.

src/resta/Client/ClientAnnotationManager.php 2 patches

Braces +5 added lines, -10 removed lines patch added patch discarded remove patch

@@ -76,8 +76,7 @@  discard block
 block discarded – undo
             //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 @@  discard block
 block discarded – undo
                                 }
                             }
 
-                        }
-                        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 @@  discard block
 block discarded – undo
                         }
                     }
                 }
-            }
-            else{
+            } else{
 
                 foreach ($this->inputs[$key] as $ikey=>$input){
 
@@ -212,8 +208,7 @@  discard block
 block discarded – undo
                                 }
                             }
                         }
-                    }
-                    else{
+                    } else{
 
                         foreach ($input as $ikey=>$item){
                             foreach($rules as $rule){

Please login to merge, or discard this patch.

Spacing +52 added lines, -52 removed lines patch added patch discarded remove patch

@@ -25,7 +25,7 @@  discard block
 block discarded – undo
      * @param ApplicationContracts $app
      * @param $request
      */
-    public function __construct(ApplicationContracts $app,$request)
+    public function __construct(ApplicationContracts $app, $request)
     {
         parent::__construct($app);
 
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
      */
     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 @@  discard block
 block discarded – undo
     {
         // 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 @@  discard block
 block discarded – undo
      */
     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 @@  discard block
 block discarded – undo
      */
     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.':'.$this->inputs[$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.':'.$this->inputs[$key]])
                                 ->invalidArgument($key.':'.$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($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');
                                     }
                                 }

Please login to merge, or discard this patch.

src/resta/Support/Http.php 2 patches

Spacing +21 added lines, -21 removed lines patch added patch discarded remove patch

@@ -28,9 +28,9 @@  discard block
 block discarded – undo
         // Fetch content and determine boundary
         $boundary = substr($raw_data, 0, strpos($raw_data, "\r\n"));
 
-        if(empty($boundary)){
-            parse_str($raw_data,$data);
-            $GLOBALS[ '_PUT' ] = $data;
+        if (empty($boundary)) {
+            parse_str($raw_data, $data);
+            $GLOBALS['_PUT'] = $data;
             return;
         }
 
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
 
         foreach ($parts as $part) {
             // If this is the last part, break
-            if ($part == "--\r\n") break;
+            if ($part=="--\r\n") break;
 
             // Separate content from headers
             $part = ltrim($part, "\r\n");
@@ -67,10 +67,10 @@  discard block
 block discarded – undo
                 list(, $type, $name) = $matches;
 
                 //Parse File
-                if( isset($matches[4]) )
+                if (isset($matches[4]))
                 {
                     //if labeled the same as previous, skip
-                    if( isset( $_FILES[ $matches[ 2 ] ] ) )
+                    if (isset($_FILES[$matches[2]]))
                     {
                         continue;
                     }
@@ -79,16 +79,16 @@  discard block
 block discarded – undo
                     $filename = $matches[4];
 
                     //get tmp name
-                    $filename_parts = pathinfo( $filename );
-                    $tmp_name = tempnam( ini_get('upload_tmp_dir'), $filename_parts['filename']);
+                    $filename_parts = pathinfo($filename);
+                    $tmp_name = tempnam(ini_get('upload_tmp_dir'), $filename_parts['filename']);
 
                     //populate $_FILES with information, size may be off in multibyte situation
                     /** @noinspection PhpUndefinedVariableInspection */
-                    $_FILES[ $matches[ 2 ] ] = array(
+                    $_FILES[$matches[2]] = array(
                         'error'=>0,
                         'name'=>$filename,
                         'tmp_name'=>$tmp_name,
-                        'size'=>strlen( $body ),
+                        'size'=>strlen($body),
                         'type'=>$value
                     );
 
@@ -98,12 +98,12 @@  discard block
 block discarded – undo
                 //Parse Field
                 else
                 {
-                    $data[$name] = substr($body, 0, strlen($body) - 2);
+                    $data[$name] = substr($body, 0, strlen($body)-2);
                 }
             }
 
         }
-        $GLOBALS[ '_PUT' ] = $data;
+        $GLOBALS['_PUT'] = $data;
         return $data;
     }
 
@@ -111,34 +111,34 @@  discard block
 block discarded – undo
      * @param string $method
      * @return array
      */
-    public function httpMethodData($method='get')
+    public function httpMethodData($method = 'get')
     {
         $body = [];
 
-        if(httpMethod()==$method){
-            $rawData = json_decode(request()->getContent(),1);
+        if (httpMethod()==$method) {
+            $rawData = json_decode(request()->getContent(), 1);
 
             $get = get();
-            if(is_array($get) && count($get)){
+            if (is_array($get) && count($get)) {
                 $body['params'] = get();
             }
 
-            if(is_null($rawData)){
+            if (is_null($rawData)) {
 
                 $containerMethod = app()->get(httpMethod());
 
-                if(is_array($containerMethod) && count($containerMethod)){
+                if (is_array($containerMethod) && count($containerMethod)) {
                     $inputData = $containerMethod;
                 }
-                else{
+                else {
                     $inputData = $this->getInputData();
                 }
 
-                if(!is_null($inputData)){
+                if (!is_null($inputData)) {
                     $body['body']['form-data'] = $inputData;
                 }
             }
-            else{
+            else {
                 $body['body']['raw-data'] = $rawData;
             }
         }

Please login to merge, or discard this patch.

Braces +8 added lines, -7 removed lines patch added patch discarded remove patch

@@ -19,8 +19,9 @@  discard block
 block discarded – undo
 
         /* Read the data 1 KB at a time
            and write to the file */
-        while ($chunk = fread($putdata, 1024))
-            $raw_data .= $chunk;
+        while ($chunk = fread($putdata, 1024)) {
+                    $raw_data .= $chunk;
+        }
 
         /* Close the streams */
         fclose($putdata);
@@ -40,7 +41,9 @@  discard block
 block discarded – undo
 
         foreach ($parts as $part) {
             // If this is the last part, break
-            if ($part == "--\r\n") break;
+            if ($part == "--\r\n") {
+                break;
+            }
 
             // Separate content from headers
             $part = ltrim($part, "\r\n");
@@ -129,16 +132,14 @@  discard block
 block discarded – undo
 
                 if(is_array($containerMethod) && count($containerMethod)){
                     $inputData = $containerMethod;
-                }
-                else{
+                } else{
                     $inputData = $this->getInputData();
                 }
 
                 if(!is_null($inputData)){
                     $body['body']['form-data'] = $inputData;
                 }
-            }
-            else{
+            } else{
                 $body['body']['raw-data'] = $rawData;
             }
         }

Please login to merge, or discard this patch.

		@@ -76,8 +76,7 @@ discard block
		block discarded – undo
76	76	//catch exception
77	77	exception($this->exceptionParams[$key]['name'],$keyParams)
78	78	->unexpectedValue($this->exceptionParams[$key]['name'].' input value is not valid as format ('.$data.')');
79		- }
80		- else{
	79	+ } else{
81	80	//catch exception
82	81	exception()->unexpectedValue($key.' input value is not valid as format ('.$data.')');
83	82	}
		@@ -140,16 +139,14 @@ discard block
		block discarded – undo
140	139	}
141	140	}
142	141
143		- }
144		- else{
	142	+ } else{
145	143	if(!preg_match('@'.$regex[1].'@is',$this->inputsValue)){
146	144	$this->catchException($key,$regex[1]);
147	145	}
148	146	}
149	147
150	148	}
151		- }
152		- else{
	149	+ } else{
153	150
154	151	// we control the regex rule that evaluates when only string arrives.
155	152	if(!preg_match('@'.$regex[1].'@is',$this->inputs[$key])){
		@@ -198,8 +195,7 @@ discard block
		block discarded – undo
198	195	}
199	196	}
200	197	}
201		- }
202		- else{
	198	+ } else{
203	199
204	200	foreach ($this->inputs[$key] as $ikey=>$input){
205	201
		@@ -212,8 +208,7 @@ discard block
		block discarded – undo
212	208	}
213	209	}
214	210	}
215		- }
216		- else{
	211	+ } else{
217	212
218	213	foreach ($input as $ikey=>$item){
219	214	foreach($rules as $rule){

		@@ -7,11 +7,11 @@
		block discarded – undo
7	7	/**
8	8	* @return void
9	9	*/
10		- public function command() : void ;
	10	+ public function command() : void;
11	11
12	12	/**
13	13	* @param ScheduleInterface $schedule
14	14	* @return void
15	15	*/
16		- public function when(ScheduleInterface $schedule) : void ;
	16	+ public function when(ScheduleInterface $schedule) : void;
17	17	}
18	18	\ No newline at end of file

		@@ -7,256 +7,256 @@
		block discarded – undo
7	7	/**
8	8	* @var string
9	9	*/
10		- public static $appDefine='src';
	10	+ public static $appDefine = 'src';
11	11
12	12	/**
13	13	* @var string
14	14	*/
15		- public static $autoloadNamespace='App';
	15	+ public static $autoloadNamespace = 'App';
16	16
17	17	/**
18	18	* @var string
19	19	*/
20		- public static $projectPrefixGroup='Api';
	20	+ public static $projectPrefixGroup = 'Api';
21	21
22	22	/**
23	23	* @var string
24	24	*/
25		- public static $methodPrefix='Action';
	25	+ public static $methodPrefix = 'Action';
26	26
27	27	/**
28	28	* @var string
29	29	*/
30		- public static $callClassPrefix='Controller';
	30	+ public static $callClassPrefix = 'Controller';
31	31
32	32	/**
33	33	* @var string
34	34	*/
35		- public static $controllerBundleName='';
	35	+ public static $controllerBundleName = '';
36	36
37	37	/**
38	38	* @var string
39	39	*/
40		- public static $resourceInController='Resource';
	40	+ public static $resourceInController = 'Resource';
41	41
42	42	/**
43	43	* @var string
44	44	*/
45		- public static $configurationInController='Config';
	45	+ public static $configurationInController = 'Config';
46	46
47	47	/**
48	48	* @var null
49	49	*/
50		- public static $appPath=null;
	50	+ public static $appPath = null;
51	51
52	52	/**
53	53	* @var string
54	54	*/
55		- public static $kernel='Kernel';
	55	+ public static $kernel = 'Kernel';
56	56
57	57	/**
58	58	* @var string
59	59	*/
60		- public static $repository='Repository';
	60	+ public static $repository = 'Repository';
61	61
62	62	/**
63	63	* @var string
64	64	*/
65		- public static $listener='Listener';
	65	+ public static $listener = 'Listener';
66	66
67	67	/**
68	68	* @var string
69	69	*/
70		- public static $serviceAnnotations='ServiceAnnotationsManager';
	70	+ public static $serviceAnnotations = 'ServiceAnnotationsManager';
71	71
72	72	/**
73	73	* @var string
74	74	*/
75		- public static $serviceMiddleware='ServiceMiddlewareManager';
	75	+ public static $serviceMiddleware = 'ServiceMiddlewareManager';
76	76
77	77	/**
78	78	* @var string
79	79	*/
80		- public static $storage='Storage';
	80	+ public static $storage = 'Storage';
81	81
82	82	/**
83	83	* @var string
84	84	*/
85		- public static $controller='Controllers';
	85	+ public static $controller = 'Controllers';
86	86
87	87	/**
88	88	* @var string
89	89	*/
90		- public static $platform='__Platform';
	90	+ public static $platform = '__Platform';
91	91
92	92	/**
93	93	* @var string
94	94	*/
95		- public static $sourcePath='Source';
	95	+ public static $sourcePath = 'Source';
96	96
97	97	/**
98	98	* @var string
99	99	*/
100		- public static $sourceRequest='Client';
	100	+ public static $sourceRequest = 'Client';
101	101
102	102	/**
103	103	* @var string
104	104	*/
105		- public static $model='Model';
	105	+ public static $model = 'Model';
106	106
107	107	/**
108	108	* @var string
109	109	*/
110		- public static $builder='Builder';
	110	+ public static $builder = 'Builder';
111	111
112	112	/**
113	113	* @var string
114	114	*/
115		- public static $migration='Migrations';
	115	+ public static $migration = 'Migrations';
116	116
117	117	/**
118	118	* @var string
119	119	*/
120		- public static $config='Config';
	120	+ public static $config = 'Config';
121	121
122	122	/**
123	123	* @var string
124	124	*/
125		- public static $helpers='Helpers';
	125	+ public static $helpers = 'Helpers';
126	126
127	127	/**
128	128	* @var string
129	129	*/
130		- public static $test='Tests';
	130	+ public static $test = 'Tests';
131	131
132	132	/**
133	133	* @var string
134	134	*/
135		- public static $workers='Workers';
	135	+ public static $workers = 'Workers';
136	136
137	137	/**
138	138	* @var string
139	139	*/
140		- public static $schedule='Schedule';
	140	+ public static $schedule = 'Schedule';
141	141
142	142
143	143	/**
144	144	* @var string
145	145	*/
146		- public static $optional='Optional';
	146	+ public static $optional = 'Optional';
147	147
148	148	/**
149	149	* @var string
150	150	*/
151		- public static $events='Events';
	151	+ public static $events = 'Events';
152	152
153	153	/**
154	154	* @var string
155	155	*/
156		- public static $listeners='Listeners';
	156	+ public static $listeners = 'Listeners';
157	157
158	158	/**
159	159	* @var string
160	160	*/
161		- public static $subscribers='Subscribers';
	161	+ public static $subscribers = 'Subscribers';
162	162
163	163	/**
164	164	* @var string
165	165	*/
166		- public static $exception='Exceptions';
	166	+ public static $exception = 'Exceptions';
167	167
168	168	/**
169	169	* @var string
170	170	*/
171		- public static $job='Job';
	171	+ public static $job = 'Job';
172	172
173	173
174	174	/**
175	175	* @var string
176	176	*/
177		- public static $webservice='Webservice';
	177	+ public static $webservice = 'Webservice';
178	178
179	179	/**
180	180	* @var string
181	181	*/
182		- public static $log='Log';
	182	+ public static $log = 'Log';
183	183
184	184	/**
185	185	* @var string
186	186	*/
187		- public static $resource='Resource';
	187	+ public static $resource = 'Resource';
188	188
189	189	/**
190	190	* @var string
191	191	*/
192		- public static $cache='Cache';
	192	+ public static $cache = 'Cache';
193	193
194	194	/**
195	195	* @var string
196	196	*/
197		- public static $language='Language';
	197	+ public static $language = 'Language';
198	198	/**
199	199	* @var string
200	200	*/
201		- public static $session='Session';
	201	+ public static $session = 'Session';
202	202
203	203	/**
204	204	* @var string
205	205	*/
206		- public static $middleware='Middleware';
	206	+ public static $middleware = 'Middleware';
207	207
208	208	/**
209	209	* @var string
210	210	*/
211		- public static $route='Routes';
	211	+ public static $route = 'Routes';
212	212
213	213	/**
214	214	* @var string
215	215	*/
216		- public static $request='Client';
	216	+ public static $request = 'Client';
217	217
218	218	/**
219	219	* @var string
220	220	*/
221		- public static $factory='Factory';
	221	+ public static $factory = 'Factory';
222	222
223	223	/**
224	224	* @var string
225	225	*/
226		- public static $node='Node';
	226	+ public static $node = 'Node';
227	227
228	228	/**
229	229	* @var string
230	230	*/
231		- public static $provider='Providers';
	231	+ public static $provider = 'Providers';
232	232
233	233	/**
234	234	* @var string
235	235	*/
236		- public static $once='Once';
	236	+ public static $once = 'Once';
237	237
238	238	/**
239	239	* @var string
240	240	*/
241		- public static $command='Command';
	241	+ public static $command = 'Command';
242	242
243	243	/**
244	244	* @var string
245	245	*/
246		- public static $stub='Stub';
	246	+ public static $stub = 'Stub';
247	247
248	248	/**
249	249	* @var string
250	250	*/
251		- public static $store='Store';
	251	+ public static $store = 'Store';
252	252
253	253	/**
254	254	* @var string
255	255	*/
256		- public static $boot='Boot';
	256	+ public static $boot = 'Boot';
257	257
258	258	/**
259	259	* @var string
260	260	*/
261		- public static $autoService='Autoservice';
	261	+ public static $autoService = 'Autoservice';
262	262	}
263	263	\ No newline at end of file

		@@ -29,15 +29,15 @@ discard block
		block discarded – undo
29	29	*/
30	30	public function log()
31	31	{
32		- if(app()->has('track.path')){
	32	+ if (app()->has('track.path')) {
33	33	$trackPath = app()->get('track.path');
34	34	$logger = $trackPath($this->argument);
35	35	}
36		- else{
	36	+ else {
37	37	$logger = app()->path()->appLog().''.DIRECTORY_SEPARATOR.''.date('Y').''.DIRECTORY_SEPARATOR.''.date('m').''.DIRECTORY_SEPARATOR.''.date('d').'-access.log';
38	38	}
39	39
40		- if(!file_exists($logger)){
	40	+ if (!file_exists($logger)) {
41	41	echo 'No requests for a log tracker have been detected yet.';
42	42	echo PHP_EOL;
43	43	exit();
		@@ -53,18 +53,18 @@ discard block
		block discarded – undo
53	53	while (!feof($proc))
54	54	{
55	55	$result = fread($proc, 4096);
56		- if(preg_match('@\{(.*)\}@',$result,$output)){
57		- $outputArray = json_decode($output[0],1);
	56	+ if (preg_match('@\{(.*)\}@', $result, $output)) {
	57	+ $outputArray = json_decode($output[0], 1);
58	58
59	59	$outputArray['trackNumber'] = ++$number;
60	60
61		- if(app()->has('track.log')){
	61	+ if (app()->has('track.log')) {
62	62
63	63	$track = app()->get('track.log');
64		- echo $track($outputArray,$this->argument);
	64	+ echo $track($outputArray, $this->argument);
65	65	}
66	66	}
67		- else{
	67	+ else {
68	68	echo $result;
69	69	}
70	70	@ flush();

		@@ -32,8 +32,7 @@ discard block
		block discarded – undo
32	32	if(app()->has('track.path')){
33	33	$trackPath = app()->get('track.path');
34	34	$logger = $trackPath($this->argument);
35		- }
36		- else{
	35	+ } else{
37	36	$logger = app()->path()->appLog().''.DIRECTORY_SEPARATOR.''.date('Y').''.DIRECTORY_SEPARATOR.''.date('m').''.DIRECTORY_SEPARATOR.''.date('d').'-access.log';
38	37	}
39	38
		@@ -63,8 +62,7 @@ discard block
		block discarded – undo
63	62	$track = app()->get('track.log');
64	63	echo $track($outputArray,$this->argument);
65	64	}
66		- }
67		- else{
	65	+ } else{
68	66	echo $result;
69	67	}
70	68	@ flush();

		@@ -16,7 +16,7 @@ discard block
		block discarded – undo
16	16	*/
17	17	public static function getInstance()
18	18	{
19		- if(is_null(self::$singleton)){
	19	+ if (is_null(self::$singleton)) {
20	20	self::$singleton = new Serializer();
21	21	}
22	22
		@@ -30,7 +30,7 @@ discard block
		block discarded – undo
30	30
31	31	public static function set($data)
32	32	{
33		- if(is_callable($data)){
	33	+ if (is_callable($data)) {
34	34	return self::getInstance()->serialize($data);
35	35	}
36	36	return self::getInstance()->serialize(function() use ($data){

		@@ -31,7 +31,7 @@ discard block
		block discarded – undo
31	31	* @param $credentials
32	32	* @param null\|AuthLoginManager $manager
33	33	*/
34		- public function __construct($credentials,$manager)
	34	+ public function __construct($credentials, $manager)
35	35	{
36	36	//get credentials as default
37	37	$this->credentials = $credentials;
		@@ -42,7 +42,7 @@ discard block
		block discarded – undo
42	42	//get credential hash
43	43	$this->setCredentialHash();
44	44
45		- if($this->manager->getUsing()===false){
	45	+ if ($this->manager->getUsing()===false) {
46	46
47	47	// the request object will help you process
48	48	// the credentials and get them correctly.
		@@ -92,13 +92,13 @@ discard block
		block discarded – undo
92	92	*/
93	93	public function getRequest()
94	94	{
95		- if(!is_null($clientProvider = $this->manager->getAuth()->provider('client'))){
	95	+ if (!is_null($clientProvider = $this->manager->getAuth()->provider('client'))) {
96	96	return $clientProvider();
97	97	}
98	98
99	99	$request = $this->manager->getAuth()->getRequest();
100	100
101		- if($request=='Default'){
	101	+ if ($request=='Default') {
102	102	return new AuthenticateRequest($this);
103	103	}
104	104
		@@ -126,8 +126,8 @@ discard block
		block discarded – undo
126	126	private function setCredentialHash()
127	127	{
128	128	//set credential hash
129		- if(count($this->credentials)){
130		- $this->credentialHash = md5(sha1(implode("\|",$this->credentials)));
	129	+ if (count($this->credentials)) {
	130	+ $this->credentialHash = md5(sha1(implode("\|", $this->credentials)));
131	131	}
132	132	}
133	133	}
134	134	\ No newline at end of file

		@@ -44,7 +44,7 @@
		block discarded – undo
44	44	$this->credentials = $credentials;
45	45
46	46	//credentials loop for expected property
47		- foreach ($this->credentials->get() as $credential){
	47	+ foreach ($this->credentials->get() as $credential) {
48	48	$this->capsule[] = $credential;
49	49	$this->expected[] = $credential;
50	50	}

		@@ -84,8 +84,9 @@ discard block
		block discarded – undo
84	84
85	85	/* Read the data 1 KB at a time
86	86	and write to the file */
87		- while ($chunk = fread($putdata, 1024))
88		- $raw_data .= $chunk;
	87	+ while ($chunk = fread($putdata, 1024)) {
	88	+ $raw_data .= $chunk;
	89	+ }
89	90
90	91	/* Close the streams */
91	92	fclose($putdata);
		@@ -105,7 +106,9 @@ discard block
		block discarded – undo
105	106
106	107	foreach ($parts as $part) {
107	108	// If this is the last part, break
108		- if ($part == "--\r\n") break;
	109	+ if ($part == "--\r\n") {
	110	+ break;
	111	+ }
109	112
110	113	// Separate content from headers
111	114	$part = ltrim($part, "\r\n");

		@@ -38,26 +38,26 @@ discard block
		block discarded – undo
38	38	*/
39	39	public function resolve()
40	40	{
41		- if($this->app->has('clientReset')){
	41	+ if ($this->app->has('clientReset')) {
42	42	$this->app->terminate('clientReset');
43	43	return [];
44	44	}
45	45
46	46	$inputs = $this->app->get($this->method);
47	47
48		- $content = json_decode($this->app['request']->getContent(),1);
	48	+ $content = json_decode($this->app['request']->getContent(), 1);
49	49
50		- if(is_array($inputs) && count($inputs)){
	50	+ if (is_array($inputs) && count($inputs)) {
51	51
52		- if(isset($inputs[$this->client->getClientName()])){
	52	+ if (isset($inputs[$this->client->getClientName()])) {
53	53	return $inputs[$this->client->getClientName()];
54	54	}
55	55	return $inputs;
56	56	}
57	57
58		- if(is_array($content)){
	58	+ if (is_array($content)) {
59	59
60		- if(isset($content[$this->client->getClientName()])){
	60	+ if (isset($content[$this->client->getClientName()])) {
61	61	return $content[$this->client->getClientName()];
62	62	}
63	63	return $content;
		@@ -65,8 +65,8 @@ discard block
		block discarded – undo
65	65
66	66	$this->inputVars();
67	67
68		- if(is_array($GLOBALS[ '_PUT' ])){
69		- return $GLOBALS[ '_PUT' ];
	68	+ if (is_array($GLOBALS['_PUT'])) {
	69	+ return $GLOBALS['_PUT'];
70	70	}
71	71
72	72	return [];
		@@ -96,9 +96,9 @@ discard block
		block discarded – undo
96	96	// Fetch content and determine boundary
97	97	$boundary = substr($raw_data, 0, strpos($raw_data, "\r\n"));
98	98
99		- if(empty($boundary)){
100		- parse_str($raw_data,$data);
101		- $GLOBALS[ '_PUT' ] = $data;
	99	+ if (empty($boundary)) {
	100	+ parse_str($raw_data, $data);
	101	+ $GLOBALS['_PUT'] = $data;
102	102	return;
103	103	}
104	104
		@@ -108,7 +108,7 @@ discard block
		block discarded – undo
108	108
109	109	foreach ($parts as $part) {
110	110	// If this is the last part, break
111		- if ($part == "--\r\n") break;
	111	+ if ($part=="--\r\n") break;
112	112
113	113	// Separate content from headers
114	114	$part = ltrim($part, "\r\n");
		@@ -135,10 +135,10 @@ discard block
		block discarded – undo
135	135	list(, $type, $name) = $matches;
136	136
137	137	//Parse File
138		- if( isset($matches[4]) )
	138	+ if (isset($matches[4]))
139	139	{
140	140	//if labeled the same as previous, skip
141		- if( isset( $_FILES[ $matches[ 2 ] ] ) )
	141	+ if (isset($_FILES[$matches[2]]))
142	142	{
143	143	continue;
144	144	}
		@@ -147,16 +147,16 @@ discard block
		block discarded – undo
147	147	$filename = $matches[4];
148	148
149	149	//get tmp name
150		- $filename_parts = pathinfo( $filename );
151		- $tmp_name = tempnam( ini_get('upload_tmp_dir'), $filename_parts['filename']);
	150	+ $filename_parts = pathinfo($filename);
	151	+ $tmp_name = tempnam(ini_get('upload_tmp_dir'), $filename_parts['filename']);
152	152
153	153	//populate $_FILES with information, size may be off in multibyte situation
154	154	/** @noinspection PhpUndefinedVariableInspection */
155		- $_FILES[ $matches[ 2 ] ] = array(
	155	+ $_FILES[$matches[2]] = array(
156	156	'error'=>0,
157	157	'name'=>$filename,
158	158	'tmp_name'=>$tmp_name,
159		- 'size'=>strlen( $body ),
	159	+ 'size'=>strlen($body),
160	160	'type'=>$value
161	161	);
162	162
		@@ -166,12 +166,12 @@ discard block
		block discarded – undo
166	166	//Parse Field
167	167	else
168	168	{
169		- $data[$name] = substr($body, 0, strlen($body) - 2);
	169	+ $data[$name] = substr($body, 0, strlen($body)-2);
170	170	}
171	171	}
172	172
173	173	}
174		- $GLOBALS[ '_PUT' ] = $data;
	174	+ $GLOBALS['_PUT'] = $data;
175	175	return;
176	176	}
177	177

		@@ -25,7 +25,7 @@ discard block
		block discarded – undo
25	25	* @param ApplicationContracts $app
26	26	* @param $request
27	27	*/
28		- public function __construct(ApplicationContracts $app,$request)
	28	+ public function __construct(ApplicationContracts $app, $request)
29	29	{
30	30	parent::__construct($app);
31	31
		@@ -41,7 +41,7 @@ discard block
		block discarded – undo
41	41	* @param $key
42	42	* @return mixed\|void
43	43	*/
44		- public function annotation($method,$key)
	44	+ public function annotation($method, $key)
45	45	{
46	46	//set annotation value with getting reflection
47	47	$reflection = $this->getReflection('reflection')->reflectionMethodParams($method);
		@@ -66,18 +66,18 @@ discard block
		block discarded – undo
66	66	* @param string $key
67	67	* @param null\|string $data
68	68	*/
69		- private function catchException($key,$data)
	69	+ private function catchException($key, $data)
70	70	{
71		- if(isset($this->exceptionParams[$key])){
	71	+ if (isset($this->exceptionParams[$key])) {
72	72
73	73	//get key params for exception params
74	74	$keyParams = ($this->exceptionParams[$key]['params']) ?? [];
75	75
76	76	//catch exception
77		- exception($this->exceptionParams[$key]['name'],$keyParams)
	77	+ exception($this->exceptionParams[$key]['name'], $keyParams)
78	78	->unexpectedValue($this->exceptionParams[$key]['name'].' input value is not valid as format ('.$data.')');
79	79	}
80		- else{
	80	+ else {
81	81	//catch exception
82	82	exception()->unexpectedValue($key.' input value is not valid as format ('.$data.')');
83	83	}
		@@ -90,23 +90,23 @@ discard block
		block discarded – undo
90	90	*/
91	91	private function getException($key)
92	92	{
93		- if(preg_match('@exception\((.?)\)\|exception\((.?)\)\r\n@is',$this->annotation,$exception)){
	93	+ if (preg_match('@exception\((.?)\)\|exception\((.?)\)\r\n@is', $this->annotation, $exception)) {
94	94
95		- $exceptionSpaceExplode = explode(" ",$exception[1]);
	95	+ $exceptionSpaceExplode = explode(" ", $exception[1]);
96	96
97		- foreach ($exceptionSpaceExplode as $exceptions){
98		- $exceptionsDotExplode = explode(":",$exceptions);
	97	+ foreach ($exceptionSpaceExplode as $exceptions) {
	98	+ $exceptionsDotExplode = explode(":", $exceptions);
99	99	$this->exceptionParams[$key][$exceptionsDotExplode[0]] = $exceptionsDotExplode[1];
100	100	}
101	101
102		- if(isset($this->exceptionParams[$key]['params'])){
	102	+ if (isset($this->exceptionParams[$key]['params'])) {
103	103
104		- $paramsCommaExplode = explode(",",$this->exceptionParams[$key]['params']);
	104	+ $paramsCommaExplode = explode(",", $this->exceptionParams[$key]['params']);
105	105	unset($this->exceptionParams[$key]['params']);
106	106
107		- foreach ($paramsCommaExplode as $params){
108		- $paramsEqualExplode = explode("=",$params);
109		- if(isset($paramsEqualExplode[0]) && isset($paramsEqualExplode[1])){
	107	+ foreach ($paramsCommaExplode as $params) {
	108	+ $paramsEqualExplode = explode("=", $params);
	109	+ if (isset($paramsEqualExplode[0]) && isset($paramsEqualExplode[1])) {
110	110	$this->exceptionParams[$key]['params'][$paramsEqualExplode[0]] = $paramsEqualExplode[1];
111	111	}
112	112	}
		@@ -123,37 +123,37 @@ discard block
		block discarded – undo
123	123	{
124	124	// with the method based regex annotation,
125	125	// we check the rule definition for our requests.
126		- if(preg_match('@regex\((.?)\)\|regex\((.?)\)\r\n@is',$this->annotation,$regex)){
127		- if(isset($this->inputs[$key])){
	126	+ if (preg_match('@regex\((.?)\)\|regex\((.?)\)\r\n@is', $this->annotation, $regex)) {
	127	+ if (isset($this->inputs[$key])) {
128	128
129	129	// for the definition of rules,
130	130	// our inputs can be array and in this case we offer array option for user comfort.
131		- if(is_array($this->inputs[$key])){
	131	+ if (is_array($this->inputs[$key])) {
132	132
133		- foreach ($this->inputs[$key] as $this->inputsKey => $this->inputsValue){
	133	+ foreach ($this->inputs[$key] as $this->inputsKey => $this->inputsValue) {
134	134
135		- if(is_array($this->inputsValue)){
	135	+ if (is_array($this->inputsValue)) {
136	136
137		- foreach ($this->inputsValue as $inputsValueKey => $inputsValueItem){
138		- if(!preg_match('@'.$regex[1].'@is',$inputsValueItem)){
139		- $this->catchException($key,$regex[1]);
	137	+ foreach ($this->inputsValue as $inputsValueKey => $inputsValueItem) {
	138	+ if (!preg_match('@'.$regex[1].'@is', $inputsValueItem)) {
	139	+ $this->catchException($key, $regex[1]);
140	140	}
141	141	}
142	142
143	143	}
144		- else{
145		- if(!preg_match('@'.$regex[1].'@is',$this->inputsValue)){
146		- $this->catchException($key,$regex[1]);
	144	+ else {
	145	+ if (!preg_match('@'.$regex[1].'@is', $this->inputsValue)) {
	146	+ $this->catchException($key, $regex[1]);
147	147	}
148	148	}
149	149
150	150	}
151	151	}
152		- else{
	152	+ else {
153	153
154	154	// we control the regex rule that evaluates when only string arrives.
155		- if(!preg_match('@'.$regex[1].'@is',$this->inputs[$key])){
156		- $this->catchException($key,$regex[1]);
	155	+ if (!preg_match('@'.$regex[1].'@is', $this->inputs[$key])) {
	156	+ $this->catchException($key, $regex[1]);
157	157	}
158	158	}
159	159	}
		@@ -168,9 +168,9 @@ discard block
		block discarded – undo
168	168	*/
169	169	private function getRemove($key)
170	170	{
171		- if(preg_match('@remove\((.*?)\)\r\n@is',$this->annotation,$remove)){
172		- if(isset($this->inputs[$key])){
173		- if(preg_match('@'.$remove[1].'@is',$this->inputs[$key])){
	171	+ if (preg_match('@remove\((.*?)\)\r\n@is', $this->annotation, $remove)) {
	172	+ if (isset($this->inputs[$key])) {
	173	+ if (preg_match('@'.$remove[1].'@is', $this->inputs[$key])) {
174	174	unset($this->inputs[$key]);
175	175	}
176	176	}
		@@ -184,42 +184,42 @@ discard block
		block discarded – undo
184	184	*/
185	185	private function getRules($key)
186	186	{
187		- if(preg_match('@rule\((.?)\)\|rule\((.?)\)\r\n@is',$this->annotation,$rule)){
	187	+ if (preg_match('@rule\((.?)\)\|rule\((.?)\)\r\n@is', $this->annotation, $rule)) {
188	188
189	189	$requestRules = $this->getReflection('rules');
190	190
191		- $rules = explode(":",$rule[1]);
192		- if(isset($this->inputs[$key]) && !is_array($this->inputs[$key])){
193		- foreach($rules as $rule){
194		- if(isset($requestRules[$rule])){
195		- if(!preg_match('@'.$requestRules[$rule].'@',$this->inputs[$key])){
196		- exception($rule,['key'=>$key.':'.$this->inputs[$key]])
	191	+ $rules = explode(":", $rule[1]);
	192	+ if (isset($this->inputs[$key]) && !is_array($this->inputs[$key])) {
	193	+ foreach ($rules as $rule) {
	194	+ if (isset($requestRules[$rule])) {
	195	+ if (!preg_match('@'.$requestRules[$rule].'@', $this->inputs[$key])) {
	196	+ exception($rule, ['key'=>$key.':'.$this->inputs[$key]])
197	197	->invalidArgument($key.':'.$this->inputs[$key].' input value is not valid for '.$rule.' request rule');
198	198	}
199	199	}
200	200	}
201	201	}
202		- else{
	202	+ else {
203	203
204		- foreach ($this->inputs[$key] as $ikey=>$input){
	204	+ foreach ($this->inputs[$key] as $ikey=>$input) {
205	205
206		- if(!is_array($input)){
207		- foreach($rules as $rule){
208		- if(isset($requestRules[$rule])){
209		- if(!preg_match('@'.$requestRules[$rule].'@',$input)){
210		- exception($rule,['key'=>''.$key.':'.$input])
	206	+ if (!is_array($input)) {
	207	+ foreach ($rules as $rule) {
	208	+ if (isset($requestRules[$rule])) {
	209	+ if (!preg_match('@'.$requestRules[$rule].'@', $input)) {
	210	+ exception($rule, ['key'=>''.$key.':'.$input])
211	211	->invalidArgument($key.':'.$input.' input value is not valid for '.$rule.' request rule');
212	212	}
213	213	}
214	214	}
215	215	}
216		- else{
	216	+ else {
217	217
218		- foreach ($input as $ikey=>$item){
219		- foreach($rules as $rule){
220		- if(isset($requestRules[$rule])){
221		- if(!preg_match('@'.$requestRules[$rule].'@',$item)){
222		- exception($rule,['key'=>''.$key.':'.$item])
	218	+ foreach ($input as $ikey=>$item) {
	219	+ foreach ($rules as $rule) {
	220	+ if (isset($requestRules[$rule])) {
	221	+ if (!preg_match('@'.$requestRules[$rule].'@', $item)) {
	222	+ exception($rule, ['key'=>''.$key.':'.$item])
223	223	->invalidArgument($key.':'.$item.' input value is not valid for '.$rule.' request rule');
224	224	}
225	225	}

		@@ -28,9 +28,9 @@ discard block
		block discarded – undo
28	28	// Fetch content and determine boundary
29	29	$boundary = substr($raw_data, 0, strpos($raw_data, "\r\n"));
30	30
31		- if(empty($boundary)){
32		- parse_str($raw_data,$data);
33		- $GLOBALS[ '_PUT' ] = $data;
	31	+ if (empty($boundary)) {
	32	+ parse_str($raw_data, $data);
	33	+ $GLOBALS['_PUT'] = $data;
34	34	return;
35	35	}
36	36
		@@ -40,7 +40,7 @@ discard block
		block discarded – undo
40	40
41	41	foreach ($parts as $part) {
42	42	// If this is the last part, break
43		- if ($part == "--\r\n") break;
	43	+ if ($part=="--\r\n") break;
44	44
45	45	// Separate content from headers
46	46	$part = ltrim($part, "\r\n");
		@@ -67,10 +67,10 @@ discard block
		block discarded – undo
67	67	list(, $type, $name) = $matches;
68	68
69	69	//Parse File
70		- if( isset($matches[4]) )
	70	+ if (isset($matches[4]))
71	71	{
72	72	//if labeled the same as previous, skip
73		- if( isset( $_FILES[ $matches[ 2 ] ] ) )
	73	+ if (isset($_FILES[$matches[2]]))
74	74	{
75	75	continue;
76	76	}
		@@ -79,16 +79,16 @@ discard block
		block discarded – undo
79	79	$filename = $matches[4];
80	80
81	81	//get tmp name
82		- $filename_parts = pathinfo( $filename );
83		- $tmp_name = tempnam( ini_get('upload_tmp_dir'), $filename_parts['filename']);
	82	+ $filename_parts = pathinfo($filename);
	83	+ $tmp_name = tempnam(ini_get('upload_tmp_dir'), $filename_parts['filename']);
84	84
85	85	//populate $_FILES with information, size may be off in multibyte situation
86	86	/** @noinspection PhpUndefinedVariableInspection */
87		- $_FILES[ $matches[ 2 ] ] = array(
	87	+ $_FILES[$matches[2]] = array(
88	88	'error'=>0,
89	89	'name'=>$filename,
90	90	'tmp_name'=>$tmp_name,
91		- 'size'=>strlen( $body ),
	91	+ 'size'=>strlen($body),
92	92	'type'=>$value
93	93	);
94	94
		@@ -98,12 +98,12 @@ discard block
		block discarded – undo
98	98	//Parse Field
99	99	else
100	100	{
101		- $data[$name] = substr($body, 0, strlen($body) - 2);
	101	+ $data[$name] = substr($body, 0, strlen($body)-2);
102	102	}
103	103	}
104	104
105	105	}
106		- $GLOBALS[ '_PUT' ] = $data;
	106	+ $GLOBALS['_PUT'] = $data;
107	107	return $data;
108	108	}
109	109
		@@ -111,34 +111,34 @@ discard block
		block discarded – undo
111	111	* @param string $method
112	112	* @return array
113	113	*/
114		- public function httpMethodData($method='get')
	114	+ public function httpMethodData($method = 'get')
115	115	{
116	116	$body = [];
117	117
118		- if(httpMethod()==$method){
119		- $rawData = json_decode(request()->getContent(),1);
	118	+ if (httpMethod()==$method) {
	119	+ $rawData = json_decode(request()->getContent(), 1);
120	120
121	121	$get = get();
122		- if(is_array($get) && count($get)){
	122	+ if (is_array($get) && count($get)) {
123	123	$body['params'] = get();
124	124	}
125	125
126		- if(is_null($rawData)){
	126	+ if (is_null($rawData)) {
127	127
128	128	$containerMethod = app()->get(httpMethod());
129	129
130		- if(is_array($containerMethod) && count($containerMethod)){
	130	+ if (is_array($containerMethod) && count($containerMethod)) {
131	131	$inputData = $containerMethod;
132	132	}
133		- else{
	133	+ else {
134	134	$inputData = $this->getInputData();
135	135	}
136	136
137		- if(!is_null($inputData)){
	137	+ if (!is_null($inputData)) {
138	138	$body['body']['form-data'] = $inputData;
139	139	}
140	140	}
141		- else{
	141	+ else {
142	142	$body['body']['raw-data'] = $rawData;
143	143	}
144	144	}

		@@ -19,8 +19,9 @@ discard block
		block discarded – undo
19	19
20	20	/* Read the data 1 KB at a time
21	21	and write to the file */
22		- while ($chunk = fread($putdata, 1024))
23		- $raw_data .= $chunk;
	22	+ while ($chunk = fread($putdata, 1024)) {
	23	+ $raw_data .= $chunk;
	24	+ }
24	25
25	26	/* Close the streams */
26	27	fclose($putdata);
		@@ -40,7 +41,9 @@ discard block
		block discarded – undo
40	41
41	42	foreach ($parts as $part) {
42	43	// If this is the last part, break
43		- if ($part == "--\r\n") break;
	44	+ if ($part == "--\r\n") {
	45	+ break;
	46	+ }
44	47
45	48	// Separate content from headers
46	49	$part = ltrim($part, "\r\n");
		@@ -129,16 +132,14 @@ discard block
		block discarded – undo
129	132
130	133	if(is_array($containerMethod) && count($containerMethod)){
131	134	$inputData = $containerMethod;
132		- }
133		- else{
	135	+ } else{
134	136	$inputData = $this->getInputData();
135	137	}
136	138
137	139	if(!is_null($inputData)){
138	140	$body['body']['form-data'] = $inputData;
139	141	}
140		- }
141		- else{
	142	+ } else{
142	143	$body['body']['raw-data'] = $rawData;
143	144	}
144	145	}

php-resta / resta-core

Push — master ( ba32c2...afae9d )

Status

Category

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +51 added lines, -51 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Braces +2 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +6 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch

Braces +5 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +52 added lines, -52 removed lines patch added patch discarded remove patch

Spacing +21 added lines, -21 removed lines patch added patch discarded remove patch

Braces +8 added lines, -7 removed lines patch added patch discarded remove patch