Merge remote-tracking branch 'upstream/master'

Conflicts:
	doc/html/classRedmatrix_1_1Import_1_1Import-members.html
	doc/html/classRedmatrix_1_1Import_1_1Import.js

1 files changed, 37 insertions, 24 deletions

diff --git a/library/HTMLPurifier/Context.php b/library/HTMLPurifier/Context.php
index 9ddf0c547..00e509c85 100644
--- a/library/HTMLPurifier/Context.php
+++ b/library/HTMLPurifier/Context.php
@@ -12,18 +12,22 @@ class HTMLPurifier_Context
 
     /**
      * Private array that stores the references.
+     * @type array
      */
     private $_storage = array();
 
     /**
      * Registers a variable into the context.
-     * @param $name String name
-     * @param $ref Reference to variable to be registered
+     * @param string $name String name
+     * @param mixed $ref Reference to variable to be registered
      */
-    public function register($name, &$ref) {
-        if (isset($this->_storage[$name])) {
-            trigger_error("Name $name produces collision, cannot re-register",
-                          E_USER_ERROR);
+    public function register($name, &$ref)
+    {
+        if (array_key_exists($name, $this->_storage)) {
+            trigger_error(
+                "Name $name produces collision, cannot re-register",
+                E_USER_ERROR
+            );
             return;
         }
         $this->_storage[$name] =& $ref;
@@ -31,14 +35,18 @@ class HTMLPurifier_Context
 
     /**
      * Retrieves a variable reference from the context.
-     * @param $name String name
-     * @param $ignore_error Boolean whether or not to ignore error
+     * @param string $name String name
+     * @param bool $ignore_error Boolean whether or not to ignore error
+     * @return mixed
      */
-    public function &get($name, $ignore_error = false) {
-        if (!isset($this->_storage[$name])) {
+    public function &get($name, $ignore_error = false)
+    {
+        if (!array_key_exists($name, $this->_storage)) {
             if (!$ignore_error) {
-                trigger_error("Attempted to retrieve non-existent variable $name",
-                              E_USER_ERROR);
+                trigger_error(
+                    "Attempted to retrieve non-existent variable $name",
+                    E_USER_ERROR
+                );
             }
             $var = null; // so we can return by reference
             return $var;
@@ -47,13 +55,16 @@ class HTMLPurifier_Context
     }
 
     /**
-     * Destorys a variable in the context.
-     * @param $name String name
+     * Destroys a variable in the context.
+     * @param string $name String name
      */
-    public function destroy($name) {
-        if (!isset($this->_storage[$name])) {
-            trigger_error("Attempted to destroy non-existent variable $name",
-                          E_USER_ERROR);
+    public function destroy($name)
+    {
+        if (!array_key_exists($name, $this->_storage)) {
+            trigger_error(
+                "Attempted to destroy non-existent variable $name",
+                E_USER_ERROR
+            );
             return;
         }
         unset($this->_storage[$name]);
@@ -61,22 +72,24 @@ class HTMLPurifier_Context
 
     /**
      * Checks whether or not the variable exists.
-     * @param $name String name
+     * @param string $name String name
+     * @return bool
      */
-    public function exists($name) {
-        return isset($this->_storage[$name]);
+    public function exists($name)
+    {
+        return array_key_exists($name, $this->_storage);
     }
 
     /**
      * Loads a series of variables from an associative array
-     * @param $context_array Assoc array of variables to load
+     * @param array $context_array Assoc array of variables to load
      */
-    public function loadArray($context_array) {
+    public function loadArray($context_array)
+    {
         foreach ($context_array as $key => $discard) {
             $this->register($key, $context_array[$key]);
         }
     }
-
 }
 
 // vim: et sw=4 sts=4