diff --git a/src/CSSList/CSSList.php b/src/CSSList/CSSList.php index 8d4a1c10..3d606cc3 100644 --- a/src/CSSList/CSSList.php +++ b/src/CSSList/CSSList.php @@ -160,7 +160,7 @@ private static function parseAtRule(ParserState $parserState) $iIdentifierLineNum = $parserState->currentLine(); $parserState->consumeWhiteSpace(); if ($identifier === 'import') { - $oLocation = URL::parse($parserState); + $location = URL::parse($parserState); $parserState->consumeWhiteSpace(); $mediaQuery = null; if (!$parserState->comes(';')) { @@ -170,7 +170,7 @@ private static function parseAtRule(ParserState $parserState) } } $parserState->consumeUntil([';', ParserState::EOF], true, true); - return new Import($oLocation, $mediaQuery, $iIdentifierLineNum); + return new Import($location, $mediaQuery, $iIdentifierLineNum); } elseif ($identifier === 'charset') { $oCharsetString = CSSString::parse($parserState); $parserState->consumeWhiteSpace(); diff --git a/src/Property/Import.php b/src/Property/Import.php index 80cd4c56..636ec58b 100644 --- a/src/Property/Import.php +++ b/src/Property/Import.php @@ -16,7 +16,7 @@ class Import implements AtRule /** * @var URL */ - private $oLocation; + private $location; /** * @var string @@ -37,9 +37,9 @@ class Import implements AtRule * @param string $mediaQuery * @param int $lineNumber */ - public function __construct(URL $oLocation, $mediaQuery, $lineNumber = 0) + public function __construct(URL $location, $mediaQuery, $lineNumber = 0) { - $this->oLocation = $oLocation; + $this->location = $location; $this->mediaQuery = $mediaQuery; $this->lineNumber = $lineNumber; $this->comments = []; @@ -54,11 +54,11 @@ public function getLineNo() } /** - * @param URL $oLocation + * @param URL $location */ - public function setLocation($oLocation): void + public function setLocation($location): void { - $this->oLocation = $oLocation; + $this->location = $location; } /** @@ -66,7 +66,7 @@ public function setLocation($oLocation): void */ public function getLocation() { - return $this->oLocation; + return $this->location; } public function __toString(): string @@ -76,7 +76,7 @@ public function __toString(): string public function render(OutputFormat $oOutputFormat): string { - return $oOutputFormat->comments($this) . '@import ' . $this->oLocation->render($oOutputFormat) + return $oOutputFormat->comments($this) . '@import ' . $this->location->render($oOutputFormat) . ($this->mediaQuery === null ? '' : ' ' . $this->mediaQuery) . ';'; } @@ -90,7 +90,7 @@ public function atRuleName(): string */ public function atRuleArgs(): array { - $aResult = [$this->oLocation]; + $aResult = [$this->location]; if ($this->mediaQuery) { \array_push($aResult, $this->mediaQuery); }