Dolibarr / dolibarr

htdocs/includes/restler/framework/Luracast/Restler/Format/TsvFormat.php

Indentation +6 added lines, -6 removed lines

@@ -15,10 +15,10 @@
  */
 class TsvFormat extends CsvFormat
 {
-    const MIME = 'text/csv';
-    const EXTENSION = 'csv';
-    public static $delimiter = "\t";
-    public static $enclosure = '"';
-    public static $escape = '\\';
-    public static $haveHeaders = null;
+	const MIME = 'text/csv';
+	const EXTENSION = 'csv';
+	public static $delimiter = "\t";
+	public static $enclosure = '"';
+	public static $escape = '\\';
+	public static $haveHeaders = null;
 }
\ No newline at end of file

htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php

Indentation +313 added lines, -313 removed lines

@@ -20,334 +20,334 @@
  */
 class XmlFormat extends Format
 {
-    const MIME = 'application/xml';
-    const EXTENSION = 'xml';
+	const MIME = 'application/xml';
+	const EXTENSION = 'xml';
 
-    // ==================================================================
-    //
-    // Properties related to reading/parsing/decoding xml
-    //
-    // ------------------------------------------------------------------
-    public static $importSettingsFromXml = false;
-    public static $parseAttributes = true;
-    public static $parseNamespaces = true;
-    public static $parseTextNodeAsProperty = true;
+	// ==================================================================
+	//
+	// Properties related to reading/parsing/decoding xml
+	//
+	// ------------------------------------------------------------------
+	public static $importSettingsFromXml = false;
+	public static $parseAttributes = true;
+	public static $parseNamespaces = true;
+	public static $parseTextNodeAsProperty = true;
 
-    // ==================================================================
-    //
-    // Properties related to writing/encoding xml
-    //
-    // ------------------------------------------------------------------
-    public static $useTextNodeProperty = true;
-    public static $useNamespaces = true;
-    public static $cdataNames = array();
+	// ==================================================================
+	//
+	// Properties related to writing/encoding xml
+	//
+	// ------------------------------------------------------------------
+	public static $useTextNodeProperty = true;
+	public static $useNamespaces = true;
+	public static $cdataNames = array();
 
-    // ==================================================================
-    //
-    // Common Properties
-    //
-    // ------------------------------------------------------------------
-    public static $attributeNames = array();
-    public static $textNodeName = 'text';
-    public static $namespaces = array();
-    public static $namespacedProperties = array();
-    /**
-     * Default name for the root node.
-     *
-     * @var string $rootNodeName
-     */
-    public static $rootName = 'response';
-    public static $defaultTagName = 'item';
+	// ==================================================================
+	//
+	// Common Properties
+	//
+	// ------------------------------------------------------------------
+	public static $attributeNames = array();
+	public static $textNodeName = 'text';
+	public static $namespaces = array();
+	public static $namespacedProperties = array();
+	/**
+	 * Default name for the root node.
+	 *
+	 * @var string $rootNodeName
+	 */
+	public static $rootName = 'response';
+	public static $defaultTagName = 'item';
 
-    /**
-     * When you decode an XML its structure is copied to the static vars
-     * we can use this function to echo them out and then copy paste inside
-     * our service methods
-     *
-     * @return string PHP source code to reproduce the configuration
-     */
-    public static function exportCurrentSettings()
-    {
-        $s = 'XmlFormat::$rootName = "' . (self::$rootName) . "\";\n";
-        $s .= 'XmlFormat::$attributeNames = ' .
-            (var_export(self::$attributeNames, true)) . ";\n";
-        $s .= 'XmlFormat::$defaultTagName = "' .
-            self::$defaultTagName . "\";\n";
-        $s .= 'XmlFormat::$parseAttributes = ' .
-            (self::$parseAttributes ? 'true' : 'false') . ";\n";
-        $s .= 'XmlFormat::$parseNamespaces = ' .
-            (self::$parseNamespaces ? 'true' : 'false') . ";\n";
-        if (self::$parseNamespaces) {
-            $s .= 'XmlFormat::$namespaces = ' .
-                (var_export(self::$namespaces, true)) . ";\n";
-            $s .= 'XmlFormat::$namespacedProperties = ' .
-                (var_export(self::$namespacedProperties, true)) . ";\n";
-        }
+	/**
+	 * When you decode an XML its structure is copied to the static vars
+	 * we can use this function to echo them out and then copy paste inside
+	 * our service methods
+	 *
+	 * @return string PHP source code to reproduce the configuration
+	 */
+	public static function exportCurrentSettings()
+	{
+		$s = 'XmlFormat::$rootName = "' . (self::$rootName) . "\";\n";
+		$s .= 'XmlFormat::$attributeNames = ' .
+			(var_export(self::$attributeNames, true)) . ";\n";
+		$s .= 'XmlFormat::$defaultTagName = "' .
+			self::$defaultTagName . "\";\n";
+		$s .= 'XmlFormat::$parseAttributes = ' .
+			(self::$parseAttributes ? 'true' : 'false') . ";\n";
+		$s .= 'XmlFormat::$parseNamespaces = ' .
+			(self::$parseNamespaces ? 'true' : 'false') . ";\n";
+		if (self::$parseNamespaces) {
+			$s .= 'XmlFormat::$namespaces = ' .
+				(var_export(self::$namespaces, true)) . ";\n";
+			$s .= 'XmlFormat::$namespacedProperties = ' .
+				(var_export(self::$namespacedProperties, true)) . ";\n";
+		}
 
-        return $s;
-    }
+		return $s;
+	}
 
-    public function encode($data, $humanReadable = false)
-    {
-        $data = Obj::toArray($data);
-        $xml = new XMLWriter();
-        $xml->openMemory();
-        $xml->startDocument('1.0', $this->charset);
-        if ($humanReadable) {
-            $xml->setIndent(true);
-            $xml->setIndentString('    ');
-        }
-        static::$useNamespaces && isset(static::$namespacedProperties[static::$rootName])
-            ?
-            $xml->startElementNs(
-                static::$namespacedProperties[static::$rootName],
-                static::$rootName,
-                static::$namespaces[static::$namespacedProperties[static::$rootName]]
-            )
-            :
-            $xml->startElement(static::$rootName);
-        if (static::$useNamespaces) {
-            foreach (static::$namespaces as $prefix => $ns) {
-                if (isset(static::$namespacedProperties[static::$rootName])
-                    && static::$namespacedProperties[static::$rootName] == $prefix
-                ) {
-                    continue;
-                }
-                $prefix = 'xmlns' . (empty($prefix) ? '' : ':' . $prefix);
-                $xml->writeAttribute($prefix, $ns);
-            }
-        }
-        $this->write($xml, $data, static::$rootName);
-        $xml->endElement();
+	public function encode($data, $humanReadable = false)
+	{
+		$data = Obj::toArray($data);
+		$xml = new XMLWriter();
+		$xml->openMemory();
+		$xml->startDocument('1.0', $this->charset);
+		if ($humanReadable) {
+			$xml->setIndent(true);
+			$xml->setIndentString('    ');
+		}
+		static::$useNamespaces && isset(static::$namespacedProperties[static::$rootName])
+			?
+			$xml->startElementNs(
+				static::$namespacedProperties[static::$rootName],
+				static::$rootName,
+				static::$namespaces[static::$namespacedProperties[static::$rootName]]
+			)
+			:
+			$xml->startElement(static::$rootName);
+		if (static::$useNamespaces) {
+			foreach (static::$namespaces as $prefix => $ns) {
+				if (isset(static::$namespacedProperties[static::$rootName])
+					&& static::$namespacedProperties[static::$rootName] == $prefix
+				) {
+					continue;
+				}
+				$prefix = 'xmlns' . (empty($prefix) ? '' : ':' . $prefix);
+				$xml->writeAttribute($prefix, $ns);
+			}
+		}
+		$this->write($xml, $data, static::$rootName);
+		$xml->endElement();
 
-        return $xml->outputMemory();
-    }
+		return $xml->outputMemory();
+	}
 
-    public function write(XMLWriter $xml, $data, $parent)
-    {
-        $text = array();
-        if (is_array($data)) {
-            if (static::$useTextNodeProperty && isset($data[static::$textNodeName])) {
-                $text [] = $data[static::$textNodeName];
-                unset($data[static::$textNodeName]);
-            }
-            $attributes = array_flip(static::$attributeNames);
-            //make sure we deal with attributes first
-            $temp = array();
-            foreach ($data as $key => $value) {
-                if (isset($attributes[$key])) {
-                    $temp[$key] = $data[$key];
-                    unset($data[$key]);
-                }
-            }
-            $data = array_merge($temp, $data);
-            foreach ($data as $key => $value) {
-                if (is_numeric($key)) {
-                    if (!is_array($value)) {
-                        $text [] = $value;
-                        continue;
-                    }
-                    $key = static::$defaultTagName;
-                }
-                $useNS = static::$useNamespaces
-                    && !empty(static::$namespacedProperties[$key])
-                    && false === strpos($key, ':');
-                if (is_array($value)) {
-                    $useNS
-                        ? $xml->startElementNs(
-                        static::$namespacedProperties[$key],
-                        $key,
-                        null
-                    )
-                        : $xml->startElement($key);
-                    $this->write($xml, $value, $key);
-                    $xml->endElement();
-                    continue;
-                } elseif (is_bool($value)) {
-                    $value = $value ? 'true' : 'false';
-                }
-                if (isset($attributes[$key])) {
-                    $xml->writeAttribute($useNS ? static::$namespacedProperties[$key] . ':' . $key : $key, $value);
-                } else {
-                    $useNS
-                        ?
-                        $xml->startElementNs(
-                            static::$namespacedProperties[$key],
-                            $key,
-                            null
-                        )
-                        : $xml->startElement($key);
-                    $this->write($xml, $value, $key);
-                    $xml->endElement();
-                }
-            }
-        } else {
-            $text [] = (string)$data;
-        }
-        if (!empty($text)) {
-            if (count($text) == 1) {
-                in_array($parent, static::$cdataNames)
-                    ? $xml->writeCdata(implode('', $text))
-                    : $xml->text(implode('', $text));
-            } else {
-                foreach ($text as $t) {
-                    $xml->writeElement(static::$textNodeName, $t);
-                }
-            }
-        }
-    }
+	public function write(XMLWriter $xml, $data, $parent)
+	{
+		$text = array();
+		if (is_array($data)) {
+			if (static::$useTextNodeProperty && isset($data[static::$textNodeName])) {
+				$text [] = $data[static::$textNodeName];
+				unset($data[static::$textNodeName]);
+			}
+			$attributes = array_flip(static::$attributeNames);
+			//make sure we deal with attributes first
+			$temp = array();
+			foreach ($data as $key => $value) {
+				if (isset($attributes[$key])) {
+					$temp[$key] = $data[$key];
+					unset($data[$key]);
+				}
+			}
+			$data = array_merge($temp, $data);
+			foreach ($data as $key => $value) {
+				if (is_numeric($key)) {
+					if (!is_array($value)) {
+						$text [] = $value;
+						continue;
+					}
+					$key = static::$defaultTagName;
+				}
+				$useNS = static::$useNamespaces
+					&& !empty(static::$namespacedProperties[$key])
+					&& false === strpos($key, ':');
+				if (is_array($value)) {
+					$useNS
+						? $xml->startElementNs(
+						static::$namespacedProperties[$key],
+						$key,
+						null
+					)
+						: $xml->startElement($key);
+					$this->write($xml, $value, $key);
+					$xml->endElement();
+					continue;
+				} elseif (is_bool($value)) {
+					$value = $value ? 'true' : 'false';
+				}
+				if (isset($attributes[$key])) {
+					$xml->writeAttribute($useNS ? static::$namespacedProperties[$key] . ':' . $key : $key, $value);
+				} else {
+					$useNS
+						?
+						$xml->startElementNs(
+							static::$namespacedProperties[$key],
+							$key,
+							null
+						)
+						: $xml->startElement($key);
+					$this->write($xml, $value, $key);
+					$xml->endElement();
+				}
+			}
+		} else {
+			$text [] = (string)$data;
+		}
+		if (!empty($text)) {
+			if (count($text) == 1) {
+				in_array($parent, static::$cdataNames)
+					? $xml->writeCdata(implode('', $text))
+					: $xml->text(implode('', $text));
+			} else {
+				foreach ($text as $t) {
+					$xml->writeElement(static::$textNodeName, $t);
+				}
+			}
+		}
+	}
 
-    public function decode($data)
-    {
-        try {
-            if ($data == '') {
-                return array();
-            }
-            libxml_use_internal_errors(true);
-            libxml_disable_entity_loader(true);
-            $xml = simplexml_load_string($data,
-                "SimpleXMLElement", LIBXML_NOBLANKS | LIBXML_NOCDATA | LIBXML_COMPACT);
-            if (false === $xml) {
-                $error = libxml_get_last_error();
-                throw new RestException(400, 'Malformed XML. '
-                    . trim($error->message, "\r\n") . ' at line ' . $error->line);
-            }
-            libxml_clear_errors();
-            if (static::$importSettingsFromXml) {
-                static::$attributeNames = array();
-                static::$namespacedProperties = array();
-                static::$namespaces = array();
-                static::$rootName = $xml->getName();
-                $namespaces = $xml->getNamespaces();
-                if (count($namespaces)) {
-                    $p = strpos($data, $xml->getName());
-                    if ($p && $data[$p - 1] == ':') {
-                        $s = strpos($data, '<') + 1;
-                        $prefix = substr($data, $s, $p - $s - 1);
-                        static::$namespacedProperties[static::$rootName] = $prefix;
-                    }
-                }
-            }
-            $data = $this->read($xml);
-            if (count($data) == 1 && isset($data[static::$textNodeName])) {
-                $data = $data[static::$textNodeName];
-            }
+	public function decode($data)
+	{
+		try {
+			if ($data == '') {
+				return array();
+			}
+			libxml_use_internal_errors(true);
+			libxml_disable_entity_loader(true);
+			$xml = simplexml_load_string($data,
+				"SimpleXMLElement", LIBXML_NOBLANKS | LIBXML_NOCDATA | LIBXML_COMPACT);
+			if (false === $xml) {
+				$error = libxml_get_last_error();
+				throw new RestException(400, 'Malformed XML. '
+					. trim($error->message, "\r\n") . ' at line ' . $error->line);
+			}
+			libxml_clear_errors();
+			if (static::$importSettingsFromXml) {
+				static::$attributeNames = array();
+				static::$namespacedProperties = array();
+				static::$namespaces = array();
+				static::$rootName = $xml->getName();
+				$namespaces = $xml->getNamespaces();
+				if (count($namespaces)) {
+					$p = strpos($data, $xml->getName());
+					if ($p && $data[$p - 1] == ':') {
+						$s = strpos($data, '<') + 1;
+						$prefix = substr($data, $s, $p - $s - 1);
+						static::$namespacedProperties[static::$rootName] = $prefix;
+					}
+				}
+			}
+			$data = $this->read($xml);
+			if (count($data) == 1 && isset($data[static::$textNodeName])) {
+				$data = $data[static::$textNodeName];
+			}
 
-            return $data;
-        } catch (\RuntimeException $e) {
-            throw new RestException(400,
-                "Error decoding request. " . $e->getMessage());
-        }
-    }
+			return $data;
+		} catch (\RuntimeException $e) {
+			throw new RestException(400,
+				"Error decoding request. " . $e->getMessage());
+		}
+	}
 
-    public function read(SimpleXMLElement $xml, $namespaces = null)
-    {
-        $r = array();
-        $text = (string)$xml;
+	public function read(SimpleXMLElement $xml, $namespaces = null)
+	{
+		$r = array();
+		$text = (string)$xml;
 
-        if (static::$parseAttributes) {
-            $attributes = $xml->attributes();
-            foreach ($attributes as $key => $value) {
-                if (static::$importSettingsFromXml
-                    && !in_array($key, static::$attributeNames)
-                ) {
-                    static::$attributeNames[] = $key;
-                }
-                $r[$key] = static::setType((string)$value);
-            }
-        }
-        $children = $xml->children();
-        foreach ($children as $key => $value) {
-            if ($key == static::$defaultTagName) {
-                $r[] = $this->read($value);
-            } elseif (isset($r[$key])) {
-                if (is_array($r[$key])) {
-                    if ($r[$key] != array_values($r[$key])) {
-                        $r[$key] = array($r[$key]);
-                    }
-                } else {
-                    $r[$key] = array($r[$key]);
-                }
-                $r[$key][] = $this->read($value, $namespaces);
-            } else {
-                $r[$key] = $this->read($value);
-            }
-        }
+		if (static::$parseAttributes) {
+			$attributes = $xml->attributes();
+			foreach ($attributes as $key => $value) {
+				if (static::$importSettingsFromXml
+					&& !in_array($key, static::$attributeNames)
+				) {
+					static::$attributeNames[] = $key;
+				}
+				$r[$key] = static::setType((string)$value);
+			}
+		}
+		$children = $xml->children();
+		foreach ($children as $key => $value) {
+			if ($key == static::$defaultTagName) {
+				$r[] = $this->read($value);
+			} elseif (isset($r[$key])) {
+				if (is_array($r[$key])) {
+					if ($r[$key] != array_values($r[$key])) {
+						$r[$key] = array($r[$key]);
+					}
+				} else {
+					$r[$key] = array($r[$key]);
+				}
+				$r[$key][] = $this->read($value, $namespaces);
+			} else {
+				$r[$key] = $this->read($value);
+			}
+		}
 
-        if (static::$parseNamespaces) {
-            if (is_null($namespaces)) {
-                $namespaces = $xml->getDocNamespaces(true);
-            }
-            foreach ($namespaces as $prefix => $ns) {
-                static::$namespaces[$prefix] = $ns;
-                if (static::$parseAttributes) {
-                    $attributes = $xml->attributes($ns);
-                    foreach ($attributes as $key => $value) {
-                        if (isset($r[$key])) {
-                            $key = "{$prefix}:$key";
-                        }
-                        if (static::$importSettingsFromXml
-                            && !in_array($key, static::$attributeNames)
-                        ) {
-                            static::$namespacedProperties[$key] = $prefix;
-                            static::$attributeNames[] = $key;
-                        }
-                        $r[$key] = static::setType((string)$value);
-                    }
-                }
-                $children = $xml->children($ns);
-                foreach ($children as $key => $value) {
-                    if (static::$importSettingsFromXml) {
-                        static::$namespacedProperties[$key] = $prefix;
-                    }
-                    if (isset($r[$key])) {
-                        if (is_array($r[$key])) {
-                            if ($r[$key] != array_values($r[$key])) {
-                                $r[$key] = array($r[$key]);
-                            }
-                        } else {
-                            $r[$key] = array($r[$key]);
-                        }
-                        $r[$key][] = $this->read($value, $namespaces);
-                    } else {
-                        $r[$key] = $this->read($value, $namespaces);
-                    }
-                }
-            }
-        }
+		if (static::$parseNamespaces) {
+			if (is_null($namespaces)) {
+				$namespaces = $xml->getDocNamespaces(true);
+			}
+			foreach ($namespaces as $prefix => $ns) {
+				static::$namespaces[$prefix] = $ns;
+				if (static::$parseAttributes) {
+					$attributes = $xml->attributes($ns);
+					foreach ($attributes as $key => $value) {
+						if (isset($r[$key])) {
+							$key = "{$prefix}:$key";
+						}
+						if (static::$importSettingsFromXml
+							&& !in_array($key, static::$attributeNames)
+						) {
+							static::$namespacedProperties[$key] = $prefix;
+							static::$attributeNames[] = $key;
+						}
+						$r[$key] = static::setType((string)$value);
+					}
+				}
+				$children = $xml->children($ns);
+				foreach ($children as $key => $value) {
+					if (static::$importSettingsFromXml) {
+						static::$namespacedProperties[$key] = $prefix;
+					}
+					if (isset($r[$key])) {
+						if (is_array($r[$key])) {
+							if ($r[$key] != array_values($r[$key])) {
+								$r[$key] = array($r[$key]);
+							}
+						} else {
+							$r[$key] = array($r[$key]);
+						}
+						$r[$key][] = $this->read($value, $namespaces);
+					} else {
+						$r[$key] = $this->read($value, $namespaces);
+					}
+				}
+			}
+		}
 
-        if (empty($text) && $text !== '0') {
-            if (empty($r)) {
-                return null;
-            }
-        } else {
-            empty($r)
-                ? $r = static::setType($text)
-                : (
-            static::$parseTextNodeAsProperty
-                ? $r[static::$textNodeName] = static::setType($text)
-                : $r[] = static::setType($text)
-            );
-        }
+		if (empty($text) && $text !== '0') {
+			if (empty($r)) {
+				return null;
+			}
+		} else {
+			empty($r)
+				? $r = static::setType($text)
+				: (
+			static::$parseTextNodeAsProperty
+				? $r[static::$textNodeName] = static::setType($text)
+				: $r[] = static::setType($text)
+			);
+		}
 
-        return $r;
-    }
+		return $r;
+	}
 
-    public static function setType($value)
-    {
-        if (empty($value) && $value !== '0') {
-            return null;
-        }
-        if ($value == 'true') {
-            return true;
-        }
-        if ($value == 'false') {
-            return true;
-        }
-        if (is_numeric($value)) {
-            return 0 + $value;
-        }
+	public static function setType($value)
+	{
+		if (empty($value) && $value !== '0') {
+			return null;
+		}
+		if ($value == 'true') {
+			return true;
+		}
+		if ($value == 'false') {
+			return true;
+		}
+		if (is_numeric($value)) {
+			return 0 + $value;
+		}
 
-        return $value;
-    }
+		return $value;
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -68,20 +68,20 @@ 
      */
     public static function exportCurrentSettings()
     {
-        $s = 'XmlFormat::$rootName = "' . (self::$rootName) . "\";\n";
-        $s .= 'XmlFormat::$attributeNames = ' .
-            (var_export(self::$attributeNames, true)) . ";\n";
-        $s .= 'XmlFormat::$defaultTagName = "' .
-            self::$defaultTagName . "\";\n";
-        $s .= 'XmlFormat::$parseAttributes = ' .
-            (self::$parseAttributes ? 'true' : 'false') . ";\n";
-        $s .= 'XmlFormat::$parseNamespaces = ' .
-            (self::$parseNamespaces ? 'true' : 'false') . ";\n";
+        $s = 'XmlFormat::$rootName = "'.(self::$rootName)."\";\n";
+        $s .= 'XmlFormat::$attributeNames = '.
+            (var_export(self::$attributeNames, true)).";\n";
+        $s .= 'XmlFormat::$defaultTagName = "'.
+            self::$defaultTagName."\";\n";
+        $s .= 'XmlFormat::$parseAttributes = '.
+            (self::$parseAttributes ? 'true' : 'false').";\n";
+        $s .= 'XmlFormat::$parseNamespaces = '.
+            (self::$parseNamespaces ? 'true' : 'false').";\n";
         if (self::$parseNamespaces) {
-            $s .= 'XmlFormat::$namespaces = ' .
-                (var_export(self::$namespaces, true)) . ";\n";
-            $s .= 'XmlFormat::$namespacedProperties = ' .
-                (var_export(self::$namespacedProperties, true)) . ";\n";
+            $s .= 'XmlFormat::$namespaces = '.
+                (var_export(self::$namespaces, true)).";\n";
+            $s .= 'XmlFormat::$namespacedProperties = '.
+                (var_export(self::$namespacedProperties, true)).";\n";
         }
 
         return $s;
@@ -113,7 +113,7 @@ 
                 ) {
                     continue;
                 }
-                $prefix = 'xmlns' . (empty($prefix) ? '' : ':' . $prefix);
+                $prefix = 'xmlns'.(empty($prefix) ? '' : ':'.$prefix);
                 $xml->writeAttribute($prefix, $ns);
             }
         }
