Dependency updates. (#51)

* Bump the version of phpSpec to 4.0

* Remove license from composer and license.

* Remove support for PHP 5.6

* More https fixes.

Author: ThePixelDeveloper

.travis.yml

@@ -7,7 +7,6 @@ cache:
 language: php
 
 php:
-  - 5.6
   - 7.0
   - 7.1
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2013 Mathew Davies <thepixeldeveloper@googlemail.com>
+Copyright (C) 2017 Mathew Davies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
 files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,

composer.json

@@ -7,7 +7,6 @@
 	"authors": [
 		{
 			"name": "Mathew Davies",
-			"email": "thepixeldeveloper@googlemail.com",
 			"homepage": "http://mathew-davies.co.uk",
 			"role": "Developer"
 		}
@@ -16,7 +15,7 @@
 		"php": ">=5.6.0"
 	},
 	"require-dev": {
-		"phpspec/phpspec": "^2.4"
+		"phpspec/phpspec": "^4.0"
 	},
 	"autoload": {
 		"psr-4": {

spec/OutputSpec.php

@@ -22,7 +22,7 @@ function it_should_format_a_sitemapindex_with_n_sitemaps()
     {
         $xml = <<<XML
 <?xml version="1.0" encoding="UTF-8"?>
-<sitemapindex xmlns:xsi="https://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="http://www.sitemaps.org/schemas/sitemap/0.9 https://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
     <sitemap>
         <loc>https://www.example.com/sitemap1.xml.gz</loc>
     </sitemap>
@@ -43,7 +43,7 @@ function it_should_generate_a_sitemap_of_images()
     {
         $xml = <<<XML
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns:xsi="https://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" xmlns:image="https://www.google.com/schemas/sitemap-image/1.1">
+<urlset xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 https://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="https://www.google.com/schemas/sitemap-image/1.1">
     <url>
         <loc>https://www.example.com/1</loc>
         <image:image>
@@ -101,7 +101,7 @@ function it_should_generate_a_sitemap_with_links()
     {
         $xml = <<<XML
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns:xsi="https://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" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<urlset xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 https://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
     <url>
         <loc>https://www.example.com/english/</loc>
         <xhtml:link rel="alternate" hreflang="de" href="https://www.example.com/deutsch/"/>
@@ -149,7 +149,7 @@ function it_should_write_processing_instructions()
         $xml = <<<XML
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/path/to/xslt/main-sitemap.xsl"?>
-<urlset xmlns:xsi="https://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" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<urlset xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 https://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
     <url>
         <loc>https://www.example.com/english/</loc>
         <xhtml:link rel="alternate" hreflang="de" href="https://www.example.com/deutsch/"/>

spec/UrlsetSpec.php

@@ -32,7 +32,7 @@ function it_should_only_append_attributes_once_for_each_subelement_type(XMLWrite
     {
         $xmlWriter->startElement('urlset')->shouldBeCalled();
         $xmlWriter->writeAttribute('xmlns:xsi', 'https://www.w3.org/2001/XMLSchema-instance')->shouldBeCalled();
-        $xmlWriter->writeAttribute('xsi:schemaLocation', 'http://www.sitemaps.org/schemas/sitemap/0.9 ' . 'http://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd')->shouldBeCalled();
+        $xmlWriter->writeAttribute('xsi:schemaLocation', 'http://www.sitemaps.org/schemas/sitemap/0.9 ' . 'https://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd')->shouldBeCalled();
         $xmlWriter->writeAttribute('xmlns', 'http://www.sitemaps.org/schemas/sitemap/0.9')->shouldBeCalled();
 
         $url->getSubelementsThatAppend()->willReturn([$image, $video]);

src/SitemapIndex.php

@@ -43,7 +43,7 @@ public function generateXML(XMLWriter $XMLWriter)
         $XMLWriter->writeAttribute(
             'xsi:schemaLocation',
             'http://www.sitemaps.org/schemas/sitemap/0.9 ' .
-            'http://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd'
+            'https://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd'
         );
 
         $XMLWriter->writeAttribute('xmlns', 'http://www.sitemaps.org/schemas/sitemap/0.9');

src/Urlset.php

@@ -50,7 +50,7 @@ public function generateXML(XMLWriter $XMLWriter)
 
         $XMLWriter->writeAttribute('xsi:schemaLocation',
             'http://www.sitemaps.org/schemas/sitemap/0.9 ' .
-            'http://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd');
+            'https://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd');
 
         $XMLWriter->writeAttribute('xmlns', 'http://www.sitemaps.org/schemas/sitemap/0.9');