Change config option site.site_url to site.url

caendesilva · caendesilva · commit d2c5220f2982 · 2022-07-18T16:38:38.000+02:00
This makes it match both the site.name and the Laravel config, adding consistency.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -12,13 +12,13 @@ This update makes breaking changes to the configuration. You will need to update
 - internal: Refactor navigation menu components and improve link helpers
 
 - Moved config option `hyde.name` to `site.name`
-- Moved config option `hyde.site_url` to `site.site_url`
+- Moved config option `hyde.site_url` to `site.url`
 - Moved config option `hyde.pretty_urls` to `site.pretty_urls`
 - Moved config option `hyde.generate_sitemap` to `site.generate_sitemap`
 - Moved config option `hyde.language` to `site.language`
 - Moved config option `hyde.output_directory` to `site.output_directory`
 
-- The default `site.site_url` is now `http://localhost` instead of `null`
+- The default `site.url` is now `http://localhost` instead of `null`
 
 ### Deprecated
 - for soon-to-be removed features.
@@ -42,7 +42,7 @@ Site-specific config options have been moved from `config/hyde.php` to `config/s
 The following configuration options have been moved. The actual usages remain the same, so you can upgrade by using copying over these options to the new file.
 
 - `hyde.name`
-- `hyde.site_url`
+- `hyde.site_url` (is now just `site.url`)
 - `hyde.pretty_urls`
 - `hyde.generate_sitemap`
 - `hyde.language`
diff --git a/_pages/404.blade.php b/_pages/404.blade.php
@@ -31,7 +31,7 @@
                     Sorry, the page you are looking for could not be found.
                 </p>
 
-                <a href="{{ config('site.site_url') ?? '/' }}">
+                <a href="{{ config('site.url') ?? '/' }}">
                     <button
                         class="bg-transparent text-grey-darkest font-bold uppercase tracking-wide py-3 px-6 border-2 border-grey-light hover:border-grey rounded-lg">
                         Go Home
diff --git a/packages/framework/resources/views/pages/404.blade.php b/packages/framework/resources/views/pages/404.blade.php
@@ -31,7 +31,7 @@
                     Sorry, the page you are looking for could not be found.
                 </p>
 
-                <a href="{{ config('site.site_url') ?? '/' }}">
+                <a href="{{ config('site.url') ?? '/' }}">
                     <button
                         class="bg-transparent text-grey-darkest font-bold uppercase tracking-wide py-3 px-6 border-2 border-grey-light hover:border-grey rounded-lg">
                         Go Home
diff --git a/packages/framework/src/Concerns/Internal/FileHelpers.php b/packages/framework/src/Concerns/Internal/FileHelpers.php
@@ -144,8 +144,8 @@ public static function image(string $name, string $current = null): string
      */
     public static function uriPath(?string $path = ''): string|false
     {
-        if (config('site.site_url', false)) {
-            return rtrim(config('site.site_url'), '/').'/'.(trim($path, '/') ?? '');
+        if (config('site.url', false)) {
+            return rtrim(config('site.url'), '/').'/'.(trim($path, '/') ?? '');
         }
 
         return false;
diff --git a/packages/framework/src/Services/RssFeedService.php b/packages/framework/src/Services/RssFeedService.php
@@ -123,7 +123,7 @@ public static function getLink(): string
     {
         return static::xmlEscape(
             rtrim(
-                config('site.site_url') ?? 'http://localhost',
+                config('site.url') ?? 'http://localhost',
                 '/'
             )
         );
diff --git a/packages/framework/tests/Feature/Commands/HydeBuildRssFeedCommandTest.php b/packages/framework/tests/Feature/Commands/HydeBuildRssFeedCommandTest.php
@@ -14,7 +14,7 @@ class HydeBuildRssFeedCommandTest extends TestCase
 {
     public function test_rss_feed_is_not_generated_when_conditions_are_not_met()
     {
-        config(['site.site_url' => '']);
+        config(['site.url' => '']);
         config(['hyde.generate_rss_feed' => false]);
 
         unlinkIfExists(Hyde::path('_site/feed.xml'));
@@ -26,7 +26,7 @@ public function test_rss_feed_is_not_generated_when_conditions_are_not_met()
 
     public function test_rss_feed_is_generated_when_conditions_are_met()
     {
-        config(['site.site_url' => 'https://example.com']);
+        config(['site.url' => 'https://example.com']);
         config(['hyde.generate_rss_feed' => true]);
 
         unlinkIfExists(Hyde::path('_site/feed.xml'));
@@ -40,7 +40,7 @@ public function test_rss_feed_is_generated_when_conditions_are_met()
 
     public function test_rss_filename_can_be_changed()
     {
-        config(['site.site_url' => 'https://example.com']);
+        config(['site.url' => 'https://example.com']);
         config(['hyde.generate_rss_feed' => true]);
         config(['hyde.rss_filename' => 'blog.xml']);
 
diff --git a/packages/framework/tests/Feature/Commands/HydeBuildSitemapCommandTest.php b/packages/framework/tests/Feature/Commands/HydeBuildSitemapCommandTest.php
@@ -12,7 +12,7 @@ class HydeBuildSitemapCommandTest extends TestCase
 {
     public function test_sitemap_is_generated_when_conditions_are_met()
     {
-        config(['site.site_url' => 'https://example.com']);
+        config(['site.url' => 'https://example.com']);
         config(['site.generate_sitemap' => true]);
 
         unlinkIfExists(Hyde::path('_site/sitemap.xml'));
@@ -27,7 +27,7 @@ public function test_sitemap_is_generated_when_conditions_are_met()
 
     public function test_sitemap_is_not_generated_when_conditions_are_not_met()
     {
-        config(['site.site_url' => '']);
+        config(['site.url' => '']);
         config(['site.generate_sitemap' => false]);
         unlinkIfExists(Hyde::path('_site/sitemap.xml'));
 
@@ -40,7 +40,7 @@ public function test_sitemap_is_not_generated_when_conditions_are_not_met()
 
     public function test_sitemap_returns_helpful_error_message_when_no_site_url_is_configured()
     {
-        config(['site.site_url' => '']);
+        config(['site.url' => '']);
         config(['site.generate_sitemap' => true]);
 
         unlinkIfExists(Hyde::path('_site/sitemap.xml'));
@@ -54,7 +54,7 @@ public function test_sitemap_returns_helpful_error_message_when_no_site_url_is_c
 
     public function test_sitemap_returns_helpful_error_message_when_sitemap_generation_is_disabled()
     {
-        config(['site.site_url' => 'https://example.com']);
+        config(['site.url' => 'https://example.com']);
         config(['site.generate_sitemap' => false]);
 
         unlinkIfExists(Hyde::path('_site/sitemap.xml'));
@@ -67,7 +67,7 @@ public function test_sitemap_returns_helpful_error_message_when_sitemap_generati
 
     public function test_sitemap_returns_helpful_error_message_when_simplexml_is_not_installed()
     {
-        config(['site.site_url' => null]);
+        config(['site.url' => null]);
         config(['testing.mock_disabled_extensions' => true]);
 
         $this->artisan('build:sitemap')
diff --git a/packages/framework/tests/Feature/Concerns/GeneratesPageMetadataTest.php b/packages/framework/tests/Feature/Concerns/GeneratesPageMetadataTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        Config::set('site.site_url', null);
+        Config::set('site.url', null);
     }
 
     protected function tearDown(): void
@@ -71,7 +71,7 @@ public function test_get_meta_properties_returns_base_array_when_initialized_wit
     // Note that this currently assumes that the object using it is a Blog Post.
     public function test_get_meta_properties_contains_og_url_when_uri_path_set()
     {
-        Config::set('site.site_url', 'https://example.com/foo');
+        Config::set('site.url', 'https://example.com/foo');
         $this->slug = 'bar';
         $this->constructMetadata();
 
diff --git a/packages/framework/tests/Feature/Concerns/HasPageMetadataTest.php b/packages/framework/tests/Feature/Concerns/HasPageMetadataTest.php
@@ -19,7 +19,7 @@ protected function setUp(): void
         parent::setUp();
 
         config(['hyde.meta' => []]);
-        config(['site.site_url' => null]);
+        config(['site.url' => null]);
         config(['site.pretty_urls' => false]);
         config(['site.generate_sitemap' => false]);
     }
@@ -38,15 +38,15 @@ protected function makePage(): AbstractPage
     public function test_get_canonical_url_returns_url_for_top_level_page()
     {
         $page = $this->makePage();
-        config(['site.site_url' => 'https://example.com']);
+        config(['site.url' => 'https://example.com']);
 
         $this->assertEquals('https://example.com/foo.html', $page->getCanonicalUrl());
     }
 
     public function test_get_canonical_url_returns_pretty_url_for_top_level_page()
     {
         $page = $this->makePage();
-        config(['site.site_url' => 'https://example.com']);
+        config(['site.url' => 'https://example.com']);
         config(['site.pretty_urls' => true]);
 
         $this->assertEquals('https://example.com/foo', $page->getCanonicalUrl());
@@ -66,7 +66,7 @@ public function getCurrentPagePath(): string
                 return 'bar/'.$this->slug;
             }
         };
-        config(['site.site_url' => 'https://example.com']);
+        config(['site.url' => 'https://example.com']);
 
         $this->assertEquals('https://example.com/bar/foo.html', $page->getCanonicalUrl());
     }
@@ -85,15 +85,15 @@ public function getCurrentPagePath(): string
                 return 'bar/baz/'.$this->slug;
             }
         };
-        config(['site.site_url' => 'https://example.com']);
+        config(['site.url' => 'https://example.com']);
 
         $this->assertEquals('https://example.com/bar/baz/foo.html', $page->getCanonicalUrl());
     }
 
     public function test_can_use_canonical_url_returns_true_when_both_uri_path_and_slug_is_set()
     {
         $page = $this->makePage();
-        config(['site.site_url' => 'https://example.com']);
+        config(['site.url' => 'https://example.com']);
 
         $this->assertTrue($page->canUseCanonicalUrl());
     }
@@ -120,7 +120,7 @@ public function test_can_use_canonical_url_returns_false_when_only_one_condition
             public string $slug;
             public static string $outputDirectory = '';
         };
-        config(['site.site_url' => 'https://example.com']);
+        config(['site.url' => 'https://example.com']);
 
         $this->assertFalse($page->canUseCanonicalUrl());
 
@@ -130,15 +130,15 @@ public function test_can_use_canonical_url_returns_false_when_only_one_condition
 
             public string $slug = 'foo';
         };
-        config(['site.site_url' => null]);
+        config(['site.url' => null]);
 
         $this->assertFalse($page->canUseCanonicalUrl());
     }
 
     public function test_render_page_metadata_returns_string_with_merged_metadata()
     {
         $page = $this->makePage();
-        config(['site.site_url' => 'https://example.com']);
+        config(['site.url' => 'https://example.com']);
 
         config(['hyde.meta' => [
             Meta::name('foo', 'bar'),
@@ -174,7 +174,7 @@ public function test_get_dynamic_metadata_only_adds_canonical_if_conditions_are_
     public function test_get_dynamic_metadata_adds_canonical_url_when_conditions_are_met()
     {
         $page = $this->makePage();
-        config(['site.site_url' => 'https://example.com']);
+        config(['site.url' => 'https://example.com']);
 
         config(['hyde.meta' => [
             Meta::name('foo', 'bar'),
@@ -191,7 +191,7 @@ public function test_get_dynamic_metadata_adds_sitemap_link_when_conditions_are_
         {
             use HasPageMetadata;
         };
-        config(['site.site_url' => 'https://example.com']);
+        config(['site.url' => 'https://example.com']);
         config(['site.generate_sitemap' => true]);
 
         $this->assertEquals(['<link rel="sitemap" type="application/xml" title="Sitemap" href="https://example.com/sitemap.xml" />'],
@@ -205,7 +205,7 @@ public function test_get_dynamic_metadata_does_not_add_sitemap_link_when_conditi
         {
             use HasPageMetadata;
         };
-        config(['site.site_url' => 'https://example.com']);
+        config(['site.url' => 'https://example.com']);
         config(['site.generate_sitemap' => false]);
 
         $this->assertEquals([],
diff --git a/packages/framework/tests/Feature/Services/BuildHookServiceTest.php b/packages/framework/tests/Feature/Services/BuildHookServiceTest.php
@@ -21,7 +21,7 @@ class BuildHookServiceTest extends TestCase
      */
     public function test_build_command_can_run_post_build_tasks()
     {
-        config(['site.site_url' => 'foo']);
+        config(['site.url' => 'foo']);
 
         $this->artisan('build')
             ->expectsOutputToContain('Generating sitemap')
diff --git a/packages/framework/tests/Feature/Services/RssFeedServiceTest.php b/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
@@ -33,7 +33,7 @@ public function test_xml_element_has_channel_element()
     public function test_xml_channel_element_has_required_elements()
     {
         config(['site.name' => 'Test Blog']);
-        config(['site.site_url' => 'https://example.com']);
+        config(['site.url' => 'https://example.com']);
 
         $service = new RssFeedService();
         $this->assertObjectHasAttribute('title', $service->feed->channel);
@@ -47,7 +47,7 @@ public function test_xml_channel_element_has_required_elements()
 
     public function test_xml_channel_element_has_additional_elements()
     {
-        config(['site.site_url' => 'https://example.com']);
+        config(['site.url' => 'https://example.com']);
 
         $service = new RssFeedService();
         $this->assertObjectHasAttribute('link', $service->feed->channel);
@@ -63,7 +63,7 @@ public function test_xml_channel_element_has_additional_elements()
     public function test_xml_channel_data_can_be_customized()
     {
         config(['site.name' => 'Foo']);
-        config(['site.site_url' => 'https://blog.foo.com/bar']);
+        config(['site.url' => 'https://blog.foo.com/bar']);
         config(['hyde.rss_description' => 'Foo is a web log about stuff']);
 
         $service = new RssFeedService();
@@ -90,7 +90,7 @@ public function test_markdown_blog_posts_are_added_to_rss_feed_through_autodisco
             MD
         );
 
-        config(['site.site_url' => 'https://example.com']);
+        config(['site.url' => 'https://example.com']);
 
         file_put_contents(Hyde::path('_media/rss-test.jpg'), 'statData'); // 8 bytes to test stat gets file length
 
@@ -128,19 +128,19 @@ public function test_generate_feed_helper_returns_xml_string()
 
     public function test_can_generate_sitemap_helper_returns_true_if_hyde_has_base_url()
     {
-        config(['site.site_url' => 'foo']);
+        config(['site.url' => 'foo']);
         $this->assertTrue(RssFeedService::canGenerateFeed());
     }
 
     public function test_can_generate_sitemap_helper_returns_false_if_hyde_does_not_have_base_url()
     {
-        config(['site.site_url' => '']);
+        config(['site.url' => '']);
         $this->assertFalse(RssFeedService::canGenerateFeed());
     }
 
     public function test_can_generate_sitemap_helper_returns_false_if_sitemaps_are_disabled_in_config()
     {
-        config(['site.site_url' => 'foo']);
+        config(['site.url' => 'foo']);
         config(['hyde.generate_rss_feed' => false]);
         $this->assertFalse(RssFeedService::canGenerateFeed());
     }
diff --git a/packages/framework/tests/Feature/Services/SitemapServiceTest.php b/packages/framework/tests/Feature/Services/SitemapServiceTest.php
@@ -93,27 +93,27 @@ public function test_generate_sitemap_shorthand_method_returns_xml_string()
 
     public function test_can_generate_sitemap_helper_returns_true_if_hyde_has_base_url()
     {
-        config(['site.site_url' => 'foo']);
+        config(['site.url' => 'foo']);
         $this->assertTrue(SitemapService::canGenerateSitemap());
     }
 
     public function test_can_generate_sitemap_helper_returns_false_if_hyde_does_not_have_base_url()
     {
-        config(['site.site_url' => '']);
+        config(['site.url' => '']);
         $this->assertFalse(SitemapService::canGenerateSitemap());
     }
 
     public function test_can_generate_sitemap_helper_returns_false_if_sitemaps_are_disabled_in_config()
     {
-        config(['site.site_url' => 'foo']);
+        config(['site.url' => 'foo']);
         config(['site.generate_sitemap' => false]);
         $this->assertFalse(SitemapService::canGenerateSitemap());
     }
 
     public function test_url_item_is_generated_correctly()
     {
         config(['site.pretty_urls' => false]);
-        config(['site.site_url' => 'https://example.com']);
+        config(['site.url' => 'https://example.com']);
         Hyde::touch(('_pages/0-test.blade.php'));
 
         $service = new SitemapService();
@@ -130,7 +130,7 @@ public function test_url_item_is_generated_correctly()
     public function test_url_item_is_generated_with_pretty_urls_if_enabled()
     {
         config(['site.pretty_urls' => true]);
-        config(['site.site_url' => 'https://example.com']);
+        config(['site.url' => 'https://example.com']);
         Hyde::touch(('_pages/0-test.blade.php'));
 
         $service = new SitemapService();
@@ -144,7 +144,7 @@ public function test_url_item_is_generated_with_pretty_urls_if_enabled()
 
     public function test_all_route_types_are_discovered()
     {
-        config(['site.site_url' => 'foo']);
+        config(['site.url' => 'foo']);
         Hyde::unlink(['_pages/index.blade.php', '_pages/404.blade.php']);
 
         $files = [
diff --git a/packages/framework/tests/Feature/Services/ValidationServiceTest.php b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
@@ -118,13 +118,13 @@ public function test_check_site_has_an_app_css_stylesheet_can_fail()
 
     public function test_check_site_has_a_base_url_set_can_pass()
     {
-        config(['site.site_url' => 'https://example.com']);
+        config(['site.url' => 'https://example.com']);
         $this->test('check_site_has_a_base_url_set', 0);
     }
 
     public function test_check_site_has_a_base_url_set_can_fail()
     {
-        config(['site.site_url' => null]);
+        config(['site.url' => null]);
         $this->test('check_site_has_a_base_url_set', 2);
     }
 
diff --git a/packages/framework/tests/Feature/StaticSiteServiceTest.php b/packages/framework/tests/Feature/StaticSiteServiceTest.php
diff --git a/packages/framework/tests/Unit/HasPageMetadataRssFeedLinkTest.php b/packages/framework/tests/Unit/HasPageMetadataRssFeedLinkTest.php
diff --git a/packages/framework/tests/Unit/HydeUriPathHelperTest.php b/packages/framework/tests/Unit/HydeUriPathHelperTest.php
diff --git a/packages/framework/tests/Unit/MarkdownPostHelpersTest.php b/packages/framework/tests/Unit/MarkdownPostHelpersTest.php

Original file line number	Diff line number	Diff line change
`@@ -144,8 +144,8 @@ public static function image(string $name, string $current = null): string`
`144`	`144`	`*/`
`145`	`145`	`public static function uriPath(?string $path = ''): string\|false`
`146`	`146`	`{`
`147`		`- if (config('site.site_url', false)) {`
`148`		`- return rtrim(config('site.site_url'), '/').'/'.(trim($path, '/') ?? '');`
	`147`	`+ if (config('site.url', false)) {`
	`148`	`+ return rtrim(config('site.url'), '/').'/'.(trim($path, '/') ?? '');`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public static function getLink(): string`
`123`	`123`	`{`
`124`	`124`	`return static::xmlEscape(`
`125`	`125`	`rtrim(`
`126`		`- config('site.site_url') ?? 'http://localhost',`
	`126`	`+ config('site.url') ?? 'http://localhost',`
`127`	`127`	`'/'`
`128`	`128`	`)`
`129`	`129`	`);`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class HydeBuildRssFeedCommandTest extends TestCase`
`14`	`14`	`{`
`15`	`15`	`public function test_rss_feed_is_not_generated_when_conditions_are_not_met()`
`16`	`16`	`{`
`17`		`- config(['site.site_url' => '']);`
	`17`	`+ config(['site.url' => '']);`
`18`	`18`	`config(['hyde.generate_rss_feed' => false]);`
`19`	`19`
`20`	`20`	`unlinkIfExists(Hyde::path('_site/feed.xml'));`
`@@ -26,7 +26,7 @@ public function test_rss_feed_is_not_generated_when_conditions_are_not_met()`
`26`	`26`
`27`	`27`	`public function test_rss_feed_is_generated_when_conditions_are_met()`
`28`	`28`	`{`
`29`		`- config(['site.site_url' => 'https://example.com']);`
	`29`	`+ config(['site.url' => 'https://example.com']);`
`30`	`30`	`config(['hyde.generate_rss_feed' => true]);`
`31`	`31`
`32`	`32`	`unlinkIfExists(Hyde::path('_site/feed.xml'));`
`@@ -40,7 +40,7 @@ public function test_rss_feed_is_generated_when_conditions_are_met()`
`40`	`40`
`41`	`41`	`public function test_rss_filename_can_be_changed()`
`42`	`42`	`{`
`43`		`- config(['site.site_url' => 'https://example.com']);`
	`43`	`+ config(['site.url' => 'https://example.com']);`
`44`	`44`	`config(['hyde.generate_rss_feed' => true]);`
`45`	`45`	`config(['hyde.rss_filename' => 'blog.xml']);`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class HydeBuildSitemapCommandTest extends TestCase`
`12`	`12`	`{`
`13`	`13`	`public function test_sitemap_is_generated_when_conditions_are_met()`
`14`	`14`	`{`
`15`		`- config(['site.site_url' => 'https://example.com']);`
	`15`	`+ config(['site.url' => 'https://example.com']);`
`16`	`16`	`config(['site.generate_sitemap' => true]);`
`17`	`17`
`18`	`18`	`unlinkIfExists(Hyde::path('_site/sitemap.xml'));`
`@@ -27,7 +27,7 @@ public function test_sitemap_is_generated_when_conditions_are_met()`
`27`	`27`
`28`	`28`	`public function test_sitemap_is_not_generated_when_conditions_are_not_met()`
`29`	`29`	`{`
`30`		`- config(['site.site_url' => '']);`
	`30`	`+ config(['site.url' => '']);`
`31`	`31`	`config(['site.generate_sitemap' => false]);`
`32`	`32`	`unlinkIfExists(Hyde::path('_site/sitemap.xml'));`
`33`	`33`
`@@ -40,7 +40,7 @@ public function test_sitemap_is_not_generated_when_conditions_are_not_met()`
`40`	`40`
`41`	`41`	`public function test_sitemap_returns_helpful_error_message_when_no_site_url_is_configured()`
`42`	`42`	`{`
`43`		`- config(['site.site_url' => '']);`
	`43`	`+ config(['site.url' => '']);`
`44`	`44`	`config(['site.generate_sitemap' => true]);`
`45`	`45`
`46`	`46`	`unlinkIfExists(Hyde::path('_site/sitemap.xml'));`
`@@ -54,7 +54,7 @@ public function test_sitemap_returns_helpful_error_message_when_no_site_url_is_c`
`54`	`54`
`55`	`55`	`public function test_sitemap_returns_helpful_error_message_when_sitemap_generation_is_disabled()`
`56`	`56`	`{`
`57`		`- config(['site.site_url' => 'https://example.com']);`
	`57`	`+ config(['site.url' => 'https://example.com']);`
`58`	`58`	`config(['site.generate_sitemap' => false]);`
`59`	`59`
`60`	`60`	`unlinkIfExists(Hyde::path('_site/sitemap.xml'));`
`@@ -67,7 +67,7 @@ public function test_sitemap_returns_helpful_error_message_when_sitemap_generati`
`67`	`67`
`68`	`68`	`public function test_sitemap_returns_helpful_error_message_when_simplexml_is_not_installed()`
`69`	`69`	`{`
`70`		`- config(['site.site_url' => null]);`
	`70`	`+ config(['site.url' => null]);`
`71`	`71`	`config(['testing.mock_disabled_extensions' => true]);`
`72`	`72`
`73`	`73`	`$this->artisan('build:sitemap')`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ protected function setUp(): void`
`24`	`24`	`{`
`25`	`25`	`parent::setUp();`
`26`	`26`
`27`		`- Config::set('site.site_url', null);`
	`27`	`+ Config::set('site.url', null);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`protected function tearDown(): void`
`@@ -71,7 +71,7 @@ public function test_get_meta_properties_returns_base_array_when_initialized_wit`
`71`	`71`	`// Note that this currently assumes that the object using it is a Blog Post.`
`72`	`72`	`public function test_get_meta_properties_contains_og_url_when_uri_path_set()`
`73`	`73`	`{`
`74`		`- Config::set('site.site_url', 'https://example.com/foo');`
	`74`	`+ Config::set('site.url', 'https://example.com/foo');`
`75`	`75`	`$this->slug = 'bar';`
`76`	`76`	`$this->constructMetadata();`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class BuildHookServiceTest extends TestCase`
`21`	`21`	`*/`
`22`	`22`	`public function test_build_command_can_run_post_build_tasks()`
`23`	`23`	`{`
`24`		`- config(['site.site_url' => 'foo']);`
	`24`	`+ config(['site.url' => 'foo']);`
`25`	`25`
`26`	`26`	`$this->artisan('build')`
`27`	`27`	`->expectsOutputToContain('Generating sitemap')`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function test_xml_element_has_channel_element()`
`33`	`33`	`public function test_xml_channel_element_has_required_elements()`
`34`	`34`	`{`
`35`	`35`	`config(['site.name' => 'Test Blog']);`
`36`		`- config(['site.site_url' => 'https://example.com']);`
	`36`	`+ config(['site.url' => 'https://example.com']);`
`37`	`37`
`38`	`38`	`$service = new RssFeedService();`
`39`	`39`	`$this->assertObjectHasAttribute('title', $service->feed->channel);`
`@@ -47,7 +47,7 @@ public function test_xml_channel_element_has_required_elements()`
`47`	`47`
`48`	`48`	`public function test_xml_channel_element_has_additional_elements()`
`49`	`49`	`{`
`50`		`- config(['site.site_url' => 'https://example.com']);`
	`50`	`+ config(['site.url' => 'https://example.com']);`
`51`	`51`
`52`	`52`	`$service = new RssFeedService();`
`53`	`53`	`$this->assertObjectHasAttribute('link', $service->feed->channel);`
`@@ -63,7 +63,7 @@ public function test_xml_channel_element_has_additional_elements()`
`63`	`63`	`public function test_xml_channel_data_can_be_customized()`
`64`	`64`	`{`
`65`	`65`	`config(['site.name' => 'Foo']);`
`66`		`- config(['site.site_url' => 'https://blog.foo.com/bar']);`
	`66`	`+ config(['site.url' => 'https://blog.foo.com/bar']);`
`67`	`67`	`config(['hyde.rss_description' => 'Foo is a web log about stuff']);`
`68`	`68`
`69`	`69`	`$service = new RssFeedService();`
`@@ -90,7 +90,7 @@ public function test_markdown_blog_posts_are_added_to_rss_feed_through_autodisco`
`90`	`90`	`MD`
`91`	`91`	`);`
`92`	`92`
`93`		`- config(['site.site_url' => 'https://example.com']);`
	`93`	`+ config(['site.url' => 'https://example.com']);`
`94`	`94`
`95`	`95`	`file_put_contents(Hyde::path('_media/rss-test.jpg'), 'statData'); // 8 bytes to test stat gets file length`
`96`	`96`
`@@ -128,19 +128,19 @@ public function test_generate_feed_helper_returns_xml_string()`
`128`	`128`
`129`	`129`	`public function test_can_generate_sitemap_helper_returns_true_if_hyde_has_base_url()`
`130`	`130`	`{`
`131`		`- config(['site.site_url' => 'foo']);`
	`131`	`+ config(['site.url' => 'foo']);`
`132`	`132`	`$this->assertTrue(RssFeedService::canGenerateFeed());`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`public function test_can_generate_sitemap_helper_returns_false_if_hyde_does_not_have_base_url()`
`136`	`136`	`{`
`137`		`- config(['site.site_url' => '']);`
	`137`	`+ config(['site.url' => '']);`
`138`	`138`	`$this->assertFalse(RssFeedService::canGenerateFeed());`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`public function test_can_generate_sitemap_helper_returns_false_if_sitemaps_are_disabled_in_config()`
`142`	`142`	`{`
`143`		`- config(['site.site_url' => 'foo']);`
	`143`	`+ config(['site.url' => 'foo']);`
`144`	`144`	`config(['hyde.generate_rss_feed' => false]);`
`145`	`145`	`$this->assertFalse(RssFeedService::canGenerateFeed());`
`146`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,27 +93,27 @@ public function test_generate_sitemap_shorthand_method_returns_xml_string()`
`93`	`93`
`94`	`94`	`public function test_can_generate_sitemap_helper_returns_true_if_hyde_has_base_url()`
`95`	`95`	`{`
`96`		`- config(['site.site_url' => 'foo']);`
	`96`	`+ config(['site.url' => 'foo']);`
`97`	`97`	`$this->assertTrue(SitemapService::canGenerateSitemap());`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`public function test_can_generate_sitemap_helper_returns_false_if_hyde_does_not_have_base_url()`
`101`	`101`	`{`
`102`		`- config(['site.site_url' => '']);`
	`102`	`+ config(['site.url' => '']);`
`103`	`103`	`$this->assertFalse(SitemapService::canGenerateSitemap());`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`public function test_can_generate_sitemap_helper_returns_false_if_sitemaps_are_disabled_in_config()`
`107`	`107`	`{`
`108`		`- config(['site.site_url' => 'foo']);`
	`108`	`+ config(['site.url' => 'foo']);`
`109`	`109`	`config(['site.generate_sitemap' => false]);`
`110`	`110`	`$this->assertFalse(SitemapService::canGenerateSitemap());`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`public function test_url_item_is_generated_correctly()`
`114`	`114`	`{`
`115`	`115`	`config(['site.pretty_urls' => false]);`
`116`		`- config(['site.site_url' => 'https://example.com']);`
	`116`	`+ config(['site.url' => 'https://example.com']);`
`117`	`117`	`Hyde::touch(('_pages/0-test.blade.php'));`
`118`	`118`
`119`	`119`	`$service = new SitemapService();`
`@@ -130,7 +130,7 @@ public function test_url_item_is_generated_correctly()`
`130`	`130`	`public function test_url_item_is_generated_with_pretty_urls_if_enabled()`
`131`	`131`	`{`
`132`	`132`	`config(['site.pretty_urls' => true]);`
`133`		`- config(['site.site_url' => 'https://example.com']);`
	`133`	`+ config(['site.url' => 'https://example.com']);`
`134`	`134`	`Hyde::touch(('_pages/0-test.blade.php'));`
`135`	`135`
`136`	`136`	`$service = new SitemapService();`
`@@ -144,7 +144,7 @@ public function test_url_item_is_generated_with_pretty_urls_if_enabled()`
`144`	`144`
`145`	`145`	`public function test_all_route_types_are_discovered()`
`146`	`146`	`{`
`147`		`- config(['site.site_url' => 'foo']);`
	`147`	`+ config(['site.url' => 'foo']);`
`148`	`148`	`Hyde::unlink(['_pages/index.blade.php', '_pages/404.blade.php']);`
`149`	`149`
`150`	`150`	`$files = [`
Original file line number	Diff line number	Diff line change
`@@ -118,13 +118,13 @@ public function test_check_site_has_an_app_css_stylesheet_can_fail()`
`118`	`118`
`119`	`119`	`public function test_check_site_has_a_base_url_set_can_pass()`
`120`	`120`	`{`
`121`		`- config(['site.site_url' => 'https://example.com']);`
	`121`	`+ config(['site.url' => 'https://example.com']);`
`122`	`122`	`$this->test('check_site_has_a_base_url_set', 0);`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`public function test_check_site_has_a_base_url_set_can_fail()`
`126`	`126`	`{`
`127`		`- config(['site.site_url' => null]);`
	`127`	`+ config(['site.url' => null]);`
`128`	`128`	`$this->test('check_site_has_a_base_url_set', 2);`
`129`	`129`	`}`
`130`	`130`