butcherman / Tech_Bench

app/Console/Commands/updateRun.php

Spacing +34 added lines, -34 removed lines

@@ -48,11 +48,11 @@ 
         $this->line('');
         //  Select which update file to use
         $updateFile = $this->checkForUpdate();
-        if ($updateFile) {
+        if($updateFile) {
             //  Open up the file and verify it is at least the same version as the current setup
             $valid = $this->openUpdate($updateFile);
 
-            if ($valid) {
+            if($valid) {
                 $this->call('down');
                 $this->copyFiles($updateFile);
 
@@ -71,37 +71,37 @@ 
         $updates    = Storage::disk('staging')->files('updates');
 
         //  Cycle through each file in the update directory to see if they are update files
-        foreach ($updates as $update) {
+        foreach($updates as $update) {
             $baseName = explode('/', $update)[1];
 
             //  Verify the file is in the .zip format
             $fileParts = pathinfo($baseName);
-            if ($fileParts['extension'] == 'zip') {
+            if($fileParts['extension'] == 'zip') {
                 //  Verify this is actually an update file
-                $zip = Zip::open(config('filesystems.disks.staging.root') .
-                    DIRECTORY_SEPARATOR . 'updates' . DIRECTORY_SEPARATOR . $baseName);
+                $zip = Zip::open(config('filesystems.disks.staging.root').
+                    DIRECTORY_SEPARATOR.'updates'.DIRECTORY_SEPARATOR.$baseName);
                 $files = $zip->listFiles();
-                if (in_array($fileParts['filename'] . '/config/version.yml', $files)) {
+                if(in_array($fileParts['filename'].'/config/version.yml', $files)) {
                     $updateList[] = $baseName;
                 }
             }
         }
 
-        if (empty($updateList)) {
+        if(empty($updateList)) {
             $this->error('No updates have been loaded to the system');
             $this->error('Please upload update package to the Storage/Staging/Updates folder');
             return false;
         }
 
         //  Determine if there is more than one update that can be applied
-        if (count($updateList) > 1) {
+        if(count($updateList) > 1) {
             $this->line('');
 
             $anticipate = [];
-            foreach ($updateList as $key => $up) {
+            foreach($updateList as $key => $up) {
                 $opt = $key + 1;
                 $anticipate[$opt] = $up;
-                $this->line('[' . $opt . '] ' . $up);
+                $this->line('['.$opt.'] '.$up);
             }
             $updateFile = $this->choice('Please select which update you would like to load', $anticipate);
         } else {
@@ -117,25 +117,25 @@ 
         $fileParts = pathinfo($file);
         $folder = $fileParts['filename'];
 
-        $zip = Zip::open(config('filesystems.disks.staging.root') .
-            DIRECTORY_SEPARATOR . 'updates' . DIRECTORY_SEPARATOR . $file);
+        $zip = Zip::open(config('filesystems.disks.staging.root').
+            DIRECTORY_SEPARATOR.'updates'.DIRECTORY_SEPARATOR.$file);
 
-        $zip->extract(config('filesystems.disks.staging.root') .
-            DIRECTORY_SEPARATOR . 'updates' . DIRECTORY_SEPARATOR . 'tmp');
+        $zip->extract(config('filesystems.disks.staging.root').
+            DIRECTORY_SEPARATOR.'updates'.DIRECTORY_SEPARATOR.'tmp');
         $zip->close();
 
-        $verFile = fopen(config('filesystems.disks.staging.root') .
-            DIRECTORY_SEPARATOR . 'updates' . DIRECTORY_SEPARATOR . 'tmp' .
-            DIRECTORY_SEPARATOR . $folder . DIRECTORY_SEPARATOR . 'config' .
-            DIRECTORY_SEPARATOR . 'version.yml', 'r');
+        $verFile = fopen(config('filesystems.disks.staging.root').
+            DIRECTORY_SEPARATOR.'updates'.DIRECTORY_SEPARATOR.'tmp'.
+            DIRECTORY_SEPARATOR.$folder.DIRECTORY_SEPARATOR.'config'.
+            DIRECTORY_SEPARATOR.'version.yml', 'r');
 
         $verData = [];
         $i = 0;
-        while (!feof($verFile)) {
+        while(!feof($verFile)) {
             $line = fgets($verFile);
             $data = explode(':', $line);
 
-            if (($data[0] === '  major' || $data[0] === '  minor' || $data[0] === '  patch') && $i < 3) {
+            if(($data[0] === '  major' || $data[0] === '  minor' || $data[0] === '  patch') && $i < 3) {
                 $verData[trim($data[0])] = trim($data[1]);
                 $i++;
             }
@@ -144,11 +144,11 @@ 
         $curVersion = new \PragmaRX\Version\Package\Version();
 
         $valid = false;
-        if ($verData['major'] > $curVersion->major()) {
+        if($verData['major'] > $curVersion->major()) {
             $valid = true;
-        } else if ($verData['minor'] > $curVersion->minor()) {
+        } else if($verData['minor'] > $curVersion->minor()) {
             $valid = true;
-        } else if ($verData['patch'] >= $curVersion->patch()) {
+        } else if($verData['patch'] >= $curVersion->patch()) {
             $valid = true;
         }
 
@@ -161,20 +161,20 @@ 
         $fileParts = pathinfo($updateFile);
         $folder = $fileParts['filename'];
 
-        $updateFile = config('filesystems.disks.staging.root') .
-            DIRECTORY_SEPARATOR . 'updates' . DIRECTORY_SEPARATOR . 'tmp' .
-            DIRECTORY_SEPARATOR . $folder . DIRECTORY_SEPARATOR;
+        $updateFile = config('filesystems.disks.staging.root').
+            DIRECTORY_SEPARATOR.'updates'.DIRECTORY_SEPARATOR.'tmp'.
+            DIRECTORY_SEPARATOR.$folder.DIRECTORY_SEPARATOR;
 
         // Copy files
-        File::copyDirectory($updateFile . 'app',       base_path() . DIRECTORY_SEPARATOR . 'app');
-        File::copyDirectory($updateFile . 'bootstrap', base_path() . DIRECTORY_SEPARATOR . 'bootstrap');
-        File::copyDirectory($updateFile . 'config',    base_path() . DIRECTORY_SEPARATOR . 'config');
-        File::copyDirectory($updateFile . 'database',  base_path() . DIRECTORY_SEPARATOR . 'database');
-        File::copyDirectory($updateFile . 'resources', base_path() . DIRECTORY_SEPARATOR . 'resources');
-        File::copyDirectory($updateFile . 'routes',    base_path() . DIRECTORY_SEPARATOR . 'routes');
+        File::copyDirectory($updateFile.'app', base_path().DIRECTORY_SEPARATOR.'app');
+        File::copyDirectory($updateFile.'bootstrap', base_path().DIRECTORY_SEPARATOR.'bootstrap');
+        File::copyDirectory($updateFile.'config', base_path().DIRECTORY_SEPARATOR.'config');
+        File::copyDirectory($updateFile.'database', base_path().DIRECTORY_SEPARATOR.'database');
+        File::copyDirectory($updateFile.'resources', base_path().DIRECTORY_SEPARATOR.'resources');
+        File::copyDirectory($updateFile.'routes', base_path().DIRECTORY_SEPARATOR.'routes');
 
         //  Run Composer Updates
-        exec('cd ' . base_path() . ' && composer install --no-dev --no-interaction --optimize-autoloader --no-ansi');
+        exec('cd '.base_path().' && composer install --no-dev --no-interaction --optimize-autoloader --no-ansi');
         // exec('cd'.base_path().  ' && ziggy:generate');
         $this->call('ziggy:generate');
         //  Run NPM

Braces +34 added lines, -15 removed lines

@@ -48,16 +48,20 @@ 
         $this->line('');
         //  Select which update file to use
         $updateFile = $this->checkForUpdate();
-        if ($updateFile) {
+        if ($updateFile)
+        {
             //  Open up the file and verify it is at least the same version as the current setup
             $valid = $this->openUpdate($updateFile);
 
-            if ($valid) {
+            if ($valid)
+            {
                 $this->call('down');
                 $this->copyFiles($updateFile);
 
                 $this->info('Update Completed');
-            } else {
+            }
+            else
+            {
                 $this->error('The selected update is not a newer version');
                 $this->error('Cannot downgrade Tech Bench in this manner');
             }
@@ -71,40 +75,48 @@ 
         $updates    = Storage::disk('staging')->files('updates');
 
         //  Cycle through each file in the update directory to see if they are update files
-        foreach ($updates as $update) {
+        foreach ($updates as $update)
+        {
             $baseName = explode('/', $update)[1];
 
             //  Verify the file is in the .zip format
             $fileParts = pathinfo($baseName);
-            if ($fileParts['extension'] == 'zip') {
+            if ($fileParts['extension'] == 'zip')
+            {
                 //  Verify this is actually an update file
                 $zip = Zip::open(config('filesystems.disks.staging.root') .
                     DIRECTORY_SEPARATOR . 'updates' . DIRECTORY_SEPARATOR . $baseName);
                 $files = $zip->listFiles();
-                if (in_array($fileParts['filename'] . '/config/version.yml', $files)) {
+                if (in_array($fileParts['filename'] . '/config/version.yml', $files))
+                {
                     $updateList[] = $baseName;
                 }
             }
         }
 
-        if (empty($updateList)) {
+        if (empty($updateList))
+        {
             $this->error('No updates have been loaded to the system');
             $this->error('Please upload update package to the Storage/Staging/Updates folder');
             return false;
         }
 
         //  Determine if there is more than one update that can be applied
-        if (count($updateList) > 1) {
+        if (count($updateList) > 1)
+        {
             $this->line('');
 
             $anticipate = [];
-            foreach ($updateList as $key => $up) {
+            foreach ($updateList as $key => $up)
+            {
                 $opt = $key + 1;
                 $anticipate[$opt] = $up;
                 $this->line('[' . $opt . '] ' . $up);
             }
             $updateFile = $this->choice('Please select which update you would like to load', $anticipate);
-        } else {
+        }
+        else
+        {
             $updateFile = $updateList[0];
         }
 
@@ -131,11 +143,13 @@ 
 
         $verData = [];
         $i = 0;
-        while (!feof($verFile)) {
+        while (!feof($verFile))
+        {
             $line = fgets($verFile);
             $data = explode(':', $line);
 
-            if (($data[0] === '  major' || $data[0] === '  minor' || $data[0] === '  patch') && $i < 3) {
+            if (($data[0] === '  major' || $data[0] === '  minor' || $data[0] === '  patch') && $i < 3)
+            {
                 $verData[trim($data[0])] = trim($data[1]);
                 $i++;
             }
@@ -144,11 +158,16 @@ 
         $curVersion = new \PragmaRX\Version\Package\Version();
 
         $valid = false;
-        if ($verData['major'] > $curVersion->major()) {
+        if ($verData['major'] > $curVersion->major())
+        {
             $valid = true;
-        } else if ($verData['minor'] > $curVersion->minor()) {
+        }
+        else if ($verData['minor'] > $curVersion->minor())
+        {
             $valid = true;
-        } else if ($verData['patch'] >= $curVersion->patch()) {
+        }
+        else if ($verData['patch'] >= $curVersion->patch())
+        {
             $valid = true;
         }