Merge branch 'master' of github.com:sabberworm/PHP-CSS-Parser into unicode_range

Author: raxbg

lib/Sabberworm/CSS/CSSList/AtRuleBlockList.php

@@ -35,9 +35,11 @@ public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat) {
 		if($sArgs) {
 			$sArgs = ' ' . $sArgs;
 		}
-		$sResult = "@{$this->sType}$sArgs{$oOutputFormat->spaceBeforeOpeningBrace()}{";
+		$sResult  = $oOutputFormat->sBeforeAtRuleBlock;
+		$sResult .= "@{$this->sType}$sArgs{$oOutputFormat->spaceBeforeOpeningBrace()}{";
 		$sResult .= parent::render($oOutputFormat);
 		$sResult .= '}';
+		$sResult .= $oOutputFormat->sAfterAtRuleBlock;
 		return $sResult;
 	}
 

lib/Sabberworm/CSS/CSSList/CSSList.php

@@ -176,13 +176,39 @@ public function getLineNo() {
 		return $this->iLineNo;
 	}
 
+	/**
+	 * Prepend item to list of contents.
+	 *
+	 * @param object $oItem Item.
+	 */
+	public function prepend($oItem) {
+		array_unshift($this->aContents, $oItem);
+	}
+
+	/**
+	 * Append item to list of contents.
+	 *
+	 * @param object $oItem Item.
+	 */
 	public function append($oItem) {
 		$this->aContents[] = $oItem;
 	}
 
+	/**
+	 * Splice the list of contents.
+	 *
+	 * @param int       $iOffset      Offset.
+	 * @param int       $iLength      Length. Optional.
+	 * @param RuleSet[] $mReplacement Replacement. Optional.
+	 */
+	public function splice($iOffset, $iLength = null, $mReplacement = null) {
+		array_splice($this->aContents, $iOffset, $iLength, $mReplacement);
+	}
+
 	/**
 	 * Removes an item from the CSS list.
 	 * @param RuleSet|Import|Charset|CSSList $oItemToRemove May be a RuleSet (most likely a DeclarationBlock), a Import, a Charset or another CSSList (most likely a MediaQuery)
+	 * @return bool Whether the item was removed.
 	 */
 	public function remove($oItemToRemove) {
 		$iKey = array_search($oItemToRemove, $this->aContents, true);
@@ -193,6 +219,19 @@ public function remove($oItemToRemove) {
 		return false;
 	}
 
+	/**
+	 * Replaces an item from the CSS list.
+	 * @param RuleSet|Import|Charset|CSSList $oItemToRemove May be a RuleSet (most likely a DeclarationBlock), a Import, a Charset or another CSSList (most likely a MediaQuery)
+	 */
+	public function replace($oOldItem, $oNewItem) {
+		$iKey = array_search($oOldItem, $this->aContents, true);
+		if ($iKey !== false) {
+			array_splice($this->aContents, $iKey, 1, $oNewItem);
+			return true;
+		}
+		return false;
+	}
+
 	/**
 	 * Set the contents.
 	 * @param array $aContents Objects to set as content.

lib/Sabberworm/CSS/OutputFormat.php

@@ -4,6 +4,11 @@
 
 use Sabberworm\CSS\Parsing\OutputException;
 
+/**
+ * Class OutputFormat
+ *
+ * @method OutputFormat setSemicolonAfterLastRule( bool $bSemicolonAfterLastRule ) Set whether semicolons are added after last rule.
+ */
 class OutputFormat {
 	/**
 	* Value format
@@ -35,6 +40,10 @@ class OutputFormat {
 	public $sSpaceAfterBlocks = '';
 	public $sSpaceBetweenBlocks = "\n";
 
+	// Content injected in and around @-rule blocks.
+	public $sBeforeAtRuleBlock = '';
+	public $sAfterAtRuleBlock = '';
+
 	// This is what’s printed before and after the comma if a declaration block contains multiple selectors.
 	public $sSpaceBeforeSelectorSeparator = '';
 	public $sSpaceAfterSelectorSeparator = ' ';
@@ -43,7 +52,12 @@ class OutputFormat {
 	public $sSpaceAfterListArgumentSeparator = '';
 
 	public $sSpaceBeforeOpeningBrace = ' ';
-	
+
+	// Content injected in and around declaration blocks.
+	public $sBeforeDeclarationBlock = '';
+	public $sAfterDeclarationBlockSelectors = '';
+	public $sAfterDeclarationBlock = '';
+
 	/**
 	* Indentation
 	*/
@@ -141,17 +155,36 @@ public function getFormatter() {
 	public function level() {
 		return $this->iIndentationLevel;
 	}
-	
+
+	/**
+	 * Create format.
+	 *
+	 * @return OutputFormat Format.
+	 */
 	public static function create() {
 		return new OutputFormat();
 	}
-	
+
+	/**
+	 * Create compact format.
+	 *
+	 * @return OutputFormat Format.
+	 */
 	public static function createCompact() {
-		return self::create()->set('Space*Rules', "")->set('Space*Blocks', "")->setSpaceAfterRuleName('')->setSpaceBeforeOpeningBrace('')->setSpaceAfterSelectorSeparator('');
+		$format = self::create();
+		$format->set('Space*Rules', "")->set('Space*Blocks', "")->setSpaceAfterRuleName('')->setSpaceBeforeOpeningBrace('')->setSpaceAfterSelectorSeparator('');
+		return $format;
 	}
-	
+
+	/**
+	 * Create pretty format.
+	 *
+	 * @return OutputFormat Format.
+	 */
 	public static function createPretty() {
-		return self::create()->set('Space*Rules', "\n")->set('Space*Blocks', "\n")->setSpaceBetweenBlocks("\n\n")->set('SpaceAfterListArgumentSeparator', array('default' => '', ',' => ' '));
+		$format = self::create();
+		$format->set('Space*Rules', "\n")->set('Space*Blocks', "\n")->setSpaceBetweenBlocks("\n\n")->set('SpaceAfterListArgumentSeparator', array('default' => '', ',' => ' '));
+		return $format;
 	}
 }
 

lib/Sabberworm/CSS/RuleSet/DeclarationBlock.php

@@ -76,6 +76,11 @@ public function setSelector($mSelector) {
 		$this->setSelectors($mSelector);
 	}
 
+	/**
+	 * Get selectors.
+	 *
+	 * @return Selector[] Selectors.
+	 */
 	public function getSelectors() {
 		return $this->aSelectors;
 	}
@@ -610,9 +615,13 @@ public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat) {
 			// If all the selectors have been removed, this declaration block becomes invalid
 			throw new OutputException("Attempt to print declaration block with missing selector", $this->iLineNo);
 		}
-		$sResult = $oOutputFormat->implode($oOutputFormat->spaceBeforeSelectorSeparator() . ',' . $oOutputFormat->spaceAfterSelectorSeparator(), $this->aSelectors) . $oOutputFormat->spaceBeforeOpeningBrace() . '{';
+		$sResult = $oOutputFormat->sBeforeDeclarationBlock;
+		$sResult .= $oOutputFormat->implode($oOutputFormat->spaceBeforeSelectorSeparator() . ',' . $oOutputFormat->spaceAfterSelectorSeparator(), $this->aSelectors);
+		$sResult .= $oOutputFormat->sAfterDeclarationBlockSelectors;
+		$sResult .= $oOutputFormat->spaceBeforeOpeningBrace() . '{';
 		$sResult .= parent::render($oOutputFormat);
 		$sResult .= '}';
+		$sResult .= $oOutputFormat->sAfterDeclarationBlock;
 		return $sResult;
 	}
 

