Merge git://github.com/goetas/PHP-CSS-Parser

Add support for @namespace. Modify goetas’ change by adding support for the alternate @url syntax and use “native” CSS valus in CSSNamespace

Closes MyIntervals#46 as fixed

* git://github.com/goetas/PHP-CSS-Parser:
  added @namespace rule support
  added @namespace rule support

Conflicts:
	lib/Sabberworm/CSS/Parser.php

Author: sabberworm

lib/Sabberworm/CSS/Parser.php

@@ -8,6 +8,7 @@
 use Sabberworm\CSS\CSSList\Keyframe;
 use Sabberworm\CSS\Property\Import;
 use Sabberworm\CSS\Property\Charset;
+use Sabberworm\CSS\Property\CSSNamespace;
 use Sabberworm\CSS\RuleSet\AtRule;
 use Sabberworm\CSS\RuleSet\DeclarationBlock;
 use Sabberworm\CSS\Value\CSSFunction;
@@ -119,6 +120,21 @@ private function parseAtRule() {
 			$this->consumeWhiteSpace();
 			$this->parseList($oResult);
 			return $oResult;
+		} else if ($sIdentifier === 'namespace') {
+			$sPrefix = null;
+			$mUrl = $this->parsePrimitiveValue();
+			if(!$this->comes(';')) {
+				$sPrefix = $mUrl;
+				$mUrl = $this->parsePrimitiveValue();
+			}
+			$this->consume(';');
+			if($sPrefix !== null && !is_string($sPrefix)) {
+				throw new \Exception('Wrong namespace prefix '.$sPrefix);
+			}
+			if(!($mUrl instanceof String || $mUrl instanceof URL)) {
+				throw new \Exception('Wrong namespace url of invalid type '.$mUrl);
+			}
+			return new CSSNamespace($mUrl, $sPrefix);
 		} else {
 			//Unknown other at rule (font-face or such)
 			$this->consume('{');

lib/Sabberworm/CSS/Property/CssNamespace.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Sabberworm\CSS\Property;
+
+/**
+* CSSNamespace represents an @namespace rule.
+*/
+class CSSNamespace {
+	private $mUrl;
+	private $sPrefix;
+	
+	public function __construct($mUrl, $sPrefix = null) {
+		$this->mUrl = $mUrl;
+		$this->sPrefix = $sPrefix;
+	}
+	
+	public function __toString() {
+		return '@namespace '.($this->sPrefix === null ? '' : $this->sPrefix.' ').$this->mUrl->__toString().';';
+	}
+	
+	public function getUrl() {
+		return $this->mUrl;
+	}
+
+	public function getPrefix() {
+		return $this->sPrefix;
+	}
+
+	public function setUrl($mUrl) {
+		$this->mUrl = $mUrl;
+	}
+
+	public function setPrefix($sPrefix) {
+		$this->sPrefix = $sPrefix;
+	}
+
+}