php-resta / resta-core

src/resta/Console/ConsoleTable.php

Spacing +62 added lines, -62 removed lines

@@ -265,13 +265,13 @@ 
      */

     function setBorder($border)

     {

-        if ($border === CONSOLE_TABLE_BORDER_ASCII) {

+        if ($border===CONSOLE_TABLE_BORDER_ASCII) {

             $intersection = '+';

             $horizontal = '-';

             $vertical = '|';

         } else if (is_string($border)) {

             $intersection = $horizontal = $vertical = $border;

-        } else if ($border == '') {

+        } else if ($border=='') {

             $intersection = $horizontal = $vertical = '';

         } else {

             extract($border);

@@ -398,7 +398,7 @@ 
             $this->_data[$row_id++][$col_id] = $col_cell;

         }

         $this->_updateRowsCols();

-        $this->_max_cols = max($this->_max_cols, $col_id + 1);

+        $this->_max_cols = max($this->_max_cols, $col_id+1);

     }

     /**

      * Adds data to the table.

@@ -412,7 +412,7 @@ 
     function addData($data, $col_id = 0, $row_id = 0)

     {

         foreach ($data as $row) {

-            if ($row === CONSOLE_TABLE_HORIZONTAL_RULE) {

+            if ($row===CONSOLE_TABLE_HORIZONTAL_RULE) {

                 $this->_data[$row_id] = CONSOLE_TABLE_HORIZONTAL_RULE;

                 $row_id++;

                 continue;

@@ -483,7 +483,7 @@ 
             $column   = $filter[0];

             $callback = $filter[1];

             foreach ($this->_data as $row_id => $row_data) {

-                if ($row_data !== CONSOLE_TABLE_HORIZONTAL_RULE) {

+                if ($row_data!==CONSOLE_TABLE_HORIZONTAL_RULE) {

                     $this->_data[$row_id][$column] =

                         call_user_func($callback, $row_data[$column]);

                 }

@@ -500,25 +500,25 @@ 
         if (!empty($this->_headers)) {

             $this->_calculateRowHeight(-1, $this->_headers[0]);

         }

-        for ($i = 0; $i < $this->_max_rows; $i++) {

-            for ($j = 0; $j < $this->_max_cols; $j++) {

+        for ($i = 0; $i<$this->_max_rows; $i++) {

+            for ($j = 0; $j<$this->_max_cols; $j++) {

                 if (!isset($this->_data[$i][$j]) &&

                     (!isset($this->_data[$i]) ||

-                        $this->_data[$i] !== CONSOLE_TABLE_HORIZONTAL_RULE)) {

+                        $this->_data[$i]!==CONSOLE_TABLE_HORIZONTAL_RULE)) {

                     $this->_data[$i][$j] = '';

                 }

             }

             $this->_calculateRowHeight($i, $this->_data[$i]);

-            if ($this->_data[$i] !== CONSOLE_TABLE_HORIZONTAL_RULE) {

+            if ($this->_data[$i]!==CONSOLE_TABLE_HORIZONTAL_RULE) {

                 ksort($this->_data[$i]);

             }

         }

         $this->_splitMultilineRows();

         // Update cell lengths.

-        for ($i = 0; $i < count($this->_headers); $i++) {

+        for ($i = 0; $i<count($this->_headers); $i++) {

             $this->_calculateCellLengths($this->_headers[$i]);

         }

-        for ($i = 0; $i < $this->_max_rows; $i++) {

+        for ($i = 0; $i<$this->_max_rows; $i++) {

             $this->_calculateCellLengths($this->_data[$i]);

         }

         ksort($this->_data);

@@ -534,24 +534,24 @@ 
         $sections          = array(&$this->_headers, &$this->_data);

         $max_rows          = array(count($this->_headers), $this->_max_rows);

         $row_height_offset = array(-1, 0);

-        for ($s = 0; $s <= 1; $s++) {

+        for ($s = 0; $s<=1; $s++) {

             $inserted = 0;

             $new_data = $sections[$s];

-            for ($i = 0; $i < $max_rows[$s]; $i++) {

+            for ($i = 0; $i<$max_rows[$s]; $i++) {

                 // Process only rows that have many lines.

-                $height = $this->_row_heights[$i + $row_height_offset[$s]];

-                if ($height > 1) {

+                $height = $this->_row_heights[$i+$row_height_offset[$s]];

+                if ($height>1) {

                     // Split column data into one-liners.

                     $split = array();

-                    for ($j = 0; $j < $this->_max_cols; $j++) {

+                    for ($j = 0; $j<$this->_max_cols; $j++) {

                         $split[$j] = preg_split('/\r?\n|\r/',

                             $sections[$s][$i][$j]);

                     }

                     $new_rows = array();

                     // Construct new 'virtual' rows - insert empty strings for

                     // columns that have less lines that the highest one.

-                    for ($i2 = 0; $i2 < $height; $i2++) {

-                        for ($j = 0; $j < $this->_max_cols; $j++) {

+                    for ($i2 = 0; $i2<$height; $i2++) {

+                        for ($j = 0; $j<$this->_max_cols; $j++) {

                             $new_rows[$i2][$j] = !isset($split[$j][$i2])

                                 ? ''

                                 : $split[$j][$i2];

@@ -560,12 +560,12 @@ 
                     // Replace current row with smaller rows.  $inserted is

                     // used to take account of bigger array because of already

                     // inserted rows.

-                    array_splice($new_data, $i + $inserted, 1, $new_rows);

-                    $inserted += count($new_rows) - 1;

+                    array_splice($new_data, $i+$inserted, 1, $new_rows);

+                    $inserted += count($new_rows)-1;

                 }

             }

             // Has the data been modified?

-            if ($inserted > 0) {

+            if ($inserted>0) {

                 $sections[$s] = $new_data;

                 $this->_updateRowsCols();

             }

@@ -584,10 +584,10 @@ 
         $vertical = $this->_border['vertical'];

         $separator = $this->_getSeparator();

         $return = array();

-        for ($i = 0; $i < count($this->_data); $i++) {

-            for ($j = 0; $j < count($this->_data[$i]); $j++) {

-                if ($this->_data[$i] !== CONSOLE_TABLE_HORIZONTAL_RULE &&

-                    $this->_strlen($this->_data[$i][$j]) <

+        for ($i = 0; $i<count($this->_data); $i++) {

+            for ($j = 0; $j<count($this->_data[$i]); $j++) {

+                if ($this->_data[$i]!==CONSOLE_TABLE_HORIZONTAL_RULE &&

+                    $this->_strlen($this->_data[$i][$j])<

                     $this->_cell_lengths[$j]) {

                     $this->_data[$i][$j] = $this->_strpad($this->_data[$i][$j],

                         $this->_cell_lengths[$j],

@@ -595,17 +595,17 @@ 
                         $this->_col_align[$j]);

                 }

             }

-            if ($this->_data[$i] !== CONSOLE_TABLE_HORIZONTAL_RULE) {

+            if ($this->_data[$i]!==CONSOLE_TABLE_HORIZONTAL_RULE) {

                 $row_begin = $this->_borderVisibility['left']

-                    ? $vertical . str_repeat(' ', $this->_padding)

+                    ? $vertical.str_repeat(' ', $this->_padding)

                     : '';

                 $row_end = $this->_borderVisibility['right']

-                    ? str_repeat(' ', $this->_padding) . $vertical

+                    ? str_repeat(' ', $this->_padding).$vertical

                     : '';

-                $implode_char = str_repeat(' ', $this->_padding) . $vertical

+                $implode_char = str_repeat(' ', $this->_padding).$vertical

                     . str_repeat(' ', $this->_padding);

                 $return[]     = $row_begin

-                    . implode($implode_char, $this->_data[$i]) . $row_end;

+                    . implode($implode_char, $this->_data[$i]).$row_end;

             } elseif (!empty($separator)) {

                 $return[] = $separator;

             }

@@ -613,15 +613,15 @@ 
         $return = implode(PHP_EOL, $return);

         if (!empty($separator)) {

             if ($this->_borderVisibility['inner']) {

-                $return = $separator . PHP_EOL . $return;

+                $return = $separator.PHP_EOL.$return;

             }

             if ($this->_borderVisibility['bottom']) {

-                $return .= PHP_EOL . $separator;

+                $return .= PHP_EOL.$separator;

             }

         }

         $return .= PHP_EOL;

         if (!empty($this->_headers)) {

-            $return = $this->_getHeaderLine() .  PHP_EOL . $return;

+            $return = $this->_getHeaderLine().PHP_EOL.$return;

         }

         return $return;

     }

@@ -643,14 +643,14 @@ 
             $return[] = str_repeat($horizontal, $cl);

         }

         $row_begin = $this->_borderVisibility['left']

-            ? $intersection . str_repeat($horizontal, $this->_padding)

+            ? $intersection.str_repeat($horizontal, $this->_padding)

             : '';

         $row_end = $this->_borderVisibility['right']

-            ? str_repeat($horizontal, $this->_padding) . $intersection

+            ? str_repeat($horizontal, $this->_padding).$intersection

             : '';

-        $implode_char = str_repeat($horizontal, $this->_padding) . $intersection

+        $implode_char = str_repeat($horizontal, $this->_padding).$intersection

             . str_repeat($horizontal, $this->_padding);

-        return $row_begin . implode($implode_char, $return) . $row_end;

+        return $row_begin.implode($implode_char, $return).$row_end;

     }

     /**

      * Returns the header line for the table.

@@ -660,16 +660,16 @@ 
     function _getHeaderLine()

     {

         // Make sure column count is correct

-        for ($j = 0; $j < count($this->_headers); $j++) {

-            for ($i = 0; $i < $this->_max_cols; $i++) {

+        for ($j = 0; $j<count($this->_headers); $j++) {

+            for ($i = 0; $i<$this->_max_cols; $i++) {

                 if (!isset($this->_headers[$j][$i])) {

                     $this->_headers[$j][$i] = '';

                 }

             }

         }

-        for ($j = 0; $j < count($this->_headers); $j++) {

-            for ($i = 0; $i < count($this->_headers[$j]); $i++) {

-                if ($this->_strlen($this->_headers[$j][$i]) <

+        for ($j = 0; $j<count($this->_headers); $j++) {

+            for ($i = 0; $i<count($this->_headers[$j]); $i++) {

+                if ($this->_strlen($this->_headers[$j][$i])<

                     $this->_cell_lengths[$i]) {

                     $this->_headers[$j][$i] =

                         $this->_strpad($this->_headers[$j][$i],

@@ -681,20 +681,20 @@ 
         }

         $vertical = $this->_border['vertical'];

         $row_begin = $this->_borderVisibility['left']

-            ? $vertical . str_repeat(' ', $this->_padding)

+            ? $vertical.str_repeat(' ', $this->_padding)

             : '';

         $row_end = $this->_borderVisibility['right']

-            ? str_repeat(' ', $this->_padding) . $vertical

+            ? str_repeat(' ', $this->_padding).$vertical

             : '';

-        $implode_char = str_repeat(' ', $this->_padding) . $vertical

+        $implode_char = str_repeat(' ', $this->_padding).$vertical

             . str_repeat(' ', $this->_padding);

         $separator = $this->_getSeparator();

         if (!empty($separator) && $this->_borderVisibility['top']) {

             $return[] = $separator;

         }

-        for ($j = 0; $j < count($this->_headers); $j++) {

+        for ($j = 0; $j<count($this->_headers); $j++) {

             $return[] = $row_begin

-                . implode($implode_char, $this->_headers[$j]) . $row_end;

+                . implode($implode_char, $this->_headers[$j]).$row_end;

         }

         return implode(PHP_EOL, $return);

     }

@@ -712,7 +712,7 @@ 
         // Update maximum rows.

         ksort($this->_data);

         $keys            = array_keys($this->_data);

-        $this->_max_rows = end($keys) + 1;

+        $this->_max_rows = end($keys)+1;

         switch ($this->_defaultAlign) {

             case CONSOLE_TABLE_ALIGN_CENTER:

                 $pad = STR_PAD_BOTH;

@@ -725,7 +725,7 @@ 
                 break;

         }

         // Set default column alignments

-        for ($i = 0; $i < $this->_max_cols; $i++) {

+        for ($i = 0; $i<$this->_max_cols; $i++) {

             if (!isset($this->_col_align[$i])) {

                 $this->_col_align[$i] = $pad;

             }

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

     function _calculateCellLengths($row)

     {

-        for ($i = 0; $i < count($row); $i++) {

+        for ($i = 0; $i<count($row); $i++) {

             if (!isset($this->_cell_lengths[$i])) {

                 $this->_cell_lengths[$i] = 0;

             }

@@ -762,10 +762,10 @@ 
             $this->_row_heights[$row_number] = 1;

         }

         // Do not process horizontal rule rows.

-        if ($row === CONSOLE_TABLE_HORIZONTAL_RULE) {

+        if ($row===CONSOLE_TABLE_HORIZONTAL_RULE) {

             return;

         }

-        for ($i = 0, $c = count($row); $i < $c; ++$i) {

+        for ($i = 0, $c = count($row); $i<$c; ++$i) {

             $lines                           = preg_split('/\r?\n|\r/', $row[$i]);

             $this->_row_heights[$row_number] = max($this->_row_heights[$row_number],

                 count($lines));

@@ -841,31 +841,31 @@ 
         $sb_length  = strlen($input);

         $pad_length = $this->_strlen($pad);

         /* Return if we already have the length. */

-        if ($mb_length >= $length) {

+        if ($mb_length>=$length) {

             return $input;

         }

         /* Shortcut for single byte strings. */

-        if ($mb_length == $sb_length && $pad_length == strlen($pad)) {

+        if ($mb_length==$sb_length && $pad_length==strlen($pad)) {

             return str_pad($input, $length, $pad, $type);

         }

         switch ($type) {

             case STR_PAD_LEFT:

-                $left   = $length - $mb_length;

+                $left   = $length-$mb_length;

                 $output = $this->_substr(str_repeat($pad, ceil($left / $pad_length)),

-                        0, $left, $this->_charset) . $input;

+                        0, $left, $this->_charset).$input;

                 break;

             case STR_PAD_BOTH:

-                $left   = floor(($length - $mb_length) / 2);

-                $right  = ceil(($length - $mb_length) / 2);

+                $left   = floor(($length-$mb_length) / 2);

+                $right  = ceil(($length-$mb_length) / 2);

                 $output = $this->_substr(str_repeat($pad, ceil($left / $pad_length)),

-                        0, $left, $this->_charset) .

-                    $input .

+                        0, $left, $this->_charset).

+                    $input.

                     $this->_substr(str_repeat($pad, ceil($right / $pad_length)),

                         0, $right, $this->_charset);

                 break;

             case STR_PAD_RIGHT:

-                $right  = $length - $mb_length;

-                $output = $input .

+                $right  = $length-$mb_length;

+                $output = $input.

                     $this->_substr(str_repeat($pad, ceil($right / $pad_length)),

                         0, $right, $this->_charset);

                 break;

src/resta/Console/Source/Event/Event.php

Indentation +2 added lines, -2 removed lines

@@ -51,8 +51,8 @@
 

         $eventDispatchers=app()->resolve(ClosureDispatcher::class,['bind'=>app()['eventDispatcher']])->call(function(){

             return [

-              'listen'      => $this->listen,

-              'subscriber'  => $this->subscribe

+                'listen'      => $this->listen,

+                'subscriber'  => $this->subscribe

             ];

         });

 

Spacing +29 added lines, -29 removed lines

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

      * @var $type

      */

-    public $type='event';

+    public $type = 'event';

 

     /**

      * @var bool

@@ -31,22 +31,22 @@ 
     /**

      * @var $commandRule

      */

-    protected $commandRule=[];

+    protected $commandRule = [];

 

     /**

      * @method create

      * @return mixed

      */

-    public function generate(){

+    public function generate() {

 

-        $this->argument['source']=StaticPathList::$events;

-        $this->argument['sourcelisten']=StaticPathList::$listeners;

+        $this->argument['source'] = StaticPathList::$events;

+        $this->argument['sourcelisten'] = StaticPathList::$listeners;

 

-        $this->argument['eventNamespace']=app()->namespace()->optionalEvents().'';

-        $this->argument['listenNamespace']=app()->namespace()->optionalListeners().'';

-        $this->argument['subscriberNamespace']=app()->namespace()->optionalSubscribers().'';

+        $this->argument['eventNamespace'] = app()->namespace()->optionalEvents().'';

+        $this->argument['listenNamespace'] = app()->namespace()->optionalListeners().'';

+        $this->argument['subscriberNamespace'] = app()->namespace()->optionalSubscribers().'';

 

-        $eventDispatchers=app()->resolve(ClosureDispatcher::class,['bind'=>app()['eventDispatcher']])->call(function(){

+        $eventDispatchers = app()->resolve(ClosureDispatcher::class, ['bind'=>app()['eventDispatcher']])->call(function() {

             return [

               'listen'      => $this->listen,

               'subscriber'  => $this->subscribe

@@ -54,40 +54,40 @@ 
         });

 

 

-        $this->directory['eventsDir']=path()->optionalEvents();

-        $this->directory['eventsListenDir']=path()->optionalListeners();

-        $this->directory['eventsListenSubscriberDir']=path()->optionalSubscribers();

+        $this->directory['eventsDir'] = path()->optionalEvents();

+        $this->directory['eventsListenDir'] = path()->optionalListeners();

+        $this->directory['eventsListenSubscriberDir'] = path()->optionalSubscribers();

 

         //set project directory

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

         

 

 

-        foreach ($eventDispatchers['listen'] as $event=>$listens){

+        foreach ($eventDispatchers['listen'] as $event=>$listens) {

 

 

-            $this->argument['eventMain']=ucfirst($event);

+            $this->argument['eventMain'] = ucfirst($event);

 

-            $this->argument['eventKeyNamespace']=app()->namespace()->optionalEvents().'\\'.$this->argument['eventMain'];

+            $this->argument['eventKeyNamespace'] = app()->namespace()->optionalEvents().'\\'.$this->argument['eventMain'];

 

-            $mainFile=$this->directory['eventsDir'].'/'.ucfirst($event).'.php';

+            $mainFile = $this->directory['eventsDir'].'/'.ucfirst($event).'.php';

 

-            if(!file_exists($mainFile)){

-                $this->touch['event/main']=$mainFile;

+            if (!file_exists($mainFile)) {

+                $this->touch['event/main'] = $mainFile;

             }

 

             //set project touch

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

 

 

-            foreach ($listens as $listen){

+            foreach ($listens as $listen) {

 

-                $listenFile=$this->directory['eventsListenDir'].'/'.ucfirst($listen).'.php';

+                $listenFile = $this->directory['eventsListenDir'].'/'.ucfirst($listen).'.php';

 

-                $this->argument['eventListen']=ucfirst($listen);

+                $this->argument['eventListen'] = ucfirst($listen);

 

-                if(!file_exists($listenFile)){

-                    $this->touch['event/listen']=$listenFile;

+                if (!file_exists($listenFile)) {

+                    $this->touch['event/listen'] = $listenFile;

 

                     //set project touch

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

@@ -99,16 +99,16 @@ 
 

         }

 

-        foreach ($eventDispatchers['subscriber'] as $subscriber){

+        foreach ($eventDispatchers['subscriber'] as $subscriber) {

 

-            $eventSubscriberName=''.ucfirst($subscriber);

+            $eventSubscriberName = ''.ucfirst($subscriber);

 

-            $subscriberFile=$this->directory['eventsListenSubscriberDir'].'/'.$eventSubscriberName.'.php';

+            $subscriberFile = $this->directory['eventsListenSubscriberDir'].'/'.$eventSubscriberName.'.php';

 

-            $this->argument['eventSubscriber']=$eventSubscriberName;

+            $this->argument['eventSubscriber'] = $eventSubscriberName;

 

-            if(!file_exists($subscriberFile)){

-                $this->touch['event/subscriber']=$subscriberFile;

+            if (!file_exists($subscriberFile)) {

+                $this->touch['event/subscriber'] = $subscriberFile;

 

                 //set project touch

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

src/resta/Console/Source/Middleware/Middleware.php

Spacing +5 added lines, -5 removed lines

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

      * @var $type

      */

-    public $type='middleware';

+    public $type = 'middleware';

 

     /**

      * @var array

@@ -31,20 +31,20 @@ 
     /**

      * @var $commandRule

      */

-    public $commandRule=['middleware'];

+    public $commandRule = ['middleware'];

 

     /**

      * @method create

      * @return mixed

      */

-    public function create(){

+    public function create() {

 

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

+        $this->touch['middleware/middleware'] = path()->middleware().'/'.$this->argument['middleware'].'.php';

 

 

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

 

-        chmod($this->touch['middleware/middleware'],0777);

+        chmod($this->touch['middleware/middleware'], 0777);

 

         echo $this->classical(' > Middleware called as "'.$this->argument['middleware'].'" has been successfully created in the '.app()->namespace()->middleware().'');

 

src/resta/Console/Source/Boot/Boot.php

Spacing +6 added lines, -6 removed lines

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

      * @var $type

      */

-    public $type='boot';

+    public $type = 'boot';

 

     /**

      * @var array

@@ -26,19 +26,19 @@ 
     /**

      * @var $commandRule

      */

-    protected $commandRule='boot';

+    protected $commandRule = 'boot';

 

     /**

      * @method create

      * @return mixed

      */

-    public function create(){

+    public function create() {

 

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

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

 

-        $this->argument['boot']=current($bootName);

+        $this->argument['boot'] = current($bootName);

 

-        $this->touch['main/boot']        = StaticPathModel::bootDir().'/'.$this->argument['boot'].'.php';

+        $this->touch['main/boot'] = StaticPathModel::bootDir().'/'.$this->argument['boot'].'.php';

 

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

         

src/resta/Console/Source/Key/Key.php

Spacing +5 added lines, -5 removed lines

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

      * @var $type

      */

-    public $type='key';

+    public $type = 'key';

 

     /**

      * @var array

@@ -27,19 +27,19 @@ 
     /**

      * @var $commandRule

      */

-    public $commandRule=[];

+    public $commandRule = [];

 

     /**

      * @method generate

      * @return mixed

      */

-    public function generate(){

+    public function generate() {

 

         //key generate file

-        $this->touch['main/keygenerate']= StaticPathModel::getEncrypter();

+        $this->touch['main/keygenerate'] = StaticPathModel::getEncrypter();

 

         //key generate code

-        $this->argument['applicationKey']=app()['encrypter']->setCipherText();

+        $this->argument['applicationKey'] = app()['encrypter']->setCipherText();

 

         //set key file touch

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

src/resta/Console/Source/Env/Env.php

Spacing +5 added lines, -5 removed lines

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

      * @var $type

      */

-    public $type='env';

+    public $type = 'env';

 

     /**

      * @var array

@@ -26,18 +26,18 @@ 
     /**

      * @var $commandRule

      */

-    protected $commandRule='env';

+    protected $commandRule = 'env';

 

     /**

      * @method create

      * @return mixed

      */

-    public function create(){

+    public function create() {

 

-        $envFile= $this->checkGroupArgument($this->argument['project'],'');

+        $envFile = $this->checkGroupArgument($this->argument['project'], '');

 

         //key generate file

-        $this->touch['main/env']= StaticPathModel::appPath().'/'.strtolower($envFile).'.yaml';

+        $this->touch['main/env'] = StaticPathModel::appPath().'/'.strtolower($envFile).'.yaml';

 

         //set key file touch

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

src/resta/Console/Source/Exception/Exception.php

Spacing +3 added lines, -3 removed lines

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

      * @var $type

      */

-    public $type='exception';

+    public $type = 'exception';

 

     /**

      * @var array

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

      * @var $commandRule

      */

-    public $commandRule=['exception'];

+    public $commandRule = ['exception'];

 

     /**

      * @method create

@@ -49,7 +49,7 @@ 
         //set project directory

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

 

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

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

 

         //set project touch

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

src/resta/Console/Source/Provider/Provider.php

Spacing +9 added lines, -9 removed lines

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

      * @var $type

      */

-    public $type='provider';

+    public $type = 'provider';

 

     /**

      * @var array

@@ -32,28 +32,28 @@ 
     /**

      * @var array

      */

-    protected $commandRule=[];

+    protected $commandRule = [];

 

     /**

      * @method create

      * @return mixed

      */

-    public function create(){

+    public function create() {

 

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

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

 

-        if(file_exists(app()->path()->app())){

+        if (file_exists(app()->path()->app())) {

 

-            if(!isset($this->argument['provider'])) exception()->invalidArgument('Provider key is not valid');

+            if (!isset($this->argument['provider'])) exception()->invalidArgument('Provider key is not valid');

 

             $this->argument['ProviderNamespace'] = app()->namespace()->provider();

             $this->touch['provider/provider'] = app()->path()->provider().'/'.$this->argument['provider'].'.php';

         }

-        else{

+        else {

 

-            $providerName = explode(":",current($bootName));

+            $providerName = explode(":", current($bootName));

 

-            $this->argument['provider']=ucfirst(end($providerName));

+            $this->argument['provider'] = ucfirst(end($providerName));

             $this->argument['ProviderNamespace'] = 'Providers';

             $this->touch['provider/provider'] = StaticPathModel::providerDir().'/'.$this->argument['provider'].'.php';

         }

Braces +4 added lines, -3 removed lines

@@ -44,12 +44,13 @@
 

         if(file_exists(app()->path()->app())){

 

-            if(!isset($this->argument['provider'])) exception()->invalidArgument('Provider key is not valid');

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

+                exception()->invalidArgument('Provider key is not valid');

+            }

 

             $this->argument['ProviderNamespace'] = app()->namespace()->provider();

             $this->touch['provider/provider'] = app()->path()->provider().'/'.$this->argument['provider'].'.php';

-        }

-        else{

+        } else{

 

             $providerName = explode(":",current($bootName));

 

src/resta/Console/Source/Repository/Repository.php

Spacing +19 added lines, -19 removed lines

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

      * @var $type

      */

-    public $type='repository';

+    public $type = 'repository';

 

     /**

      * @var array

@@ -31,39 +31,39 @@ 
     /**

      * @var $commandRule

      */

-    public $commandRule=['repository','?source'];

+    public $commandRule = ['repository', '?source'];

 

     /**

      * @method create

      * @return mixed

      */

-    public function create(){

+    public function create() {

 

-        $repository=$this->argument['repository'];

+        $repository = $this->argument['repository'];

 

-        $repositoryPath=$this->repository().'/'.$repository;

+        $repositoryPath = $this->repository().'/'.$repository;

 

-        $this->argument['repositoryNamespace']=Utils::getNamespace($repositoryPath);

+        $this->argument['repositoryNamespace'] = Utils::getNamespace($repositoryPath);

 

-        if($this->sourceCreate()) return true;

+        if ($this->sourceCreate()) return true;

 

         $this->directory['repositoryPath'] = $this->repository();

-        $this->directory['repositoryDir']=$repositoryPath;

+        $this->directory['repositoryDir'] = $repositoryPath;

 

-        $this->directory['repositorySourceDir']=$this->repository().'/'.$repository.'/Source';

-        $this->directory['repositorySourceMainDir']=$this->directory['repositorySourceDir'].'/Main';

+        $this->directory['repositorySourceDir'] = $this->repository().'/'.$repository.'/Source';

+        $this->directory['repositorySourceMainDir'] = $this->directory['repositorySourceDir'].'/Main';

 

         //set project directory

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

 

-        $this->touch['repository/adapter']      =$this->directory['repositoryDir'].'/'.$repository.'Adapter.php';

-        $this->touch['repository/contract']     =$this->directory['repositoryDir'].'/'.$repository.'Contract.php';

+        $this->touch['repository/adapter']      = $this->directory['repositoryDir'].'/'.$repository.'Adapter.php';

+        $this->touch['repository/contract']     = $this->directory['repositoryDir'].'/'.$repository.'Contract.php';

         //$this->touch['repository/trait']        =$this->directory['repositoryDir'].'/'.$repository.'Trait.php';

 

-        $this->touch['repository/sourcemain']       =$this->directory['repositorySourceMainDir'].'/'.$repository.'Main.php';

+        $this->touch['repository/sourcemain'] = $this->directory['repositorySourceMainDir'].'/'.$repository.'Main.php';

 

         //set project touch

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

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

             'stub'=>'Repository_Create'

         ]);

         

@@ -77,16 +77,16 @@ 
     /**

      * @return bool

      */

-    private function sourceCreate(){

+    private function sourceCreate() {

 

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

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

 

-            $this->directory['repositorySourceCustomDir']=$this->repository().'/'.$this->argument['repository'].'/Source/'.$this->argument['source'];

+            $this->directory['repositorySourceCustomDir'] = $this->repository().'/'.$this->argument['repository'].'/Source/'.$this->argument['source'];

 

             //set project directory

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

 

-            $this->touch['repository/sourcecustommain']=$this->directory['repositorySourceCustomDir'].'/'.$this->argument['repository'].''.$this->argument['source'].'.php';

+            $this->touch['repository/sourcecustommain'] = $this->directory['repositorySourceCustomDir'].'/'.$this->argument['repository'].''.$this->argument['source'].'.php';

 

             //set project touch

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

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

      * @return bool

      */

-    private function setAnnotations(){

+    private function setAnnotations() {

 

         return Utils::changeClass(path()->version().'/ServiceAnnotationsManager.php',

             ['Trait ServiceAnnotationsManager'=>'Trait ServiceAnnotationsManager'.PHP_EOL.' * @method \\'.app()->namespace()->repository().'\\'.$this->argument['repository'].'\\'.$this->argument['repository'].'Contract '.lcfirst($this->argument['repository']).'Repository'

Braces +3 added lines, -1 removed lines

@@ -45,7 +45,9 @@
 

         $this->argument['repositoryNamespace']=Utils::getNamespace($repositoryPath);

 

-        if($this->sourceCreate()) return true;

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

+            return true;

+        }

 

         $this->directory['repositoryPath'] = $this->repository();

         $this->directory['repositoryDir']=$repositoryPath;