@@ -167,7 +167,7 @@ 
                     $value = $value ? 'true' : 'false';
                 }
                 if (isset($attributes[$key])) {
-                    $xml->writeAttribute($useNS ? static::$namespacedProperties[$key] . ':' . $key : $key, $value);
+                    $xml->writeAttribute($useNS ? static::$namespacedProperties[$key].':'.$key : $key, $value);
                 } else {
                     $useNS
                         ?
@@ -182,7 +182,7 @@ 
                 }
             }
         } else {
-            $text [] = (string)$data;
+            $text [] = (string) $data;
         }
         if (!empty($text)) {
             if (count($text) == 1) {
@@ -210,7 +210,7 @@ 
             if (false === $xml) {
                 $error = libxml_get_last_error();
                 throw new RestException(400, 'Malformed XML. '
-                    . trim($error->message, "\r\n") . ' at line ' . $error->line);
+                    . trim($error->message, "\r\n").' at line '.$error->line);
             }
             libxml_clear_errors();
             if (static::$importSettingsFromXml) {
@@ -236,14 +236,14 @@ 
             return $data;
         } catch (\RuntimeException $e) {
             throw new RestException(400,
-                "Error decoding request. " . $e->getMessage());
+                "Error decoding request. ".$e->getMessage());
         }
     }
 
     public function read(SimpleXMLElement $xml, $namespaces = null)
     {
         $r = array();
-        $text = (string)$xml;
+        $text = (string) $xml;
 
         if (static::$parseAttributes) {
             $attributes = $xml->attributes();
@@ -253,7 +253,7 @@ 
                 ) {
                     static::$attributeNames[] = $key;
                 }
-                $r[$key] = static::setType((string)$value);
+                $r[$key] = static::setType((string) $value);
             }
         }
         $children = $xml->children();
