Merge pull request #150 from Masterminds/backport

Backport few changes from old master branch

Author: goetas

src/HTML5.php

@@ -201,8 +201,8 @@ public function parseFragment($input, array $options = array())
      *
      * @param mixed $dom
      *            The DOM to be serialized.
-     * @param string $file
-     *            The filename to be written.
+     * @param string|resource $file
+     *            The filename to be written or resource to write to.
      * @param array $options
      *            Configuration options when serializing the DOM. These include:
      *            - encode_entities: Text written to the output is escaped by default and not all

src/HTML5/Elements.php

@@ -557,7 +557,7 @@ public static function isElement($name)
      * @param string $name
      *            The name of the element.
      *
-     * @return int|bool The element mask or false if element does not exist.
+     * @return int The element mask.
      */
     public static function element($name)
     {
@@ -571,7 +571,7 @@ public static function element($name)
             return static::$mathml[$name];
         }
 
-        return false;
+        return 0;
     }
 
     /**

src/HTML5/Serializer/Traverser.php

@@ -16,7 +16,7 @@ class Traverser
     /**
      * Namespaces that should be treated as "local" to HTML5.
      */
-    static $local_ns = array(
+    protected static $local_ns = array(
         'http://www.w3.org/1999/xhtml' => 'html',
         'http://www.w3.org/1998/Math/MathML' => 'math',
         'http://www.w3.org/2000/svg' => 'svg'

test/HTML5/ElementsTest.php

@@ -351,7 +351,7 @@ public function testElement()
             'baz'
         );
         foreach ($nonhtml5 as $element) {
-            $this->assertFalse(Elements::element($element));
+            $this->assertEquals(0, Elements::element($element));
         }
     }