Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use https for real URLs #337

Merged
merged 1 commit into from
Feb 13, 2024
Merged

Use https for real URLs #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Sitemap/Sitemapindex.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ protected function getSitemapXml(Urlset $urlset): string
protected function getStructureXml(): string
{
$struct = '<?xml version="1.0" encoding="UTF-8"?>';
$struct .= '<sitemapindex xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"';
$struct .= ' xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9' .
' http://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd"';
$struct .= ' xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">SITEMAPS</sitemapindex>';
$struct .= '<sitemapindex xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"';
$struct .= ' xsi:schemaLocation="https://www.sitemaps.org/schemas/sitemap/0.9' .
' https://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd"';
$struct .= ' xmlns="https://www.sitemaps.org/schemas/sitemap/0.9">SITEMAPS</sitemapindex>';

return $struct;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Sitemap/Url/GoogleMultilangUrlDecorator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class GoogleMultilangUrlDecorator extends UrlDecorator
/**
* @var array<string, string>
*/
protected $customNamespaces = ['xhtml' => 'http://www.w3.org/1999/xhtml'];
protected $customNamespaces = ['xhtml' => 'https://www.w3.org/1999/xhtml'];

/**
* @var string
Expand Down
2 changes: 1 addition & 1 deletion src/Sitemap/Url/GoogleNewsUrlDecorator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class GoogleNewsUrlDecorator extends UrlDecorator
/**
* @var array<string, string>
*/
protected $customNamespaces = ['news' => 'http://www.google.com/schemas/sitemap-news/0.9'];
protected $customNamespaces = ['news' => 'https://www.google.com/schemas/sitemap-news/0.9'];

/**
* @var string
Expand Down
2 changes: 1 addition & 1 deletion src/Sitemap/Url/GoogleVideoUrlDecorator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class GoogleVideoUrlDecorator extends UrlDecorator
/**
* @var array<string, string>
*/
protected $customNamespaces = ['video' => 'http://www.google.com/schemas/sitemap-video/1.1'];
protected $customNamespaces = ['video' => 'https://www.google.com/schemas/sitemap-video/1.1'];

/**
* @var string
Expand Down
4 changes: 2 additions & 2 deletions src/Sitemap/Url/UrlConcrete.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public function setChangefreq(string $changefreq = null): self
throw new \RuntimeException(
sprintf(
'The value "%s" is not supported by the option changefreq.' .
' See http://www.sitemaps.org/protocol.html#xmlTagDefinitions',
' See https://www.sitemaps.org/protocol.html#xmlTagDefinitions',
$changefreq
)
);
Expand Down Expand Up @@ -177,7 +177,7 @@ public function setPriority($priority = null): self
sprintf(
'The value "%s" is not supported by the option priority,' .
' it must be a numeric between 0.0 and 1.0.' .
' See http://www.sitemaps.org/protocol.html#xmlTagDefinitions',
' See https://www.sitemaps.org/protocol.html#xmlTagDefinitions',
$priority
)
);
Expand Down
2 changes: 1 addition & 1 deletion src/Sitemap/Urlset.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ protected function appendXML(string $urlXml): void
protected function getStructureXml(): string
{
$struct = '<?xml version="1.0" encoding="UTF-8"?>';
$struct .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" NAMESPACES>URLS</urlset>';
$struct .= '<urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9" NAMESPACES>URLS</urlset>';

$namespaces = '';
foreach ($this->customNamespaces as $key => $location) {
Expand Down
4 changes: 2 additions & 2 deletions tests/Integration/src/Listener/SitemapListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ final class SitemapListener implements EventSubscriberInterface
[
'title' => 'Post with one image',
'slug' => 'post-with-one-image',
'images' => ['http://lorempixel.com/400/200/technics/1'],
'images' => ['https://lorempixel.com/400/200/technics/1'],
'video' => null,
],
[
Expand All @@ -45,7 +45,7 @@ final class SitemapListener implements EventSubscriberInterface
[
'title' => 'Post with multimedia',
'slug' => 'post-with-multimedia',
'images' => ['http://lorempixel.com/400/200/technics/2', 'http://lorempixel.com/400/200/technics/3'],
'images' => ['https://lorempixel.com/400/200/technics/2', 'https://lorempixel.com/400/200/technics/3'],
'video' => 'https://www.youtube.com/watch?v=JugaMuswrmk',
],
];
Expand Down
18 changes: 9 additions & 9 deletions tests/Integration/tests/BaseSitemapTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ abstract class BaseSitemapTestCase extends WebTestCase
protected static function assertIndex(string $xml, bool $gzip = false): void
{
$index = simplexml_load_string($xml);
$index->registerXPathNamespace('sm', 'http://www.sitemaps.org/schemas/sitemap/0.9');
$index->registerXPathNamespace('sm', 'https://www.sitemaps.org/schemas/sitemap/0.9');

self::assertIndexContainsSectionLink($index, 'static', $gzip);
self::assertIndexContainsSectionLink($index, 'blog', $gzip);
Expand All @@ -34,7 +34,7 @@ protected static function assertIndex(string $xml, bool $gzip = false): void
protected static function assertStaticSection(string $xml): void
{
$static = simplexml_load_string($xml);
$static->registerXPathNamespace('sm', 'http://www.sitemaps.org/schemas/sitemap/0.9');
$static->registerXPathNamespace('sm', 'https://www.sitemaps.org/schemas/sitemap/0.9');

if (Kernel::VERSION_ID >= 50100) {
self::assertSectionContainsCountUrls($static, 'static', 4);
Expand All @@ -58,29 +58,29 @@ protected static function assertStaticSection(string $xml): void
protected static function assertBlogSection(string $xml): void
{
$blog = simplexml_load_string($xml);
$blog->registerXPathNamespace('sm', 'http://www.sitemaps.org/schemas/sitemap/0.9');
$blog->registerXPathNamespace('image', 'http://www.google.com/schemas/sitemap-image/1.1');
$blog->registerXPathNamespace('video', 'http://www.google.com/schemas/sitemap-video/1.1');
$blog->registerXPathNamespace('sm', 'https://www.sitemaps.org/schemas/sitemap/0.9');
$blog->registerXPathNamespace('image', 'https://www.google.com/schemas/sitemap-image/1.1');
$blog->registerXPathNamespace('video', 'https://www.google.com/schemas/sitemap-video/1.1');

self::assertSectionContainsCountUrls($blog, 'blog', 5);
$list = self::assertSectionContainsPath($blog, 'blog', '/blog');
self::assertUrlConcrete($list, 'blog', 0.5, 'daily');
$postWithoutMedia = self::assertSectionContainsPath($blog, 'blog', '/blog/post-without-media');
self::assertUrlConcrete($postWithoutMedia, 'blog', 0.5, 'daily');
$postWithOneImage = self::assertSectionContainsPath($blog, 'blog', '/blog/post-with-one-image');
self::assertUrlHasImage($postWithOneImage, 'blog', 'http://lorempixel.com/400/200/technics/1');
self::assertUrlHasImage($postWithOneImage, 'blog', 'https://lorempixel.com/400/200/technics/1');
$postWithAVideo = self::assertSectionContainsPath($blog, 'blog', '/blog/post-with-a-video');
self::assertUrlHasVideo($postWithAVideo, 'blog', 'https://www.youtube.com/watch?v=j6IKRxH8PTg');
$postWithMultimedia = self::assertSectionContainsPath($blog, 'blog', '/blog/post-with-multimedia');
self::assertUrlHasImage($postWithMultimedia, 'blog', 'http://lorempixel.com/400/200/technics/2');
self::assertUrlHasImage($postWithMultimedia, 'blog', 'http://lorempixel.com/400/200/technics/3');
self::assertUrlHasImage($postWithMultimedia, 'blog', 'https://lorempixel.com/400/200/technics/2');
self::assertUrlHasImage($postWithMultimedia, 'blog', 'https://lorempixel.com/400/200/technics/3');
self::assertUrlHasVideo($postWithMultimedia, 'blog', 'https://www.youtube.com/watch?v=JugaMuswrmk');
}

protected static function assertArchivesSection(string $xml): void
{
$archives = simplexml_load_string($xml);
$archives->registerXPathNamespace('sm', 'http://www.sitemaps.org/schemas/sitemap/0.9');
$archives->registerXPathNamespace('sm', 'https://www.sitemaps.org/schemas/sitemap/0.9');

self::assertSectionContainsCountUrls($archives, 'archive', 10);
Assert::assertCount(
Expand Down
12 changes: 6 additions & 6 deletions tests/Unit/Service/DumperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,9 @@ public function existingInvalidSitemap(): \Generator
yield [
<<<XML
<?xml version="1.0" encoding="UTF-8"?>
<sitemapindex xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd"
xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<sitemapindex xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://www.sitemaps.org/schemas/sitemap/0.9 https://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd"
xmlns="https://www.sitemaps.org/schemas/sitemap/0.9">
<sitemap>
<!-- missing <loc> tag -->
<lastmod>2020-08-19T20:04:26+02:00</lastmod>
Expand All @@ -191,9 +191,9 @@ public function existingInvalidSitemap(): \Generator
yield [
<<<XML
<?xml version="1.0" encoding="UTF-8"?>
<sitemapindex xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd"
xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<sitemapindex xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://www.sitemaps.org/schemas/sitemap/0.9 https://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd"
xmlns="https://www.sitemaps.org/schemas/sitemap/0.9">
<sitemap>
<loc>https://acme.org/sitemap.default.xml.gz</loc>
<!-- missing <lastmod> tag -->
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Sitemap/SitemapindexTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function testToXml(): void
$sitemapindex = new Sitemap\Sitemapindex();
$xml = $sitemapindex->toXml();
self::assertXmlStringEqualsXmlString(
'<?xml version="1.0" encoding="UTF-8"?><sitemapindex xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"></sitemapindex>',
'<?xml version="1.0" encoding="UTF-8"?><sitemapindex xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://www.sitemaps.org/schemas/sitemap/0.9 https://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd" xmlns="https://www.sitemaps.org/schemas/sitemap/0.9"></sitemapindex>',
$xml
);
}
Expand Down
12 changes: 6 additions & 6 deletions tests/Unit/Sitemap/Url/GoogleNewsUrlDecoratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function testCountNamespaces(): void
$dom = new \DOMDocument();
$dom->loadXML($this->generateXml($url));

$newsTags = $dom->getElementsByTagNameNS('http://www.google.com/schemas/sitemap-news/0.9', '*');
$newsTags = $dom->getElementsByTagNameNS('https://www.google.com/schemas/sitemap-news/0.9', '*');

self::assertEquals(6, $newsTags->length, 'Could not find news specific tags');
}
Expand All @@ -54,7 +54,7 @@ public function testDefaultDateFormat(): void
$dom = new \DOMDocument();
$dom->loadXML($this->generateXml($url));

$dateNodes = $dom->getElementsByTagNameNS('http://www.google.com/schemas/sitemap-news/0.9', 'publication_date');
$dateNodes = $dom->getElementsByTagNameNS('https://www.google.com/schemas/sitemap-news/0.9', 'publication_date');
self::assertEquals(1, $dateNodes->length, 'Could not find news:publication_date tag');
self::assertEquals($date->format(\DateTime::W3C), $dateNodes->item(0)->textContent, 'Date was not formatted properly');
}
Expand All @@ -73,7 +73,7 @@ public function testCustomDateFormat(): void
$dom = new \DOMDocument();
$dom->loadXML($this->generateXml($url));

$dateNodes = $dom->getElementsByTagNameNS('http://www.google.com/schemas/sitemap-news/0.9', 'publication_date');
$dateNodes = $dom->getElementsByTagNameNS('https://www.google.com/schemas/sitemap-news/0.9', 'publication_date');
self::assertEquals(1, $dateNodes->length, 'Could not find news:publication_date tag');
self::assertEquals($date->format('Y-m-d'), $dateNodes->item(0)->textContent, 'Date was not formatted properly');
}
Expand Down Expand Up @@ -103,7 +103,7 @@ public function testAccessPropertyValidation(): void

$dom = new \DOMDocument();
$dom->loadXML($this->generateXml($url));
$accessNodes = $dom->getElementsByTagNameNS('http://www.google.com/schemas/sitemap-news/0.9', 'access');
$accessNodes = $dom->getElementsByTagNameNS('https://www.google.com/schemas/sitemap-news/0.9', 'access');
self::assertEquals(1, $accessNodes->length, 'Could not find news:access tag');
self::assertEquals('Registration', $accessNodes->item(0)->textContent, 'Acces tag did not contain the right value');
}
Expand Down Expand Up @@ -134,7 +134,7 @@ public function testGeoLocationPropertyValidation(): void

$dom = new \DOMDocument();
$dom->loadXML($this->generateXml($url));
$geoNodes = $dom->getElementsByTagNameNS('http://www.google.com/schemas/sitemap-news/0.9', 'geo_locations');
$geoNodes = $dom->getElementsByTagNameNS('https://www.google.com/schemas/sitemap-news/0.9', 'geo_locations');
self::assertEquals(1, $geoNodes->length, 'Could not find news:geo_locations tag');
self::assertEquals('Detroit, Michigan, USA', $geoNodes->item(0)->textContent, 'Locations tag did not contain the right value');
}
Expand Down Expand Up @@ -191,7 +191,7 @@ public function testStockTickersLimit(): void
);
$dom = new \DOMDocument();
$dom->loadXML($this->generateXml($url));
$stockNodes = $dom->getElementsByTagNameNS('http://www.google.com/schemas/sitemap-news/0.9', 'stock_tickers');
$stockNodes = $dom->getElementsByTagNameNS('https://www.google.com/schemas/sitemap-news/0.9', 'stock_tickers');
self::assertEquals(1, $stockNodes->length, 'Could not find news:stock_tickers tag');
self::assertEquals('NYSE:OWW, NASDAQ:GTAT', $stockNodes->item(0)->textContent, 'Stock tickers tag did not contain the right value');
}
Expand Down
8 changes: 4 additions & 4 deletions tests/Unit/Sitemap/Url/GoogleVideoUrlDecoratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ protected function setUp(): void

$this->xml = new \DOMDocument();

$xml = '<?xml version="1.0" encoding="UTF-8"?><urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"';
$xml = '<?xml version="1.0" encoding="UTF-8"?><urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9"';

foreach ($url->getCustomNamespaces() as $name => $uri) {
$xml .= ' xmlns:' . $name . '="' . $uri . '"';
Expand All @@ -77,7 +77,7 @@ protected function setUp(): void

public function testCountNamespaces(): void
{
$namespaces = $this->xml->getElementsByTagNameNS('http://www.google.com/schemas/sitemap-video/1.1', '*');
$namespaces = $this->xml->getElementsByTagNameNS('https://www.google.com/schemas/sitemap-video/1.1', '*');
self::assertEquals(72, $namespaces->length);
}

Expand Down Expand Up @@ -117,8 +117,8 @@ public function testItemsLimitExceeded(): void
public function testTagsByVideo(): void
{
$xpath = new \DOMXPath($this->xml);
$xpath->registerNamespace('s', 'http://www.sitemaps.org/schemas/sitemap/0.9');
$xpath->registerNamespace('v', 'http://www.google.com/schemas/sitemap-video/1.1');
$xpath->registerNamespace('s', 'https://www.sitemaps.org/schemas/sitemap/0.9');
$xpath->registerNamespace('v', 'https://www.google.com/schemas/sitemap-video/1.1');

self::assertEquals('http://acme.com/video/thumbnail1.jpg', $xpath->evaluate('string(/s:urlset/s:url/v:video[1]/v:thumbnail_loc)'));
self::assertEquals('http://acme.com/video/thumbnail2.jpg', $xpath->evaluate('string(/s:urlset/s:url/v:video[2]/v:thumbnail_loc)'));
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Sitemap/Url/UrlConcreteTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public function testSetInvalidPriority($value): void
$this->expectException(\RuntimeException::class);
$this->expectExceptionMessage(
"The value \"$value\" is not supported by the option priority, it must be a numeric between 0.0 and 1.0." .
" See http://www.sitemaps.org/protocol.html#xmlTagDefinitions"
" See https://www.sitemaps.org/protocol.html#xmlTagDefinitions"
);

$url = new UrlConcrete('http://example.com');
Expand Down
Loading