diff options
author | Asmir Mustafic <[email protected]> | 2018-11-24 11:31:15 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2018-11-24 11:31:15 +0100 |
commit | 1fd419b9e62efcab9c79f3848c54dd3717a7e725 (patch) | |
tree | 726da15a56dc8b51649bde768d8dabcd385e0d85 /src | |
parent | c7105a8abc4549f77dbbc1ef3d96caea3c4ec320 (diff) | |
parent | c9b90792d47974e2b7fb2e4f3509e5fb1143e9f7 (diff) |
Merge pull request #150 from Masterminds/backport
Backport few changes from old master branch
Diffstat (limited to 'src')
-rw-r--r-- | src/HTML5.php | 4 | ||||
-rw-r--r-- | src/HTML5/Elements.php | 4 | ||||
-rw-r--r-- | src/HTML5/Serializer/Traverser.php | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/HTML5.php b/src/HTML5.php index a3db74c..0697bed 100644 --- a/src/HTML5.php +++ b/src/HTML5.php @@ -201,8 +201,8 @@ class HTML5 * * @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 diff --git a/src/HTML5/Elements.php b/src/HTML5/Elements.php index b45de89..511da9d 100644 --- a/src/HTML5/Elements.php +++ b/src/HTML5/Elements.php @@ -557,7 +557,7 @@ class Elements * @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 @@ class Elements return static::$mathml[$name]; } - return false; + return 0; } /** diff --git a/src/HTML5/Serializer/Traverser.php b/src/HTML5/Serializer/Traverser.php index e95dc36..399570d 100644 --- a/src/HTML5/Serializer/Traverser.php +++ b/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' |