Fix more PSR-12 style issues

oliverklee · oliverklee · commit 05cca5264b35 · 2021-06-19T14:39:14.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/Rule/Rule.php b/src/Rule/Rule.php
@@ -14,7 +14,6 @@
  */
 class Rule implements Renderable, Commentable
 {
-
     private $sRule;
 
     private $mValue;
diff --git a/src/RuleSet/RuleSet.php b/src/RuleSet/RuleSet.php
@@ -14,7 +14,6 @@
  */
 abstract class RuleSet implements Renderable, Commentable
 {
-
     private $aRules;
 
     protected $iLineNo;
@@ -128,7 +127,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
@@ -4,7 +4,6 @@
 
 class CSSFunction extends ValueList
 {
-
     protected $sName;
 
     /**
diff --git a/src/Value/CSSString.php b/src/Value/CSSString.php
@@ -7,7 +7,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
@@ -6,7 +6,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
@@ -6,7 +6,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
@@ -6,7 +6,6 @@
 
 class URL extends PrimitiveValue
 {
-
     private $oURL;
 
     public function __construct(CSSString $oURL, $iLineNo = 0)
diff --git a/src/Value/ValueList.php b/src/Value/ValueList.php
@@ -4,7 +4,6 @@
 
 abstract class ValueList extends Value
 {
-
     protected $aComponents;
 
     protected $sSeparator;
diff --git a/tests/CSSList/AtRuleBlockListTest.php b/tests/CSSList/AtRuleBlockListTest.php
@@ -6,7 +6,6 @@
 
 class AtRuleBlockListTest extends \PHPUnit\Framework\TestCase
 {
-
     public function testMediaQueries()
     {
         $sCss = '@media(min-width: 768px){.class{color:red}}';
diff --git a/tests/CSSList/DocumentTest.php b/tests/CSSList/DocumentTest.php
@@ -6,7 +6,6 @@
 
 class DocumentTest extends \PHPUnit\Framework\TestCase
 {
-
     public function testOverrideContents()
     {
         $sCss = '.thing { left: 10px; }';
diff --git a/tests/ParserTest.php b/tests/ParserTest.php
@@ -19,7 +19,6 @@
 
 class ParserTest extends \PHPUnit\Framework\TestCase
 {
-
     public function testFiles()
     {
         $sDirectory = __DIR__ . '/fixtures';
diff --git a/tests/RuleSet/DeclarationBlockTest.php b/tests/RuleSet/DeclarationBlockTest.php
@@ -8,7 +8,6 @@
 
 class DeclarationBlockTest extends \PHPUnit\Framework\TestCase
 {
-
     /**
      * @dataProvider expandBorderShorthandProvider
      * */
diff --git a/tests/RuleSet/LenientParsingTest.php b/tests/RuleSet/LenientParsingTest.php
@@ -7,7 +7,6 @@
 
 class LenientParsingTest extends \PHPUnit\Framework\TestCase
 {
-
     /**
      * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
      */

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
`@@ -14,7 +14,6 @@`
`14`	`14`	`*/`
`15`	`15`	`class Rule implements Renderable, Commentable`
`16`	`16`	`{`
`17`		`-`
`18`	`17`	`private $sRule;`
`19`	`18`
`20`	`19`	`private $mValue;`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`class CSSFunction extends ValueList`
`6`	`6`	`{`
`7`		`-`
`8`	`7`	`protected $sName;`
`9`	`8`
`10`	`9`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`
`8`	`8`	`class CSSString extends PrimitiveValue`
`9`	`9`	`{`
`10`		`-`
`11`	`10`	`private $sString;`
`12`	`11`
`13`	`12`	`public function __construct($sString, $iLineNo = 0)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`
`7`	`7`	`class Color extends CSSFunction`
`8`	`8`	`{`
`9`		`-`
`10`	`9`	`public function __construct(array $aColor, $iLineNo = 0)`
`11`	`10`	`{`
`12`	`11`	`parent::__construct(implode('', array_keys($aColor)), $aColor, ',', $iLineNo);`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`
`7`	`7`	`class Size extends PrimitiveValue`
`8`	`8`	`{`
`9`		`-`
`10`	`9`	`/**`
`11`	`10`	`* vh/vw/vm(ax)/vmin/rem are absolute insofar as they don’t scale to the immediate parent (only the viewport)`
`12`	`11`	`*`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`
`7`	`7`	`class URL extends PrimitiveValue`
`8`	`8`	`{`
`9`		`-`
`10`	`9`	`private $oURL;`
`11`	`10`
`12`	`11`	`public function __construct(CSSString $oURL, $iLineNo = 0)`