php-resta / resta-core

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

Spacing +14 added lines, -14 removed lines

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

      * @var $type

      */

-    public $type='model';

+    public $type = 'model';

 

     /**

      * @var array

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

      * @var $commandRule

      */

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

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

 

     /**

      * @method create

      * @return mixed

      */

-    public function create(){

+    public function create() {

 

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

 

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

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

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

         }

 

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

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

 

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

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

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

         }

 

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

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

 

-        if(!file_exists($entityDir)){

+        if (!file_exists($entityDir)) {

             files()->makeDirectory($entityDir);

         }

 

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

 

 

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

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

 

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

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

 

             //$this->setAnnotations();

             $generator->createClass();

@@ -119,15 +119,15 @@ 
 

 

         //set builder map

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

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

 

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

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

 

             $this->setAnnotations();

             $generator->createClass();

         }

 

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

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

 

             $generator->createMethod([

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

@@ -148,7 +148,7 @@ 
         }

 

         //set project touch

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

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

             'stub'=>'Model_Create'

         ]);

 

@@ -159,11 +159,11 @@ 
     /**

      * @return bool

      */

-    private function setAnnotations(){

+    private function setAnnotations() {

 

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

 

-        if(file_exists($entityMap)){

+        if (file_exists($entityMap)) {

 

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

                 [

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

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,45 +49,45 @@ 
             $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(isset($contentResult) && $contentResult!==false){
+            if (isset($contentResult) && $contentResult!==false) {
                 
                 $this->schema->getConnection()->generateEntity($dbtable);
 
-                if(substr($dbtable,-1)=='s'){
-                    app()->command('model create','model:'.strtolower(substr($dbtable,0,-1)).' table:'.$dbtable.' entity:'.$dbtable);
+                if (substr($dbtable, -1)=='s') {
+                    app()->command('model create', 'model:'.strtolower(substr($dbtable, 0, -1)).' table:'.$dbtable.' entity:'.$dbtable);
                 }
-                else{
-                    app()->command('model create','model:'.strtolower($dbtable).' table:'.$dbtable.' entity:'.$dbtable);
+                else {
+                    app()->command('model create', 'model:'.strtolower($dbtable).' table:'.$dbtable.' entity:'.$dbtable);
                 }
                 
                 echo $dbtablekey.'- '.$migrationName.' ---> Ok';
             }
-            elseif($exist){
+            elseif ($exist) {
                 echo $dbtablekey.'- '.$migrationName.' ---> (Already Exist)';
             }
-            else{
+            else {
                 echo $dbtablekey.'- '.$migrationName.' ---> Fail';
             }
 
@@ -115,46 +115,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()';
             }
 
@@ -169,39 +169,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);
     }
 
     /**
@@ -212,43 +212,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;
         }
     }
@@ -260,11 +260,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];
             }
         }
@@ -282,13 +282,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;
             }
         }
@@ -307,7 +307,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

@@ -52,8 +52,7 @@ 
             if(!file_exists($makeDirectory)){
                 files()->makeDirectory($makeDirectory,0755,true);
                 $exist=false;
-            }
-            else{
+            } else{
                 $exist=true;
             }
 
@@ -77,17 +76,14 @@ 
 
                 if(substr($dbtable,-1)=='s'){
                     app()->command('model create','model:'.strtolower(substr($dbtable,0,-1)).' table:'.$dbtable.' entity:'.$dbtable);
-                }
-                else{
+                } else{
                     app()->command('model create','model:'.strtolower($dbtable).' table:'.$dbtable.' entity:'.$dbtable);
                 }
                 
                 echo $dbtablekey.'- '.$migrationName.' ---> Ok';
-            }
-            elseif($exist){
+            } elseif($exist){
                 echo $dbtablekey.'- '.$migrationName.' ---> (Already Exist)';
-            }
-            else{
+            } else{
                 echo $dbtablekey.'- '.$migrationName.' ---> Fail';
             }
 
@@ -214,41 +210,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/Database/Migration/Src/Resource/PushManager/PushingProcess.php

Spacing +15 added lines, -15 removed lines

@@ -14,37 +14,37 @@ 
      */
     public function processHandler()
     {
-        return $this->errorHandler(function(){
+        return $this->errorHandler(function() {
             
             $results = [];
             
-            foreach ($this->list as $table =>$datas){
+            foreach ($this->list as $table =>$datas) {
 
-                foreach ($datas as $data){
+                foreach ($datas as $data) {
                     
-                    $query = $this->queryBuilder($table,$data);
+                    $query = $this->queryBuilder($table, $data);
 
                     $query = $query->handle();
                     
                     
-                    if($query===false){
+                    if ($query===false) {
                         $results[] = [];
                     }
-                    else{
-                        $status =($query['result']!==false) ? true : false;
+                    else {
+                        $status = ($query['result']!==false) ? true : false;
                         
-                        if($status){
+                        if ($status) {
                             $this->schema->getConnection()->generateEntity($table);
 
-                            if(substr($table,-1)=='s'){
-                                app()->command('model create','model:'.strtolower(substr($table,0,-1)).' table:'.$table.' entity:'.$table);
+                            if (substr($table, -1)=='s') {
+                                app()->command('model create', 'model:'.strtolower(substr($table, 0, -1)).' table:'.$table.' entity:'.$table);
                             }
-                            else{
-                                app()->command('model create','model:'.strtolower($table).' table:'.$table.' entity:'.$table);
+                            else {
+                                app()->command('model create', 'model:'.strtolower($table).' table:'.$table.' entity:'.$table);
                             }
                         }
 
-                        $results[]= [
+                        $results[] = [
                             'success'=>$status,
                             'file'=>$data->getFile(),
                             'table'=>$table,
@@ -74,11 +74,11 @@ 
             {
                 $alterBinds = $object->getAlterBinds();
                 
-                if(!is_null($alterBinds) && count($alterBinds)>1){
+                if (!is_null($alterBinds) && count($alterBinds)>1) {
                     exception()->runtime('Only one command can be applied to alter groups');
                 }
                 
-                if(count($object->getError())){
+                if (count($object->getError())) {
                     exception()->runtime(''.$object->getFile().' -> '.$object->getError()[0].'');
                 }
                 

Braces +2 added lines, -4 removed lines

@@ -29,8 +29,7 @@ 
                     
                     if($query===false){
                         $results[] = [];
-                    }
-                    else{
+                    } else{
                         $status =($query['result']!==false) ? true : false;
                         
                         if($status){
@@ -38,8 +37,7 @@ 
 
                             if(substr($table,-1)=='s'){
                                 app()->command('model create','model:'.strtolower(substr($table,0,-1)).' table:'.$table.' entity:'.$table);
-                            }
-                            else{
+                            } else{
                                 app()->command('model create','model:'.strtolower($table).' table:'.$table.' entity:'.$table);
                             }
                         }

src/resta/Database/Migration/Src/GrammarStructure/Mysql/Traits/QueryStack.php

Spacing +16 added lines, -16 removed lines

@@ -50,7 +50,7 @@ 
     {
         $collation = $this->connection()->query('SHOW COLLATION LIKE \''.$collation.'%\'')->fetchAll();
 
-        if(isset($collation[0])){
+        if (isset($collation[0])) {
             return $collation[0]['Charset'];
         }
 
@@ -67,7 +67,7 @@ 
     {
         $status = $this->connection()->query('show table status like \''.$table.'\'')->fetchAll();
 
-        if(isset($status[0])){
+        if (isset($status[0])) {
             return $status[0];
         }
 
@@ -103,7 +103,7 @@ 
         WHERE rc.CONSTRAINT_SCHEMA = \''.$database.'\'
         AND rc.TABLE_NAME = \''.$table.'\' AND r.REFERENCED_TABLE_NAME is not null')->fetchAll();
 
-        if(isset($query[0])){
+        if (isset($query[0])) {
             return $query[0];
         }
 
@@ -120,7 +120,7 @@ 
     {
         try {
 
-            $query =$this->connection()->query($query);
+            $query = $this->connection()->query($query);
 
             return [
                 'result'=>true,
@@ -128,7 +128,7 @@ 
                 'message'=>null,
             ];
         }
-        catch (\PDOException $exception){
+        catch (\PDOException $exception) {
 
             return [
                 'result'=>false,
@@ -144,15 +144,15 @@ 
      */
     public function generateEntity($table)
     {
-        if(in_array($table,$this->showTables()) || in_array($table = strtolower($table),$this->showTables())){
+        if (in_array($table, $this->showTables()) || in_array($table = strtolower($table), $this->showTables())) {
             
             $entityDirectory = path()->model().''.DIRECTORY_SEPARATOR.'Entity';
             
-            if(!file_exists(app()->path()->model())){
+            if (!file_exists(app()->path()->model())) {
                 files()->makeDirectory(app()->path()->model());
             }
 
-            if(!file_exists($entityDirectory)){
+            if (!file_exists($entityDirectory)) {
                 files()->makeDirectory($entityDirectory);
             }
 
@@ -164,8 +164,8 @@ 
                 $list[] = $column['Field'];
             }
 
-            if(!file_exists($entityDirectory.''.DIRECTORY_SEPARATOR.''.ucfirst($table))){
-                $generator = new Generator($entityDirectory.''.DIRECTORY_SEPARATOR.''.ucfirst($table),$table.'');
+            if (!file_exists($entityDirectory.''.DIRECTORY_SEPARATOR.''.ucfirst($table))) {
+                $generator = new Generator($entityDirectory.''.DIRECTORY_SEPARATOR.''.ucfirst($table), $table.'');
 
                 $generator->createClass();
             }
@@ -174,15 +174,15 @@ 
             $abstractClassPath = $entityDirectory.''.DIRECTORY_SEPARATOR.''.ucfirst($table).''.DIRECTORY_SEPARATOR.'Entity';
             $abstractNamespace = Utils::getNamespace($abstractClassPath.''.DIRECTORY_SEPARATOR.''.ucfirst($table).'Abstract');
 
-            $generator->createClassExtend($abstractNamespace,ucfirst($table).'Abstract');
+            $generator->createClassExtend($abstractNamespace, ucfirst($table).'Abstract');
 
-            $generator = new Generator($abstractClassPath,$table.'Abstract');
+            $generator = new Generator($abstractClassPath, $table.'Abstract');
 
             $generator->createClass();
 
-            $method =array_merge([
+            $method = array_merge([
                 '__construct'
-            ],array_merge($list,['__get']));
+            ], array_merge($list, ['__get']));
 
             $generator->createMethod($method);
 
@@ -207,7 +207,7 @@ 
 
             $generator->createClassDocument($createClassDocument);
 
-            $generator->createMethodDocument(array_merge($createMethodDocument,[
+            $generator->createMethodDocument(array_merge($createMethodDocument, [
                 '__construct' => [
                     ''.$table.' constructor.',
                     '@param null|object $query'
@@ -223,7 +223,7 @@ 
             $createMethodBody = array_merge([
                 '__construct' => 'self::$query = $query;',
                 '__get' => 'return static::{$name}();'
-            ],$methodBodyList);
+            ], $methodBodyList);
 
             $generator->createMethodBody($createMethodBody);