.../MediaSettingsDefaultIframeDomainUpdateTest.php | 4 +- ...GlobalThemeSettingsDefaultLogoUrlUpdateTest.php | 3 +- .../UpdateSettingsDefaultFetchUrlUpdateTest.php | 45 +++++++++++----------- core/modules/update/update.install | 1 - 4 files changed, 25 insertions(+), 28 deletions(-) diff --git a/core/modules/media/tests/src/Functional/Update/MediaSettingsDefaultIframeDomainUpdateTest.php b/core/modules/media/tests/src/Functional/Update/MediaSettingsDefaultIframeDomainUpdateTest.php index 27b0b7887e..0f12e6e5e5 100644 --- a/core/modules/media/tests/src/Functional/Update/MediaSettingsDefaultIframeDomainUpdateTest.php +++ b/core/modules/media/tests/src/Functional/Update/MediaSettingsDefaultIframeDomainUpdateTest.php @@ -52,8 +52,8 @@ public function testUpdate() { $this->runUpdates(); - $logo_url_after = $this->config('media.settings')->get('iframe_domain'); - $this->assertSame(NULL, $logo_url_after); + $iframe_domain_after = $this->config('media.settings')->get('iframe_domain'); + $this->assertNull($iframe_domain_after); } } diff --git a/core/modules/system/tests/src/Functional/Update/GlobalThemeSettingsDefaultLogoUrlUpdateTest.php b/core/modules/system/tests/src/Functional/Update/GlobalThemeSettingsDefaultLogoUrlUpdateTest.php index ff43f2502e..54316ff9ed 100644 --- a/core/modules/system/tests/src/Functional/Update/GlobalThemeSettingsDefaultLogoUrlUpdateTest.php +++ b/core/modules/system/tests/src/Functional/Update/GlobalThemeSettingsDefaultLogoUrlUpdateTest.php @@ -19,7 +19,6 @@ class GlobalThemeSettingsDefaultLogoUrlUpdateTest extends UpdatePathTestBase { */ protected $defaultTheme = 'stark'; - /** * {@inheritdoc} */ @@ -39,7 +38,7 @@ public function testUpdate() { $this->runUpdates(); $logo_url_after = $this->config('system.theme.global')->get('logo.url'); - $this->assertSame(NULL, $logo_url_after); + $this->assertNull($logo_url_after); } } diff --git a/core/modules/update/tests/src/Functional/Update/UpdateSettingsDefaultFetchUrlUpdateTest.php b/core/modules/update/tests/src/Functional/Update/UpdateSettingsDefaultFetchUrlUpdateTest.php index bcb47d6195..1d82f1d645 100644 --- a/core/modules/update/tests/src/Functional/Update/UpdateSettingsDefaultFetchUrlUpdateTest.php +++ b/core/modules/update/tests/src/Functional/Update/UpdateSettingsDefaultFetchUrlUpdateTest.php @@ -20,7 +20,6 @@ class UpdateSettingsDefaultFetchUrlUpdateTest extends UpdatePathTestBase { */ protected $defaultTheme = 'stark'; - /** * {@inheritdoc} */ @@ -65,37 +64,37 @@ protected function setUp(): void { ->execute(); // Create update.settings config. + $default_update_settings = [ + 'check' => [ + 'disabled_extensions' => FALSE, + 'interval_days' => 1, + ], + 'fetch' => [ + 'url' => '', + 'max_attempts' => 2, + 'timeout' => 30, + ], + 'notification' => [ + 'emails' => [], + 'threshold' => 'all', + ], + ]; $connection->insert('config') - ->fields(array( + ->fields([ 'collection', 'name', 'data', - )) - ->values(array( + ]) + ->values([ 'collection' => '', 'name' => 'update.settings', - 'data' => serialize([ - 'check' => [ - 'disabled_extensions' => FALSE, - 'interval_days' => 1, - ], - 'fetch' => [ - 'url' => '', - 'max_attempts' => 2, - 'timeout' => 30, - ], - 'notification' => [ - 'emails' => [], - 'threshold' => 'all', - ], - ]) - )) + 'data' => serialize($default_update_settings), + ]) ->execute(); } - /** - * Tests update of update.settings:fetch.url + * Tests update of update.settings:fetch.url. */ public function testUpdate() { $fetch_url_before = $this->config('update.settings')->get('fetch.url'); @@ -104,7 +103,7 @@ public function testUpdate() { $this->runUpdates(); $fetch_url_after = $this->config('update.settings')->get('fetch.url'); - $this->assertSame(NULL, $fetch_url_after); + $this->assertNull($fetch_url_after); } } diff --git a/core/modules/update/update.install b/core/modules/update/update.install index dd65e88b1f..a9140c44e8 100644 --- a/core/modules/update/update.install +++ b/core/modules/update/update.install @@ -187,4 +187,3 @@ function update_update_10200() { ->save(TRUE); } } -