Update most URLs to HTTPS

Author: oliverklee

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2011 Raphael Schweikert, http://sabberworm.com/
+Copyright (c) 2011 Raphael Schweikert, https://www.sabberworm.com/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -617,7 +617,7 @@ class Sabberworm\CSS\CSSList\Document#4 (2) {
 * [Lullabot](https://github.com/Lullabot) for a patch that allows to know the line number for each parsed token.
 * [ju1ius](https://github.com/ju1ius) for the specificity parsing code and the ability to expand/compact shorthand properties.
 * [ossinkine](https://github.com/ossinkine) for a 150 time performance boost.
-* [GaryJones](https://github.com/GaryJones) for lots of input and [http://css-specificity.info/](http://css-specificity.info/).
+* [GaryJones](https://github.com/GaryJones) for lots of input and [https://css-specificity.info/](https://css-specificity.info/).
 * [docteurklein](https://github.com/docteurklein) for output formatting and `CSSList->remove()` inspiration.
 * [nicolopignatelli](https://github.com/nicolopignatelli) for PSR-0 compatibility.
 * [diegoembarcadero](https://github.com/diegoembarcadero) for keyframe at-rule parsing.

composer.json

@@ -3,7 +3,7 @@
     "type": "library",
     "description": "Parser for CSS Files written in PHP",
     "keywords": ["parser", "css", "stylesheet"],
-    "homepage": "http://www.sabberworm.com/blog/2010/6/10/php-css-parser",
+    "homepage": "https://www.sabberworm.com/blog/2010/6/10/php-css-parser",
     "license": "MIT",
     "authors": [
         {"name": "Raphael Schweikert"}

lib/Sabberworm/CSS/RuleSet/DeclarationBlock.php

@@ -142,7 +142,7 @@ public function expandShorthands() {
 	public function createShorthands() {
 		$this->createBackgroundShorthand();
 		$this->createDimensionsShorthand();
-		// border must be shortened after dimensions 
+		// border must be shortened after dimensions
 		$this->createBorderShorthand();
 		$this->createFontShorthand();
 		$this->createListStyleShorthand();
@@ -264,7 +264,7 @@ public function expandFontShorthand() {
 		if (!isset($aRules['font']))
 			return;
 		$oRule = $aRules['font'];
-		// reset properties to 'normal' per http://www.w3.org/TR/21/fonts.html#font-shorthand
+		// reset properties to 'normal' per https://www.w3.org/TR/21/fonts.html#font-shorthand
 		$aFontProperties = array(
 			'font-style' => 'normal',
 			'font-variant' => 'normal',
@@ -322,7 +322,7 @@ public function expandFontShorthand() {
 	 * Convert shorthand background declarations
 	 * (e.g. <tt>background: url("chess.png") gray 50% repeat fixed;</tt>)
 	 * into their constituent parts.
-	 * @see http://www.w3.org/TR/21/colors.html#propdef-background
+	 * @see https://www.w3.org/TR/21/colors.html#propdef-background
 	 * */
 
 	public function expandBackgroundShorthand() {
@@ -501,7 +501,7 @@ public function createBorderShorthand() {
 
 	/*
 	 * Looks for long format CSS dimensional properties
-	 * (margin, padding, border-color, border-style and border-width) 
+	 * (margin, padding, border-color, border-style and border-width)
 	 * and converts them into shorthand CSS properties.
 	 * */
 
@@ -556,7 +556,7 @@ public function createDimensionsShorthand() {
 						$oNewRule->addValue($aValues['bottom']);
 					}
 				} else {
-					// No sides are equal 
+					// No sides are equal
 					$oNewRule->addValue($aValues['top']);
 					$oNewRule->addValue($aValues['left']);
 					$oNewRule->addValue($aValues['bottom']);
@@ -571,8 +571,8 @@ public function createDimensionsShorthand() {
 	}
 
 	/**
-	 * Looks for long format CSS font properties (e.g. <tt>font-weight</tt>) and 
-	 * tries to convert them into a shorthand CSS <tt>font</tt> property. 
+	 * Looks for long format CSS font properties (e.g. <tt>font-weight</tt>) and
+	 * tries to convert them into a shorthand CSS <tt>font</tt> property.
 	 * At least font-size AND font-family must be present in order to create a shorthand declaration.
 	 * */
 	public function createFontShorthand() {

phpunit.xml

@@ -1,6 +1,6 @@
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd"
     bootstrap="tests/bootstrap.php">
     <testsuites>
         <testsuite name="Project Test Suite">

tests/Sabberworm/CSS/ParserTest.php

@@ -181,8 +181,8 @@ function testManipulation() {
 	to {top: 200px;}}
 @supports ( (perspective: 10px) or (-moz-perspective: 10px) or (-webkit-perspective: 10px) or (-ms-perspective: 10px) or (-o-perspective: 10px) ) {body {font-family: "Helvetica";}}
 @page :pseudo-class {margin: 2in;}
-@-moz-document url(http://www.w3.org/),
-               url-prefix(http://www.w3.org/Style/),
+@-moz-document url(https://www.w3.org/),
+               url-prefix(https://www.w3.org/Style/),
                domain(mozilla.org),
                regexp("https:.*") {body {color: purple;background: yellow;}}
 @media screen and (orientation: landscape) {@-ms-viewport {width: 1024px;height: 768px;}}
@@ -202,8 +202,8 @@ function testManipulation() {
 	to {top: 200px;}}
 @supports ( (perspective: 10px) or (-moz-perspective: 10px) or (-webkit-perspective: 10px) or (-ms-perspective: 10px) or (-o-perspective: 10px) ) {#my_id body {font-family: "Helvetica";}}
 @page :pseudo-class {margin: 2in;}
-@-moz-document url(http://www.w3.org/),
-               url-prefix(http://www.w3.org/Style/),
+@-moz-document url(https://www.w3.org/),
+               url-prefix(https://www.w3.org/Style/),
                domain(mozilla.org),
                regexp("https:.*") {#my_id body {color: purple;background: yellow;}}
 @media screen and (orientation: landscape) {@-ms-viewport {width: 1024px;height: 768px;}}
@@ -320,10 +320,10 @@ function testCreateShorthands() {
 
 	function testNamespaces() {
 		$oDoc = $this->parsedStructureForFile('namespaces');
-		$sExpected = '@namespace toto "http://toto.example.org";
-@namespace "http://example.com/foo";
-@namespace foo url("http://www.example.com/");
-@namespace foo url("http://www.example.com/");
+		$sExpected = '@namespace toto "https://toto.example.org";
+@namespace "https://example.com/foo";
+@namespace foo url("https://www.example.com/");
+@namespace foo url("https://www.example.com/");
 foo|test {gaga: 1;}
 |test {gaga: 2;}';
 		$this->assertSame($sExpected, $oDoc->render());
@@ -397,8 +397,8 @@ function testComments() {
 
 	function testUrlInFile() {
 		$oDoc = $this->parsedStructureForFile('url', Settings::create()->withMultibyteSupport(true));
-		$sExpected = 'body {background: #fff url("http://somesite.com/images/someimage.gif") repeat top center;}
-body {background-url: url("http://somesite.com/images/someimage.gif");}';
+		$sExpected = 'body {background: #fff url("https://somesite.com/images/someimage.gif") repeat top center;}
+body {background-url: url("https://somesite.com/images/someimage.gif");}';
 		$this->assertSame($sExpected, $oDoc->render());
 	}
 
@@ -519,8 +519,8 @@ function testCalcFailure() {
 
 	function testUrlInFileMbOff() {
 		$oDoc = $this->parsedStructureForFile('url', Settings::create()->withMultibyteSupport(false));
-		$sExpected = 'body {background: #fff url("http://somesite.com/images/someimage.gif") repeat top center;}
-body {background-url: url("http://somesite.com/images/someimage.gif");}';
+		$sExpected = 'body {background: #fff url("https://somesite.com/images/someimage.gif") repeat top center;}
+body {background-url: url("https://somesite.com/images/someimage.gif");}';
 		$this->assertSame($sExpected, $oDoc->render());
 	}
 

tests/files/atrules.css

@@ -29,17 +29,17 @@ html, body {
   margin:2in;
 }
 
-@-moz-document url(http://www.w3.org/),
-               url-prefix(http://www.w3.org/Style/),
+@-moz-document url(https://www.w3.org/),
+               url-prefix(https://www.w3.org/Style/),
                domain(mozilla.org),
                regexp("https:.*") {
   /* CSS rules here apply to:
-     + The page "http://www.w3.org/".
-     + Any page whose URL begins with "http://www.w3.org/Style/"
+     + The page "https://www.w3.org/".
+     + Any page whose URL begins with "https://www.w3.org/Style/"
      + Any page whose URL's host is "mozilla.org" or ends with
        ".mozilla.org"
      + Any page whose URL starts with "https:" */
- 
+
   /* make the above-mentioned pages really ugly */
   body { color: purple; background: yellow; }
 }

tests/files/line-numbers.css

@@ -1,10 +1,10 @@
 @charset "utf-8"; /* line 1 */
 
-@namespace "http://toto.example.org"; /* line 3 */
+@namespace "https://toto.example.org"; /* line 3 */
 
 @font-face { /* line 5 */
     font-family: "CrassRoots";
-    src: url("http://example.com/media/cr.ttf") /* line 7 */
+    src: url("https://example.com/media/cr.ttf") /* line 7 */
 }
 
 
@@ -23,7 +23,7 @@
 @IMPORT uRL(test.css); /* line 23 */
 
 body {
-    background: #FFFFFF url("http://somesite.com/images/someimage.gif") repeat top center; /* line 25 */
+    background: #FFFFFF url("https://somesite.com/images/someimage.gif") repeat top center; /* line 25 */
     color: rgb(   /* line 27 */
             233,  /* line 28 */
             100,  /* line 29 */

tests/files/namespaces.css

@@ -1,12 +1,12 @@
-/* From the spec at http://www.w3.org/TR/css3-namespace/ */
+/* From the spec at https://www.w3.org/TR/css3-namespace/ */
 
-@namespace toto "http://toto.example.org";
-@namespace "http://example.com/foo";
+@namespace toto "https://toto.example.org";
+@namespace "https://example.com/foo";
 
 
 /* From an introduction at http://www.blooberry.com/indexdot/css/syntax/atrules/namespace.htm */
-@namespace foo url("http://www.example.com/");
-@namespace foo url('http://www.example.com/');
+@namespace foo url("https://www.example.com/");
+@namespace foo url('https://www.example.com/');
 
 
 foo|test {

tests/files/url.css

@@ -1,4 +1,4 @@
-body { background: #FFFFFF url("http://somesite.com/images/someimage.gif") repeat top center; }
+body { background: #FFFFFF url("https://somesite.com/images/someimage.gif") repeat top center; }
 body {
-	background-url: url("http://somesite.com/images/someimage.gif");
+	background-url: url("https://somesite.com/images/someimage.gif");
 }