Fixed issues with uninstaller

aicwebtech · Feb 11, 2022 · 149ab49 · 149ab49
1 parent 797370b
commit 149ab49
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/app/InstallManager.php b/app/InstallManager.php
@@ -270,14 +270,13 @@ static function uninstall(Request $request) {
 
         $InstalledBibles = Bible::where('installed', 1)->get();
         $success = TRUE;
-        // return TRUE;
 
         foreach($InstalledBibles as $B) {
             $B->uninstall();
             $success = ($B->hasErrors()) ? FALSE : $success;
         }
 
-        $exit_code = Artisan::call('migrate:reset'); // Roll back ALL DB migrations
+        $exit_code = Artisan::call('migrate:reset', array('--force' => TRUE)); // Roll back ALL DB migrations
 
         if(\Schema::hasTable('migrations')) {
             \Schema::drop('migrations');

diff --git a/public/widgets/download/download.php b/public/widgets/download/download.php
@@ -5,6 +5,7 @@
 
 <?php
     $downloadable_bibles = 0;
+    $BibleSuperSearchBibles = (array) $BibleSuperSearchBibles;
 
     foreach($BibleSuperSearchBibles as $bible) {
         if($bible['downloadable']) {

diff --git a/tests/Feature/Controllers/AdminControllerTest.php b/tests/Feature/Controllers/AdminControllerTest.php
@@ -9,15 +9,6 @@
 
 class AdminControllerTest extends TestCase
 {
-//     Route::get('/admin/debug', 'AdminController@debug')->name('admin.debug');
-//     Route::get('/admin/update', 'AdminController@softwareUpdate')->name('admin.update')->middleware('install');
-//     Route::get('/admin/uninstall', 'AdminController@uninstallPage')->name('admin.uninstall')->middleware('install');
-//     Route::get('/admin/tos', 'Admin\PostConfigController@tos')->name('admin.tos')->middleware('install');
-// Route::post('/admin/tos', 'Admin\PostConfigController@saveTos');
-// Route::get('/admin/privacy', 'Admin\PostConfigController@privacy')->name('admin.privacy')->middleware('install');
-// Route::post('/admin/privacy', 'Admin\PostConfigController@savePrivacy');
-
-// Route::resource('/admin/bibles', 'Admin\BibleController', ['as' => 'admin']);
 
     public function testBible()
     {