lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Moved composer clear commands to after composer install per #16334

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2025-02-26 09:37:31 +00:00
parent 992214fc66
commit 9b0ea51d35
1 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
upgrade.php
View file

@ -479,15 +479,6 @@ foreach ($unused_files as $unused_file) {
} }
echo "\n"; echo "\n";
$config_clear = shell_exec('php artisan config:clear');
$cache_clear = shell_exec('php artisan cache:clear');
$route_clear = shell_exec('php artisan route:clear');
$view_clear = shell_exec('php artisan view:clear');
echo $success_icon.' '.trim($config_clear)."\n";
echo $success_icon.' '.trim($cache_clear)."\n";
echo $success_icon.' '.trim($route_clear)."\n";
echo $success_icon.' '.trim($view_clear)."\n";
echo "\n";
echo "\e[95m--------------------------------------------------------\n"; echo "\e[95m--------------------------------------------------------\n";
echo "STEP 6: Updating composer dependencies:\n"; echo "STEP 6: Updating composer dependencies:\n";
@ -497,13 +488,11 @@ echo "-- Running the app in ".$app_environment." mode.\n";
// Composer install // Composer install
if (file_exists('composer.phar')) { if (file_exists('composer.phar')) {
echo "√ Local composer.phar detected, so we'll use that.\n\n"; echo $success_icon." Local composer.phar detected, so we'll use that.\n\n";
echo "-- Updating local composer.phar\n\n"; echo "-- Updating local composer.phar\n\n";
$composer_update = shell_exec('php composer.phar self-update'); $composer_update = shell_exec('php composer.phar self-update');
echo $composer_update."\n\n"; echo $composer_update."\n\n";
// Use --no-dev only if we are in production mode. // Use --no-dev only if we are in production mode.
// This will cause errors otherwise, if the user is in develop or local for their APP_ENV // This will cause errors otherwise, if the user is in develop or local for their APP_ENV
if ($app_environment == 'production') { if ($app_environment == 'production') {
@ -511,10 +500,9 @@ if (file_exists('composer.phar')) {
} else { } else {
$composer = shell_exec('php composer.phar install --prefer-source'); $composer = shell_exec('php composer.phar install --prefer-source');
} }
$composer_dump = shell_exec('php composer.phar dump'); $composer_dump = shell_exec('php composer.phar dump');
} else { } else {
echo "-- We couldn't find a local composer.phar. No worries, trying globally.\n"; echo "-- We couldn't find a local composer.phar. No worries, trying globally.\n";
@ -531,13 +519,20 @@ if (file_exists('composer.phar')) {
$composer_dump = shell_exec('composer dump'); $composer_dump = shell_exec('composer dump');
} }
echo $composer_dump."\n"; echo $composer_dump."\n";
echo $composer; echo $composer;
$config_clear = shell_exec('php artisan config:clear');
$cache_clear = shell_exec('php artisan cache:clear');
$route_clear = shell_exec('php artisan route:clear');
$view_clear = shell_exec('php artisan view:clear');
echo $success_icon.' '.trim($config_clear)."\n";
echo $success_icon.' '.trim($cache_clear)."\n";
echo $success_icon.' '.trim($route_clear)."\n";
echo $success_icon.' '.trim($view_clear)."\n";
echo "\n";
echo "\e[95m--------------------------------------------------------\n"; echo "\e[95m--------------------------------------------------------\n";
echo "STEP 7: Putting application into maintenance mode: \n"; echo "STEP 7: Putting application into maintenance mode: \n";