wip

spatie · Feb 6, 2019 · 5fa183b · 5fa183b
1 parent 66194b7
commit 5fa183b
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-sitemap` will be documented in this file
 
+## 5.2.8 - 2019-01-07
+
+- adhere to sitemap standards
+
 ## 5.2.7 - 2018-11-03
 
 - enforce priority value to be in between 0 and 1.

diff --git a/tests/SitemapTest.php b/tests/SitemapTest.php
@@ -67,7 +67,7 @@ public function an_url_with_an_alternate_can_be_added_to_the_sitemap()
 
         $this->sitemap->add($url);
 
-        $this->assertMatchesXmlSnapshot($this->sitemap->render());
+        $this->assertMatchesSnapshot($this->sitemap->render());
     }
 
     /** @test */

diff --git a/tests/__snapshots__/SitemapGeneratorTest__it_can_generate_a_sitemap__1.xml b/tests/__snapshots__/SitemapGeneratorTest__it_can_generate_a_sitemap__1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" 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/sitemap.xsd">
   <url>
     <loc>http://localhost:4020/</loc>
     <lastmod>2016-01-01T00:00:00+00:00</lastmod>

diff --git a/...__/SitemapGeneratorTest__it_can_modify_the_attributes_while_generating_the_sitemap__1.xml b/...__/SitemapGeneratorTest__it_can_modify_the_attributes_while_generating_the_sitemap__1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" 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/sitemap.xsd">
   <url>
     <loc>http://localhost:4020/</loc>
     <lastmod>2016-01-01T00:00:00+00:00</lastmod>

diff --git a/tests/__snapshots__/SitemapGeneratorTest__it_can_use_a_custom_profile__1.xml b/tests/__snapshots__/SitemapGeneratorTest__it_can_use_a_custom_profile__1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" 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/sitemap.xsd">
   <url>
     <loc>http://localhost:4020/</loc>
     <lastmod>2016-01-01T00:00:00+00:00</lastmod>

diff --git a/...torTest__it_will_not_add_the_url_to_the_site_map_if_has_crawled_does_not_return_it__1.xml b/...torTest__it_will_not_add_the_url_to_the_site_map_if_has_crawled_does_not_return_it__1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" 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/sitemap.xsd">
   <url>
     <loc>http://localhost:4020/</loc>
     <lastmod>2016-01-01T00:00:00+00:00</lastmod>

diff --git a/...ots__/SitemapGeneratorTest__it_will_not_crawl_an_url_if_should_crawl_returns_false__1.xml b/...ots__/SitemapGeneratorTest__it_will_not_crawl_an_url_if_should_crawl_returns_false__1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" 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/sitemap.xsd">
   <url>
     <loc>http://localhost:4020/</loc>
     <lastmod>2016-01-01T00:00:00+00:00</lastmod>

diff --git a/tests/__snapshots__/SitemapTest__a_url_string_can_not_be_added_twice_to_the_sitemap__1.xml b/tests/__snapshots__/SitemapTest__a_url_string_can_not_be_added_twice_to_the_sitemap__1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" 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/sitemap.xsd">
   <url>
     <loc>http://localhost/home</loc>
     <lastmod>2016-01-01T00:00:00+00:00</lastmod>

diff --git a/tests/__snapshots__/SitemapTest__an_url_object_can_be_added_to_the_sitemap__1.xml b/tests/__snapshots__/SitemapTest__an_url_object_can_be_added_to_the_sitemap__1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" 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/sitemap.xsd">
   <url>
     <loc>http://localhost/home</loc>
     <lastmod>2016-01-01T00:00:00+00:00</lastmod>

diff --git a/tests/__snapshots__/SitemapTest__an_url_string_can_be_added_to_the_sitemap__1.xml b/tests/__snapshots__/SitemapTest__an_url_string_can_be_added_to_the_sitemap__1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" 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/sitemap.xsd">
   <url>
     <loc>http://localhost/home</loc>
     <lastmod>2016-01-01T00:00:00+00:00</lastmod>

diff --git a/tests/__snapshots__/SitemapTest__an_url_with_an_alternate_can_be_added_to_the_sitemap__1.php b/tests/__snapshots__/SitemapTest__an_url_with_an_alternate_can_be_added_to_the_sitemap__1.php
@@ -0,0 +1,16 @@
+<?php return '<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+        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/sitemap.xsd">
+    <url>
+    
+    <loc>http://localhost/home</loc>
+        <xhtml:link rel="alternate" hreflang="nl" href="http://localhost/thuis" />
+        <xhtml:link rel="alternate" hreflang="fr" href="http://localhost/maison" />
+        <lastmod>2016-01-01T00:00:00+00:00</lastmod>
+        <changefreq>daily</changefreq>
+        <priority>0.8</priority>
+    </url>
+</urlset>
+';
diff --git a/tests/__snapshots__/SitemapTest__it_can_render_an_empty_sitemap__1.xml b/tests/__snapshots__/SitemapTest__it_can_render_an_empty_sitemap__1.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" 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/sitemap.xsd">
 </urlset>
diff --git a/tests/__snapshots__/SitemapTest__it_can_render_an_url_with_all_its_set_properties__1.xml b/tests/__snapshots__/SitemapTest__it_can_render_an_url_with_all_its_set_properties__1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" 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/sitemap.xsd">
   <url>
     <loc>http://localhost/home</loc>
     <lastmod>2015-12-31T00:00:00+00:00</lastmod>

diff --git a/tests/__snapshots__/SitemapTest__it_can_write_a_sitemap_to_a_file__1.xml b/tests/__snapshots__/SitemapTest__it_can_write_a_sitemap_to_a_file__1.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" 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/sitemap.xsd">
 </urlset>
diff --git a/tests/__snapshots__/SitemapTest__multiple_urls_can_be_added_to_the_sitemap__1.xml b/tests/__snapshots__/SitemapTest__multiple_urls_can_be_added_to_the_sitemap__1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" 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/sitemap.xsd">
   <url>
     <loc>http://localhost/contact</loc>
     <lastmod>2016-01-01T00:00:00+00:00</lastmod>