@@ -292,7 +292,7 @@ 
                             static::$namespacedProperties[$key] = $prefix;
                             static::$attributeNames[] = $key;
                         }
-                        $r[$key] = static::setType((string)$value);
+                        $r[$key] = static::setType((string) $value);
                     }
                 }
                 $children = $xml->children($ns);

htdocs/includes/restler/framework/Luracast/Restler/Format/HtmlFormat.php

Indentation +521 added lines, -521 removed lines

@@ -38,525 +38,525 @@
  */
 class HtmlFormat extends DependentFormat
 {
-    const BLADE = 'Illuminate\View\View';
-    const TWIG = 'Twig\Environment';
-    const MUSTACHE = 'Mustache_Engine';
-
-    public static $mime = 'text/html';
-    public static $extension = 'html';
-    public static $view;
-    public static $errorView = 'debug.php';
-    public static $template = 'php';
-    public static $handleSession = true;
-    public static $convertResponseToArray = false;
-
-    public static $useSmartViews = true;
-    /**
-     * @var null|string defaults to template named folder in Defaults::$cacheDirectory
-     */
-    public static $cacheDirectory = null;
-    /**
-     * @var array global key value pair to be supplied to the templates. All
-     * keys added here will be available as a variable inside the template
-     */
-    public static $data = array();
-    /**
-     * @var string set it to the location of your the view files. Defaults to
-     * views folder which is same level as vendor directory.
-     */
-    public static $viewPath;
-    /**
-     * @var array template and its custom extension key value pair
-     */
-    public static $customTemplateExtensions = array('blade' => 'blade.php');
-    /**
-     * @var bool used internally for error handling
-     */
-    protected static $parseViewMetadata = true;
-    /**
-     * @var Restler;
-     */
-    public $restler;
-
-    public function __construct()
-    {
-        //============ SESSION MANAGEMENT =============//
-        if (static::$handleSession) {
-            if (session_start() && isset($_SESSION['flash'])) {
-                static::$data['flash'] = $_SESSION['flash'];
-                unset($_SESSION['flash']);
-            }
-        }
-        if (!static::$viewPath) {
-            $array = explode('vendor', __DIR__, 2);
-            static::$viewPath = $array[0] . 'views';
-        }
-    }
-
-    public function getDependencyMap()
-    {
-        return array(
-            self::BLADE    => 'illuminate/view:^8',
-            self::TWIG     => 'twig/twig:^3',
-            self::MUSTACHE => 'mustache/mustache:dev-master',
-        );
-    }
-
-    public static function blade(array $data, $debug = true)
-    {
-        $resolver = new EngineResolver();
-        $files = new Filesystem();
-        $compiler = new BladeCompiler($files, static::$cacheDirectory);
-        $engine = new CompilerEngine($compiler);
-        $resolver->register('blade', function () use ($engine) {
-            return $engine;
-        });
-        $phpEngine = new PhpEngine($files);
-        $resolver->register('php', function () use ($phpEngine) {
-            return $phpEngine;
-        });
-
-        /** @var Restler $restler */
-        $restler = Scope::get('Restler');
-
-        //Lets expose shortcuts for our classes
-        spl_autoload_register(function ($className) use ($restler) {
-            if (isset($restler->apiMethodInfo->metadata['scope'][$className])) {
-                return class_alias($restler->apiMethodInfo->metadata['scope'][$className], $className);
-            }
-            if (isset(Scope::$classAliases[$className])) {
-                return class_alias(Scope::$classAliases[$className], $className);
-            }
-            return false;
-        }, true, true);
-
-        $viewFinder = new FileViewFinder($files, array(static::$viewPath));
-        $factory = new Factory($resolver, $viewFinder, new Dispatcher());
-        $path = $viewFinder->find(self::$view);
-        $view = new View($factory, $engine, self::$view, $path, $data);
-        $factory->callCreator($view);
-        return $view->render();
-    }
-
-    /**
-     * @param array|object $data
-     * @param bool         $debug
-     *
-     * @return string
-     * @throws \Twig\Error\LoaderError
-     * @throws \Twig\Error\RuntimeError
-     * @throws \Twig\Error\SyntaxError
-     */
-    public static function twig($data, $debug = true)
-    {
-        $loader = new FilesystemLoader(static::$viewPath);
-        $twig = new Environment($loader, array(
-            'cache'                => is_string(static::$cacheDirectory)
-                ? static::$cacheDirectory : false,
-            'debug'                => $debug,
-            'use_strict_variables' => $debug,
-        ));
-        if ($debug) {
-            $twig->addExtension(new DebugExtension());
-        }
-
-        $twig->addFunction(
-            new TwigFunction(
-                'form',
-                'Luracast\Restler\UI\Forms::get',
-                array('is_safe' => array('html'))
-            )
-        );
-        $twig->addFunction(
-            new TwigFunction(
-                'form_key',
-                'Luracast\Restler\UI\Forms::key'
-            )
-        );
-        $twig->addFunction(
-            new TwigFunction(
-                'nav',
-                'Luracast\Restler\UI\Nav::get'
-            )
-        );
-
-        $twig->registerUndefinedFunctionCallback(function ($name) {
-            if (
-                isset(HtmlFormat::$data[$name]) &&
-                is_callable(HtmlFormat::$data[$name])
-            ) {
-                return new TwigFunction(
-                    $name,
-                    HtmlFormat::$data[$name]
-                );
-            }
-            return false;
-        });
-
-        $template = $twig->load(static::getViewFile());
-        return $template->render((array)$data);
-    }
-
-    /**
-     * @param array|object $data
-     * @param bool         $debug
-     *
-     * @return string
-     */
-    public static function handlebar($data, $debug = true)
-    {
-        return static::mustache($data, $debug);
-    }
-
-    /**
-     * @param array|object $data
-     * @param bool         $debug
-     *
-     * @return string
-     */
-    public static function mustache($data, $debug = true)
-    {
-        $data = (array)$data;
-        if (!isset($data['nav'])) {
-            $data['nav'] = array_values(Nav::get());
-        }
-        $options = array(
-            'loader'  => new \Mustache_Loader_FilesystemLoader(
-                static::$viewPath,
-                array('extension' => static::getViewExtension())
-            ),
-            'helpers' => array(
-                'form' => function ($text, \Mustache_LambdaHelper $m) {
-                    $params = explode(',', $m->render($text));
-                    return call_user_func_array(
-                        'Luracast\Restler\UI\Forms::get',
-                        $params
-                    );
-                },
-            )
-        );
-        if (!$debug) {
-            $options['cache'] = static::$cacheDirectory;
-        }
-        $m = new \Mustache_Engine($options);
-        return $m->render(static::getViewFile(), $data);
-    }
-
-    /**
-     * @param array|object $data
-     * @param bool         $debug
-     *
-     * @return string
-     * @throws RestException
-     */
-    public static function php($data, $debug = true)
-    {
-        if (static::$view == 'debug') {
-            static::$viewPath = dirname(__DIR__) . '/views';
-        }
-        $view = static::getViewFile(true);
-
-        if (!is_readable($view)) {
-            throw new RestException(
-                500,
-                "view file `$view` is not readable. " .
-                'Check for file presence and file permissions'
-            );
-        }
-
-        $path = static::$viewPath . DIRECTORY_SEPARATOR;
-        $template = function ($view) use ($data, $path) {
-            $data = (array)$data;
-            $form = function () {
-                return call_user_func_array(
-                    'Luracast\Restler\UI\Forms::get',
-                    func_get_args()
-                );
-            };
-            if (!isset($data['form'])) {
-                $data['form'] = $form;
-            }
-            $nav = function () {
-                return call_user_func_array(
-                    'Luracast\Restler\UI\Nav::get',
-                    func_get_args()
-                );
-            };
-            if (!isset($data['nav'])) {
-                $data['nav'] = $nav;
-            }
-
-
-            $_ = function () use ($data, $path) {
-                extract($data);
-                $args = func_get_args();
-                $task = array_shift($args);
-                switch ($task) {
-                    case 'require':
-                    case 'include':
-                        $file = $path . $args[0];
-                        if (is_readable($file)) {
-                            if (
-                                isset($args[1]) &&
-                                ($arrays = Util::nestedValue($data, $args[1]))
-                            ) {
-                                $str = '';
-                                foreach ($arrays as $arr) {
-                                    extract((array)$arr);
-                                    $str .= include $file;
-                                }
-                                return $str;
-                            } else {
-                                return include $file;
-                            }
-                        }
-                        break;
-                    case 'if':
-                        if (count($args) < 2) {
-                            $args[1] = '';
-                        }
-                        if (count($args) < 3) {
-                            $args[2] = '';
-                        }
-                        return $args[0] ? $args[1] : $args[2];
-                        break;
-                    default:
-                        if (isset($data[$task]) && is_callable($data[$task])) {
-                            return call_user_func_array($data[$task], $args);
-                        }
-                }
-                return '';
-            };
-            extract($data);
-            return @include $view;
-        };
-        $value = $template($view);
-        if (is_string($value)) {
-            return $value;
-        }
-    }
-
-    /**
-     * Encode the given data in the format
-     *
-     * @param array   $data                resulting data that needs to
-     *                                     be encoded in the given format
-     * @param boolean $humanReadable       set to TRUE when restler
-     *                                     is not running in production mode.
-     *                                     Formatter has to make the encoded
-     *                                     output more human readable
-     *
-     * @return string encoded string
-     * @throws \Exception
-     */
-    public function encode($data, $humanReadable = false)
-    {
-        if (!is_readable(static::$viewPath)) {
-            throw new \Exception(
-                'The views directory `'
-                . self::$viewPath . '` should exist with read permission.'
-            );
-        }
-        static::$data['basePath'] = dirname($_SERVER['SCRIPT_NAME']);
-        static::$data['baseUrl'] = $this->restler->getBaseUrl();
-        static::$data['currentPath'] = $this->restler->url;
-
-        try {
-            $exception = $this->restler->exception;
-            $success = is_null($exception);
-            $error = $success ? null : $exception->getMessage();
-            $data = array(
-                'response' => static::$convertResponseToArray
-                    ? Obj::toArray($data)
-                    : $data,
-                'stages'   => $this->restler->getEvents(),
-                'success'  => $success,
-                'error'    => $error
-            );
-            $info = $data['api'] = $this->restler->apiMethodInfo;
-            $metadata = Util::nestedValue(
-                $this->restler, 'apiMethodInfo', 'metadata'
-            );
-            $view = $success ? 'view' : 'errorView';
-            $value = false;
-            if (static::$parseViewMetadata && isset($metadata[$view])) {
-                if (is_array($metadata[$view])) {
-                    self::$view = $metadata[$view]['description'];
-                    $value = Util::nestedValue(
-                        $metadata[$view], 'properties', 'value'
-                    );
-                } else {
-                    self::$view = $metadata[$view];
-                }
-            } elseif (!self::$view) {
-                self::$view = static::guessViewName($this->restler->url);
-            }
-            if (
-                isset($metadata['param'])
-                && (!$value || 0 === strpos($value, 'request'))
-            ) {
-                $params = $metadata['param'];
-                foreach ($params as $index => &$param) {
-                    $index = intval($index);
-                    if (is_numeric($index)) {
-                        $param['value'] = $this
-                            ->restler
-                            ->apiMethodInfo
-                            ->parameters[$index];
-                    }
-                }
-                $data['request']['parameters'] = $params;
-            }
-            if ($value) {
-                $data = Util::nestedValue($data, explode('.', $value));
-            }
-            if (is_array($data)) {
-                $data += static::$data;
-            }
-            if (false === ($i = strrpos(self::$view, '.'))) {
-                $template = self::$template;
-            } else {
-                self::$template = $template = substr(self::$view, $i + 1);
-                self::$view = substr(self::$view, 0, $i);
-            }
-            if (!static::$cacheDirectory) {
-                static::$cacheDirectory = Defaults::$cacheDirectory . DIRECTORY_SEPARATOR . $template;
-                if (!file_exists(static::$cacheDirectory)) {
-                    if (!mkdir(static::$cacheDirectory, 0770, true)) {
-                        throw new RestException(500,
-                            'Unable to create cache directory `' . static::$cacheDirectory . '`');
-                    }
-                }
-            }
-            if (method_exists($class = get_called_class(), $template)) {
-                if ($template == 'blade') {
-                    $this->checkDependency(self::BLADE);
-                } elseif ($template == 'twig') {
-                    $this->checkDependency(self::TWIG);
-                } elseif ($template == 'mustache' || $template == 'handlebar') {
-                    $this->checkDependency(self::MUSTACHE);
-                }
-                return call_user_func("$class::$template", $data, $humanReadable);
-            }
-            throw new RestException(500, "Unsupported template system `$template`");
-        } catch (Exception $e) {
-            static::$parseViewMetadata = false;
-            $this->reset();
-            throw $e;
-        }
-    }
-
-    public static function guessViewName($path)
-    {
-        if (empty($path)) {
-            $path = 'index';
-        } elseif (strpos($path, '/')) {
-            $path .= '/index';
-        }
-        $file = static::$viewPath . '/' . $path . '.' . static::getViewExtension();
-
-        return static::$useSmartViews && is_readable($file)
-            ? $path
-            : static::$errorView;
-    }
-
-    public static function getViewExtension()
-    {
-        return isset(static::$customTemplateExtensions[static::$template])
-            ? static::$customTemplateExtensions[static::$template]
-            : static::$template;
-    }
-
-    public static function getViewFile($fullPath = false, $includeExtension = true)
-    {
-        $v = $fullPath ? static::$viewPath . '/' : '';
-        $v .= static::$view;
-        if ($includeExtension) {
-            $v .= '.' . static::getViewExtension();
-        }
-        return $v;
-    }
-
-    private function reset()
-    {
-        static::$mime = 'text/html';
-        static::$extension = 'html';
-        static::$view = 'debug';
-        static::$template = 'php';
-    }
-
-    /**
-     * Decode the given data from the format
-     *
-     * @param string $data
-     *            data sent from client to
-     *            the api in the given format.
-     *
-     * @return array associative array of the parsed data
-     *
-     * @throws RestException
-     */
-    public function decode($data)
-    {
-        throw new RestException(500, 'HtmlFormat is write only');
-    }
-
-    /**
-     * @return bool false as HTML format is write only
-     */
-    public function isReadable()
-    {
-        return false;
-    }
-
-    /**
-     * Get MIME type => Extension mappings as an associative array
-     *
-     * @return array list of mime strings for the format
-     * @example array('application/json'=>'json');
-     */
-    public function getMIMEMap()
-    {
-        return array(
-            static::$mime => static::$extension
-        );
-    }
-
-    /**
-     * Set the selected MIME type
-     *
-     * @param string $mime MIME type
-     */
-    public function setMIME($mime)
-    {
-        static::$mime = $mime;
-    }
-
-    /**
-     * Get selected MIME type
-     */
-    public function getMIME()
-    {
-        return static::$mime;
-    }
-
-    /**
-     * Get the selected file extension
-     *
-     * @return string file extension
-     */
-    public function getExtension()
-    {
-        return static::$extension;
-    }
-
-    /**
-     * Set the selected file extension
-     *
-     * @param string $extension file extension
-     */
-    public function setExtension($extension)
-    {
-        static::$extension = $extension;
-    }
+	const BLADE = 'Illuminate\View\View';
+	const TWIG = 'Twig\Environment';
+	const MUSTACHE = 'Mustache_Engine';
+
+	public static $mime = 'text/html';
+	public static $extension = 'html';
+	public static $view;
+	public static $errorView = 'debug.php';
+	public static $template = 'php';
+	public static $handleSession = true;
+	public static $convertResponseToArray = false;
+
+	public static $useSmartViews = true;
+	/**
+	 * @var null|string defaults to template named folder in Defaults::$cacheDirectory
+	 */
+	public static $cacheDirectory = null;
+	/**
+	 * @var array global key value pair to be supplied to the templates. All
+	 * keys added here will be available as a variable inside the template
+	 */
+	public static $data = array();
+	/**
+	 * @var string set it to the location of your the view files. Defaults to
+	 * views folder which is same level as vendor directory.
+	 */
+	public static $viewPath;
+	/**
+	 * @var array template and its custom extension key value pair
+	 */
+	public static $customTemplateExtensions = array('blade' => 'blade.php');
+	/**
+	 * @var bool used internally for error handling
+	 */
+	protected static $parseViewMetadata = true;
+	/**
+	 * @var Restler;
+	 */
+	public $restler;
+
+	public function __construct()
+	{
+		//============ SESSION MANAGEMENT =============//
+		if (static::$handleSession) {
+			if (session_start() && isset($_SESSION['flash'])) {
+				static::$data['flash'] = $_SESSION['flash'];
+				unset($_SESSION['flash']);
+			}
+		}
+		if (!static::$viewPath) {
+			$array = explode('vendor', __DIR__, 2);
+			static::$viewPath = $array[0] . 'views';
+		}
+	}
+
+	public function getDependencyMap()
+	{
+		return array(
+			self::BLADE    => 'illuminate/view:^8',
+			self::TWIG     => 'twig/twig:^3',
+			self::MUSTACHE => 'mustache/mustache:dev-master',
+		);
+	}
+
+	public static function blade(array $data, $debug = true)
+	{
+		$resolver = new EngineResolver();
+		$files = new Filesystem();
+		$compiler = new BladeCompiler($files, static::$cacheDirectory);
+		$engine = new CompilerEngine($compiler);
+		$resolver->register('blade', function () use ($engine) {
+			return $engine;
+		});
+		$phpEngine = new PhpEngine($files);
+		$resolver->register('php', function () use ($phpEngine) {
+			return $phpEngine;
+		});
+
+		/** @var Restler $restler */
+		$restler = Scope::get('Restler');
+
+		//Lets expose shortcuts for our classes
+		spl_autoload_register(function ($className) use ($restler) {
+			if (isset($restler->apiMethodInfo->metadata['scope'][$className])) {
+				return class_alias($restler->apiMethodInfo->metadata['scope'][$className], $className);
+			}
+			if (isset(Scope::$classAliases[$className])) {
+				return class_alias(Scope::$classAliases[$className], $className);
+			}
+			return false;
+		}, true, true);
+
+		$viewFinder = new FileViewFinder($files, array(static::$viewPath));
+		$factory = new Factory($resolver, $viewFinder, new Dispatcher());
+		$path = $viewFinder->find(self::$view);
+		$view = new View($factory, $engine, self::$view, $path, $data);
+		$factory->callCreator($view);
+		return $view->render();
+	}
+
+	/**
+	 * @param array|object $data
+	 * @param bool         $debug
+	 *
+	 * @return string
+	 * @throws \Twig\Error\LoaderError
+	 * @throws \Twig\Error\RuntimeError
+	 * @throws \Twig\Error\SyntaxError
+	 */
+	public static function twig($data, $debug = true)
+	{
+		$loader = new FilesystemLoader(static::$viewPath);
+		$twig = new Environment($loader, array(
+			'cache'                => is_string(static::$cacheDirectory)
+				? static::$cacheDirectory : false,
+			'debug'                => $debug,
+			'use_strict_variables' => $debug,
+		));
+		if ($debug) {
+			$twig->addExtension(new DebugExtension());
+		}
+
+		$twig->addFunction(
+			new TwigFunction(
+				'form',
+				'Luracast\Restler\UI\Forms::get',
+				array('is_safe' => array('html'))
+			)
+		);
+		$twig->addFunction(
+			new TwigFunction(
+				'form_key',
+				'Luracast\Restler\UI\Forms::key'
+			)
+		);
+		$twig->addFunction(
+			new TwigFunction(
+				'nav',
+				'Luracast\Restler\UI\Nav::get'
+			)
+		);
+
+		$twig->registerUndefinedFunctionCallback(function ($name) {
+			if (
+				isset(HtmlFormat::$data[$name]) &&
+				is_callable(HtmlFormat::$data[$name])
+			) {
+				return new TwigFunction(
+					$name,
+					HtmlFormat::$data[$name]
+				);
+			}
+			return false;
+		});
+
+		$template = $twig->load(static::getViewFile());
+		return $template->render((array)$data);
+	}
+
+	/**
+	 * @param array|object $data
+	 * @param bool         $debug
+	 *
+	 * @return string
+	 */
+	public static function handlebar($data, $debug = true)
+	{
+		return static::mustache($data, $debug);
+	}
+
+	/**
+	 * @param array|object $data
+	 * @param bool         $debug
+	 *
+	 * @return string
+	 */
+	public static function mustache($data, $debug = true)
+	{
+		$data = (array)$data;
+		if (!isset($data['nav'])) {
+			$data['nav'] = array_values(Nav::get());
+		}
+		$options = array(
+			'loader'  => new \Mustache_Loader_FilesystemLoader(
+				static::$viewPath,
+				array('extension' => static::getViewExtension())
+			),
+			'helpers' => array(
+				'form' => function ($text, \Mustache_LambdaHelper $m) {
+					$params = explode(',', $m->render($text));
+					return call_user_func_array(
+						'Luracast\Restler\UI\Forms::get',
+						$params
+					);
+				},
+			)
+		);
+		if (!$debug) {
+			$options['cache'] = static::$cacheDirectory;
+		}
+		$m = new \Mustache_Engine($options);
+		return $m->render(static::getViewFile(), $data);
+	}
+
+	/**
+	 * @param array|object $data
+	 * @param bool         $debug
+	 *
+	 * @return string
+	 * @throws RestException
+	 */
+	public static function php($data, $debug = true)
+	{
+		if (static::$view == 'debug') {
+			static::$viewPath = dirname(__DIR__) . '/views';
+		}
+		$view = static::getViewFile(true);
+
+		if (!is_readable($view)) {
+			throw new RestException(
+				500,
+				"view file `$view` is not readable. " .
+				'Check for file presence and file permissions'
+			);
+		}
+
+		$path = static::$viewPath . DIRECTORY_SEPARATOR;
+		$template = function ($view) use ($data, $path) {
+			$data = (array)$data;
+			$form = function () {
+				return call_user_func_array(
+					'Luracast\Restler\UI\Forms::get',
+					func_get_args()
+				);
+			};
+			if (!isset($data['form'])) {
+				$data['form'] = $form;
+			}
+			$nav = function () {
+				return call_user_func_array(
+					'Luracast\Restler\UI\Nav::get',
+					func_get_args()
+				);
+			};
+			if (!isset($data['nav'])) {
+				$data['nav'] = $nav;
+			}
+
+
+			$_ = function () use ($data, $path) {
+				extract($data);
+				$args = func_get_args();
+				$task = array_shift($args);
+				switch ($task) {
+					case 'require':
+					case 'include':
+						$file = $path . $args[0];
+						if (is_readable($file)) {
+							if (
+								isset($args[1]) &&
+								($arrays = Util::nestedValue($data, $args[1]))
+							) {
+								$str = '';
+								foreach ($arrays as $arr) {
+									extract((array)$arr);
+									$str .= include $file;
+								}
+								return $str;
+							} else {
+								return include $file;
+							}
+						}
+						break;
+					case 'if':
+						if (count($args) < 2) {
+							$args[1] = '';
+						}
+						if (count($args) < 3) {
+							$args[2] = '';
+						}
+						return $args[0] ? $args[1] : $args[2];
+						break;
+					default:
+						if (isset($data[$task]) && is_callable($data[$task])) {
+							return call_user_func_array($data[$task], $args);
+						}
+				}
+				return '';
+			};
+			extract($data);
+			return @include $view;
+		};
+		$value = $template($view);
+		if (is_string($value)) {
+			return $value;
+		}
+	}
+
+	/**
+	 * Encode the given data in the format
+	 *
+	 * @param array   $data                resulting data that needs to
+	 *                                     be encoded in the given format
+	 * @param boolean $humanReadable       set to TRUE when restler
+	 *                                     is not running in production mode.
+	 *                                     Formatter has to make the encoded
+	 *                                     output more human readable
+	 *
+	 * @return string encoded string
+	 * @throws \Exception
+	 */
+	public function encode($data, $humanReadable = false)
+	{
+		if (!is_readable(static::$viewPath)) {
+			throw new \Exception(
+				'The views directory `'
+				. self::$viewPath . '` should exist with read permission.'
+			);
+		}
+		static::$data['basePath'] = dirname($_SERVER['SCRIPT_NAME']);
+		static::$data['baseUrl'] = $this->restler->getBaseUrl();
+		static::$data['currentPath'] = $this->restler->url;
+
+		try {
+			$exception = $this->restler->exception;
+			$success = is_null($exception);
+			$error = $success ? null : $exception->getMessage();
+			$data = array(
+				'response' => static::$convertResponseToArray
+					? Obj::toArray($data)
+					: $data,
+				'stages'   => $this->restler->getEvents(),
+				'success'  => $success,
+				'error'    => $error
+			);
+			$info = $data['api'] = $this->restler->apiMethodInfo;
+			$metadata = Util::nestedValue(
+				$this->restler, 'apiMethodInfo', 'metadata'
+			);
+			$view = $success ? 'view' : 'errorView';
+			$value = false;
+			if (static::$parseViewMetadata && isset($metadata[$view])) {
+				if (is_array($metadata[$view])) {
+					self::$view = $metadata[$view]['description'];
+					$value = Util::nestedValue(
+						$metadata[$view], 'properties', 'value'
+					);
+				} else {
+					self::$view = $metadata[$view];
+				}
+			} elseif (!self::$view) {
+				self::$view = static::guessViewName($this->restler->url);
+			}
+			if (
+				isset($metadata['param'])
+				&& (!$value || 0 === strpos($value, 'request'))
+			) {
+				$params = $metadata['param'];
+				foreach ($params as $index => &$param) {
+					$index = intval($index);
+					if (is_numeric($index)) {
+						$param['value'] = $this
+							->restler
+							->apiMethodInfo
+							->parameters[$index];
+					}
+				}
+				$data['request']['parameters'] = $params;
+			}
+			if ($value) {
+				$data = Util::nestedValue($data, explode('.', $value));
+			}
+			if (is_array($data)) {
+				$data += static::$data;
+			}
+			if (false === ($i = strrpos(self::$view, '.'))) {
+				$template = self::$template;
+			} else {
+				self::$template = $template = substr(self::$view, $i + 1);
+				self::$view = substr(self::$view, 0, $i);
+			}
+			if (!static::$cacheDirectory) {
+				static::$cacheDirectory = Defaults::$cacheDirectory . DIRECTORY_SEPARATOR . $template;
+				if (!file_exists(static::$cacheDirectory)) {
+					if (!mkdir(static::$cacheDirectory, 0770, true)) {
+						throw new RestException(500,
+							'Unable to create cache directory `' . static::$cacheDirectory . '`');
+					}
+				}
+			}
+			if (method_exists($class = get_called_class(), $template)) {
+				if ($template == 'blade') {
+					$this->checkDependency(self::BLADE);
+				} elseif ($template == 'twig') {
+					$this->checkDependency(self::TWIG);
+				} elseif ($template == 'mustache' || $template == 'handlebar') {
+					$this->checkDependency(self::MUSTACHE);
+				}
+				return call_user_func("$class::$template", $data, $humanReadable);
+			}
+			throw new RestException(500, "Unsupported template system `$template`");
+		} catch (Exception $e) {
+			static::$parseViewMetadata = false;
+			$this->reset();
+			throw $e;
+		}
+	}
+
+	public static function guessViewName($path)
+	{
+		if (empty($path)) {
+			$path = 'index';
+		} elseif (strpos($path, '/')) {
+			$path .= '/index';
+		}
+		$file = static::$viewPath . '/' . $path . '.' . static::getViewExtension();
+
+		return static::$useSmartViews && is_readable($file)
+			? $path
+			: static::$errorView;
+	}
+
+	public static function getViewExtension()
+	{
+		return isset(static::$customTemplateExtensions[static::$template])
+			? static::$customTemplateExtensions[static::$template]
+			: static::$template;
+	}
+
+	public static function getViewFile($fullPath = false, $includeExtension = true)
+	{
+		$v = $fullPath ? static::$viewPath . '/' : '';
+		$v .= static::$view;
+		if ($includeExtension) {
+			$v .= '.' . static::getViewExtension();
+		}
+		return $v;
+	}
+
+	private function reset()
+	{
+		static::$mime = 'text/html';
+		static::$extension = 'html';
+		static::$view = 'debug';
+		static::$template = 'php';
+	}
+
+	/**
+	 * Decode the given data from the format
+	 *
+	 * @param string $data
+	 *            data sent from client to
+	 *            the api in the given format.
+	 *
+	 * @return array associative array of the parsed data
+	 *
+	 * @throws RestException
+	 */
+	public function decode($data)
+	{
+		throw new RestException(500, 'HtmlFormat is write only');
+	}
+
+	/**
+	 * @return bool false as HTML format is write only
+	 */
+	public function isReadable()
+	{
+		return false;
+	}
+
+	/**
+	 * Get MIME type => Extension mappings as an associative array
+	 *
+	 * @return array list of mime strings for the format
+	 * @example array('application/json'=>'json');
+	 */
+	public function getMIMEMap()
+	{
+		return array(
+			static::$mime => static::$extension
+		);
+	}
+
+	/**
+	 * Set the selected MIME type
+	 *
+	 * @param string $mime MIME type
+	 */
+	public function setMIME($mime)
+	{
+		static::$mime = $mime;
+	}
+
+	/**
+	 * Get selected MIME type
+	 */
+	public function getMIME()
+	{
+		return static::$mime;
+	}
+
+	/**
+	 * Get the selected file extension
+	 *
+	 * @return string file extension
+	 */
+	public function getExtension()
+	{
+		return static::$extension;
+	}
+
+	/**
+	 * Set the selected file extension
+	 *
+	 * @param string $extension file extension
+	 */
+	public function setExtension($extension)
+	{
+		static::$extension = $extension;
+	}
 }

