php-resta / resta-core

src/resta/Database/Migration/Src/Resource/PullManager/Pulling.php

Braces +16 added lines, -32 removed lines

@@ -42,8 +42,7 @@ 
             if(!file_exists($makeDirectory)){
                 files()->makeDirectory($makeDirectory,0755,true);
                 $exist=false;
-            }
-            else{
+            } else{
                 $exist=true;
             }
 
@@ -61,18 +60,15 @@ 
 
             if(substr($dbtable,-1)=='s'){
                 app()->command('model create','model:'.strtolower(substr($dbtable,0,-1)).' table:'.$dbtable);
-            }
-            else{
+            } else{
                 app()->command('model create','model:'.strtolower($dbtable).' table:'.$dbtable);
             }
 
             if(isset($contentResult) && $contentResult!==false){
                 echo $dbtablekey.'- '.$migrationName.' ---> Ok';
-            }
-            elseif($exist){
+            } elseif($exist){
                 echo $dbtablekey.'- '.$migrationName.' ---> (Already Exist)';
-            }
-            else{
+            } else{
                 echo $dbtablekey.'- '.$migrationName.' ---> Fail';
             }
 
@@ -199,41 +195,29 @@ 
     {
         if($column=='datetime'){
             return 'datetime()';
-        }
-        elseif($column=='longtext'){
+        } elseif($column=='longtext'){
             return 'longtext()';
-        }
-        elseif($column=='date'){
+        } elseif($column=='date'){
             return 'date()';
-        }
-        elseif($column=='text'){
+        } elseif($column=='text'){
             return 'text()';
-        }
-        elseif($column=='timestamp'){
+        } elseif($column=='timestamp'){
             return 'timestamp()';
-        }
-        elseif($column=='mediumint'){
+        } elseif($column=='mediumint'){
             return 'mediumint()';
-        }
-        elseif($column=='tinyint'){
+        } elseif($column=='tinyint'){
             return 'tinyint()';
-        }
-        elseif($column=='float'){
+        } elseif($column=='float'){
             return 'float()';
-        }
-        elseif($column=='mediumtext'){
+        } elseif($column=='mediumtext'){
             return 'mediumtext()';
-        }
-        elseif($column=='mediumblob'){
+        } elseif($column=='mediumblob'){
             return 'mediumblob()';
-        }
-        elseif($column=='blob'){
+        } elseif($column=='blob'){
             return 'blob()';
-        }
-        elseif(preg_match('@enum.*\((.*?)\)@',$column,$enum)){
+        } elseif(preg_match('@enum.*\((.*?)\)@',$column,$enum)){
             return 'enum(['.$enum[1].'])';
-        }
-        else{
+        } else{
             return $column;
         }
     }

Spacing +56 added lines, -56 removed lines

