php-resta / resta-core

src/resta/Database/Migration/Src/GrammarStructure/Mysql/Wizard/WizardAlter.php

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
 use Migratio\Contract\WizardContract;
 use Migratio\Contract\WizardAlterContract;
 
-class WizardAlter extends Wizard implements WizardContract,WizardAlterContract
+class WizardAlter extends Wizard implements WizardContract, WizardAlterContract
 {
     /**
      * @var string
@@ -27,7 +27,7 @@ 
      */
     public function after($field)
     {
-        $this->wizard->setAlterType('place',['AFTER'=>$field]);
+        $this->wizard->setAlterType('place', ['AFTER'=>$field]);
 
         return $this->wizard;
     }

src/resta/Database/Migration/Src/GrammarStructure/Mysql/QuerySyntaxHelper.php

Braces +2 added lines, -4 removed lines

@@ -17,8 +17,7 @@ 
         if(isset($nullable[$name])){
             if($nullable[$name]===false){
                 $nullableValue='NOT NULL';
-            }
-            else{
+            } else{
                 $nullableValue='NULL';
             }
         }
@@ -72,8 +71,7 @@ 
         
         if($this->data['types'][$nameKey]!=='timestamp'){
             $list[] = (isset($this->data['default'][$name])) ? ' DEFAULT "'.$this->data['default'][$name].'"' : '';
-        }
-        else{
+        } else{
             $list[] = (isset($this->data['default'][$name])) ? ' DEFAULT '.$this->data['default'][$name].'' : '';
         }
         

Spacing +28 added lines, -28 removed lines

@@ -10,16 +10,16 @@ 
      * @param $name
      * @return string
      */
-    protected function getNullableValue($nullable,$name)
+    protected function getNullableValue($nullable, $name)
     {
-        $nullableValue='';
+        $nullableValue = '';
 
-        if(isset($nullable[$name])){
-            if($nullable[$name]===false){
-                $nullableValue='NOT NULL';
+        if (isset($nullable[$name])) {
+            if ($nullable[$name]===false) {
+                $nullableValue = 'NOT NULL';
             }
-            else{
-                $nullableValue='NULL';
+            else {
+                $nullableValue = 'NULL';
             }
         }
 
@@ -59,21 +59,21 @@ 
      */
     protected function getValueWithIsset($name)
     {
-        $nameKey = array_search($name,$this->data['names']);
+        $nameKey = array_search($name, $this->data['names']);
         
         $list   = [];
-        $list[] = $this->getNullableValue($this->data['nullable'],$name);
+        $list[] = $this->getNullableValue($this->data['nullable'], $name);
         $list[] = (isset($this->data['autoIncrement'][$name])) ? 'AUTO_INCREMENT' : '';
         $list[] = (isset($this->data['primaryKey'][$name])) ? 'PRIMARY KEY' : '';
         
-        if($this->data['types'][$nameKey]=='timestamp' && !isset($this->data['default'][$nameKey])){
+        if ($this->data['types'][$nameKey]=='timestamp' && !isset($this->data['default'][$nameKey])) {
             $this->data['default'][$name] = 'CURRENT_TIMESTAMP';
         }
         
-        if($this->data['types'][$nameKey]!=='timestamp'){
+        if ($this->data['types'][$nameKey]!=='timestamp') {
             $list[] = (isset($this->data['default'][$name])) ? ' DEFAULT "'.$this->data['default'][$name].'"' : '';
         }
-        else{
+        else {
             $list[] = (isset($this->data['default'][$name])) ? ' DEFAULT '.$this->data['default'][$name].'' : '';
         }
         
@@ -90,8 +90,8 @@ 
     protected function getUniqueValueList($name)
     {
         //get unique
-        if(isset($this->data['unique'][$name])){
-            $this->data['uniqueValueList'][]      = 'UNIQUE INDEX '.$this->data['unique'][$name]['value'].' ('.$name.' ASC)';
+        if (isset($this->data['unique'][$name])) {
+            $this->data['uniqueValueList'][] = 'UNIQUE INDEX '.$this->data['unique'][$name]['value'].' ('.$name.' ASC)';
         }
     }
 
@@ -101,8 +101,8 @@ 
     protected function getIndexValueList($name)
     {
         //get index
-        if(isset($this->data['index'][$name])){
-            $this->data['indexValueList'][]  = 'INDEX '.$this->data['index'][$name]['value'].' ('.$name.')';
+        if (isset($this->data['index'][$name])) {
+            $this->data['indexValueList'][] = 'INDEX '.$this->data['index'][$name]['value'].' ('.$name.')';
         }
     }
 
@@ -123,19 +123,19 @@ 
      */
     protected function getCreateDefaultList()
     {
-        $list               = [];
+        $list = [];
 
         foreach ($this->data['names'] as $key=>$name)
         {
             list(
-                $nullableValue,$autoIncrementValue,
-                $primaryKeyValue,$defaultValue,$commentValue
+                $nullableValue, $autoIncrementValue,
+                $primaryKeyValue, $defaultValue, $commentValue
                 ) = $this->getValueWithIsset($name);
 
             //set index values
             $this->setIndex($name);
 
-            $list[]=''.$name.' '.$this->data['types'][$key].' '.$nullableValue.' '.$defaultValue.' '.$primaryKeyValue.' '.$autoIncrementValue.' '.$commentValue.'';
+            $list[] = ''.$name.' '.$this->data['types'][$key].' '.$nullableValue.' '.$defaultValue.' '.$primaryKeyValue.' '.$autoIncrementValue.' '.$commentValue.'';
         }
 
         return $list;
@@ -146,18 +146,18 @@ 
      */
     protected function getKeyList()
     {
-        $keyList            = [];
+        $keyList = [];
 
         //multiple indexes
-        if(isset($this->data['index']['indexes'])){
+        if (isset($this->data['index']['indexes'])) {
 
-            foreach ($this->data['index']['indexes'] as $index_key=>$index_value){
+            foreach ($this->data['index']['indexes'] as $index_key=>$index_value) {
 
                 $indexesCommentValue = (isset($index_value['comment'])) ? 'COMMENT "'.$index_value['comment'].'"' : '';
 
                 $keyType    = (isset($index_value['type'])) ? ucfirst($index_value['type']) : 'KEY';
 
-                $keyList[]  = "".$keyType." ".$index_value['name']." (".implode(",",$index_value['value']).") ".$indexesCommentValue;
+                $keyList[]  = "".$keyType." ".$index_value['name']." (".implode(",", $index_value['value']).") ".$indexesCommentValue;
             }
         }
 
@@ -172,13 +172,13 @@ 
     {
         $list = [];
 
-        foreach ($reference as $constraint=>$values){
+        foreach ($reference as $constraint=>$values) {
 
-            $list[]=',CONSTRAINT '.$constraint.' FOREIGN KEY ('.$values['key'].') 
+            $list[] = ',CONSTRAINT '.$constraint.' FOREIGN KEY ('.$values['key'].') 
             REFERENCES '.$values['references']['table'].'('.$values['references']['field'].') '.$this->getOnProcess($values);
         }
 
-        return implode (" ",$list);
+        return implode(" ", $list);
     }
 
     /**
@@ -186,7 +186,7 @@ 
      */
     private function getOnProcess($referenceValue)
     {
-        if(isset($referenceValue['on']) && isset($referenceValue['onOption'])){
+        if (isset($referenceValue['on']) && isset($referenceValue['onOption'])) {
             return ''.$referenceValue['on'].' '.strtoupper($referenceValue['onOption']).'';
         }
 

src/resta/Database/Migration/Src/GrammarStructure/Mysql/QuerySyntax.php

Spacing +36 added lines, -36 removed lines

@@ -25,28 +25,28 @@ 
 
         $this->getDefaultSyntaxGroup();
 
-        $this->syntax[]=')';
+        $this->syntax[] = ')';
 
         //get table collation
-        if(isset($this->data['tableCollation']['table'])){
-            $this->syntax[]=' DEFAULT CHARACTER SET '.$this->data['tableCollation']['table'];
+        if (isset($this->data['tableCollation']['table'])) {
+            $this->syntax[] = ' DEFAULT CHARACTER SET '.$this->data['tableCollation']['table'];
         }
-        else{
-            $this->syntax[]=' DEFAULT CHARACTER SET utf8';
+        else {
+            $this->syntax[] = ' DEFAULT CHARACTER SET utf8';
         }
 
         //get engine
-        if($this->data['engine']!==null)
+        if ($this->data['engine']!==null)
         {
-            $this->syntax[]=' ENGINE='.$this->data['engine'].' ';
+            $this->syntax[] = ' ENGINE='.$this->data['engine'].' ';
         }
-        else{
-            $this->syntax[]=' ENGINE=InnoDB ';
+        else {
+            $this->syntax[] = ' ENGINE=InnoDB ';
         }
 
-        $syntax = implode("",$this->syntax);
+        $syntax = implode("", $this->syntax);
         
-        $query=$this->schema->getConnection()->setQueryBasic($syntax);
+        $query = $this->schema->getConnection()->setQueryBasic($syntax);
 
         return [
             'syntax'=>$syntax,
@@ -62,25 +62,25 @@ 
     private function getDefaultSyntaxGroup()
     {
 
-        $this->syntax[]=implode(",",$this->getCreateDefaultList());
+        $this->syntax[] = implode(",", $this->getCreateDefaultList());
 
         //get unique values
-        if(isset($this->data['uniqueValueList']) && count($this->data['uniqueValueList'])){
-            $this->syntax[]=','.implode(',',$this->data['uniqueValueList']);
+        if (isset($this->data['uniqueValueList']) && count($this->data['uniqueValueList'])) {
+            $this->syntax[] = ','.implode(',', $this->data['uniqueValueList']);
         }
 
         //get index values
-        if(isset($this->data['indexValueList']) && count($this->data['indexValueList'])){
-            $this->syntax[]=','.implode(',',$this->data['indexValueList']);
+        if (isset($this->data['indexValueList']) && count($this->data['indexValueList'])) {
+            $this->syntax[] = ','.implode(',', $this->data['indexValueList']);
         }
 
         //get index values for key
-        if(count($this->getKeyList())){
-            $this->syntax[]=','.implode(',',$this->getKeyList());
+        if (count($this->getKeyList())) {
+            $this->syntax[] = ','.implode(',', $this->getKeyList());
         }
 
-        if(count($this->data['references'])){
-            $this->syntax[]=$this->getReferenceSyntax($this->data['references']);
+        if (count($this->data['references'])) {
+            $this->syntax[] = $this->getReferenceSyntax($this->data['references']);
         }
     }
 
@@ -104,33 +104,33 @@ 
     
     private function change($alterType)
     {
-        if(isset($alterType['place'])){
+        if (isset($alterType['place'])) {
 
-            foreach ($alterType['place'] as $placeKey=>$placeValue){
-                $placeList=$placeKey .' '.$placeValue.'';
+            foreach ($alterType['place'] as $placeKey=>$placeValue) {
+                $placeList = $placeKey.' '.$placeValue.'';
             }
 
-            $syntax = implode("",$this->syntax);
+            $syntax = implode("", $this->syntax);
             
             $columns = $this->schema->getConnection()->showColumnsFrom($this->table);
             
-            foreach ($columns as $columnKey=>$columnData){
-                if($columnData['Field']==$placeValue){
+            foreach ($columns as $columnKey=>$columnData) {
+                if ($columnData['Field']==$placeValue) {
                     $changeAbleField = $columns[$columnKey+1]['Field'];
                 }
             }
             
-            $syntaxList = explode(' ',$syntax);
+            $syntaxList = explode(' ', $syntax);
 
-            if(current($syntaxList)!==$changeAbleField){
-                $alterSytanx = 'ALTER TABLE '.$this->table.' change '.$changeAbleField.' '.current($syntaxList).'  '.implode(' ',array_splice($syntaxList,1)).' '.$placeList;
+            if (current($syntaxList)!==$changeAbleField) {
+                $alterSytanx = 'ALTER TABLE '.$this->table.' change '.$changeAbleField.' '.current($syntaxList).'  '.implode(' ', array_splice($syntaxList, 1)).' '.$placeList;
             }
-            else{
+            else {
                 $alterSytanx = 'ALTER TABLE '.$this->table.' modify '.$syntax.' '.$placeList;
             }
             
 
-            $query=$this->schema->getConnection()->setQueryBasic($alterSytanx);
+            $query = $this->schema->getConnection()->setQueryBasic($alterSytanx);
 
             return [
                 'syntax'=>$syntax,
@@ -143,17 +143,17 @@ 
 
     private function addColumn($alterType)
     {
-        if(isset($alterType['place'])){
+        if (isset($alterType['place'])) {
 
-            foreach ($alterType['place'] as $placeKey=>$placeValue){
-                $placeList=$placeKey .' '.$placeValue.'';
+            foreach ($alterType['place'] as $placeKey=>$placeValue) {
+                $placeList = $placeKey.' '.$placeValue.'';
             }
 
-            $syntax = implode("",$this->syntax);
+            $syntax = implode("", $this->syntax);
 
             $alterSytanx = 'ALTER TABLE '.$this->table.' ADD COLUMN '.$syntax.' '.$placeList;
 
-            $query=$this->schema->getConnection()->setQueryBasic($alterSytanx);
+            $query = $this->schema->getConnection()->setQueryBasic($alterSytanx);
 
             return [
                 'syntax'=>$syntax,

Braces +3 added lines, -6 removed lines

@@ -30,8 +30,7 @@ 
         //get table collation
         if(isset($this->data['tableCollation']['table'])){
             $this->syntax[]=' DEFAULT CHARACTER SET '.$this->data['tableCollation']['table'];
-        }
-        else{
+        } else{
             $this->syntax[]=' DEFAULT CHARACTER SET utf8';
         }
 
@@ -39,8 +38,7 @@ 
         if($this->data['engine']!==null)
         {
             $this->syntax[]=' ENGINE='.$this->data['engine'].' ';
-        }
-        else{
+        } else{
             $this->syntax[]=' ENGINE=InnoDB ';
         }
 
@@ -124,8 +122,7 @@ 
 
             if(current($syntaxList)!==$changeAbleField){
                 $alterSytanx = 'ALTER TABLE '.$this->table.' change '.$changeAbleField.' '.current($syntaxList).'  '.implode(' ',array_splice($syntaxList,1)).' '.$placeList;
-            }
-            else{
+            } else{
                 $alterSytanx = 'ALTER TABLE '.$this->table.' modify '.$syntax.' '.$placeList;
             }
             

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

Spacing +10 added lines, -10 removed lines

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

      * @var $type

      */

-    public $type='project';

+    public $type = 'project';

 

     /**

      * @var array

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

      * @var $commandRule

      */

-    public $commandRule=[];

+    public $commandRule = [];

 

     /**

      * @method create

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

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

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

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

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

 

-        $recursiveDefaultDirectory = explode("\\",$this->argument['project']);

+        $recursiveDefaultDirectory = explode("\\", $this->argument['project']);

         $this->argument['applicationName'] = pos($recursiveDefaultDirectory);

         $recursiveDefaultDirectory[] = 'V1';

         $recursiveDefaultDirectoryList = [];

 

-        foreach (array_slice($recursiveDefaultDirectory,1) as $defaultDirectory){

+        foreach (array_slice($recursiveDefaultDirectory, 1) as $defaultDirectory) {

 

-            $recursiveDefaultDirectoryList[]=$defaultDirectory;

-            $this->directory[$defaultDirectory.'Path'] = $this->projectPath().''.implode("/",$recursiveDefaultDirectoryList);

+            $recursiveDefaultDirectoryList[] = $defaultDirectory;

+            $this->directory[$defaultDirectory.'Path'] = $this->projectPath().''.implode("/", $recursiveDefaultDirectoryList);

         }

 

         //$this->directory['optionalDir'] = $this->optional();

@@ -82,7 +82,7 @@ 
         //$this->directory['sourceDir']               = $this->sourceDir();

         //$this->directory['sourceSupportDir']        = $this->sourceSupportDir();

         //$this->directory['sourceSupportTraitDir']   = $this->sourceSupportDir().'/Traits';

-        $this->directory['exceptionDir']            = app()->path()->exception();

+        $this->directory['exceptionDir'] = app()->path()->exception();

 

         //set project directory

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

@@ -97,7 +97,7 @@ 
         $this->touch['kernel/worker']               = $this->provider().'/WorkerServiceProvider.php';

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

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

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

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

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

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

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

@@ -136,7 +136,7 @@ 
         $this->touch['app/gitignore']               = $this->projectPath().'/.gitignore';

         $this->touch['app/composer']                = $this->projectPath().'/composer.json';

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

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

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

 

         //set project touch

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

src/resta/Authenticate/AuthenticateToken.php

Spacing +5 added lines, -5 removed lines

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

      * @var null

      */

-    public $credentialHash=null;

+    public $credentialHash = null;

 

     /**

      * @return string

@@ -16,7 +16,7 @@ 
     {

         // the absolute params property must be present

         // in the object and the params value must be the builder key.

-        if(property_exists($this,'params') and isset($this->params['builder'])){

+        if (property_exists($this, 'params') and isset($this->params['builder'])) {

 

             // a real token will be generated after

             // you get the first method of the query builder value.

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

             // we refer to the token closure feature on the config to enable

             // the creation of user-based tokens on the application side.

-            return $this->getTokenFromProvider($authData,function() use($authData){

+            return $this->getTokenFromProvider($authData, function() use($authData){

                 return md5(sha1($authData->id.'__'.$this->credentialHash.'__'.time().'__'.fingerPrint()));

             });

         }

@@ -37,11 +37,11 @@ 
      * @param callable $callback

      * @return mixed

      */

-    private function getTokenFromProvider($authData,callable $callback)

+    private function getTokenFromProvider($authData, callable $callback)

     {

         // if the token value is a closure value,

         // we will run a user-based token closure.

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

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

             return $token($authData);

         }

 

src/resta/Support/Command.php

Spacing +6 added lines, -6 removed lines

@@ -19,19 +19,19 @@ 
      * @param $command

      * @param $args

      */

-    public function __construct($app,$command,$args)

+    public function __construct($app, $command, $args)

     {

         parent::__construct($app);

 

         $this->arguments[]  = 'php';

         $this->arguments[]  = 'api';

-        $this->arguments    = array_merge($this->arguments,explode(" ",$command));

+        $this->arguments    = array_merge($this->arguments, explode(" ", $command));

         $this->arguments[]  = strtolower(app);

 

-        $argsList = explode(' ',$args);

+        $argsList = explode(' ', $args);

 

         foreach ($argsList as $item) {

-            $this->arguments[]  = $item;

+            $this->arguments[] = $item;

         }

     }

 

@@ -42,11 +42,11 @@ 
      */

     public function handle()

     {

-        $process = new ProcessHandler($this->arguments,root.'');

+        $process = new ProcessHandler($this->arguments, root.'');

         $process->start();

 

         foreach ($process as $type => $data) {

-            if ($process::OUT !== $type) {

+            if ($process::OUT!==$type) {

                 return false;

             }

             return true;

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

Spacing +51 added lines, -51 removed lines

@@ -21,7 +21,7 @@ 
 
         $list = [];
 
-        foreach ($migrations as $table=>$item){
+        foreach ($migrations as $table=>$item) {
             $list[] = strtolower($table);
         }
 
@@ -30,7 +30,7 @@ 
         echo 'Toplam : '.count($dbtables).' Table';
         echo PHP_EOL;
 
-        foreach ($dbtables as $dbtablekey=>$dbtable){
+        foreach ($dbtables as $dbtablekey=>$dbtable) {
 
             $dbtablekey = $dbtablekey+1;
 
@@ -39,40 +39,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';
             }
 
@@ -100,46 +100,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()';
             }
 
@@ -154,39 +154,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);
     }
 
     /**
@@ -197,43 +197,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;
         }
     }
@@ -245,11 +245,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];
             }
         }
@@ -268,7 +268,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'];
             }
         }

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;
         }
     }

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.