lib/Sabberworm/CSS/RuleSet/RuleSet.php

@@ -89,6 +89,7 @@ public function addRule(Rule $oRule, Rule $oSibling = null) {
 	 * @param (null|string|Rule) $mRule pattern to search for. If null, returns all rules. if the pattern ends with a dash, all rules starting with the pattern are returned as well as one matching the pattern with the dash excluded. passing a Rule behaves like calling getRules($mRule->getRule()).
 	 * @example $oRuleSet->getRules('font-') //returns an array of all rules either beginning with font- or matching font.
 	 * @example $oRuleSet->getRules('font') //returns array(0 => $oRule, …) or array().
+	 * @return Rule[] Rules.
 	 */
 	public function getRules($mRule = null) {
 		if ($mRule instanceof Rule) {
@@ -106,7 +107,7 @@ public function getRules($mRule = null) {
 
 	/**
 	 * Override all the rules of this set.
-	 * @param array $aRules The rules to override with.
+	 * @param Rule[] $aRules The rules to override with.
 	 */
 	public function setRules(array $aRules) {
 		$this->aRules = array();
@@ -119,6 +120,7 @@ public function setRules(array $aRules) {
 	 * Returns all rules matching the given pattern and returns them in an associative array with the rule’s name as keys. This method exists mainly for backwards-compatibility and is really only partially useful.
 	 * @param (string) $mRule pattern to search for. If null, returns all rules. if the pattern ends with a dash, all rules starting with the pattern are returned as well as one matching the pattern with the dash excluded. passing a Rule behaves like calling getRules($mRule->getRule()).
 	 * Note: This method loses some information: Calling this (with an argument of 'background-') on a declaration block like { background-color: green; background-color; rgba(0, 127, 0, 0.7); } will only yield an associative array containing the rgba-valued rule while @link{getRules()} would yield an indexed array containing both.
+	 * @return Rule[] Rules.
 	 */
 	public function getRulesAssoc($mRule = null) {
 		$aResult = array();
@@ -129,9 +131,9 @@ public function getRulesAssoc($mRule = null) {
 	}
 
 	/**
-	* Remove a rule from this RuleSet. This accepts all the possible values that @link{getRules()} accepts. If given a Rule, it will only remove this particular rule (by identity). If given a name, it will remove all rules by that name. Note: this is different from pre-v.2.0 behaviour of PHP-CSS-Parser, where passing a Rule instance would remove all rules with the same name. To get the old behvaiour, use removeRule($oRule->getRule()).
- * @param (null|string|Rule) $mRule pattern to remove. If $mRule is null, all rules are removed. If the pattern ends in a dash, all rules starting with the pattern are removed as well as one matching the pattern with the dash excluded. Passing a Rule behaves matches by identity.
-	*/
+	 * Remove a rule from this RuleSet. This accepts all the possible values that @link{getRules()} accepts. If given a Rule, it will only remove this particular rule (by identity). If given a name, it will remove all rules by that name. Note: this is different from pre-v.2.0 behaviour of PHP-CSS-Parser, where passing a Rule instance would remove all rules with the same name. To get the old behvaiour, use removeRule($oRule->getRule()).
+	 * @param (null|string|Rule) $mRule pattern to remove. If $mRule is null, all rules are removed. If the pattern ends in a dash, all rules starting with the pattern are removed as well as one matching the pattern with the dash excluded. Passing a Rule behaves matches by identity.
+	 */
 	public function removeRule($mRule) {
 		if($mRule instanceof Rule) {
 			$sRule = $mRule->getRule();

lib/Sabberworm/CSS/Value/Value.php

@@ -3,6 +3,7 @@
 namespace Sabberworm\CSS\Value;
 
 use Sabberworm\CSS\Parsing\ParserState;
+use Sabberworm\CSS\Parsing\UnexpectedTokenException;
 use Sabberworm\CSS\Renderable;
 
 abstract class Value implements Renderable {
@@ -55,6 +56,9 @@ public static function parseValue(ParserState $oParserState, $aListDelimiters =
 				array_splice($aStack, $iStartPosition - 1, $iLength * 2 - 1, array($oList));
 			}
 		}
+		if (!isset($aStack[0])) {
+			throw new UnexpectedTokenException(" {$oParserState->peek()} ", $oParserState->peek(1, -1) . $oParserState->peek(2), 'literal', $oParserState->currentLine());
+		}
 		return $aStack[0];
 	}
 

tests/Sabberworm/CSS/ParserTest.php

@@ -478,26 +478,63 @@ function testTrailingWhitespace() {
 	}
 
 	/**
-	* @expectedException Sabberworm\CSS\Parsing\UnexpectedTokenException
-	*/
+	 * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
+	 */
 	function testCharsetFailure1() {
 		$this->parsedStructureForFile('-charset-after-rule', Settings::create()->withLenientParsing(false));
 	}
 
 	/**
-	* @expectedException Sabberworm\CSS\Parsing\UnexpectedTokenException
-	*/
+	 * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
+	 */
 	function testCharsetFailure2() {
 		$this->parsedStructureForFile('-charset-in-block', Settings::create()->withLenientParsing(false));
 	}
 
 	/**
-	* @expectedException Sabberworm\CSS\Parsing\SourceException
-	*/
+	 * @expectedException \Sabberworm\CSS\Parsing\SourceException
+	 */
 	function testUnopenedClosingBracketFailure() {
 		$this->parsedStructureForFile('unopened-close-brackets', Settings::create()->withLenientParsing(false));
 	}
 
+	/**
+	 * Ensure that a missing property value raises an exception.
+	 *
+	 * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
+	 * @covers \Sabberworm\CSS\Value\Value::parseValue()
+	 */
+	function testMissingPropertyValueStrict() {
+		$this->parsedStructureForFile('missing-property-value', Settings::create()->withLenientParsing(false));
+	}
+
+	/**
+	 * Ensure that a missing property value is ignored when in lenient parsing mode.
+	 *
+	 * @covers \Sabberworm\CSS\Value\Value::parseValue()
+	 */
+	function testMissingPropertyValueLenient() {
+		$parsed = $this->parsedStructureForFile('missing-property-value', Settings::create()->withLenientParsing(true));
+		$rulesets = $parsed->getAllRuleSets();
+		$this->assertCount( 1, $rulesets );
+		$block = $rulesets[0];
+		$this->assertTrue( $block instanceof DeclarationBlock );
+		$this->assertEquals( array( 'div' ), $block->getSelectors() );
+		$rules = $block->getRules();
+		$this->assertCount( 1, $rules );
+		$rule = $rules[0];
+		$this->assertEquals( 'display', $rule->getRule() );
+		$this->assertEquals( 'inline-block', $rule->getValue() );
+	}
+
+	/**
+	 * Parse structure for file.
+	 *
+	 * @param string      $sFileName Filename.
+	 * @param null|obJeCt $oSettings Settings.
+	 *
+	 * @return CSSList\Document Parsed document.
+	 */
 	function parsedStructureForFile($sFileName, $oSettings = null) {
 		$sFile = dirname(__FILE__) . '/../../files' . DIRECTORY_SEPARATOR . "$sFileName.css";
 		$oParser = new Parser(file_get_contents($sFile), $oSettings);

tests/files/missing-property-value.css

@@ -0,0 +1,4 @@
+div {
+	display: inline-block;
+	display:
+}