MyIntervals · sabberworm · May 10, 2021 · May 7, 2021
diff --git a/lib/Sabberworm/CSS/CSSList/CSSBlockList.php b/lib/Sabberworm/CSS/CSSList/CSSBlockList.php
@@ -68,7 +68,7 @@ protected function allValues($oElement, &$aResult, $sSearchString = null, $bSear
 
     protected function allSelectors(&$aResult, $sSpecificitySearch = null)
     {
-        $aDeclarationBlocks = array();
+        $aDeclarationBlocks = [];
         $this->allDeclarationBlocks($aDeclarationBlocks);
         foreach ($aDeclarationBlocks as $oBlock) {
             foreach ($oBlock->getSelectors() as $oSelector) {

diff --git a/lib/Sabberworm/CSS/CSSList/CSSList.php b/lib/Sabberworm/CSS/CSSList/CSSList.php
@@ -46,8 +46,8 @@ abstract class CSSList implements Renderable, Commentable
      */
     public function __construct($iLineNo = 0)
     {
-        $this->aComments = array();
-        $this->aContents = array();
+        $this->aComments = [];
+        $this->aContents = [];
         $this->iLineNo = $iLineNo;
     }
 
@@ -130,14 +130,14 @@ private static function parseAtRule(ParserState $oParserState)
             $oParserState->consumeWhiteSpace();
             $sMediaQuery = null;
             if (!$oParserState->comes(';')) {
-                $sMediaQuery = trim($oParserState->consumeUntil(array(';', ParserState::EOF)));
+                $sMediaQuery = trim($oParserState->consumeUntil([';', ParserState::EOF]));
             }
-            $oParserState->consumeUntil(array(';', ParserState::EOF), true, true);
+            $oParserState->consumeUntil([';', ParserState::EOF], true, true);
             return new Import($oLocation, $sMediaQuery ?: null, $iIdentifierLineNum);
         } elseif ($sIdentifier === 'charset') {
             $sCharset = CSSString::parse($oParserState);
             $oParserState->consumeWhiteSpace();
-            $oParserState->consumeUntil(array(';', ParserState::EOF), true, true);
+            $oParserState->consumeUntil([';', ParserState::EOF], true, true);
             return new Charset($sCharset, $iIdentifierLineNum);
         } elseif (self::identifierIs($sIdentifier, 'keyframes')) {
             $oResult = new KeyFrame($iIdentifierLineNum);
@@ -155,7 +155,7 @@ private static function parseAtRule(ParserState $oParserState)
                 $sPrefix = $mUrl;
                 $mUrl = Value::parsePrimitiveValue($oParserState);
             }
-            $oParserState->consumeUntil(array(';', ParserState::EOF), true, true);
+            $oParserState->consumeUntil([';', ParserState::EOF], true, true);
             if ($sPrefix !== null && !is_string($sPrefix)) {
                 throw new UnexpectedTokenException('Wrong namespace prefix', $sPrefix, 'custom', $iIdentifierLineNum);
             }
@@ -271,7 +271,7 @@ public function replace($oOldItem, $mNewItem)
             if (is_array($mNewItem)) {
                 array_splice($this->aContents, $iKey, 1, $mNewItem);
             } else {
-                array_splice($this->aContents, $iKey, 1, array($mNewItem));
+                array_splice($this->aContents, $iKey, 1, [$mNewItem]);
             }
             return true;
         }
@@ -284,7 +284,7 @@ public function replace($oOldItem, $mNewItem)
      */
     public function setContents(array $aContents)
     {
-        $this->aContents = array();
+        $this->aContents = [];
         foreach ($aContents as $content) {
             $this->append($content);
         }

diff --git a/lib/Sabberworm/CSS/CSSList/Document.php b/lib/Sabberworm/CSS/CSSList/Document.php
@@ -37,7 +37,7 @@ public static function parse(ParserState $oParserState)
      */
     public function getAllDeclarationBlocks()
     {
-        $aResult = array();
+        $aResult = [];
         $this->allDeclarationBlocks($aResult);
         return $aResult;
     }
@@ -55,7 +55,7 @@ public function getAllSelectors()
      */
     public function getAllRuleSets()
     {
-        $aResult = array();
+        $aResult = [];
         $this->allRuleSets($aResult);
         return $aResult;
     }
@@ -74,7 +74,7 @@ public function getAllValues($mElement = null, $bSearchInFunctionArguments = fal
             $sSearchString = $mElement;
             $mElement = $this;
         }
-        $aResult = array();
+        $aResult = [];
         $this->allValues($mElement, $aResult, $sSearchString, $bSearchInFunctionArguments);
         return $aResult;
     }
@@ -87,7 +87,7 @@ public function getAllValues($mElement = null, $bSearchInFunctionArguments = fal
      */
     public function getSelectorsBySpecificity($sSpecificitySearch = null)
     {
-        $aResult = array();
+        $aResult = [];
         $this->allSelectors($aResult, $sSpecificitySearch);
         return $aResult;
     }

diff --git a/lib/Sabberworm/CSS/OutputFormat.php b/lib/Sabberworm/CSS/OutputFormat.php
@@ -3,6 +3,7 @@
 namespace Sabberworm\CSS;
 
 use Sabberworm\CSS\Parsing\OutputException;
+use Sabberworm\CSS\OutputFormatter;
 
 /**
  * Class OutputFormat
@@ -81,7 +82,7 @@ public function __construct()
 
     public function get($sName)
     {
-        $aVarPrefixes = array('a', 's', 'm', 'b', 'f', 'o', 'c', 'i');
+        $aVarPrefixes = ['a', 's', 'm', 'b', 'f', 'o', 'c', 'i'];
         foreach ($aVarPrefixes as $sPrefix) {
             $sFieldName = $sPrefix . ucfirst($sName);
             if (isset($this->$sFieldName)) {
@@ -93,11 +94,11 @@ public function get($sName)
 
     public function set($aNames, $mValue)
     {
-        $aVarPrefixes = array('a', 's', 'm', 'b', 'f', 'o', 'c', 'i');
+        $aVarPrefixes = ['a', 's', 'm', 'b', 'f', 'o', 'c', 'i'];
         if (is_string($aNames) && strpos($aNames, '*') !== false) {
-            $aNames = array(str_replace('*', 'Before', $aNames), str_replace('*', 'Between', $aNames), str_replace('*', 'After', $aNames));
+            $aNames = [str_replace('*', 'Before', $aNames), str_replace('*', 'Between', $aNames), str_replace('*', 'After', $aNames)];
         } elseif (!is_array($aNames)) {
-            $aNames = array($aNames);
+            $aNames = [$aNames];
         }
         foreach ($aVarPrefixes as $sPrefix) {
             $bDidReplace = false;
@@ -122,8 +123,8 @@ public function __call($sMethodName, $aArguments)
             return $this->set(substr($sMethodName, 3), $aArguments[0]);
         } elseif (strpos($sMethodName, 'get') === 0) {
             return $this->get(substr($sMethodName, 3));
-        } elseif (method_exists('\\Sabberworm\\CSS\\OutputFormatter', $sMethodName)) {
-            return call_user_func_array(array($this->getFormatter(), $sMethodName), $aArguments);
+        } elseif (method_exists(OutputFormatter::class, $sMethodName)) {
+            return call_user_func_array([$this->getFormatter(), $sMethodName], $aArguments);
         } else {
             throw new \Exception('Unknown OutputFormat method called: ' . $sMethodName);
         }
@@ -197,7 +198,7 @@ public static function createCompact()
     public static function createPretty()
     {
         $format = self::create();
-        $format->set('Space*Rules', "\n")->set('Space*Blocks', "\n")->setSpaceBetweenBlocks("\n\n")->set('SpaceAfterListArgumentSeparator', array('default' => '', ',' => ' '));
+        $format->set('Space*Rules', "\n")->set('Space*Blocks', "\n")->setSpaceBetweenBlocks("\n\n")->set('SpaceAfterListArgumentSeparator', ['default' => '', ',' => ' ']);
         return $format;
     }
 }

diff --git a/lib/Sabberworm/CSS/Parsing/ParserState.php b/lib/Sabberworm/CSS/Parsing/ParserState.php
@@ -134,7 +134,7 @@ public function parseCharacter($bIsForIdentifier)
 
     public function consumeWhiteSpace()
     {
-        $comments = array();
+        $comments = [];
         do {
             while (preg_match('/\\s/isSu', $this->peek()) === 1) {
                 $this->consume(1);
@@ -238,9 +238,9 @@ public function isEnd()
         return $this->iCurrentPosition >= $this->iLength;
     }
 
-    public function consumeUntil($aEnd, $bIncludeEnd = false, $consumeEnd = false, array &$comments = array())
+    public function consumeUntil($aEnd, $bIncludeEnd = false, $consumeEnd = false, array &$comments = [])
     {
-        $aEnd = is_array($aEnd) ? $aEnd : array($aEnd);
+        $aEnd = is_array($aEnd) ? $aEnd : [$aEnd];
         $out = '';
         $start = $this->iCurrentPosition;
 
@@ -329,15 +329,15 @@ private function strsplit($sString)
                 return preg_split('//u', $sString, null, PREG_SPLIT_NO_EMPTY);
             } else {
                 $iLength = mb_strlen($sString, $this->sCharset);
-                $aResult = array();
+                $aResult = [];
                 for ($i = 0; $i < $iLength; ++$i) {
                     $aResult[] = mb_substr($sString, $i, 1, $this->sCharset);
                 }
                 return $aResult;
             }
         } else {
             if ($sString === '') {
-                return array();
+                return [];
             } else {
                 return str_split($sString);
             }

diff --git a/lib/Sabberworm/CSS/Property/CSSNamespace.php b/lib/Sabberworm/CSS/Property/CSSNamespace.php
@@ -17,7 +17,7 @@ public function __construct($mUrl, $sPrefix = null, $iLineNo = 0)
         $this->mUrl = $mUrl;
         $this->sPrefix = $sPrefix;
         $this->iLineNo = $iLineNo;
-        $this->aComments = array();
+        $this->aComments = [];
     }
 
     /**
@@ -76,7 +76,7 @@ public function atRuleName()
      */
     public function atRuleArgs()
     {
-        $aResult = array($this->mUrl);
+        $aResult = [$this->mUrl];
         if ($this->sPrefix) {
             array_unshift($aResult, $this->sPrefix);
         }

diff --git a/lib/Sabberworm/CSS/Property/Charset.php b/lib/Sabberworm/CSS/Property/Charset.php
@@ -34,7 +34,7 @@ public function __construct($sCharset, $iLineNo = 0)
     {
         $this->sCharset = $sCharset;
         $this->iLineNo = $iLineNo;
-        $this->aComments = array();
+        $this->aComments = [];
     }
 
     /**

diff --git a/lib/Sabberworm/CSS/Property/Import.php b/lib/Sabberworm/CSS/Property/Import.php
@@ -39,7 +39,7 @@ public function __construct(URL $oLocation, $sMediaQuery, $iLineNo = 0)
         $this->oLocation = $oLocation;
         $this->sMediaQuery = $sMediaQuery;
         $this->iLineNo = $iLineNo;
-        $this->aComments = array();
+        $this->aComments = [];
     }
 
     /**
@@ -88,7 +88,7 @@ public function atRuleName()
      */
     public function atRuleArgs()
     {
-        $aResult = array($this->oLocation);
+        $aResult = [$this->oLocation];
         if ($this->sMediaQuery) {
             array_push($aResult, $this->sMediaQuery);
         }

diff --git a/lib/Sabberworm/CSS/Rule/Rule.php b/lib/Sabberworm/CSS/Rule/Rule.php
@@ -28,10 +28,10 @@ public function __construct($sRule, $iLineNo = 0, $iColNo = 0)
         $this->sRule = $sRule;
         $this->mValue = null;
         $this->bIsImportant = false;
-        $this->aIeHack = array();
+        $this->aIeHack = [];
         $this->iLineNo = $iLineNo;
         $this->iColNo = $iColNo;
-        $this->aComments = array();
+        $this->aComments = [];
     }
 
     public static function parse(ParserState $oParserState)
@@ -69,9 +69,9 @@ public static function parse(ParserState $oParserState)
     private static function listDelimiterForRule($sRule)
     {
         if (preg_match('/^font($|-)/', $sRule)) {
-            return array(',', '/', ' ');
+            return [',', '/', ' '];
         }
-        return array(',', ' ', '/');
+        return [',', ' ', '/'];
     }
 
     /**
@@ -158,19 +158,19 @@ public function setValues($aSpaceSeparatedValues)
     public function getValues()
     {
         if (!$this->mValue instanceof RuleValueList) {
-            return array(array($this->mValue));
+            return [[$this->mValue]];
         }
         if ($this->mValue->getListSeparator() === ',') {
-            return array($this->mValue->getListComponents());
+            return [$this->mValue->getListComponents()];
         }
-        $aResult = array();
+        $aResult = [];
         foreach ($this->mValue->getListComponents() as $mValue) {
             if (!$mValue instanceof RuleValueList || $mValue->getListSeparator() !== ',') {
-                $aResult[] = array($mValue);
+                $aResult[] = [$mValue];
                 continue;
             }
             if ($this->mValue->getListSeparator() === ' ' || count($aResult) === 0) {
-                $aResult[] = array();
+                $aResult[] = [];
             }
             foreach ($mValue->getListComponents() as $mValue) {
                 $aResult[count($aResult) - 1][] = $mValue;
@@ -185,7 +185,7 @@ public function getValues()
     public function addValue($mValue, $sType = ' ')
     {
         if (!is_array($mValue)) {
-            $mValue = array($mValue);
+            $mValue = [$mValue];
         }
         if (!$this->mValue instanceof RuleValueList || $this->mValue->getListSeparator() !== $sType) {
             $mCurrentValue = $this->mValue;