@@ -122,7 +122,7 @@ |
||
| 122 | 122 | $output->writeln(''); |
| 123 | 123 | $table->render(); |
| 124 | 124 | |
| 125 | - exit; |
|
| 125 | + exit; |
|
| 126 | 126 | $task = 'cd '.$jsonDb[$nameOfProject]; |
| 127 | 127 | echo $console = shell_exec($task); |
| 128 | 128 | echo "\n"; |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | $db = file_get_contents(getenv("HOME").'/'.self::DIRECTORY.'/'.self::DB); |
| 64 | - $jsonDb = json_decode($db,true); |
|
| 64 | + $jsonDb = json_decode($db, true); |
|
| 65 | 65 | |
| 66 | 66 | if (is_null($jsonDb)) { |
| 67 | 67 | $output->writeln(''); |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | $final = self::STAGING; |
| 73 | 73 | foreach ($hieranchy as $k => $v) { |
| 74 | 74 | if ($v == $branchOfProject) { |
| 75 | - $merge = $hieranchy[$k-1]; |
|
| 75 | + $merge = $hieranchy[$k - 1]; |
|
| 76 | 76 | $final = $v; |
| 77 | 77 | } |
| 78 | 78 | } |
@@ -80,9 +80,9 @@ discard block |
||
| 80 | 80 | chdir($jsonDb[$nameOfProject]); |
| 81 | 81 | |
| 82 | 82 | $pipetask = [ |
| 83 | - 'git checkout ' .$merge, |
|
| 83 | + 'git checkout '.$merge, |
|
| 84 | 84 | 'git pull', |
| 85 | - 'git checkout ' .$final, |
|
| 85 | + 'git checkout '.$final, |
|
| 86 | 86 | 'git merge '.$merge, |
| 87 | 87 | 'git push', |
| 88 | 88 | 'git checkout develop', |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | |
| 97 | 97 | $table = new Table($output); |
| 98 | 98 | |
| 99 | - foreach ($pipetask as $t){ |
|
| 99 | + foreach ($pipetask as $t) { |
|
| 100 | 100 | //$console = ""; |
| 101 | 101 | //exec($t,$console); |
| 102 | 102 | $table->addRow([ |