Skip to content

Update most URLs to HTTPS #216

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.

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

Merged
merged 1 commit into from
May 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
2 changes: 1 addition & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
16 changes: 8 additions & 8 deletions tests/Sabberworm/CSS/ParserTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,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;}}
Expand All @@ -209,8 +209,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;}}
Expand Down Expand Up @@ -416,8 +416,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());
}

Expand Down Expand Up @@ -553,8 +553,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());
}

Expand Down
10 changes: 5 additions & 5 deletions tests/files/atrules.css
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
Expand Down
4 changes: 2 additions & 2 deletions tests/files/line-numbers.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

@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 */
}


Expand All @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions tests/files/namespaces.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* 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";


/* From an introduction at http://www.blooberry.com/indexdot/css/syntax/atrules/namespace.htm */
/* From an introduction at https://www.blooberry.com/indexdot/css/syntax/atrules/namespace.htm */
@namespace foo url("http://www.example.com/");
@namespace foo url('http://www.example.com/');

Expand Down
4 changes: 2 additions & 2 deletions tests/files/url.css
Original file line number Diff line number Diff line change
@@ -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");
}