@@ -14,7 +14,7 @@ 
      */
     public function get()
     {
-        if(!isset($this->config['paths'][0])){
+        if (!isset($this->config['paths'][0])) {
             exit();
         }
         
@@ -27,11 +27,11 @@ 
 
         $list = [];
 
-        foreach ($migrations as $table=>$item){
+        foreach ($migrations as $table=>$item) {
             $list[] = strtolower($table);
         }
         
-        if(isset($arguments['only'])){
+        if (isset($arguments['only'])) {
             $dbtables = $this->getOnly($dbtables);
         }
 
@@ -40,7 +40,7 @@ 
         echo 'Toplam : '.count($dbtables).' Table';
         echo PHP_EOL;
 
-        foreach ($dbtables as $dbtablekey=>$dbtable){
+        foreach ($dbtables as $dbtablekey=>$dbtable) {
 
             $dbtablekey = $dbtablekey+1;
 
@@ -49,40 +49,40 @@ 
             $dbtable = ucfirst($dbtable);
             $makeDirectory = $directory.''.DIRECTORY_SEPARATOR.''.$dbtable;
 
-            if(!file_exists($makeDirectory)){
-                files()->makeDirectory($makeDirectory,0755,true);
-                $exist=false;
+            if (!file_exists($makeDirectory)) {
+                files()->makeDirectory($makeDirectory, 0755, true);
+                $exist = false;
             }
-            else{
-                $exist=true;
+            else {
+                $exist = true;
             }
 
             $migrationName = time().'_'.$dbtable.'';
 
-            if($exist===false){
+            if ($exist===false) {
 
-                $content = $this->getContentFile($this->getStubPath().''.DIRECTORY_SEPARATOR.'pullCreate.stub',[
+                $content = $this->getContentFile($this->getStubPath().''.DIRECTORY_SEPARATOR.'pullCreate.stub', [
                     'className' => $dbtable,
                     'informations' => $informations
                 ]);
 
-                $contentResult = files()->put($makeDirectory.''.DIRECTORY_SEPARATOR.''.$migrationName.'.php',$content);
+                $contentResult = files()->put($makeDirectory.''.DIRECTORY_SEPARATOR.''.$migrationName.'.php', $content);
             }
 
-            if(substr($dbtable,-1)=='s'){
-                app()->command('model create','model:'.strtolower(substr($dbtable,0,-1)).' table:'.$dbtable);
+            if (substr($dbtable, -1)=='s') {
+                app()->command('model create', 'model:'.strtolower(substr($dbtable, 0, -1)).' table:'.$dbtable);
             }
-            else{
-                app()->command('model create','model:'.strtolower($dbtable).' table:'.$dbtable);
+            else {
+                app()->command('model create', 'model:'.strtolower($dbtable).' table:'.$dbtable);
             }
 
-            if(isset($contentResult) && $contentResult!==false){
+            if (isset($contentResult) && $contentResult!==false) {
                 echo $dbtablekey.'- '.$migrationName.' ---> Ok';
             }
-            elseif($exist){
+            elseif ($exist) {
                 echo $dbtablekey.'- '.$migrationName.' ---> (Already Exist)';
             }
-            else{
+            else {
                 echo $dbtablekey.'- '.$migrationName.' ---> Fail';
             }
 
@@ -110,46 +110,46 @@ 
 
         $list = [];
 
-        foreach ($columns as $key=>$data){
+        foreach ($columns as $key=>$data) {
 
-            $data['Type'] = rtrim(str_replace('unsigned','',$data['Type']));
+            $data['Type'] = rtrim(str_replace('unsigned', '', $data['Type']));
 
             $field      = $data['Field'];
             $list[]     = '$wizard->name(\''.$field.'\')';
             $list[]     = '->'.$this->getColumnTransformers($data['Type']).'';
 
             //default block
-            if(!is_null($data['Default'])){
+            if (!is_null($data['Default'])) {
                 $default = $data['Default'];
-                $list[]     = '->default(\''.$default.'\')';
+                $list[] = '->default(\''.$default.'\')';
             }
 
-            $getIndex = $this->getIndexInformation($indexes,$data['Field']);
+            $getIndex = $this->getIndexInformation($indexes, $data['Field']);
 
             //unique block
-            if($getIndex['Non_unique']=='0' && $getIndex['Key_name']!=='PRIMARY'){
+            if ($getIndex['Non_unique']=='0' && $getIndex['Key_name']!=='PRIMARY') {
                 $indexName = $getIndex['Key_name'];
-                $list[]     = '->unique(\''.$indexName.'\')';
+                $list[] = '->unique(\''.$indexName.'\')';
             }
 
             //index block
-            if($getIndex['Non_unique']=='1' && $getIndex['Key_name']!=='PRIMARY'){
+            if ($getIndex['Non_unique']=='1' && $getIndex['Key_name']!=='PRIMARY') {
                 $columnName = $getIndex['Column_name'];
                 $indexName = $getIndex['Key_name'];
 
-                if(count($multipleIndexes[$indexName])==1){
+                if (count($multipleIndexes[$indexName])==1) {
                     $list[] = '->index(\''.$indexName.'\')';
                 }
             }
 
             //comment block
-            if(strlen($data['Comment'])>0){
+            if (strlen($data['Comment'])>0) {
                 $comment = $data['Comment'];
                 $list[] = '->comment(\''.$comment.'\')';
             }
 
             //auto increment block
-            if($data['Extra']=='auto_increment'){
+            if ($data['Extra']=='auto_increment') {
                 $list[] = '->auto_increment()';
             }
 
@@ -164,39 +164,39 @@ 
 
         //table indexes
         foreach ($multipleIndexes as $indexName=>$values) {
-            if(count($values)>1){
-                $values = '\''.implode('\',\'',$values).'\'';
+            if (count($values)>1) {
+                $values = '\''.implode('\',\'', $values).'\'';
                 $list[] = '    $wizard->table()->indexes(\''.$indexName.'\',['.$values.']);
                 ';
             }
         }
 
-        if(count($foreignKeys)){
+        if (count($foreignKeys)) {
 
             $constraintName = $foreignKeys['CONSTRAINT_NAME'];
             $key = $foreignKeys['COLUMN_NAME'];
             $referenceTable = $foreignKeys['REFERENCED_TABLE_NAME'];
             $referenceColumn = $foreignKeys['REFERENCED_COLUMN_NAME'];
 
-            if($foreignKeys['UPDATE_RULE']=='RESTRICT' && $foreignKeys['DELETE_RULE']=='RESTRICT'){
+            if ($foreignKeys['UPDATE_RULE']=='RESTRICT' && $foreignKeys['DELETE_RULE']=='RESTRICT') {
                 $list[] = '    $wizard->table()->foreign()->constraint(\''.$constraintName.'\')->key(\''.$key.'\')->references(\''.$referenceTable.'\',\''.$referenceColumn.'\');
                 ';
             }
 
-            if($foreignKeys['UPDATE_RULE']!=='RESTRICT' && $foreignKeys['DELETE_RULE']=='RESTRICT'){
+            if ($foreignKeys['UPDATE_RULE']!=='RESTRICT' && $foreignKeys['DELETE_RULE']=='RESTRICT') {
                 $rule = $foreignKeys['UPDATE_RULE'];
                 $list[] = '    $wizard->table()->foreign()->constraint(\''.$constraintName.'\')->key(\''.$key.'\')->references(\''.$referenceTable.'\',\''.$referenceColumn.'\')->onUpdate()->'.strtolower($rule).'();
                 ';
             }
 
-            if($foreignKeys['UPDATE_RULE']=='RESTRICT' && $foreignKeys['DELETE_RULE']!=='RESTRICT'){
+            if ($foreignKeys['UPDATE_RULE']=='RESTRICT' && $foreignKeys['DELETE_RULE']!=='RESTRICT') {
                 $rule = $foreignKeys['DELETE_RULE'];
                 $list[] = '    $wizard->table()->foreign()->constraint(\''.$constraintName.'\')->key(\''.$key.'\')->references(\''.$referenceTable.'\',\''.$referenceColumn.'\')->onDelete()->'.strtolower($rule).'();
                 ';
             }
         }
 
-        return implode('',$list);
+        return implode('', $list);
     }
 
     /**
@@ -207,43 +207,43 @@ 
      */
     private function getColumnTransformers($column)
     {
-        if($column=='datetime'){
+        if ($column=='datetime') {
             return 'datetime()';
         }
-        elseif($column=='longtext'){
+        elseif ($column=='longtext') {
             return 'longtext()';
         }
-        elseif($column=='date'){
+        elseif ($column=='date') {
             return 'date()';
         }
-        elseif($column=='text'){
+        elseif ($column=='text') {
             return 'text()';
         }
-        elseif($column=='timestamp'){
+        elseif ($column=='timestamp') {
             return 'timestamp()';
         }
-        elseif($column=='mediumint'){
+        elseif ($column=='mediumint') {
             return 'mediumint()';
         }
-        elseif($column=='tinyint'){
+        elseif ($column=='tinyint') {
             return 'tinyint()';
         }
-        elseif($column=='float'){
+        elseif ($column=='float') {
             return 'float()';
         }
-        elseif($column=='mediumtext'){
+        elseif ($column=='mediumtext') {
             return 'mediumtext()';
         }
-        elseif($column=='mediumblob'){
+        elseif ($column=='mediumblob') {
             return 'mediumblob()';
         }
-        elseif($column=='blob'){
+        elseif ($column=='blob') {
             return 'blob()';
         }
-        elseif(preg_match('@enum.*\((.*?)\)@',$column,$enum)){
+        elseif (preg_match('@enum.*\((.*?)\)@', $column, $enum)) {
             return 'enum(['.$enum[1].'])';
         }
-        else{
+        else {
             return $column;
         }
     }
@@ -255,11 +255,11 @@ 
      * @param $field
      * @return void|mixed
      */
-    private function getIndexInformation($index,$field)
+    private function getIndexInformation($index, $field)
     {
         foreach ($index as $key=>$item) {
 
-            if($item['Column_name'] == $field){
+            if ($item['Column_name']==$field) {
                 return $index[$key];
             }
         }
@@ -277,13 +277,13 @@ 
     {
         $arguments = $this->schema->getArguments();
         
-        $only = explode(',',$arguments['only']);
+        $only = explode(',', $arguments['only']);
         
         $list = [];
         
-        foreach($only as $table){
+        foreach ($only as $table) {
             
-            if(in_array($table,$tables) || in_array($table = strtolower($table),$tables)){
+            if (in_array($table, $tables) || in_array($table = strtolower($table), $tables)) {
                 $list[] = $table;
             }
         }
@@ -302,7 +302,7 @@ 
     {
         $list = [];
         foreach ($index as $key=>$item) {
-            if($item['Non_unique']==1 && $item['Key_name']!=='PRIMARY'){
+            if ($item['Non_unique']==1 && $item['Key_name']!=='PRIMARY') {
                 $list[$item['Key_name']][] = $item['Column_name'];
             }
         }

src/resta/Router/RouteMatching.php

Spacing +30 added lines, -30 removed lines

@@ -18,7 +18,7 @@ 
      * @param ApplicationContracts $app
      * @param null|object $route
      */
-    public function __construct(ApplicationContracts $app, $route=null)
+    public function __construct(ApplicationContracts $app, $route = null)
     {
         parent::__construct($app);
 
@@ -34,53 +34,53 @@ 
     {
         $routes = $this->route->getRoutes();
 
-        if(!isset($routes['pattern'])){
+        if (!isset($routes['pattern'])) {
             return [];
         }
 
         $patterns = $routes['pattern'];
-        $urlRoute = array_filter(route(),'strlen');
+        $urlRoute = array_filter(route(), 'strlen');
 
         $patternList = [];
 
-        foreach($routes['data'] as $patternKey=>$routeData){
-            if($routeData['http']==httpMethod()){
-                $patternList[$patternKey]=$patterns[$patternKey];
+        foreach ($routes['data'] as $patternKey=>$routeData) {
+            if ($routeData['http']==httpMethod()) {
+                $patternList[$patternKey] = $patterns[$patternKey];
             }
         }
 
         $scoredList = [];
 
-        foreach ($patternList as $key=>$pattern){
+        foreach ($patternList as $key=>$pattern) {
 
             $patternCount = $this->getPatternRealCount($pattern);
 
-            if(count($urlRoute)==0 && count($urlRoute)==0) return array_key_first($patternList);
+            if (count($urlRoute)==0 && count($urlRoute)==0) return array_key_first($patternList);
 
-            if(isset($patternCount['optional'])){
-                $optionalCount = count($patternCount['default']) + count($patternCount['optional']);
+            if (isset($patternCount['optional'])) {
+                $optionalCount = count($patternCount['default'])+count($patternCount['optional']);
             }
 
-            if(count($urlRoute) == count($patternCount['default']) ||
+            if (count($urlRoute)==count($patternCount['default']) ||
                 (isset($optionalCount) && count($urlRoute)>count($patternCount['default']) && $optionalCount>=count($urlRoute))
-            ){
+            ) {
 
-                foreach ($pattern as $pkey=>$item){
+                foreach ($pattern as $pkey=>$item) {
 
-                    if($this->route->isMatchVaribleRegexPattern($item)===false){
-                        if(isset($urlRoute[$pkey]) && $urlRoute[$pkey]==$item){
+                    if ($this->route->isMatchVaribleRegexPattern($item)===false) {
+                        if (isset($urlRoute[$pkey]) && $urlRoute[$pkey]==$item) {
                             $scoredList[$key][] = 3;
                         }
                     }
 
-                    if($this->route->isMatchVaribleRegexPattern($item) && !$this->route->isOptionalVaribleRegexPattern($item)){
-                        if(isset($urlRoute[$pkey])){
+                    if ($this->route->isMatchVaribleRegexPattern($item) && !$this->route->isOptionalVaribleRegexPattern($item)) {
+                        if (isset($urlRoute[$pkey])) {
                             $scoredList[$key][] = 2;
                         }
                     }
 
-                    if($this->route->isMatchVaribleRegexPattern($item) && $this->route->isOptionalVaribleRegexPattern($item)){
-                        if(isset($urlRoute[$pkey])){
+                    if ($this->route->isMatchVaribleRegexPattern($item) && $this->route->isOptionalVaribleRegexPattern($item)) {
+                        if (isset($urlRoute[$pkey])) {
                             $scoredList[$key][] = 1;
                         }
                     }
@@ -104,14 +104,14 @@ 
         $list = [];
         $list['default'] = [];
 
-        foreach ($pattern as $key=>$value){
-            if(($this->route->isMatchVaribleRegexPattern($value)===false) || ($this->route->isMatchVaribleRegexPattern($value)
-                    && !$this->route->isOptionalVaribleRegexPattern($value))){
+        foreach ($pattern as $key=>$value) {
+            if (($this->route->isMatchVaribleRegexPattern($value)===false) || ($this->route->isMatchVaribleRegexPattern($value)
+                    && !$this->route->isOptionalVaribleRegexPattern($value))) {
                 $list['default'][$key] = $value;
             }
 
-            if(($this->route->isMatchVaribleRegexPattern($value)
-                && $this->route->isOptionalVaribleRegexPattern($value))){
+            if (($this->route->isMatchVaribleRegexPattern($value)
+                && $this->route->isOptionalVaribleRegexPattern($value))) {
                 $list['optional'][] = true;
             }
         }
@@ -125,16 +125,16 @@ 
      * @param array $scoredList
      * @return false|int|string
      */
-    private function showKeyAccordingToScoredList($scoredList=array())
+    private function showKeyAccordingToScoredList($scoredList = array())
     {
         $scored = [];
 
-        foreach($scoredList as $key=>$item){
+        foreach ($scoredList as $key=>$item) {
             $scored[$key] = array_sum($item);
         }
 
-        if(count($scored)){
-            return array_search(max($scored),$scored);
+        if (count($scored)) {
+            return array_search(max($scored), $scored);
         }
 
         return null;
@@ -152,8 +152,8 @@ 
         $route = route();
 
         foreach ($pattern as $key=>$item) {
-            if($this->route->isMatchVaribleRegexPattern($item)===false){
-                if(isset($route[$key]) && $item!==$route[$key]){
+            if ($this->route->isMatchVaribleRegexPattern($item)===false) {
+                if (isset($route[$key]) && $item!==$route[$key]) {
                     return false;
                 }
             }

Braces +3 added lines, -1 removed lines

@@ -55,7 +55,9 @@
 
             $patternCount = $this->getPatternRealCount($pattern);
 
-            if(count($urlRoute)==0 && count($urlRoute)==0) return array_key_first($patternList);
+            if(count($urlRoute)==0 && count($urlRoute)==0) {

+                return array_key_first($patternList);

+            }

 
             if(isset($patternCount['optional'])){
                 $optionalCount = count($patternCount['default']) + count($patternCount['optional']);

src/resta/Router/RouteAccessiblePropertyTrait.php

Spacing +8 added lines, -8 removed lines

@@ -36,11 +36,11 @@ 
      * @param null|string $method

      * @return array

      */

-    public static function getRoutes($method=null) : array

+    public static function getRoutes($method = null) : array

     {

         // it collects and

         // executes route data in an array.

-        if(is_null($method)){

+        if (is_null($method)) {

             return static::$routes;

         }

 

@@ -48,16 +48,16 @@ 
 

         $routes = self::getRoutes();

 

-        if(isset($routes['data'])){

-            foreach ($routes['data'] as $key=>$item){

-                if($item['http']==httpMethod()){

+        if (isset($routes['data'])) {

+            foreach ($routes['data'] as $key=>$item) {

+                if ($item['http']==httpMethod()) {

                     $httpRouteList['data'][$key] = $item;

                 }

             }

         }

 

-        if(isset($routes['pattern'],$httpRouteList['data'])){

-            foreach ($httpRouteList['data'] as $key=>$item){

+        if (isset($routes['pattern'], $httpRouteList['data'])) {

+            foreach ($httpRouteList['data'] as $key=>$item) {

                 $httpRouteList['pattern'][$key] = $routes['pattern'][$key];

             }

         }

@@ -74,7 +74,7 @@ 
     {

         // detects where the route path is coming from

         // and returns this data in the static path.

-        $trace = Utils::trace(2,'file');

+        $trace = Utils::trace(2, 'file');

 

         // the trace is returned if the variable is available

         // in the path data, otherwise it returns null.

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

Spacing +15 added lines, -15 removed lines

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

      * @var $type

      */

-    public $type='model';

+    public $type = 'model';

 

     /**

      * @var array

@@ -31,27 +31,27 @@ 
     /**

      * @var $commandRule

      */

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

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

 

     /**

      * @method create

      * @return mixed

      */

-    public function create(){

+    public function create() {

 

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

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

 

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

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

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

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

         }

 

         //lower case for table

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

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

 

-        $this->directory['modelDir']=$this->version().'/Model';

-        $this->directory['builderDir']=$this->directory['modelDir'].'/Builder';

-        $this->directory['contract']=$this->directory['modelDir'].'/Contract';

-        $this->directory['helper']=$this->directory['modelDir'].'/Helper';

+        $this->directory['modelDir'] = $this->version().'/Model';

+        $this->directory['builderDir'] = $this->directory['modelDir'].'/Builder';

+        $this->directory['contract'] = $this->directory['modelDir'].'/Contract';

+        $this->directory['helper'] = $this->directory['modelDir'].'/Helper';

 

         //set project directory

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

@@ -61,12 +61,12 @@ 
         $this->touch['model/builder']   = $this->model().'/Builder/'.$this->argument['file'].'Builder.php';

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

 

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

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

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

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

         }

 

         //set project touch

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

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

             'stub'=>'Model_Create'

         ]);

 

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

      * @return bool

      */

-    private function setAnnotations(){

+    private function setAnnotations() {

 

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

             ['Trait ServiceAnnotationsManager'=>'Trait ServiceAnnotationsManager'.PHP_EOL.' * @method \\'.app()->namespace()->builder().'\\'.$this->argument['file'].'Builder '.strtolower($this->argument['file']).'Builder'

src/resta/Support/Arr.php

Spacing +44 added lines, -44 removed lines

@@ -45,7 +45,7 @@ 
         foreach ($array as $values) {

             if ($values instanceof Collection) {

                 $values = $values->all();

-            } elseif (! is_array($values)) {

+            } elseif (!is_array($values)) {

                 continue;

             }

             $results = array_merge($results, $values);

@@ -94,7 +94,7 @@ 
     {

         $results = [];

         foreach ($array as $key => $value) {

-            if (is_array($value) && ! empty($value)) {

+            if (is_array($value) && !empty($value)) {

                 $results = array_merge($results, static::dot($value, $prepend.$key.'.'));

             } else {

                 $results[$prepend.$key] = $value;

@@ -180,12 +180,12 @@ 
         $result = [];

         foreach ($array as $item) {

             $item = $item instanceof Collection ? $item->all() : $item;

-            if (! is_array($item)) {

+            if (!is_array($item)) {

                 $result[] = $item;

-            } elseif ($depth === 1) {

+            } elseif ($depth===1) {

                 $result = array_merge($result, array_values($item));

             } else {

-                $result = array_merge($result, static::flatten($item, $depth - 1));

+                $result = array_merge($result, static::flatten($item, $depth-1));

             }

         }

         return $result;

@@ -200,8 +200,8 @@ 
     public static function forget(&$array, $keys)

     {

         $original = &$array;

-        $keys = (array) $keys;

-        if (count($keys) === 0) {

+        $keys = (array)$keys;

+        if (count($keys)===0) {

             return;

         }

         foreach ($keys as $key) {

@@ -213,7 +213,7 @@ 
             $parts = explode('.', $key);

             // clean up before each pass

             $array = &$original;

-            while (count($parts) > 1) {

+            while (count($parts)>1) {

                 $part = array_shift($parts);

                 if (isset($array[$part]) && is_array($array[$part])) {

                     $array = &$array[$part];

@@ -234,7 +234,7 @@ 
      */

     public static function get($array, $key, $default = null)

     {

-        if (! static::accessible($array)) {

+        if (!static::accessible($array)) {

             return value($default);

         }

         if (is_null($key)) {

@@ -243,7 +243,7 @@ 
         if (static::exists($array, $key)) {

             return $array[$key];

         }

-        if (strpos($key, '.') === false) {

+        if (strpos($key, '.')===false) {

             return $array[$key] ?? value($default);

         }

         foreach (explode('.', $key) as $segment) {

@@ -267,11 +267,11 @@ 
         if (is_null($keys)) {

             return false;

         }

-        $keys = (array) $keys;

-        if (! $array) {

+        $keys = (array)$keys;

+        if (!$array) {

             return false;

         }

-        if ($keys === []) {

+        if ($keys===[]) {

             return false;

         }

         foreach ($keys as $key) {

@@ -300,7 +300,7 @@ 
     public static function isAssoc(array $array)

     {

         $keys = array_keys($array);

-        return array_keys($keys) !== $keys;

+        return array_keys($keys)!==$keys;

     }

     /**

      * Get a subset of the items from the given array.

@@ -311,7 +311,7 @@ 
      */

     public static function only($array, $keys)

     {

-        return array_intersect_key($array, array_flip((array) $keys));

+        return array_intersect_key($array, array_flip((array)$keys));

     }

     /**

      * Pluck an array of values from an array.

@@ -335,7 +335,7 @@ 
             } else {

                 $itemKey = data_get($item, $key);

                 if (is_object($itemKey) && method_exists($itemKey, '__toString')) {

-                    $itemKey = (string) $itemKey;

+                    $itemKey = (string)$itemKey;

                 }

                 $results[$itemKey] = $itemValue;

             }

@@ -368,7 +368,7 @@ 
         if (is_null($key)) {

             array_unshift($array, $value);

         } else {

-            $array = [$key => $value] + $array;

+            $array = [$key => $value]+$array;

         }

         return $array;

     }

@@ -399,7 +399,7 @@ 
     {

         $requested = is_null($number) ? 1 : $number;

         $count = count($array);

-        if ($requested > $count) {

+        if ($requested>$count) {

             throw new InvalidArgumentException(

                 "You requested {$requested} items, but there are only {$count} items available."

             );

@@ -407,12 +407,12 @@ 
         if (is_null($number)) {

             return $array[array_rand($array)];

         }

-        if ((int) $number === 0) {

+        if ((int)$number===0) {

             return [];

         }

         $keys = array_rand($array, $number);

         $results = [];

-        foreach ((array) $keys as $key) {

+        foreach ((array)$keys as $key) {

             $results[] = $array[$key];

         }

         return $results;

@@ -433,12 +433,12 @@ 
             return $array = $value;

         }

         $keys = explode('.', $key);

-        while (count($keys) > 1) {

+        while (count($keys)>1) {

             $key = array_shift($keys);

             // If the key doesn't exist at this depth, we will just create an empty array

             // to hold the next value, allowing us to create the arrays to hold final

             // values at the correct depth. Then we'll keep digging into the array.

-            if (! isset($array[$key]) || ! is_array($array[$key])) {

+            if (!isset($array[$key]) || !is_array($array[$key])) {

                 $array[$key] = [];

             }

             $array = &$array[$key];

@@ -459,7 +459,7 @@ 
             shuffle($array);

         } else {

             srand($seed);

-            usort($array, function () {

+            usort($array, function() {

                 return rand(-1, 1);

             });

         }

@@ -536,16 +536,16 @@ 
      * @param array $referenceArray

      * @return array

      */

-    public static function removeSameValues($removeArray=array(),$referenceArray=array())

+    public static function removeSameValues($removeArray = array(), $referenceArray = array())

     {

         $list = [];

 

-        foreach ($removeArray as $remove){

-            if(!in_array($remove,$referenceArray)){

-                $list[]=$remove;

+        foreach ($removeArray as $remove) {

+            if (!in_array($remove, $referenceArray)) {

+                $list[] = $remove;

             }

         }

-        return array_merge($referenceArray,$list);

+        return array_merge($referenceArray, $list);

     }

 

     /**

@@ -553,9 +553,9 @@ 
      * @param $key

      * @return null

      */

-    public static function isset($array,$key)

+    public static function isset($array, $key)

     {

-        if(isset($array[$key])){

+        if (isset($array[$key])) {

             return $array[$key];

         }

         return null;

@@ -566,13 +566,13 @@ 
      * @param null $withKey

      * @return bool

      */

-    public static function isArrayWithCount($array,$withKey=null)

+    public static function isArrayWithCount($array, $withKey = null)

     {

-        if($withKey===null){

+        if ($withKey===null) {

             return is_array($array) && count($array);

         }

 

-        return isset($array[$withKey]) && self::isArrayWithCount($array[$withKey],null);

+        return isset($array[$withKey]) && self::isArrayWithCount($array[$withKey], null);

     }

 

     /**

@@ -580,12 +580,12 @@ 
      * @param $array2

      * @return int

      */

-    public static function arrayDiffKey($array1,$array2)

+    public static function arrayDiffKey($array1, $array2)

     {

-        $forArray1 = array_diff_key($array1,$array2);

-        $forArray2 = array_diff_key($array2,$array1);

+        $forArray1 = array_diff_key($array1, $array2);

+        $forArray2 = array_diff_key($array2, $array1);

 

-        if(count($forArray1)=="0" && count($forArray2)=="0"){

+        if (count($forArray1)=="0" && count($forArray2)=="0") {

             return true;

         }

         return false;

@@ -597,12 +597,12 @@ 
      * @param $original

      * @param array $overwrite

      */

-    public static function overwriteWith($original,$overwrite=array())

+    public static function overwriteWith($original, $overwrite = array())

     {

-        foreach ($original as $key=>$item){

+        foreach ($original as $key=>$item) {

 

-            if(array_key_exists($key,$overwrite)){

-                array_splice($original,$key,0,$overwrite[$key]);

+            if (array_key_exists($key, $overwrite)) {

+                array_splice($original, $key, 0, $overwrite[$key]);

             }

         }

 

@@ -616,12 +616,12 @@ 
      * @param array $remove

      * @return array

      */

-    public static function removeKey($data,$remove=array())

+    public static function removeKey($data, $remove = array())

     {

         $list = [];

 

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

-            if(!in_array($key,$remove)){

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

+            if (!in_array($key, $remove)) {

                 $list[$key] = $value;

             }

         }

src/resta/Authenticate/Driver/Eloquent/UserBuilder.php

Spacing +9 added lines, -9 removed lines

@@ -53,7 +53,7 @@ 
 

         // with query we bind the returned values to the params property of the auth object.

         // and so the auth object will make a final return with these values.

-        $this->paramValues('check',$query);

+        $this->paramValues('check', $query);

     }

 

     /**

@@ -66,16 +66,16 @@ 
     {

         // using the driver object we write the query builder statement.

         // we do the values of the query with the credentials that are sent.

-        if(!is_null($provider = $this->auth->provider('login'))){

+        if (!is_null($provider = $this->auth->provider('login'))) {

             $query = $provider($credentials->get());

         }

-        else{

+        else {

             $query = $this->setQuery($credentials);

         }

 

         // with query we bind the returned values to the params property of the auth object.

         // and so the auth object will make a final return with these values.

-        $this->paramValues('login',$query);

+        $this->paramValues('login', $query);

 

         // we assign the credential hash value

         // to the global of the authenticate object.

@@ -85,7 +85,7 @@ 
         // we update the token value.

         $this->updateToken();

 

-        if(isset($this->auth->params['authToken'])){

+        if (isset($this->auth->params['authToken'])) {

             $this->saveDeviceToken();

         }

     }

@@ -104,18 +104,18 @@ 
 

         // with query we bind the returned values to the params property of the auth object.

         // and so the auth object will make a final return with these values.

-        $this->paramValues('logout',$query);

+        $this->paramValues('logout', $query);

 

         //token updating as null

-        if(isset($this->auth->params['authToken'])){

-            if(!$this->deleteDeviceToken()){

+        if (isset($this->auth->params['authToken'])) {

+            if (!$this->deleteDeviceToken()) {

                 $this->auth->params['status'] = 0;

                 $this->auth->params['exception'] = 'logoutInternal';

                 return false;

             }

         }

 

-        if($this->auth->params['status']===0){

+        if ($this->auth->params['status']===0) {

             $this->auth->params['exception'] = 'logoutException';

         }

     }

Braces +1 added lines, -2 removed lines

@@ -68,8 +68,7 @@
         // we do the values of the query with the credentials that are sent.

         if(!is_null($provider = $this->auth->provider('login'))){

             $query = $provider($credentials->get());

-        }

-        else{

+        } else{

             $query = $this->setQuery($credentials);

         }

 

src/resta/Authenticate/Driver/Eloquent/UserBuilderHelper.php

Spacing +31 added lines, -31 removed lines

@@ -51,7 +51,7 @@ 
     {

         $userId = $manager->getAuth()->params['userId'];

 

-        return DeviceToken::where('user_id',$userId)->get();

+        return DeviceToken::where('user_id', $userId)->get();

     }

 

     /**

@@ -64,8 +64,8 @@ 
         return DeviceToken::where(function($query) use($token) {

 

             //where query for token

-            $query->where('token_integer',crc32(md5($token)));

-            $query->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])));

+            $query->where('token_integer', crc32(md5($token)));

+            $query->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])));

         });

     }

 

@@ -79,8 +79,8 @@ 
         return DeviceToken::where(function($query) use($token) {

 

             //where query for token

-            $query->where('token_integer',crc32(md5($token)));

-            $query->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])));

+            $query->where('token_integer', crc32(md5($token)));

+            $query->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])));

 

         });

     }

@@ -91,23 +91,23 @@ 
      * @param null|object $query

      * @return mixed

      */

-    protected function checkPasswordVerify($query=null)

+    protected function checkPasswordVerify($query = null)

     {

-        if(is_null($query) && isset($this->credentials['password'])){

-            if(!is_null($password = $this->auth->provider('password'))

-                && $password($this->credentials['password'])=='verify'){

+        if (is_null($query) && isset($this->credentials['password'])) {

+            if (!is_null($password = $this->auth->provider('password'))

+                && $password($this->credentials['password'])=='verify') {

 

                 $this->password = $this->credentials['password'];

                 $this->passwordVerify = true;

-                $this->credentials = Arr::removeKey($this->credentials,['password']);

+                $this->credentials = Arr::removeKey($this->credentials, ['password']);

 

                 return null;

             }

         }

 

-        if(is_object($query) && $query->count()){

+        if (is_object($query) && $query->count()) {

             $password = $query->first()->password;

-            if(password_verify($this->password,$password)){

+            if (password_verify($this->password, $password)) {

                 return $query;

             }

         }

@@ -137,24 +137,24 @@ 
 

             // with the callback method (eloquent model)

             // we write the where clause.

-            foreach ($this->credentials as $credential=>$credentialValue){

+            foreach ($this->credentials as $credential=>$credentialValue) {

 

-                if(!is_null($provider = $this->auth->provider($credential))){

-                    $query->where($credential,$provider($credentialValue));

+                if (!is_null($provider = $this->auth->provider($credential))) {

+                    $query->where($credential, $provider($credentialValue));

                 }

-                else{

-                    $query->where($credential,$credentialValue);

+                else {

+                    $query->where($credential, $credentialValue);

                 }

             }

 

             // for the authenticate query,

             // the user can add additional queries by the service provider.

-            if(!is_null($addQuery = $this->auth->provider('addQuery'))){

+            if (!is_null($addQuery = $this->auth->provider('addQuery'))) {

                 $addQuery($query);

             }

         });

 

-        if(false === $this->passwordVerify){

+        if (false===$this->passwordVerify) {

             return $query;

         }

 

@@ -164,10 +164,10 @@ 
     /**

      * @return void|mixed

      */

-    protected function updateToken($token=null)

+    protected function updateToken($token = null)

     {

         //if query status value is true

-        if($this->auth->params['status']){

+        if ($this->auth->params['status']) {

 

             // we go to the method that produces

             // the classical token value and get the token value.

@@ -177,7 +177,7 @@ 
             // if there is no update, we reset the status value to 0.

             $update = $this->auth->params['builder']->update(['token'=>$this->auth->params['token']]);

 

-            if(!$update){

+            if (!$update) {

                 $this->auth->params['status'] = 0;

                 $this->auth->params['exception'] = 'update';

             }

@@ -193,10 +193,10 @@ 
     {

         $token_integer = crc32(md5($this->auth->params['token']));

 

-        if(!is_null($token_integer)){

+        if (!is_null($token_integer)) {

 

-            if(DeviceToken::where('user_id',$this->auth->params['authId'])

-                    ->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])))->count()==0){

+            if (DeviceToken::where('user_id', $this->auth->params['authId'])

+                    ->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])))->count()==0) {

 

                 return DeviceToken::create([

                     'user_id' => $this->auth->params['authId'],

@@ -207,10 +207,10 @@ 
                     'expire' => $this->auth->getExpire(),

                 ]);

             }

-            else{

+            else {

 

-                return DeviceToken::where('user_id',$this->auth->params['authId'])

-                    ->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])))

+                return DeviceToken::where('user_id', $this->auth->params['authId'])

+                    ->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])))

                     ->update([

                         'token' => $this->auth->params['token'],

                         'token_integer' => $token_integer

@@ -230,11 +230,11 @@ 
     {

         $token_integer = crc32(md5($this->auth->getTokenSentByUser()));

 

-        if(!is_null($token_integer)){

+        if (!is_null($token_integer)) {

 

-            DeviceToken::where('token_integer',$token_integer)->delete();

+            DeviceToken::where('token_integer', $token_integer)->delete();

 

-            return (DeviceToken::where('token_integer',$token_integer)->count()) ? false : true;

+            return (DeviceToken::where('token_integer', $token_integer)->count()) ? false : true;

         }

 

     }

Braces +2 added lines, -4 removed lines

@@ -141,8 +141,7 @@ 
 

                 if(!is_null($provider = $this->auth->provider($credential))){

                     $query->where($credential,$provider($credentialValue));

-                }

-                else{

+                } else{

                     $query->where($credential,$credentialValue);

                 }

             }

@@ -206,8 +205,7 @@ 
                     'device_agent_integer' => crc32(md5($_SERVER['HTTP_USER_AGENT'])),

                     'expire' => $this->auth->getExpire(),

                 ]);

-            }

-            else{

+            } else{

 

                 return DeviceToken::where('user_id',$this->auth->params['authId'])

                     ->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])))

src/resta/Authenticate/ConfigProvider.php

Spacing +6 added lines, -6 removed lines

@@ -36,7 +36,7 @@ 
     {

         $this->config();

 

-        if($this->guard=="default"){

+        if ($this->guard=="default") {

             $this->setAuthenticateNeeds();

         }

     }

@@ -60,7 +60,7 @@ 
      */

     public function getAddToWhere()

     {

-        if(isset($this->config['guard'][$this->guard]['addToWhere'])){

+        if (isset($this->config['guard'][$this->guard]['addToWhere'])) {

             return $this->config['guard'][$this->guard]['addToWhere'];

         }

         return null;

@@ -73,7 +73,7 @@ 
      */

     public function getConfigToken()

     {

-        if(isset($this->config['guard'][$this->guard]['token'])){

+        if (isset($this->config['guard'][$this->guard]['token'])) {

             return $this->config['guard'][$this->guard]['token'];

         }

         return null;

@@ -98,7 +98,7 @@ 
     {

         $this->getModel();

 

-        if($this->model=="Default"){

+        if ($this->model=="Default") {

 

             return $this->driverDefaultNamespace.'\\'.$this->getDriver().'\\UserBuilder';

         }

@@ -125,7 +125,7 @@ 
     {

         $this->getModel();

 

-        if($this->model=="Default"){

+        if ($this->model=="Default") {

 

             return $this->driverDefaultNamespace.'\\'.$this->getDriver().'\\User';

         }

@@ -193,7 +193,7 @@ 
      */

     public function provider($key)

     {

-        if(app()->has('authenticate.'.$key) && is_callable($provider = app()->get('authenticate.'.$key))){

+        if (app()->has('authenticate.'.$key) && is_callable($provider = app()->get('authenticate.'.$key))) {

             return $provider;

         }

 

src/resta/Response/ResponseProvider.php

Spacing +7 added lines, -8 removed lines

@@ -27,13 +27,13 @@ 
         //the auto service to be called.

         return ClosureDispatcher::bind($controllerInstance)->call(function() use($controllerInstance){

 

-            if(property_exists($controllerInstance,'response')){

+            if (property_exists($controllerInstance, 'response')) {

                 return $controllerInstance->response;

             }

 

             // if the client wishes,

             // data can be returned in the supported format.

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

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

                 return $this->app->get('clientResponseType');

             }

 

@@ -73,8 +73,7 @@ 
     {

         //we get the response type by checking the instanceController object from the router.

         //Each type of response is in the base class in project directory.

-        return ($this->getControllerInstance()===null) ? core()->responseType :

-            $this->appResponseType();

+        return ($this->getControllerInstance()===null) ? core()->responseType : $this->appResponseType();

     }

 

     /**

@@ -85,19 +84,19 @@ 
     public function handle()

     {

         //definition for singleton instance

-        define ('responseApp',true);

+        define('responseApp', true);

 

         //get out putter for response

         $formatter = $this->formatter();

 

         //if out putter is not null

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

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

 

             //We resolve the response via the service container

             //and run the handle method.

             $result = app()->resolve($formatter)->{$this->getResponseKind()}($this->getOutPutter());

 

-            $this->app->register('result',$result);

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

         }

     }

 

@@ -107,7 +106,7 @@ 
      * @param array $data

      * @return array

      */

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

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

     {

         $dataCapsule = config('response.data');