Spacing +24 added lines, -24 removed lines

@@ -89,7 +89,7 @@ 
         }
         if (!static::$viewPath) {
             $array = explode('vendor', __DIR__, 2);
-            static::$viewPath = $array[0] . 'views';
+            static::$viewPath = $array[0].'views';
         }
     }
 
@@ -108,11 +108,11 @@ 
         $files = new Filesystem();
         $compiler = new BladeCompiler($files, static::$cacheDirectory);
         $engine = new CompilerEngine($compiler);
-        $resolver->register('blade', function () use ($engine) {
+        $resolver->register('blade', function() use ($engine) {
             return $engine;
         });
         $phpEngine = new PhpEngine($files);
-        $resolver->register('php', function () use ($phpEngine) {
+        $resolver->register('php', function() use ($phpEngine) {
             return $phpEngine;
         });
 
@@ -120,7 +120,7 @@ 
         $restler = Scope::get('Restler');
 
         //Lets expose shortcuts for our classes
-        spl_autoload_register(function ($className) use ($restler) {
+        spl_autoload_register(function($className) use ($restler) {
             if (isset($restler->apiMethodInfo->metadata['scope'][$className])) {
                 return class_alias($restler->apiMethodInfo->metadata['scope'][$className], $className);
             }
@@ -180,7 +180,7 @@ 
             )
         );
 
-        $twig->registerUndefinedFunctionCallback(function ($name) {
+        $twig->registerUndefinedFunctionCallback(function($name) {
             if (
                 isset(HtmlFormat::$data[$name]) &&
                 is_callable(HtmlFormat::$data[$name])
@@ -194,7 +194,7 @@ 
         });
 
         $template = $twig->load(static::getViewFile());
-        return $template->render((array)$data);
+        return $template->render((array) $data);
     }
 
     /**
@@ -216,7 +216,7 @@ 
      */
     public static function mustache($data, $debug = true)
     {
-        $data = (array)$data;
+        $data = (array) $data;
         if (!isset($data['nav'])) {
             $data['nav'] = array_values(Nav::get());
         }
@@ -226,7 +226,7 @@ 
                 array('extension' => static::getViewExtension())
             ),
             'helpers' => array(
-                'form' => function ($text, \Mustache_LambdaHelper $m) {
+                'form' => function($text, \Mustache_LambdaHelper $m) {
                     $params = explode(',', $m->render($text));
                     return call_user_func_array(
                         'Luracast\Restler\UI\Forms::get',
@@ -252,22 +252,22 @@ 
     public static function php($data, $debug = true)
     {
         if (static::$view == 'debug') {
-            static::$viewPath = dirname(__DIR__) . '/views';
+            static::$viewPath = dirname(__DIR__).'/views';
         }
         $view = static::getViewFile(true);
 
         if (!is_readable($view)) {
             throw new RestException(
                 500,
-                "view file `$view` is not readable. " .
+                "view file `$view` is not readable. ".
                 'Check for file presence and file permissions'
             );
         }
 
-        $path = static::$viewPath . DIRECTORY_SEPARATOR;
-        $template = function ($view) use ($data, $path) {
-            $data = (array)$data;
-            $form = function () {
+        $path = static::$viewPath.DIRECTORY_SEPARATOR;
+        $template = function($view) use ($data, $path) {
+            $data = (array) $data;
+            $form = function() {
                 return call_user_func_array(
                     'Luracast\Restler\UI\Forms::get',
                     func_get_args()
@@ -276,7 +276,7 @@ 
             if (!isset($data['form'])) {
                 $data['form'] = $form;
             }
-            $nav = function () {
+            $nav = function() {
                 return call_user_func_array(
                     'Luracast\Restler\UI\Nav::get',
                     func_get_args()
@@ -287,14 +287,14 @@ 
             }
 
 
-            $_ = function () use ($data, $path) {
+            $_ = function() use ($data, $path) {
                 extract($data);
                 $args = func_get_args();
                 $task = array_shift($args);
                 switch ($task) {
                     case 'require':
                     case 'include':
-                        $file = $path . $args[0];
+                        $file = $path.$args[0];
                         if (is_readable($file)) {
                             if (
                                 isset($args[1]) &&
@@ -302,7 +302,7 @@ 
                             ) {
                                 $str = '';
                                 foreach ($arrays as $arr) {
-                                    extract((array)$arr);
+                                    extract((array) $arr);
                                     $str .= include $file;
                                 }
                                 return $str;
@@ -354,7 +354,7 @@ 
         if (!is_readable(static::$viewPath)) {
             throw new \Exception(
                 'The views directory `'
-                . self::$viewPath . '` should exist with read permission.'
+                . self::$viewPath.'` should exist with read permission.'
             );
         }
         static::$data['basePath'] = dirname($_SERVER['SCRIPT_NAME']);
@@ -420,11 +420,11 @@ 
                 self::$view = substr(self::$view, 0, $i);
             }
             if (!static::$cacheDirectory) {
-                static::$cacheDirectory = Defaults::$cacheDirectory . DIRECTORY_SEPARATOR . $template;
+                static::$cacheDirectory = Defaults::$cacheDirectory.DIRECTORY_SEPARATOR.$template;
                 if (!file_exists(static::$cacheDirectory)) {
                     if (!mkdir(static::$cacheDirectory, 0770, true)) {
                         throw new RestException(500,
-                            'Unable to create cache directory `' . static::$cacheDirectory . '`');
+                            'Unable to create cache directory `'.static::$cacheDirectory.'`');
                     }
                 }
             }
@@ -453,7 +453,7 @@ 
         } elseif (strpos($path, '/')) {
             $path .= '/index';
         }
-        $file = static::$viewPath . '/' . $path . '.' . static::getViewExtension();
+        $file = static::$viewPath.'/'.$path.'.'.static::getViewExtension();
 
         return static::$useSmartViews && is_readable($file)
             ? $path
@@ -469,10 +469,10 @@ 
 
     public static function getViewFile($fullPath = false, $includeExtension = true)
     {
-        $v = $fullPath ? static::$viewPath . '/' : '';
+        $v = $fullPath ? static::$viewPath.'/' : '';
         $v .= static::$view;
         if ($includeExtension) {
-            $v .= '.' . static::getViewExtension();
+            $v .= '.'.static::getViewExtension();
         }
         return $v;
     }

htdocs/includes/restler/framework/Luracast/Restler/Format/YamlFormat.php

Indentation +12 added lines, -12 removed lines

@@ -18,20 +18,20 @@
  */
 class YamlFormat extends DependentFormat
 {
-    const MIME = 'text/plain';
-    const EXTENSION = 'yaml';
+	const MIME = 'text/plain';
+	const EXTENSION = 'yaml';
 
-    const PACKAGE_NAME = 'symfony/yaml:*';
-    const EXTERNAL_CLASS = 'Symfony\Component\Yaml\Yaml';
+	const PACKAGE_NAME = 'symfony/yaml:*';
+	const EXTERNAL_CLASS = 'Symfony\Component\Yaml\Yaml';
 
-    public function encode($data, $humanReadable = false)
-    {
-        return @Yaml::dump(Obj::toArray($data), $humanReadable ? 10 : 4);
-    }
+	public function encode($data, $humanReadable = false)
+	{
+		return @Yaml::dump(Obj::toArray($data), $humanReadable ? 10 : 4);
+	}
 
-    public function decode($data)
-    {
-        return Yaml::parse($data);
-    }
+	public function decode($data)
+	{
+		return Yaml::parse($data);
+	}
 }
 

htdocs/includes/restler/framework/Luracast/Restler/Format/UploadFormat.php

Indentation +121 added lines, -121 removed lines

@@ -17,131 +17,131 @@
  */
 class UploadFormat extends Format
 {
-    const MIME = 'multipart/form-data';
-    const EXTENSION = 'post';
-    public static $errors = array(
-        0 => false,
-        1 => "The uploaded file exceeds the maximum allowed size",
-        2 => "The uploaded file exceeds the maximum allowed size",
-        3 => "The uploaded file was only partially uploaded",
-        4 => "No file was uploaded",
-        6 => "Missing a temporary folder",
-        7 => "Failed to write file to disk",
-        8 => "A PHP extension stopped the file upload"
-    );
-    /**
-     * use it if you need to restrict uploads based on file type
-     * setting it as an empty array allows all file types
-     * default is to allow only png and jpeg images
-     *
-     * @var array
-     */
-    public static $allowedMimeTypes = array('image/jpeg', 'image/png');
-    /**
-     * use it to restrict uploads based on file size
-     * set it to 0 to allow all sizes
-     * please note that it upload restrictions in the server
-     * takes precedence so it has to be lower than or equal to that
-     * default value is 1MB (1024x1024)bytes
-     * usual value for the server is 8388608
-     *
-     * @var int
-     */
-    public static $maximumFileSize = 1048576;
-    /**
-     * Your own validation function for validating each uploaded file
-     * it can return false or throw an exception for invalid file
-     * use anonymous function / closure in PHP 5.3 and above
-     * use function name in other cases
-     *
-     * @var Callable
-     */
-    public static $customValidationFunction;
-    /**
-     * Since exceptions are triggered way before at the `get` stage
-     *
-     * @var bool
-     */
-    public static $suppressExceptionsAsError = false;
+	const MIME = 'multipart/form-data';
+	const EXTENSION = 'post';
+	public static $errors = array(
+		0 => false,
+		1 => "The uploaded file exceeds the maximum allowed size",
+		2 => "The uploaded file exceeds the maximum allowed size",
+		3 => "The uploaded file was only partially uploaded",
+		4 => "No file was uploaded",
+		6 => "Missing a temporary folder",
+		7 => "Failed to write file to disk",
+		8 => "A PHP extension stopped the file upload"
+	);
+	/**
+	 * use it if you need to restrict uploads based on file type
+	 * setting it as an empty array allows all file types
+	 * default is to allow only png and jpeg images
+	 *
+	 * @var array
+	 */
+	public static $allowedMimeTypes = array('image/jpeg', 'image/png');
+	/**
+	 * use it to restrict uploads based on file size
+	 * set it to 0 to allow all sizes
+	 * please note that it upload restrictions in the server
+	 * takes precedence so it has to be lower than or equal to that
+	 * default value is 1MB (1024x1024)bytes
+	 * usual value for the server is 8388608
+	 *
+	 * @var int
+	 */
+	public static $maximumFileSize = 1048576;
+	/**
+	 * Your own validation function for validating each uploaded file
+	 * it can return false or throw an exception for invalid file
+	 * use anonymous function / closure in PHP 5.3 and above
+	 * use function name in other cases
+	 *
+	 * @var Callable
+	 */
+	public static $customValidationFunction;
+	/**
+	 * Since exceptions are triggered way before at the `get` stage
+	 *
+	 * @var bool
+	 */
+	public static $suppressExceptionsAsError = false;
 
-    protected static function checkFile(& $file, $doMimeCheck = false, $doSizeCheck = false)
-    {
-        try {
-            if ($file['error']) {
-                //server is throwing an error
-                //assume that the error is due to maximum size limit
-                throw new RestException($file['error'] > 5 ? 500 : 413, static::$errors[$file['error']]);
-            }
-            $typeElements = explode('/', $file['type']);
-            $genericType = $typeElements[0].'/*';
-            if (
-                $doMimeCheck
-                && !(
-                    in_array($file['type'], self::$allowedMimeTypes)
-                    || in_array($genericType, self::$allowedMimeTypes)
-                )
-            ) {
-                throw new RestException(403, "File type ({$file['type']}) is not supported.");
-            }
-            if ($doSizeCheck && $file['size'] > self::$maximumFileSize) {
-                throw new RestException(413, "Uploaded file ({$file['name']}) is too big.");
-            }
-            if (self::$customValidationFunction) {
-                if (!call_user_func(self::$customValidationFunction, $file)) {
-                    throw new RestException(403, "File ({$file['name']}) is not supported.");
-                }
-            }
-        } catch (RestException $e) {
-            if (static::$suppressExceptionsAsError) {
-                $file['error'] = $e->getCode() == 413 ? 1 : 6;
-                $file['exception'] = $e;
-            } else {
-                throw $e;
-            }
-        }
-    }
+	protected static function checkFile(& $file, $doMimeCheck = false, $doSizeCheck = false)
+	{
+		try {
+			if ($file['error']) {
+				//server is throwing an error
+				//assume that the error is due to maximum size limit
+				throw new RestException($file['error'] > 5 ? 500 : 413, static::$errors[$file['error']]);
+			}
+			$typeElements = explode('/', $file['type']);
+			$genericType = $typeElements[0].'/*';
+			if (
+				$doMimeCheck
+				&& !(
+					in_array($file['type'], self::$allowedMimeTypes)
+					|| in_array($genericType, self::$allowedMimeTypes)
+				)
+			) {
+				throw new RestException(403, "File type ({$file['type']}) is not supported.");
+			}
+			if ($doSizeCheck && $file['size'] > self::$maximumFileSize) {
+				throw new RestException(413, "Uploaded file ({$file['name']}) is too big.");
+			}
+			if (self::$customValidationFunction) {
+				if (!call_user_func(self::$customValidationFunction, $file)) {
+					throw new RestException(403, "File ({$file['name']}) is not supported.");
+				}
+			}
+		} catch (RestException $e) {
+			if (static::$suppressExceptionsAsError) {
+				$file['error'] = $e->getCode() == 413 ? 1 : 6;
+				$file['exception'] = $e;
+			} else {
+				throw $e;
+			}
+		}
+	}
 
-    public function encode($data, $humanReadable = false)
-    {
-        throw new RestException(500, 'UploadFormat is read only');
-    }
+	public function encode($data, $humanReadable = false)
+	{
+		throw new RestException(500, 'UploadFormat is read only');
+	}
 
-    public function decode($data)
-    {
-        $doMimeCheck = !empty(self::$allowedMimeTypes);
-        $doSizeCheck = self::$maximumFileSize ? TRUE : FALSE;
-        //validate
-        foreach ($_FILES as & $file) {
-            if (is_array($file['error'])) {
-                foreach ($file['error'] as $i => $error) {
-                    $innerFile = array();
-                    foreach ($file as $property => $value) {
-                        $innerFile[$property] = $value[$i];
-                    }
-                    if ($innerFile['name'])
-                        static::checkFile($innerFile, $doMimeCheck, $doSizeCheck);
+	public function decode($data)
+	{
+		$doMimeCheck = !empty(self::$allowedMimeTypes);
+		$doSizeCheck = self::$maximumFileSize ? TRUE : FALSE;
+		//validate
+		foreach ($_FILES as & $file) {
+			if (is_array($file['error'])) {
+				foreach ($file['error'] as $i => $error) {
+					$innerFile = array();
+					foreach ($file as $property => $value) {
+						$innerFile[$property] = $value[$i];
+					}
+					if ($innerFile['name'])
+						static::checkFile($innerFile, $doMimeCheck, $doSizeCheck);
 
-                    if (isset($innerFile['exception'])) {
-                        $file['error'][$i] = $innerFile['error'];
-                        $file['exception'] = $innerFile['exception'];
-                        break;
-                    }
-                }
-            } else {
-                if ($file['name'])
-                    static::checkFile($file, $doMimeCheck, $doSizeCheck);
-                if (isset($innerFile['exception'])) {
-                    break;
-                }
-            }
-        }
-        //sort file order if needed;
-        return UrlEncodedFormat::decoderTypeFix($_FILES + $_POST);
-    }
+					if (isset($innerFile['exception'])) {
+						$file['error'][$i] = $innerFile['error'];
+						$file['exception'] = $innerFile['exception'];
+						break;
+					}
+				}
+			} else {
+				if ($file['name'])
+					static::checkFile($file, $doMimeCheck, $doSizeCheck);
+				if (isset($innerFile['exception'])) {
+					break;
+				}
+			}
+		}
+		//sort file order if needed;
+		return UrlEncodedFormat::decoderTypeFix($_FILES + $_POST);
+	}
 
-    function isWritable()
-    {
-        return false;
-    }
+	function isWritable()
+	{
+		return false;
+	}
 
 }

Braces +6 added lines, -4 removed lines

@@ -118,8 +118,9 @@ 
                     foreach ($file as $property => $value) {
                         $innerFile[$property] = $value[$i];
                     }
-                    if ($innerFile['name'])
-                        static::checkFile($innerFile, $doMimeCheck, $doSizeCheck);
+                    if ($innerFile['name']) {
+                                            static::checkFile($innerFile, $doMimeCheck, $doSizeCheck);
+                    }
 
                     if (isset($innerFile['exception'])) {
                         $file['error'][$i] = $innerFile['error'];
@@ -128,8 +129,9 @@ 
                     }
                 }
             } else {
-                if ($file['name'])
-                    static::checkFile($file, $doMimeCheck, $doSizeCheck);
+                if ($file['name']) {
+                                    static::checkFile($file, $doMimeCheck, $doSizeCheck);
+                }
                 if (isset($innerFile['exception'])) {
                     break;
                 }

htdocs/includes/restler/framework/Luracast/Restler/Format/iFormat.php

Indentation +80 added lines, -80 removed lines

@@ -15,95 +15,95 @@
  */
 interface iFormat
 {
-    /**
-     * Get MIME type => Extension mappings as an associative array
-     *
-     * @return array list of mime strings for the format
-     * @example array('application/json'=>'json');
-     */
-    public function getMIMEMap();
+	/**
+	 * Get MIME type => Extension mappings as an associative array
+	 *
+	 * @return array list of mime strings for the format
+	 * @example array('application/json'=>'json');
+	 */
+	public function getMIMEMap();
 
-    /**
-     * Set the selected MIME type
-     *
-     * @param string $mime
-     *            MIME type
-     */
-    public function setMIME($mime);
+	/**
+	 * Set the selected MIME type
+	 *
+	 * @param string $mime
+	 *            MIME type
+	 */
+	public function setMIME($mime);
 
-    /**
-     * Content-Type field of the HTTP header can send a charset
-     * parameter in the HTTP header to specify the character
-     * encoding of the document.
-     * This information is passed
-     * here so that Format class can encode data accordingly
-     * Format class may choose to ignore this and use its
-     * default character set.
-     *
-     * @param string $charset
-     *            Example utf-8
-     */
-    public function setCharset($charset);
+	/**
+	 * Content-Type field of the HTTP header can send a charset
+	 * parameter in the HTTP header to specify the character
+	 * encoding of the document.
+	 * This information is passed
+	 * here so that Format class can encode data accordingly
+	 * Format class may choose to ignore this and use its
+	 * default character set.
+	 *
+	 * @param string $charset
+	 *            Example utf-8
+	 */
+	public function setCharset($charset);
 
-    /**
-     * Content-Type accepted by the Format class
-     *
-     * @return string $charset Example utf-8
-     */
-    public function getCharset();
+	/**
+	 * Content-Type accepted by the Format class
+	 *
+	 * @return string $charset Example utf-8
+	 */
+	public function getCharset();
 
-    /**
-     * Get selected MIME type
-     */
-    public function getMIME();
+	/**
+	 * Get selected MIME type
+	 */
+	public function getMIME();
 
-    /**
-     * Set the selected file extension
-     *
-     * @param string $extension
-     *            file extension
-     */
-    public function setExtension($extension);
+	/**
+	 * Set the selected file extension
+	 *
+	 * @param string $extension
+	 *            file extension
+	 */
+	public function setExtension($extension);
 
-    /**
-     * Get the selected file extension
-     *
-     * @return string file extension
-     */
-    public function getExtension();
+	/**
+	 * Get the selected file extension
+	 *
+	 * @return string file extension
+	 */
+	public function getExtension();
 
-    /**
-     * Encode the given data in the format
-     *
-     * @param array $data
-     *            resulting data that needs to
-     *            be encoded in the given format
-     * @param boolean $humanReadable
-     *            set to TRUE when restler
-     *            is not running in production mode. Formatter has to
-     *            make the encoded output more human readable
-     * @return string encoded string
-     */
-    public function encode($data, $humanReadable = false);
+	/**
+	 * Encode the given data in the format
+	 *
+	 * @param array $data
+	 *            resulting data that needs to
+	 *            be encoded in the given format
+	 * @param boolean $humanReadable
+	 *            set to TRUE when restler
+	 *            is not running in production mode. Formatter has to
+	 *            make the encoded output more human readable
+	 * @return string encoded string
+	 */
+	public function encode($data, $humanReadable = false);
 
-    /**
-     * Decode the given data from the format
-     *
-     * @param string $data
-     *            data sent from client to
-     *            the api in the given format.
-     * @return array associative array of the parsed data
-     */
-    public function decode($data);
+	/**
+	 * Decode the given data from the format
+	 *
+	 * @param string $data
+	 *            data sent from client to
+	 *            the api in the given format.
+	 * @return array associative array of the parsed data
+	 */
+	public function decode($data);
 
-    /**
-     * @return boolean is parsing the request supported?
-     */
-    public function isReadable();
+	/**
+	 * @return boolean is parsing the request supported?
+	 */
+	public function isReadable();
 
-    /**
-     * @return boolean is composing response supported?
-     */
-    public function isWritable();
+	/**
+	 * @return boolean is composing response supported?
+	 */
+	public function isWritable();
 }
 

htdocs/includes/restler/framework/Luracast/Restler/Format/MultiFormat.php

Indentation +114 added lines, -114 removed lines

@@ -13,132 +13,132 @@
  */
 abstract class MultiFormat implements iFormat
 {
-    /**
-     * override in the extending class
-     */
-    const MIME = 'text/plain,text/html';
-    /**
-     * override in the extending class
-     */
-    const EXTENSION = 'txt,html';
+	/**
+	 * override in the extending class
+	 */
+	const MIME = 'text/plain,text/html';
+	/**
+	 * override in the extending class
+	 */
+	const EXTENSION = 'txt,html';
 
-    /**
-     * @var string charset encoding defaults to UTF8
-     */
-    protected $charset='utf-8';
+	/**
+	 * @var string charset encoding defaults to UTF8
+	 */
+	protected $charset='utf-8';
 
-    public static $mime;
-    public static $extension;
+	public static $mime;
+	public static $extension;
 
-    /**
-     * Injected at runtime
-     *
-     * @var \Luracast\Restler\Restler
-     */
-    public $restler;
+	/**
+	 * Injected at runtime
+	 *
+	 * @var \Luracast\Restler\Restler
+	 */
+	public $restler;
 
-    /**
-     * Get MIME type => Extension mappings as an associative array
-     *
-     * @return array list of mime strings for the format
-     * @example array('application/json'=>'json');
-     */
-    public function getMIMEMap()
-    {
-        $extensions = explode(',',static::EXTENSION);
-        $mimes = explode(',',static::MIME);
-        $count = max(count($extensions), count($mimes));
-        $extensions += array_fill(0, $count, end($extensions));
-        $mimes += array_fill(0, $count, end($mimes));
-        return array_combine($mimes,$extensions);
-    }
+	/**
+	 * Get MIME type => Extension mappings as an associative array
+	 *
+	 * @return array list of mime strings for the format
+	 * @example array('application/json'=>'json');
+	 */
+	public function getMIMEMap()
+	{
+		$extensions = explode(',',static::EXTENSION);
+		$mimes = explode(',',static::MIME);
+		$count = max(count($extensions), count($mimes));
+		$extensions += array_fill(0, $count, end($extensions));
+		$mimes += array_fill(0, $count, end($mimes));
+		return array_combine($mimes,$extensions);
+	}
 
-    /**
-     * Set the selected MIME type
-     *
-     * @param string $mime
-     *            MIME type
-     */
-    public function setMIME($mime)
-    {
-        static::$mime = $mime;
-    }
+	/**
+	 * Set the selected MIME type
+	 *
+	 * @param string $mime
+	 *            MIME type
+	 */
+	public function setMIME($mime)
+	{
+		static::$mime = $mime;
+	}
 
-    /**
-     * Content-Type field of the HTTP header can send a charset
-     * parameter in the HTTP header to specify the character
-     * encoding of the document.
-     * This information is passed
-     * here so that Format class can encode data accordingly
-     * Format class may choose to ignore this and use its
-     * default character set.
-     *
-     * @param string $charset
-     *            Example utf-8
-     */
-    public function setCharset($charset)
-    {
-        $this->charset = $charset;
-    }
+	/**
+	 * Content-Type field of the HTTP header can send a charset
+	 * parameter in the HTTP header to specify the character
+	 * encoding of the document.
+	 * This information is passed
+	 * here so that Format class can encode data accordingly
+	 * Format class may choose to ignore this and use its
+	 * default character set.
+	 *
+	 * @param string $charset
+	 *            Example utf-8
+	 */
+	public function setCharset($charset)
+	{
+		$this->charset = $charset;
+	}
 
-    /**
-     * Content-Type accepted by the Format class
-     *
-     * @return string $charset Example utf-8
-     */
-    public function getCharset()
-    {
-        return $this->charset;
-    }
+	/**
+	 * Content-Type accepted by the Format class
+	 *
+	 * @return string $charset Example utf-8
+	 */
+	public function getCharset()
+	{
+		return $this->charset;
+	}
 
-    /**
-     * Get selected MIME type
-     */
-    public function getMIME()
-    {
-        return static::$mime;
-    }
+	/**
+	 * Get selected MIME type
+	 */
+	public function getMIME()
+	{
+		return static::$mime;
+	}
 
-    /**
-     * Set the selected file extension
-     *
-     * @param string $extension
-     *            file extension
-     */
-    public function setExtension($extension)
-    {
-        static::$extension = $extension;
-    }
+	/**
+	 * Set the selected file extension
+	 *
+	 * @param string $extension
+	 *            file extension
+	 */
+	public function setExtension($extension)
+	{
+		static::$extension = $extension;
+	}
 
-    /**
-     * Get the selected file extension
-     *
-     * @return string file extension
-     */
-    public function getExtension()
-    {
-        return static::$extension;
-    }
+	/**
+	 * Get the selected file extension
+	 *
+	 * @return string file extension
+	 */
+	public function getExtension()
+	{
+		return static::$extension;
+	}
 
-    /**
-     * @return boolean is parsing the request supported?
-     */
-    public function isReadable()
-    {
-        return true;
-    }
+	/**
+	 * @return boolean is parsing the request supported?
+	 */
+	public function isReadable()
+	{
+		return true;
+	}
 
-    /**
-     * @return boolean is composing response supported?
-     */
-    public function isWritable()
-    {
-        return true;
-    }
+	/**
+	 * @return boolean is composing response supported?
+	 */
+	public function isWritable()
+	{
+		return true;
+	}
 
-    public function __toString()
-    {
-        return $this->getExtension();
-    }
+	public function __toString()
+	{
+		return $this->getExtension();
+	}
 }
 

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
     /**
      * @var string charset encoding defaults to UTF8
      */
-    protected $charset='utf-8';
+    protected $charset = 'utf-8';
 
     public static $mime;
     public static $extension;
@@ -45,12 +45,12 @@ 
      */
     public function getMIMEMap()
     {
-        $extensions = explode(',',static::EXTENSION);
-        $mimes = explode(',',static::MIME);
+        $extensions = explode(',', static::EXTENSION);
+        $mimes = explode(',', static::MIME);
         $count = max(count($extensions), count($mimes));
         $extensions += array_fill(0, $count, end($extensions));
         $mimes += array_fill(0, $count, end($mimes));
-        return array_combine($mimes,$extensions);
+        return array_combine($mimes, $extensions);
     }
 
     /**

htdocs/includes/restler/framework/Luracast/Restler/Format/DependentFormat.php

Indentation +46 added lines, -46 removed lines

@@ -6,51 +6,51 @@
 
 abstract class DependentFormat extends Format
 {
-    /**
-     * override in the extending class
-     *
-     * @example symfony/yaml:*
-     */
-    const PACKAGE_NAME = 'vendor/project:version';
-
-    /**
-     * override in the extending class
-     *
-     * fully qualified class name
-     */
-    const EXTERNAL_CLASS = 'Namespace\\ClassName';
-
-    /**
-     * Get external class => packagist package name as an associative array
-     *
-     * @return array list of dependencies for the format
-     */
-    public function getDependencyMap()
-    {
-        return array(
-            static::EXTERNAL_CLASS => static::PACKAGE_NAME
-        );
-    }
-
-    protected function checkDependency($class = null)
-    {
-        if (empty($class)) {
-            $class = key($this->getDependencyMap());
-        }
-        if (!class_exists($class, true)) {
-            $map = $this->getDependencyMap();
-            $package = $map[$class];
-            throw new RestException(
-                500,
-                get_called_class() . ' has external dependency. Please run `composer require ' .
-                $package . '` from the project root. Read https://getcomposer.org for more info'
-            );
-        }
-    }
-
-    public function __construct()
-    {
-        $this->checkDependency();
-    }
+	/**
+	 * override in the extending class
+	 *
+	 * @example symfony/yaml:*
+	 */
+	const PACKAGE_NAME = 'vendor/project:version';
+
+	/**
+	 * override in the extending class
+	 *
+	 * fully qualified class name
+	 */
+	const EXTERNAL_CLASS = 'Namespace\\ClassName';
+
+	/**
+	 * Get external class => packagist package name as an associative array
+	 *
+	 * @return array list of dependencies for the format
+	 */
+	public function getDependencyMap()
+	{
+		return array(
+			static::EXTERNAL_CLASS => static::PACKAGE_NAME
+		);
+	}
+
+	protected function checkDependency($class = null)
+	{
+		if (empty($class)) {
+			$class = key($this->getDependencyMap());
+		}
+		if (!class_exists($class, true)) {
+			$map = $this->getDependencyMap();
+			$package = $map[$class];
+			throw new RestException(
+				500,
+				get_called_class() . ' has external dependency. Please run `composer require ' .
+				$package . '` from the project root. Read https://getcomposer.org for more info'
+			);
+		}
+	}
+
+	public function __construct()
+	{
+		$this->checkDependency();
+	}
 
 } 
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -42,8 +42,8 @@
             $package = $map[$class];
             throw new RestException(
                 500,
-                get_called_class() . ' has external dependency. Please run `composer require ' .
-                $package . '` from the project root. Read https://getcomposer.org for more info'
+                get_called_class().' has external dependency. Please run `composer require '.
+                $package.'` from the project root. Read https://getcomposer.org for more info'
             );
         }
     }

htdocs/includes/restler/framework/Luracast/Restler/Format/JsFormat.php

Indentation +27 added lines, -27 removed lines

@@ -15,34 +15,34 @@
  */
 class JsFormat extends JsonFormat
 {
-    const MIME = 'text/javascript';
-    const EXTENSION = 'js';
+	const MIME = 'text/javascript';
+	const EXTENSION = 'js';
 
-    public static $callbackMethodName = 'parseResponse';
-    public static $callbackOverrideQueryString = 'callback';
-    public static $includeHeaders = true;
+	public static $callbackMethodName = 'parseResponse';
+	public static $callbackOverrideQueryString = 'callback';
+	public static $includeHeaders = true;
 
-    public function encode($data, $human_readable = false)
-    {
-        $r = array();
-        if (static::$includeHeaders) {
-            $r['meta'] = array();
-            foreach (headers_list() as $header) {
-                list($h, $v) = explode(': ', $header, 2);
-                $r['meta'][$h] = $v;
-            }
-        }
-        $r['data'] = $data;
-        if (isset($_GET[static::$callbackOverrideQueryString])) {
-            static::$callbackMethodName
-                = (string) $_GET[static::$callbackOverrideQueryString];
-        }
-        return static::$callbackMethodName . '('
-            . parent::encode($r, $human_readable) . ');';
-    }
+	public function encode($data, $human_readable = false)
+	{
+		$r = array();
+		if (static::$includeHeaders) {
+			$r['meta'] = array();
+			foreach (headers_list() as $header) {
+				list($h, $v) = explode(': ', $header, 2);
+				$r['meta'][$h] = $v;
+			}
+		}
+		$r['data'] = $data;
+		if (isset($_GET[static::$callbackOverrideQueryString])) {
+			static::$callbackMethodName
+				= (string) $_GET[static::$callbackOverrideQueryString];
+		}
+		return static::$callbackMethodName . '('
+			. parent::encode($r, $human_readable) . ');';
+	}
 
-    public function isReadable()
-    {
-        return false;
-    }
+	public function isReadable()
+	{
+		return false;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -37,8 +37,8 @@
             static::$callbackMethodName
                 = (string) $_GET[static::$callbackOverrideQueryString];
         }
-        return static::$callbackMethodName . '('
-            . parent::encode($r, $human_readable) . ');';
+        return static::$callbackMethodName.'('
+            . parent::encode($r, $human_readable).');';
     }
 
     public function isReadable()