Merge pull request #211 from oliverklee/cleanup/php-53

Use PHP 5.3 language features

Author: sabberworm

lib/Sabberworm/CSS/CSSList/CSSList.php

@@ -115,7 +115,7 @@ private static function parseAtRule(ParserState $oParserState) {
 				$sMediaQuery = trim($oParserState->consumeUntil(array(';', ParserState::EOF)));
 			}
 			$oParserState->consumeUntil(array(';', ParserState::EOF), true, true);
-			return new Import($oLocation, $sMediaQuery ? $sMediaQuery : null, $iIdentifierLineNum);
+			return new Import($oLocation, $sMediaQuery ?: null, $iIdentifierLineNum);
 		} else if ($sIdentifier === 'charset') {
 			$sCharset = CSSString::parse($oParserState);
 			$oParserState->consumeWhiteSpace();

lib/Sabberworm/CSS/Value/Value.php

@@ -117,7 +117,7 @@ private static function parseUnicodeRangeValue(ParserState $oParserState) {
 		} while (strlen($sRange) < $iCodepointMaxLenth && preg_match("/[A-Fa-f0-9\?-]/", $oParserState->peek()));
 		return "U+{$sRange}";
 	}
-	
+
 	/**
 	 * @return int
 	 */

tests/Sabberworm/CSS/ParserTest.php

@@ -13,7 +13,7 @@
 class ParserTest extends \PHPunit\Framework\TestCase {
 
 	function testFiles() {
-		$sDirectory = dirname(__FILE__) . '/../../files';
+		$sDirectory = __DIR__ . '/../../files';
 		if ($rHandle = opendir($sDirectory)) {
 			/* This is the correct way to loop over the directory. */
 			while (false !== ($sFileName = readdir($rHandle))) {
@@ -613,7 +613,7 @@ function testMissingPropertyValueLenient() {
 	 * @return CSSList\Document Parsed document.
 	 */
 	function parsedStructureForFile($sFileName, $oSettings = null) {
-		$sFile = dirname(__FILE__) . '/../../files' . DIRECTORY_SEPARATOR . "$sFileName.css";
+		$sFile = __DIR__ . '/../../files' . DIRECTORY_SEPARATOR . "$sFileName.css";
 		$oParser = new Parser(file_get_contents($sFile), $oSettings);
 		return $oParser->parse();
 	}

tests/Sabberworm/CSS/RuleSet/LenientParsingTest.php

@@ -11,23 +11,23 @@ class LenientParsingTest extends \PHPUnit\Framework\TestCase {
 	* @expectedException Sabberworm\CSS\Parsing\UnexpectedTokenException
 	*/
 	public function testFaultToleranceOff() {
-		$sFile = dirname(__FILE__) . '/../../../files' . DIRECTORY_SEPARATOR . "-fault-tolerance.css";
+		$sFile = __DIR__ . '/../../../files' . DIRECTORY_SEPARATOR . "-fault-tolerance.css";
 		$oParser = new Parser(file_get_contents($sFile), Settings::create()->beStrict());
 		$oParser->parse();
 	}
 
 	public function testFaultToleranceOn() {
-		$sFile = dirname(__FILE__) . '/../../../files' . DIRECTORY_SEPARATOR . "-fault-tolerance.css";
+		$sFile = __DIR__ . '/../../../files' . DIRECTORY_SEPARATOR . "-fault-tolerance.css";
 		$oParser = new Parser(file_get_contents($sFile), Settings::create()->withLenientParsing(true));
 		$oResult = $oParser->parse();
 		$this->assertSame('.test1 {}'."\n".'.test2 {hello: 2.2;hello: 2000000000000.2;}'."\n".'#test {}'."\n".'#test2 {help: none;}', $oResult->render());
 	}
-	
+
 	/**
 	* @expectedException Sabberworm\CSS\Parsing\UnexpectedTokenException
 	*/
 	public function testEndToken() {
-		$sFile = dirname(__FILE__) . '/../../../files' . DIRECTORY_SEPARATOR . "-end-token.css";
+		$sFile = __DIR__ . '/../../../files' . DIRECTORY_SEPARATOR . "-end-token.css";
 		$oParser = new Parser(file_get_contents($sFile), Settings::create()->beStrict());
 		$oParser->parse();
 	}
@@ -36,35 +36,35 @@ public function testEndToken() {
 	* @expectedException Sabberworm\CSS\Parsing\UnexpectedTokenException
 	*/
 	public function testEndToken2() {
-		$sFile = dirname(__FILE__) . '/../../../files' . DIRECTORY_SEPARATOR . "-end-token-2.css";
+		$sFile = __DIR__ . '/../../../files' . DIRECTORY_SEPARATOR . "-end-token-2.css";
 		$oParser = new Parser(file_get_contents($sFile), Settings::create()->beStrict());
 		$oParser->parse();
 	}
-	
+
 	public function testEndTokenPositive() {
-		$sFile = dirname(__FILE__) . '/../../../files' . DIRECTORY_SEPARATOR . "-end-token.css";
+		$sFile = __DIR__ . '/../../../files' . DIRECTORY_SEPARATOR . "-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 = dirname(__FILE__) . '/../../../files' . DIRECTORY_SEPARATOR . "-end-token-2.css";
+		$sFile = __DIR__ . '/../../../files' . DIRECTORY_SEPARATOR . "-end-token-2.css";
 		$oParser = new Parser(file_get_contents($sFile), Settings::create()->withLenientParsing(true));
 		$oResult = $oParser->parse();
 		$this->assertSame('#home .bg-layout {background-image: url("/bundles/main/img/bg1.png?5");}', $oResult->render());
 	}
 
 	public function testLocaleTrap() {
 		setlocale(LC_ALL, "pt_PT", "no");
-		$sFile = dirname(__FILE__) . '/../../../files' . DIRECTORY_SEPARATOR . "-fault-tolerance.css";
+		$sFile = __DIR__ . '/../../../files' . DIRECTORY_SEPARATOR . "-fault-tolerance.css";
 		$oParser = new Parser(file_get_contents($sFile), Settings::create()->withLenientParsing(true));
 		$oResult = $oParser->parse();
 		$this->assertSame('.test1 {}'."\n".'.test2 {hello: 2.2;hello: 2000000000000.2;}'."\n".'#test {}'."\n".'#test2 {help: none;}', $oResult->render());
 	}
 
 	public function testCaseInsensitivity() {
-		$sFile = dirname(__FILE__) . '/../../../files' . DIRECTORY_SEPARATOR . "case-insensitivity.css";
+		$sFile = __DIR__ . '/../../../files' . DIRECTORY_SEPARATOR . "case-insensitivity.css";
 		$oParser = new Parser(file_get_contents($sFile));
 		$oResult = $oParser->parse();
 		$this->assertSame('@charset "utf-8";

tests/quickdump.php

@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-require_once(dirname(__FILE__).'/bootstrap.php');
+require_once(__DIR__.'/bootstrap.php');
 
 $sSource = file_get_contents('php://stdin');
 $oParser = new Sabberworm\CSS\Parser($sSource);