Merge branch 'master' into cleanup/imports

sabberworm · web-flow · commit 2fbcff0ea61c · 2021-06-21T10:28:52.000+02:00
diff --git a/src/Comment/Commentable.php b/src/Comment/Commentable.php
@@ -4,7 +4,6 @@
 
 interface Commentable
 {
-
     /**
      * @param array $aComments Array of comments.
      */
diff --git a/src/Property/KeyframeSelector.php b/src/Property/KeyframeSelector.php
@@ -4,7 +4,6 @@
 
 class KeyframeSelector extends Selector
 {
-
     //Regexes for specificity calculations
 
     const SELECTOR_VALIDATION_RX = '/
diff --git a/src/Property/Selector.php b/src/Property/Selector.php
@@ -8,7 +8,6 @@
  */
 class Selector
 {
-
     //Regexes for specificity calculations
     const NON_ID_ATTRIBUTES_AND_PSEUDO_CLASSES_RX = '/
 	(\.[\w]+)                   # classes
diff --git a/src/Renderable.php b/src/Renderable.php
@@ -4,6 +4,9 @@
 
 interface Renderable
 {
+    /**
+     * @return string
+     */
     public function __toString();
 
     /**
diff --git a/src/Rule/Rule.php b/src/Rule/Rule.php
@@ -15,7 +15,6 @@
  */
 class Rule implements Renderable, Commentable
 {
-
     private $sRule;
 
     private $mValue;
diff --git a/src/RuleSet/DeclarationBlock.php b/src/RuleSet/DeclarationBlock.php
@@ -51,7 +51,7 @@ public static function parse(ParserState $oParserState, $oList = null)
                     }
                 }
             } while (!in_array($oParserState->peek(), ['{', '}']) || $sStringWrapperChar !== false);
-            $oResult->setSelector(implode('', $aSelectorParts), $oList);
+            $oResult->setSelectors(implode('', $aSelectorParts), $oList);
             if ($oParserState->comes('{')) {
                 $oParserState->consume(1);
             }
diff --git a/src/RuleSet/RuleSet.php b/src/RuleSet/RuleSet.php
@@ -15,7 +15,6 @@
  */
 abstract class RuleSet implements Renderable, Commentable
 {
-
     private $aRules;
 
     protected $iLineNo;
@@ -129,7 +128,8 @@ public function getRules($mRule = null)
             // or the search rule ends in “-” and the found rule starts with the search rule.
             if (
                 !$mRule || $sName === $mRule
-                || (strrpos($mRule, '-') === strlen($mRule) - strlen('-')
+                || (
+                    strrpos($mRule, '-') === strlen($mRule) - strlen('-')
                     && (strpos($sName, $mRule) === 0 || $sName === substr($mRule, 0, -1))
                 )
             ) {
diff --git a/src/Value/CSSFunction.php b/src/Value/CSSFunction.php
@@ -6,7 +6,6 @@
 
 class CSSFunction extends ValueList
 {
-
     protected $sName;
 
     /**
diff --git a/src/Value/CSSString.php b/src/Value/CSSString.php
@@ -8,7 +8,6 @@
 
 class CSSString extends PrimitiveValue
 {
-
     private $sString;
 
     public function __construct($sString, $iLineNo = 0)
diff --git a/src/Value/Color.php b/src/Value/Color.php
@@ -7,7 +7,6 @@
 
 class Color extends CSSFunction
 {
-
     public function __construct(array $aColor, $iLineNo = 0)
     {
         parent::__construct(implode('', array_keys($aColor)), $aColor, ',', $iLineNo);
diff --git a/src/Value/Size.php b/src/Value/Size.php
@@ -7,7 +7,6 @@
 
 class Size extends PrimitiveValue
 {
-
     /**
      * vh/vw/vm(ax)/vmin/rem are absolute insofar as they don’t scale to the immediate parent (only the viewport)
      *
diff --git a/src/Value/URL.php b/src/Value/URL.php
@@ -7,7 +7,6 @@
 
 class URL extends PrimitiveValue
 {
-
     private $oURL;
 
     public function __construct(CSSString $oURL, $iLineNo = 0)
diff --git a/src/Value/Value.php b/src/Value/Value.php
@@ -151,8 +151,4 @@ public function getLineNo()
     {
         return $this->iLineNo;
     }
-
-    //Methods are commented out because re-declaring them here is a fatal error in PHP < 5.3.9
-    //public abstract function __toString();
-    //public abstract function render(OutputFormat $oOutputFormat);
 }
diff --git a/src/Value/ValueList.php b/src/Value/ValueList.php
@@ -6,7 +6,6 @@
 
 abstract class ValueList extends Value
 {
-
     protected $aComponents;
 
     protected $sSeparator;
diff --git a/tests/CSSList/AtRuleBlockListTest.php b/tests/CSSList/AtRuleBlockListTest.php
@@ -7,7 +7,6 @@
 
 class AtRuleBlockListTest extends TestCase
 {
-
     public function testMediaQueries()
     {
         $sCss = '@media(min-width: 768px){.class{color:red}}';
diff --git a/tests/CSSList/DocumentTest.php b/tests/CSSList/DocumentTest.php
@@ -7,7 +7,6 @@
 
 class DocumentTest extends TestCase
 {
-
     public function testOverrideContents()
     {
         $sCss = '.thing { left: 10px; }';
diff --git a/tests/ParserTest.php b/tests/ParserTest.php
@@ -21,7 +21,6 @@
 
 class ParserTest extends TestCase
 {
-
     public function testFiles()
     {
         $sDirectory = __DIR__ . '/fixtures';
@@ -39,7 +38,7 @@ public function testFiles()
                     // or a future test of a as-of-now missing feature
                     continue;
                 }
-                $oParser = new Parser(file_get_contents($sDirectory . DIRECTORY_SEPARATOR . $sFileName));
+                $oParser = new Parser(file_get_contents($sDirectory . '/' . $sFileName));
                 try {
                     $this->assertNotEquals('', $oParser->parse()->render());
                 } catch (\Exception $e) {
@@ -809,7 +808,7 @@ public function testMissingPropertyValueLenient()
      */
     private function parsedStructureForFile($sFileName, $oSettings = null)
     {
-        $sFile = __DIR__ . '/fixtures' . DIRECTORY_SEPARATOR . "$sFileName.css";
+        $sFile = __DIR__ . "/fixtures/$sFileName.css";
         $oParser = new Parser(file_get_contents($sFile), $oSettings);
         return $oParser->parse();
     }
diff --git a/tests/RuleSet/DeclarationBlockTest.php b/tests/RuleSet/DeclarationBlockTest.php
@@ -9,7 +9,6 @@
 
 class DeclarationBlockTest extends TestCase
 {
-
     /**
      * @dataProvider expandBorderShorthandProvider
      * */
diff --git a/tests/RuleSet/LenientParsingTest.php b/tests/RuleSet/LenientParsingTest.php
@@ -8,20 +8,19 @@
 
 class LenientParsingTest extends TestCase
 {
-
     /**
      * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
      */
     public function testFaultToleranceOff()
     {
-        $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-fault-tolerance.css";
+        $sFile = __DIR__ . '/../fixtures/-fault-tolerance.css';
         $oParser = new Parser(file_get_contents($sFile), Settings::create()->beStrict());
         $oParser->parse();
     }
 
     public function testFaultToleranceOn()
     {
-        $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-fault-tolerance.css";
+        $sFile = __DIR__ . '/../fixtures/-fault-tolerance.css';
         $oParser = new Parser(file_get_contents($sFile), Settings::create()->withLenientParsing(true));
         $oResult = $oParser->parse();
         $this->assertSame(
@@ -36,7 +35,7 @@ public function testFaultToleranceOn()
      */
     public function testEndToken()
     {
-        $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-end-token.css";
+        $sFile = __DIR__ . '/../fixtures/-end-token.css';
         $oParser = new Parser(file_get_contents($sFile), Settings::create()->beStrict());
         $oParser->parse();
     }
@@ -46,22 +45,22 @@ public function testEndToken()
      */
     public function testEndToken2()
     {
-        $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-end-token-2.css";
+        $sFile = __DIR__ . '/../fixtures/-end-token-2.css';
         $oParser = new Parser(file_get_contents($sFile), Settings::create()->beStrict());
         $oParser->parse();
     }
 
     public function testEndTokenPositive()
     {
-        $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-end-token.css";
+        $sFile = __DIR__ . '/../fixtures/-end-token.css';
         $oParser = new Parser(file_get_contents($sFile), Settings::create()->withLenientParsing(true));
         $oResult = $oParser->parse();
         $this->assertSame("", $oResult->render());
     }
 
     public function testEndToken2Positive()
     {
-        $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-end-token-2.css";
+        $sFile = __DIR__ . '/../fixtures/-end-token-2.css';
         $oParser = new Parser(file_get_contents($sFile), Settings::create()->withLenientParsing(true));
         $oResult = $oParser->parse();
         $this->assertSame(
@@ -73,7 +72,7 @@ public function testEndToken2Positive()
     public function testLocaleTrap()
     {
         setlocale(LC_ALL, "pt_PT", "no");
-        $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-fault-tolerance.css";
+        $sFile = __DIR__ . '/../fixtures/-fault-tolerance.css';
         $oParser = new Parser(file_get_contents($sFile), Settings::create()->withLenientParsing(true));
         $oResult = $oParser->parse();
         $this->assertSame(
@@ -85,7 +84,7 @@ public function testLocaleTrap()
 
     public function testCaseInsensitivity()
     {
-        $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "case-insensitivity.css";
+        $sFile = __DIR__ . '/../fixtures/case-insensitivity.css';
         $oParser = new Parser(file_get_contents($sFile));
         $oResult = $oParser->parse();
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`interface Commentable`
`6`	`6`	`{`
`7`		`-`
`8`	`7`	`/**`
`9`	`8`	`* @param array $aComments Array of comments.`
`10`	`9`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`class KeyframeSelector extends Selector`
`6`	`6`	`{`
`7`		`-`
`8`	`7`	`//Regexes for specificity calculations`
`9`	`8`
`10`	`9`	`const SELECTOR_VALIDATION_RX = '/`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`*/`
`9`	`9`	`class Selector`
`10`	`10`	`{`
`11`		`-`
`12`	`11`	`//Regexes for specificity calculations`
`13`	`12`	`const NON_ID_ATTRIBUTES_AND_PSEUDO_CLASSES_RX = '/`
`14`	`13`	`(\.[\w]+) # classes`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,9 @@`
`4`	`4`
`5`	`5`	`interface Renderable`
`6`	`6`	`{`
	`7`	`+ /**`
	`8`	`+ * @return string`
	`9`	`+ */`
`7`	`10`	`public function __toString();`
`8`	`11`
`9`	`12`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`*/`
`16`	`16`	`class Rule implements Renderable, Commentable`
`17`	`17`	`{`
`18`		`-`
`19`	`18`	`private $sRule;`
`20`	`19`
`21`	`20`	`private $mValue;`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public static function parse(ParserState $oParserState, $oList = null)`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`} while (!in_array($oParserState->peek(), ['{', '}']) \|\| $sStringWrapperChar !== false);`
`54`		`- $oResult->setSelector(implode('', $aSelectorParts), $oList);`
	`54`	`+ $oResult->setSelectors(implode('', $aSelectorParts), $oList);`
`55`	`55`	`if ($oParserState->comes('{')) {`
`56`	`56`	`$oParserState->consume(1);`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`
`7`	`7`	`class CSSFunction extends ValueList`
`8`	`8`	`{`
`9`		`-`
`10`	`9`	`protected $sName;`
`11`	`10`
`12`	`11`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`
`9`	`9`	`class CSSString extends PrimitiveValue`
`10`	`10`	`{`
`11`		`-`
`12`	`11`	`private $sString;`
`13`	`12`
`14`	`13`	`public function __construct($sString, $iLineNo = 0)`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`
`8`	`8`	`class Color extends CSSFunction`
`9`	`9`	`{`
`10`		`-`
`11`	`10`	`public function __construct(array $aColor, $iLineNo = 0)`
`12`	`11`	`{`
`13`	`12`	`parent::__construct(implode('', array_keys($aColor)), $aColor, ',', $iLineNo);`