diff --git a/app/Http/Controllers/Admin/UpdateController.php b/app/Http/Controllers/Admin/UpdateController.php index 7142c43cde..6eb781c3ad 100644 --- a/app/Http/Controllers/Admin/UpdateController.php +++ b/app/Http/Controllers/Admin/UpdateController.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Admin; +use FireflyConfig; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Middleware\IsDemoUser; @@ -85,7 +86,7 @@ class UpdateController extends Controller public function post(Request $request) { $checkForUpdates = intval($request->get('check_for_updates')); - app('fireflyconfig')->set('permission_update_check', $checkForUpdates); + FireflyConfig::set('permission_update_check', $checkForUpdates); Session::flash('success', strval(trans('firefly.configuration_updated'))); return redirect(route('admin.update-check')); @@ -107,7 +108,7 @@ class UpdateController extends Controller $first = reset($releases); $string = ''; $check = version_compare($current, $first->getTitle()); - app('fireflyconfig')->set('last_update_check', time()); + FireflyConfig::set('last_update_check', time()); } catch (FireflyException $e) { Log::error(sprintf('Could not check for updates: %s', $e->getMessage())); } diff --git a/tests/Feature/Controllers/Admin/UpdateControllerTest.php b/tests/Feature/Controllers/Admin/UpdateControllerTest.php index a0e4bf69d1..7d05ff5ee8 100644 --- a/tests/Feature/Controllers/Admin/UpdateControllerTest.php +++ b/tests/Feature/Controllers/Admin/UpdateControllerTest.php @@ -24,6 +24,7 @@ namespace Tests\Feature\Controllers\Admin; use FireflyConfig; use FireflyIII\Models\Configuration; +use FireflyIII\Services\Github\Request\UpdateRequest; use Tests\TestCase; /** @@ -33,23 +34,23 @@ use Tests\TestCase; * @SuppressWarnings(PHPMD.ExcessiveMethodLength) * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class ConfigurationControllerTest extends TestCase +class UpdateControllerTest extends TestCase { /** - * @covers \FireflyIII\Http\Controllers\Admin\UpdateControllerTest::index - * @covers \FireflyIII\Http\Controllers\Admin\UpdateControllerTest::__construct + * @covers \FireflyIII\Http\Controllers\Admin\UpdateController::index + * @covers \FireflyIII\Http\Controllers\Admin\UpdateController::__construct */ public function testIndex() { $this->be($this->user()); - $config = new Configuration; + $config = new Configuration; $config->data = -1; $falseConfig = new Configuration; $falseConfig->data = false; - FireflyConfig::shouldReceive('get')->withArgs(['permission_update_check', true])->once()->andReturn($config); + FireflyConfig::shouldReceive('get')->withArgs(['permission_update_check', -1])->once()->andReturn($config); FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig); $response = $this->get(route('admin.update-check')); @@ -59,21 +60,59 @@ class ConfigurationControllerTest extends TestCase $response->assertSee('