YetiForceCompany / YetiForceCRM

libraries/restler/restler.php

Doc Comments +21 added lines, -4 removed lines

@@ -268,9 +268,9 @@ 
      *
      * All the protected methods that do not start with _ (underscore)
      * will exposed as protected api which will require authentication
-     * @param string $class name of the service class
-     * @param string $basePath optional url prefix for mapping, uses
+     * @param string $base_path optional url prefix for mapping, uses
      * lowercase version of the class name when not specified
+     * @param string $class_name
      * @throws Exception when supplied with invalid class name
      */
     public function addAPIClass($class_name, $base_path = null)
@@ -322,8 +322,8 @@ 
 
     /**
      * Convenience method to respond with an error message
-     * @param int $statusCode http error code
-     * @param string $errorMessage optional custom error message
+     * @param int $status_code http error code
+     * @param string $error_message optional custom error message
      */
     public function handleError($status_code, $error_message = null)
     {
@@ -916,6 +916,10 @@ 
 {
 
 
+    /**
+     * @param integer $http_status_code
+     * @param string $error_message
+     */
     public function __construct($http_status_code, $error_message = null)
     {
         parent::__construct($error_message, $http_status_code);
@@ -1033,12 +1037,14 @@ 
     /**
      * Set the selected MIME type
      * @param string $mime MIME type
+     * @return void
      */
     public function setMIME($mime);
 
 
     /**
      * Get selected MIME type
+     * @return string
      */
     public function getMIME();
 
@@ -1046,6 +1052,7 @@ 
     /**
      * Set the selected file extension
      * @param string $extension file extension
+     * @return void
      */
     public function setExtension($extension);
 
@@ -1349,6 +1356,9 @@ 
     }
 
 
+    /**
+     * @param string[] $lines
+     */
     private function parseLines($lines)
     {
         foreach ($lines as $line) {
@@ -1398,6 +1408,10 @@ 
     }
 
 
+    /**
+     * @param string $param
+     * @param string $value
+     */
     private function setParam($param, $value)
     {
         if ($param == 'param' || $param == 'return') {
@@ -1454,6 +1468,9 @@ 
 //
 // ------------------------------------------------------------------
 
+/**
+ * @param string $php_doc_comment
+ */
 function parse_doc($php_doc_comment)
 {
     $p = new DocParser();

Indentation +1299 added lines, -1299 removed lines

@@ -16,883 +16,883 @@ 
  */
 class Restler
 {
-    // ==================================================================
-    //
-    // Public variables
-    //
-    // ------------------------------------------------------------------
-
-    const VERSION = '2.2.1';
-
-    /**
-     * URL of the currently mapped service
-     * @var string
-     */
-    public $url;
-
-    /**
-     * Http request method of the current request.
-     * Any value between [GET, PUT, POST, DELETE]
-     * @var string
-     */
-    public $request_method;
-
-    /**
-     * Requested data format. Instance of the current format class
-     * which implements the iFormat interface
-     * @var iFormat
-     * @example jsonFormat, xmlFormat, yamlFormat etc
-     */
-    public $request_format;
-
-    /**
-     * Data sent to the service
-     * @var array
-     */
-    public $request_data = array();
-
-    /**
-     * Used in production mode to store the URL Map to disk
-     * @var string
-     */
-    public $cache_dir;
-
-    /**
-     * base directory to locate format and auth files
-     * @var string
-     */
-    public $base_dir;
-
-    /**
-     * Name of an iRespond implementation class
-     * @var string
-     */
-    public $response = 'DefaultResponse';
-
-    /**
-     * Response data format. Instance of the current format class
-     * which implements the iFormat interface
-     * @var iFormat
-     * @example jsonFormat, xmlFormat, yamlFormat etc
-     */
-    public $response_format;
-
-    // ==================================================================
-    //
-    // Private & Protected variables
-    //
-    // ------------------------------------------------------------------
-
-    /**
-     * When set to false, it will run in debug mode and parse the
-     * class files every time to map it to the URL
-     * @var boolean
-     */
-    protected $production_mode;
-
-    /**
-     * Associated array that maps urls to their respective class and method
-     * @var array
-     */
-    protected $routes = array();
-
-    /**
-     * Associated array that maps formats to their respective format class name
-     * @var array
-     */
-    protected $format_map = array();
-
-    /**
-     * Instance of the current api service class
-     * @var object
-     */
-    protected $service_class_instance;
-
-    /**
-     * Name of the api method being called
-     * @var string
-     */
-    protected $service_method;
-
-    /**
-     * list of authentication classes
-     * @var array
-     */
-    protected $auth_classes = array();
-
-    /**
-     * list of error handling classes
-     * @var array
-     */
-    protected $error_classes = array();
-
-    /**
-     * HTTP status codes
-     * @var array
-     */
-    private $codes = array(
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        306 => '(Unused)',
-        307 => 'Temporary Redirect',
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Timeout',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Long',
-        415 => 'Unsupported Media Type',
-        416 => 'Requested Range Not Satisfiable',
-        417 => 'Expectation Failed',
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Timeout',
-        505 => 'HTTP Version Not Supported'
-    );
-
-    /**
-     * Caching of url map is enabled or not
-     * @var boolean
-     */
-    protected $cached;
-
-    // ==================================================================
-    //
-    // Public functions
-    //
-    // ------------------------------------------------------------------
-
-
-    /**
-     * Constructor
-     * @param boolean $production_mode When set to false, it will run in
-     * debug mode and parse the class files every time to map it to the URL
-     */
-    public function __construct($production_mode = false)
-    {
-        $this->production_mode = $production_mode;
-        $this->cache_dir = getcwd();
-        $this->base_dir = RESTLER_PATH;
-    }
-
-
-    /**
-     * Store the url map cache if needed
-     */
-    public function __destruct()
-    {
-        if ($this->production_mode && !($this->cached)) {
-            $this->saveCache();
-        }
-    }
-
-
-    /**
-     * Use it in production mode to refresh the url map cache
-     */
-    public function refreshCache()
-    {
-        $this->routes = array();
-        $this->cached = false;
-    }
-
-
-    /**
-     * Call this method and pass all the formats that should be
-     * supported by the API. Accepts multiple parameters
-     * @param string class name of the format class that implements iFormat
-     * @example $restler->setSupportedFormats('JsonFormat', 'XmlFormat'...);
-     */
-    public function setSupportedFormats()
-    {
-        $args = func_get_args();
-        $extensions = array();
-        foreach ($args as $class_name) {
-            if (!is_string($class_name) || !class_exists($class_name)) {
-                throw new Exception("$class_name is not a vaild Format Class.");
-            }
-            $obj = new $class_name;
-            if (!($obj instanceof iFormat)) {
-                throw new Exception('Invalid format class; must implement '
-                    . 'iFormat interface');
-            }
-            foreach ($obj->getMIMEMap() as $extension => $mime) {
-                if (!isset($this->format_map[$extension])) {
-                    $this->format_map[$extension] = $class_name;
-                }
-                $mime = explode(',', $mime);
-                if (!is_array($mime)) {
-                    $mime = array($mime);
-                }
-                foreach ($mime as $value) {
-                    if (!isset($this->format_map[$value])) {
-                        $this->format_map[$value] = $class_name;
-                    }
-                }
-                $extensions[".$extension"] = true;
-            }
-        }
-        $this->format_map['default'] = $args[0];
-        $this->format_map['extensions'] = array_keys($extensions);
-    }
-
-
-    /**
-     * Add api classes throgh this method. All the public methods
-     * that do not start with _ (underscore) will be  will be exposed
-     * as the public api by default.
-     *
-     * All the protected methods that do not start with _ (underscore)
-     * will exposed as protected api which will require authentication
-     * @param string $class name of the service class
-     * @param string $basePath optional url prefix for mapping, uses
-     * lowercase version of the class name when not specified
-     * @throws Exception when supplied with invalid class name
-     */
-    public function addAPIClass($class_name, $base_path = null)
-    {
-        if (!class_exists($class_name)) {
-            throw new Exception("API class $class_name is missing.");
-        }
-        $this->loadCache();
-        if (!$this->cached) {
-            if (is_null($base_path)) {
-                $base_path = strtolower($class_name);
-                $index = strrpos($class_name, '\\');
-                if ($index !== false) {
-                    $base_path = substr($base_path, $index + 1);
-                }
-            } else {
-                $base_path = trim($base_path, '/');
-            }
-            if (strlen($base_path) > 0) {
-                $base_path .= '/';
-            }
-            $this->generateMap($class_name, $base_path);
-        }
-    }
-
-
-    /**
-     * protected methods will need atleast one authentication class to be set
-     * in order to allow that method to be executed
-     * @param string $class_name of the authentication class
-     * @param string $base_path optional url prefix for mapping
-     */
-    public function addAuthenticationClass($class_name, $base_path = null)
-    {
-        $this->auth_classes[] = $class_name;
-        $this->addAPIClass($class_name, $base_path);
-    }
-
-
-    /**
-     * Add class for custom error handling
-     * @param string $class_name of the error handling class
-     */
-    public function addErrorClass($class_name)
-    {
-        $this->error_classes[] = $class_name;
-    }
-
-
-    /**
-     * Convenience method to respond with an error message
-     * @param int $statusCode http error code
-     * @param string $errorMessage optional custom error message
-     */
-    public function handleError($status_code, $error_message = null)
-    {
-        $method = "handle$status_code";
-        $handled = false;
-        foreach ($this->error_classes as $class_name) {
-            if (method_exists($class_name, $method)) {
-                $obj = new $class_name();
-                $obj->restler = $this;
-                $obj->$method();
-                $handled = true;
-            }
-        }
-        if ($handled) {
-            return;
-        }
-        $message = $this->codes[$status_code]
-            . (!$error_message ? '' : ': ' . $error_message);
-        $this->setStatus($status_code);
-        $responder = new $this->response();
-        $responder->restler = $this;
-        $this->sendData($responder->__formatError($status_code, $message));
-    }
-
-
-    /**
-     * An initialize function to allow use of the restler error generation 
-     * functions for pre-processing and pre-routing of requests.
-     */
-    public function init()
-    {
-        if (empty($this->format_map)) {
-            $this->setSupportedFormats('JsonFormat');
-        }
-        $this->url = $this->getPath();
-        $this->request_method = $this->getRequestMethod();
-        $this->response_format = $this->getResponseFormat();
-        $this->request_format = $this->getRequestFormat();
-        if (is_null($this->request_format)) {
-            $this->request_format = $this->response_format;
-        }
-        if ($this->request_method == 'PUT' || $this->request_method == 'POST') {
-            $this->request_data = $this->getRequestData();
-        }
-    }
-
-
-    /**
-     * Main function for processing the api request
-     * and return the response
-     * @throws Exception when the api service class is missing
-     * @throws RestException to send error response
-     */
-    public function handle()
-    {
-        $this->init();
-        $o = $this->mapUrlToMethod();
-
-        if (!isset($o->class_name)) {
-            $this->handleError(404);
-        } else {
-            try {
-                if ($o->method_flag) {
-                    $auth_method = '__isAuthenticated';
-                    if (!count($this->auth_classes)) {
-                        throw new RestException(401);
-                    }
-                    foreach ($this->auth_classes as $auth_class) {
-                        $auth_obj = new $auth_class();
-                        $auth_obj->restler = $this;
-                        $this->applyClassMetadata($auth_class, $auth_obj, $o);
-                        if (!method_exists($auth_obj, $auth_method)) {
-                            throw new RestException(401, 'Authentication Class '
-                                . 'should implement iAuthenticate');
-                        } else if (!$auth_obj->$auth_method()) {
-                            throw new RestException(401);
-                        }
-                    }
-                }
-                $this->applyClassMetadata(get_class($this->request_format),
-                    $this->request_format, $o);
-                $pre_process = '_' . $this->request_format->getExtension() . '_'
-                    . $o->method_name;
-                $this->service_method = $o->method_name;
-                if ($o->method_flag == 2) {
-                    $o = unprotect($o);
-                }
-                $object = $this->service_class_instance = new $o->class_name();
-                $object->restler = $this;
-                if (method_exists($o->class_name, $pre_process)) {
-                    call_user_func_array(
-                        array($object, $pre_process), $o->arguments
-                    );
-                }
-                switch ($o->method_flag) {
-                    case 3:
-                        $reflection_method = new ReflectionMethod($object,
-                                $o->method_name);
-                        $reflection_method->setAccessible(true);
-                        $result = $reflection_method->invokeArgs($object,
-                            $o->arguments);
-                        break;
-                    case 2:
-                    case 1:
-                    default:
-                        $result = call_user_func_array(array(
-                            $object,
-                            $o->method_name), $o->arguments
-                        );
-                        break;
-                }
-            } catch (RestException $e) {
-                $this->handleError($e->getCode(), $e->getMessage());
-            }
-        }
-        $responder = new $this->response();
-        $responder->restler = $this;
-        $this->applyClassMetadata($this->response, $responder, $o);
-        if (isset($result) && $result !== null) {
-            $result = $responder->__formatResponse($result);
-            $this->sendData($result);
-        }
-    }
-
-
-    /**
-     * Encodes the response in the prefered format
-     * and sends back
-     * @param $data array php data
-     */
-    public function sendData($data)
-    {
-        $data = $this->response_format->encode($data, 
-            !($this->production_mode)
-        );
-        $post_process = '_' . $this->service_method . '_'
-            . $this->response_format->getExtension();
-        if (isset($this->service_class_instance)
-            && method_exists($this->service_class_instance, $post_process)
-        ) {
-            $data = call_user_func(array($this->service_class_instance,
-                $post_process), $data);
-        }
-        header("Cache-Control: no-cache, must-revalidate");
-        header("Expires: 0");
-        header('Content-Type: ' . $this->response_format->getMIME());
-        //.'; charset=utf-8');
-        header("X-Powered-By: Luracast Restler v" . Restler::VERSION);
+	// ==================================================================
+	//
+	// Public variables
+	//
+	// ------------------------------------------------------------------
+
+	const VERSION = '2.2.1';
+
+	/**
+	 * URL of the currently mapped service
+	 * @var string
+	 */
+	public $url;
+
+	/**
+	 * Http request method of the current request.
+	 * Any value between [GET, PUT, POST, DELETE]
+	 * @var string
+	 */
+	public $request_method;
+
+	/**
+	 * Requested data format. Instance of the current format class
+	 * which implements the iFormat interface
+	 * @var iFormat
+	 * @example jsonFormat, xmlFormat, yamlFormat etc
+	 */
+	public $request_format;
+
+	/**
+	 * Data sent to the service
+	 * @var array
+	 */
+	public $request_data = array();
+
+	/**
+	 * Used in production mode to store the URL Map to disk
+	 * @var string
+	 */
+	public $cache_dir;
+
+	/**
+	 * base directory to locate format and auth files
+	 * @var string
+	 */
+	public $base_dir;
+
+	/**
+	 * Name of an iRespond implementation class
+	 * @var string
+	 */
+	public $response = 'DefaultResponse';
+
+	/**
+	 * Response data format. Instance of the current format class
+	 * which implements the iFormat interface
+	 * @var iFormat
+	 * @example jsonFormat, xmlFormat, yamlFormat etc
+	 */
+	public $response_format;
+
+	// ==================================================================
+	//
+	// Private & Protected variables
+	//
+	// ------------------------------------------------------------------
+
+	/**
+	 * When set to false, it will run in debug mode and parse the
+	 * class files every time to map it to the URL
+	 * @var boolean
+	 */
+	protected $production_mode;
+
+	/**
+	 * Associated array that maps urls to their respective class and method
+	 * @var array
+	 */
+	protected $routes = array();
+
+	/**
+	 * Associated array that maps formats to their respective format class name
+	 * @var array
+	 */
+	protected $format_map = array();
+
+	/**
+	 * Instance of the current api service class
+	 * @var object
+	 */
+	protected $service_class_instance;
+
+	/**
+	 * Name of the api method being called
+	 * @var string
+	 */
+	protected $service_method;
+
+	/**
+	 * list of authentication classes
+	 * @var array
+	 */
+	protected $auth_classes = array();
+
+	/**
+	 * list of error handling classes
+	 * @var array
+	 */
+	protected $error_classes = array();
+
+	/**
+	 * HTTP status codes
+	 * @var array
+	 */
+	private $codes = array(
+		100 => 'Continue',
+		101 => 'Switching Protocols',
+		200 => 'OK',
+		201 => 'Created',
+		202 => 'Accepted',
+		203 => 'Non-Authoritative Information',
+		204 => 'No Content',
+		205 => 'Reset Content',
+		206 => 'Partial Content',
+		300 => 'Multiple Choices',
+		301 => 'Moved Permanently',
+		302 => 'Found',
+		303 => 'See Other',
+		304 => 'Not Modified',
+		305 => 'Use Proxy',
+		306 => '(Unused)',
+		307 => 'Temporary Redirect',
+		400 => 'Bad Request',
+		401 => 'Unauthorized',
+		402 => 'Payment Required',
+		403 => 'Forbidden',
+		404 => 'Not Found',
+		405 => 'Method Not Allowed',
+		406 => 'Not Acceptable',
+		407 => 'Proxy Authentication Required',
+		408 => 'Request Timeout',
+		409 => 'Conflict',
+		410 => 'Gone',
+		411 => 'Length Required',
+		412 => 'Precondition Failed',
+		413 => 'Request Entity Too Large',
+		414 => 'Request-URI Too Long',
+		415 => 'Unsupported Media Type',
+		416 => 'Requested Range Not Satisfiable',
+		417 => 'Expectation Failed',
+		500 => 'Internal Server Error',
+		501 => 'Not Implemented',
+		502 => 'Bad Gateway',
+		503 => 'Service Unavailable',
+		504 => 'Gateway Timeout',
+		505 => 'HTTP Version Not Supported'
+	);
+
+	/**
+	 * Caching of url map is enabled or not
+	 * @var boolean
+	 */
+	protected $cached;
+
+	// ==================================================================
+	//
+	// Public functions
+	//
+	// ------------------------------------------------------------------
+
+
+	/**
+	 * Constructor
+	 * @param boolean $production_mode When set to false, it will run in
+	 * debug mode and parse the class files every time to map it to the URL
+	 */
+	public function __construct($production_mode = false)
+	{
+		$this->production_mode = $production_mode;
+		$this->cache_dir = getcwd();
+		$this->base_dir = RESTLER_PATH;
+	}
+
+
+	/**
+	 * Store the url map cache if needed
+	 */
+	public function __destruct()
+	{
+		if ($this->production_mode && !($this->cached)) {
+			$this->saveCache();
+		}
+	}
+
+
+	/**
+	 * Use it in production mode to refresh the url map cache
+	 */
+	public function refreshCache()
+	{
+		$this->routes = array();
+		$this->cached = false;
+	}
+
+
+	/**
+	 * Call this method and pass all the formats that should be
+	 * supported by the API. Accepts multiple parameters
+	 * @param string class name of the format class that implements iFormat
+	 * @example $restler->setSupportedFormats('JsonFormat', 'XmlFormat'...);
+	 */
+	public function setSupportedFormats()
+	{
+		$args = func_get_args();
+		$extensions = array();
+		foreach ($args as $class_name) {
+			if (!is_string($class_name) || !class_exists($class_name)) {
+				throw new Exception("$class_name is not a vaild Format Class.");
+			}
+			$obj = new $class_name;
+			if (!($obj instanceof iFormat)) {
+				throw new Exception('Invalid format class; must implement '
+					. 'iFormat interface');
+			}
+			foreach ($obj->getMIMEMap() as $extension => $mime) {
+				if (!isset($this->format_map[$extension])) {
+					$this->format_map[$extension] = $class_name;
+				}
+				$mime = explode(',', $mime);
+				if (!is_array($mime)) {
+					$mime = array($mime);
+				}
+				foreach ($mime as $value) {
+					if (!isset($this->format_map[$value])) {
+						$this->format_map[$value] = $class_name;
+					}
+				}
+				$extensions[".$extension"] = true;
+			}
+		}
+		$this->format_map['default'] = $args[0];
+		$this->format_map['extensions'] = array_keys($extensions);
+	}
+
+
+	/**
+	 * Add api classes throgh this method. All the public methods
+	 * that do not start with _ (underscore) will be  will be exposed
+	 * as the public api by default.
+	 *
+	 * All the protected methods that do not start with _ (underscore)
+	 * will exposed as protected api which will require authentication
+	 * @param string $class name of the service class
+	 * @param string $basePath optional url prefix for mapping, uses
+	 * lowercase version of the class name when not specified
+	 * @throws Exception when supplied with invalid class name
+	 */
+	public function addAPIClass($class_name, $base_path = null)
+	{
+		if (!class_exists($class_name)) {
+			throw new Exception("API class $class_name is missing.");
+		}
+		$this->loadCache();
+		if (!$this->cached) {
+			if (is_null($base_path)) {
+				$base_path = strtolower($class_name);
+				$index = strrpos($class_name, '\\');
+				if ($index !== false) {
+					$base_path = substr($base_path, $index + 1);
+				}
+			} else {
+				$base_path = trim($base_path, '/');
+			}
+			if (strlen($base_path) > 0) {
+				$base_path .= '/';
+			}
+			$this->generateMap($class_name, $base_path);
+		}
+	}
+
+
+	/**
+	 * protected methods will need atleast one authentication class to be set
+	 * in order to allow that method to be executed
+	 * @param string $class_name of the authentication class
+	 * @param string $base_path optional url prefix for mapping
+	 */
+	public function addAuthenticationClass($class_name, $base_path = null)
+	{
+		$this->auth_classes[] = $class_name;
+		$this->addAPIClass($class_name, $base_path);
+	}
+
+
+	/**
+	 * Add class for custom error handling
+	 * @param string $class_name of the error handling class
+	 */
+	public function addErrorClass($class_name)
+	{
+		$this->error_classes[] = $class_name;
+	}
+
+
+	/**
+	 * Convenience method to respond with an error message
+	 * @param int $statusCode http error code
+	 * @param string $errorMessage optional custom error message
+	 */
+	public function handleError($status_code, $error_message = null)
+	{
+		$method = "handle$status_code";
+		$handled = false;
+		foreach ($this->error_classes as $class_name) {
+			if (method_exists($class_name, $method)) {
+				$obj = new $class_name();
+				$obj->restler = $this;
+				$obj->$method();
+				$handled = true;
+			}
+		}
+		if ($handled) {
+			return;
+		}
+		$message = $this->codes[$status_code]
+			. (!$error_message ? '' : ': ' . $error_message);
+		$this->setStatus($status_code);
+		$responder = new $this->response();
+		$responder->restler = $this;
+		$this->sendData($responder->__formatError($status_code, $message));
+	}
+
+
+	/**
+	 * An initialize function to allow use of the restler error generation 
+	 * functions for pre-processing and pre-routing of requests.
+	 */
+	public function init()
+	{
+		if (empty($this->format_map)) {
+			$this->setSupportedFormats('JsonFormat');
+		}
+		$this->url = $this->getPath();
+		$this->request_method = $this->getRequestMethod();
+		$this->response_format = $this->getResponseFormat();
+		$this->request_format = $this->getRequestFormat();
+		if (is_null($this->request_format)) {
+			$this->request_format = $this->response_format;
+		}
+		if ($this->request_method == 'PUT' || $this->request_method == 'POST') {
+			$this->request_data = $this->getRequestData();
+		}
+	}
+
+
+	/**
+	 * Main function for processing the api request
+	 * and return the response
+	 * @throws Exception when the api service class is missing
+	 * @throws RestException to send error response
+	 */
+	public function handle()
+	{
+		$this->init();
+		$o = $this->mapUrlToMethod();
+
+		if (!isset($o->class_name)) {
+			$this->handleError(404);
+		} else {
+			try {
+				if ($o->method_flag) {
+					$auth_method = '__isAuthenticated';
+					if (!count($this->auth_classes)) {
+						throw new RestException(401);
+					}
+					foreach ($this->auth_classes as $auth_class) {
+						$auth_obj = new $auth_class();
+						$auth_obj->restler = $this;
+						$this->applyClassMetadata($auth_class, $auth_obj, $o);
+						if (!method_exists($auth_obj, $auth_method)) {
+							throw new RestException(401, 'Authentication Class '
+								. 'should implement iAuthenticate');
+						} else if (!$auth_obj->$auth_method()) {
+							throw new RestException(401);
+						}
+					}
+				}
+				$this->applyClassMetadata(get_class($this->request_format),
+					$this->request_format, $o);
+				$pre_process = '_' . $this->request_format->getExtension() . '_'
+					. $o->method_name;
+				$this->service_method = $o->method_name;
+				if ($o->method_flag == 2) {
+					$o = unprotect($o);
+				}
+				$object = $this->service_class_instance = new $o->class_name();
+				$object->restler = $this;
+				if (method_exists($o->class_name, $pre_process)) {
+					call_user_func_array(
+						array($object, $pre_process), $o->arguments
+					);
+				}
+				switch ($o->method_flag) {
+					case 3:
+						$reflection_method = new ReflectionMethod($object,
+								$o->method_name);
+						$reflection_method->setAccessible(true);
+						$result = $reflection_method->invokeArgs($object,
+							$o->arguments);
+						break;
+					case 2:
+					case 1:
+					default:
+						$result = call_user_func_array(array(
+							$object,
+							$o->method_name), $o->arguments
+						);
+						break;
+				}
+			} catch (RestException $e) {
+				$this->handleError($e->getCode(), $e->getMessage());
+			}
+		}
+		$responder = new $this->response();
+		$responder->restler = $this;
+		$this->applyClassMetadata($this->response, $responder, $o);
+		if (isset($result) && $result !== null) {
+			$result = $responder->__formatResponse($result);
+			$this->sendData($result);
+		}
+	}
+
+
+	/**
+	 * Encodes the response in the prefered format
+	 * and sends back
+	 * @param $data array php data
+	 */
+	public function sendData($data)
+	{
+		$data = $this->response_format->encode($data, 
+			!($this->production_mode)
+		);
+		$post_process = '_' . $this->service_method . '_'
+			. $this->response_format->getExtension();
+		if (isset($this->service_class_instance)
+			&& method_exists($this->service_class_instance, $post_process)
+		) {
+			$data = call_user_func(array($this->service_class_instance,
+				$post_process), $data);
+		}
+		header("Cache-Control: no-cache, must-revalidate");
+		header("Expires: 0");
+		header('Content-Type: ' . $this->response_format->getMIME());
+		//.'; charset=utf-8');
+		header("X-Powered-By: Luracast Restler v" . Restler::VERSION);
 		if($this->production_mode){
 			die($data);
 		}else{
 			echo $data;
 		}
-    }
-
-
-    /**
-     * Sets the HTTP response status
-     * @param int $code response code
-     */
-    public function setStatus($code)
-    {
-        header("{$_SERVER['SERVER_PROTOCOL']} $code " . 
-            $this->codes[strval($code)]);
-    }
-
-
-    /**
-     * Compare two strings and remove the common
-     * sub string from the first string and return it
-     * @param string $first
-     * @param string $second
-     * @param string $char optional, set it as
-     * blank string for char by char comparison
-     * @return string
-     */
-    public function removeCommonPath($first, $second, $char = '/')
-    {
-        $first = explode($char, $first);
-        $second = explode($char, $second);
-        while (count($second)) {
-            if ($first[0] == $second[0]) {
-                array_shift($first);
-            } else {
-                break;
-            }
-            array_shift($second);
-        }
-        return implode($char, $first);
-    }
-
-
-    /**
-     * Save cache to file
-     */
-    public function saveCache()
-    {
-        $file = $this->cache_dir . '/routes.php';
-        $s = '$o=array();' . PHP_EOL;
-        foreach ($this->routes as $key => $value) {
-            $s .= PHP_EOL . PHP_EOL . PHP_EOL . 
-                "############### $key ###############" . PHP_EOL . PHP_EOL;
-            $s .= '$o[\'' . $key . '\']=array();';
-            foreach ($value as $ke => $va) {
-                $s .= PHP_EOL . PHP_EOL . "#==== $key $ke" . PHP_EOL . PHP_EOL;
-                $s .= '$o[\'' . $key . '\'][\'' . $ke . '\']=' . str_replace(
-                        PHP_EOL, PHP_EOL . "\t", var_export($va, true)
-                    ) . ';';
-            }
-        }
-        $s .= PHP_EOL . 'return $o;';
-        $r = @file_put_contents($file, "<?php $s");
-        @chmod($file, 0777);
-        if ($r === false) {
-            throw new Exception(
-                "The cache directory located at '$this->cache_dir' needs to "
-                . "have the permissions set to read/write/execute for everyone"
-                . " in order to save cache and improve performance.");
-        }
-    }
-
-    // ==================================================================
-    //
-    // Protected functions
-    //
-    // ------------------------------------------------------------------
-
-
-    /**
-     * Parses the requst url and get the api path
-     * @return string api path
-     */
-    protected function getPath()
-    {
-        $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'],
-                $_SERVER['SCRIPT_NAME']));
-        $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path);
-        $path = str_replace($this->format_map['extensions'], '', $path);
-        return $path;
-    }
-
-
-    /**
-     * Parses the request to figure out the http request type
-     * @return string which will be one of the following
-     * [GET, POST, PUT, DELETE]
-     * @example GET
-     */
-    protected function getRequestMethod()
-    {
-        $method = $_SERVER['REQUEST_METHOD'];
-        if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) {
-            $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'];
-        }
-        //support for HEAD request
-        if ($method == 'HEAD') {
-            $method = 'GET';
-        }
-        return $method;
-    }
-
-
-    /**
-     * Parses the request to figure out format of the request data
-     * @return iFormat any class that implements iFormat
-     * @example JsonFormat
-     */
-    protected function getRequestFormat()
-    {
-        $format = null;
-        //check if client has sent any information on request format
-        if (isset($_SERVER['CONTENT_TYPE'])) {
-            $mime = explode(';', $_SERVER['CONTENT_TYPE']);
-            $mime = $mime[0];
-            if ($mime == UrlEncodedFormat::MIME) {
-                $format = new UrlEncodedFormat();
-            } else {
-                if (isset($this->format_map[$mime])) {
-                    $format = $this->format_map[$mime];
-                    $format = is_string($format) ? new $format : $format;
-                    $format->setMIME($mime);
-                }
-            }
-        }
-        return $format;
-    }
-
-
-    /**
-     * Parses the request to figure out the best format for response
-     * @return iFormat any class that implements iFormat
-     * @example JsonFormat
-     */
-    protected function getResponseFormat()
-    {
-        //check if client has specified an extension
-        /**
-         * @var iFormat
-         */
-        $format = null;
-        $extensions = explode('.',
-            parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
-        while ($extensions) {
-            $extension = array_pop($extensions);
-            $extension = explode('/', $extension);
-            $extension = array_shift($extension);
-            if ($extension && isset($this->format_map[$extension])) {
-                $format = $this->format_map[$extension];
-                $format = is_string($format) ? new $format : $format;
-                $format->setExtension($extension);
-                //echo "Extension $extension";
-                return $format;
-            }
-        }
-        //check if client has sent list of accepted data formats
-        if (isset($_SERVER['HTTP_ACCEPT'])) {
-            $acceptList = array();
-            $accepts = explode(',', strtolower($_SERVER['HTTP_ACCEPT']));
-            if (!is_array($accepts)) {
-                $accepts = array($accepts);
-            }
-            foreach ($accepts as $pos => $accept) {
-                $parts = explode(';q=', trim($accept));
-                $type = array_shift($parts);
-                $quality = count($parts) ? 
-                    floatval(array_shift($parts)) : 
-                    (1000 - $pos) / 1000;
-                $acceptList[$type] = $quality;
-            }
-            arsort($acceptList);
-            foreach ($acceptList as $accept => $quality) {
-                if (isset($this->format_map[$accept])) {
-                    $format = $this->format_map[$accept];
-                    $format = is_string($format) ? new $format : $format;
-                    $format->setMIME($accept);
-                    //echo "MIME $accept";
-                    // Tell cache content is based on Accept header
-                    header("Vary: Accept"); 
-                    return $format;
-                }
-            }
-        } else {
-            // RFC 2616: If no Accept header field is
-            // present, then it is assumed that the
-            // client accepts all media types.
-            $_SERVER['HTTP_ACCEPT'] = '*/*';
-        }
-        if (strpos($_SERVER['HTTP_ACCEPT'], '*') !== false) {
-            if (strpos($_SERVER['HTTP_ACCEPT'], 'application/*') !== false) {
-                $format = new JsonFormat;
-            } else if (strpos($_SERVER['HTTP_ACCEPT'], 'text/*') !== false) {
-                $format = new XmlFormat;
-            } else if (strpos($_SERVER['HTTP_ACCEPT'], '*/*') !== false) {
-                $format = new $this->format_map['default'];
-            }
-        }
-        if (empty($format)) {
-            // RFC 2616: If an Accept header field is present, and if the 
-            // server cannot send a response which is acceptable according to 
-            // the combined Accept field value, then the server SHOULD send 
-            // a 406 (not acceptable) response.
-            header('HTTP/1.1 406 Not Acceptable');
-            die('406 Not Acceptable: The server was unable to ' . 
-                    'negotiate content for this request.');
-        } else {
-            // Tell cache content is based ot Accept header
-            header("Vary: Accept"); 
-            return $format;
-        }
-    }
-
-
-    /**
-     * Parses the request data and returns it
-     * @return array php data
-     */
-    protected function getRequestData()
-    {
-        try {
-            $r = file_get_contents('php://input');
-            if (is_null($r)) {
-                return $_GET;
-            }
-            $r = $this->request_format->decode($r);
-            return is_null($r) ? array() : $r;
-        } catch (RestException $e) {
-            $this->handleError($e->getCode(), $e->getMessage());
-        }
-    }
-
-
-    protected function mapUrlToMethod()
-    {
-        if (!isset($this->routes[$this->request_method])) {
-            return array();
-        }
-        $urls = $this->routes[$this->request_method];
-        if (!$urls) {
-            return array();
-        }
-
-        $found = false;
-        $this->request_data += $_GET;
-        $params = array('request_data' => $this->request_data);
-        $params += $this->request_data;
-        $lc = strtolower($this->url);
-        foreach ($urls as $url => $call) {
-            //echo PHP_EOL.$url.' = '.$this->url.PHP_EOL;
-            $call = (object) $call;
-            if (strstr($url, ':')) {
-                $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)',
-                    preg_quote($url));
-                if (preg_match(":^$regex$:i", $this->url, $matches)) {
-                    foreach ($matches as $arg => $match) {
-                        if (isset($call->arguments[$arg])) {
-                            //flog("$arg => $match $args[$arg]");
-                            $params[$arg] = $match;
-                        }
-                    }
-                    $found = true;
-                    break;
-                }
-            } else if ($url == $lc) {
-                $found = true;
-                break;
-            }
-        }
-        if ($found) {
-            //echo PHP_EOL."Found $url ";
-            //print_r($call);
-            $p = $call->defaults;
-            foreach ($call->arguments as $key => $value) {
-                //echo "$key => $value \n";
-                if (isset($params[$key])) {
-                    $p[$value] = $params[$key];
-                }
-            }
-            $call->arguments = $p;
-            return $call;
-        }
-    }
-
-
-    /**
-     * Apply static and non-static properties defined in
-     * the method information anotation
-     * @param String $class_name
-     * @param Object $instance instance of that class
-     * @param Object $method_info method information and metadata
-     */
-    protected function applyClassMetadata($class_name, $instance, $method_info)
-    {
-        if (isset($method_info->metadata[$class_name])
-            && is_array($method_info->metadata[$class_name])
-        ) {
-            foreach ($method_info->metadata[$class_name] as
-                    $property => $value) {
-                if (property_exists($class_name, $property)) {
-                    $reflection_property = 
-                        new ReflectionProperty($class_name, $property);
-                    $reflection_property->setValue($instance, $value);
-                }
-            }
-        }
-    }
-
-
-    protected function loadCache()
-    {
-        if ($this->cached !== null) {
-            return;
-        }
-        $file = $this->cache_dir . '/routes.php';
-        $this->cached = false;
-
-        if ($this->production_mode) {
-            if (file_exists($file)) {
-                $routes = include($file);
-            }
-            if (isset($routes) && is_array($routes)) {
-                $this->routes = $routes;
-                $this->cached = true;
-            }
-        } else {
-            //@unlink($this->cache_dir . "/$name.php");
-        }
-    }
-
-
-    /**
-     * Generates cachable url to method mapping
-     * @param string $class_name
-     * @param string $base_path
-     */
-    protected function generateMap($class_name, $base_path = '')
-    {
-        $reflection = new ReflectionClass($class_name);
-        $class_metadata = parse_doc($reflection->getDocComment());
-        $methods = $reflection->getMethods(
-            ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED
-        );
-        foreach ($methods as $method) {
-            $doc = $method->getDocComment();
-            $arguments = array();
-            $defaults = array();
-            $metadata = $class_metadata + parse_doc($doc);
-            $params = $method->getParameters();
-            $position = 0;
-            foreach ($params as $param) {
-                $arguments[$param->getName()] = $position;
-                $defaults[$position] = $param->isDefaultValueAvailable() ? 
-                    $param->getDefaultValue() : null;
-                $position++;
-            }
-            $method_flag = $method->isProtected() ? 
-                (isRestlerCompatibilityModeEnabled() ? 2 : 3) : 
-                (isset($metadata['protected']) ? 1 : 0);
-
-            //take note of the order
-            $call = array(
-                'class_name' => $class_name,
-                'method_name' => $method->getName(),
-                'arguments' => $arguments,
-                'defaults' => $defaults,
-                'metadata' => $metadata,
-                'method_flag' => $method_flag
-            );
-            $method_url = strtolower($method->getName());
-            if (preg_match_all(
-                '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s',
-                    $doc, $matches, PREG_SET_ORDER)
-            ) {
-                foreach ($matches as $match) {
-                    $http_method = $match[1];
-                    $url = rtrim($base_path . $match[2], '/');
-                    $this->routes[$http_method][$url] = $call;
-                }
-            } elseif ($method_url[0] != '_') { 
-                //not prefixed with underscore
-                // no configuration found so use convention
-                if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i',
-                        $method_url, $matches)
-                ) {
-                    $http_method = strtoupper($matches[0][0]);
-                    $method_url = substr($method_url, strlen($http_method));
-                } else {
-                    $http_method = 'GET';
-                }
-                $url = $base_path
-                    . ($method_url == 'index' || $method_url == 'default' ? '' :
-                        $method_url);
-                $url = rtrim($url, '/');
-                $this->routes[$http_method][$url] = $call;
-                foreach ($params as $param) {
-                    if ($param->getName() == 'request_data') {
-                        break;
-                    }
-                    $url .= $url == '' ? ':' : '/:';
-                    $url .= $param->getName();
-                    $this->routes[$http_method][$url] = $call;
-                }
-            }
-        }
-    }
+	}
+
+
+	/**
+	 * Sets the HTTP response status
+	 * @param int $code response code
+	 */
+	public function setStatus($code)
+	{
+		header("{$_SERVER['SERVER_PROTOCOL']} $code " . 
+			$this->codes[strval($code)]);
+	}
+
+
+	/**
+	 * Compare two strings and remove the common
+	 * sub string from the first string and return it
+	 * @param string $first
+	 * @param string $second
+	 * @param string $char optional, set it as
+	 * blank string for char by char comparison
+	 * @return string
+	 */
+	public function removeCommonPath($first, $second, $char = '/')
+	{
+		$first = explode($char, $first);
+		$second = explode($char, $second);
+		while (count($second)) {
+			if ($first[0] == $second[0]) {
+				array_shift($first);
+			} else {
+				break;
+			}
+			array_shift($second);
+		}
+		return implode($char, $first);
+	}
+
+
+	/**
+	 * Save cache to file
+	 */
+	public function saveCache()
+	{
+		$file = $this->cache_dir . '/routes.php';
+		$s = '$o=array();' . PHP_EOL;
+		foreach ($this->routes as $key => $value) {
+			$s .= PHP_EOL . PHP_EOL . PHP_EOL . 
+				"############### $key ###############" . PHP_EOL . PHP_EOL;
+			$s .= '$o[\'' . $key . '\']=array();';
+			foreach ($value as $ke => $va) {
+				$s .= PHP_EOL . PHP_EOL . "#==== $key $ke" . PHP_EOL . PHP_EOL;
+				$s .= '$o[\'' . $key . '\'][\'' . $ke . '\']=' . str_replace(
+						PHP_EOL, PHP_EOL . "\t", var_export($va, true)
+					) . ';';
+			}
+		}
+		$s .= PHP_EOL . 'return $o;';
+		$r = @file_put_contents($file, "<?php $s");
+		@chmod($file, 0777);
+		if ($r === false) {
+			throw new Exception(
+				"The cache directory located at '$this->cache_dir' needs to "
+				. "have the permissions set to read/write/execute for everyone"
+				. " in order to save cache and improve performance.");
+		}
+	}
+
+	// ==================================================================
+	//
+	// Protected functions
+	//
+	// ------------------------------------------------------------------
+
+
+	/**
+	 * Parses the requst url and get the api path
+	 * @return string api path
+	 */
+	protected function getPath()
+	{
+		$path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'],
+				$_SERVER['SCRIPT_NAME']));
+		$path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path);
+		$path = str_replace($this->format_map['extensions'], '', $path);
+		return $path;
+	}
+
+
+	/**
+	 * Parses the request to figure out the http request type
+	 * @return string which will be one of the following
+	 * [GET, POST, PUT, DELETE]
+	 * @example GET
+	 */
+	protected function getRequestMethod()
+	{
+		$method = $_SERVER['REQUEST_METHOD'];
+		if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) {
+			$method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'];
+		}
+		//support for HEAD request
+		if ($method == 'HEAD') {
+			$method = 'GET';
+		}
+		return $method;
+	}
+
+
+	/**
+	 * Parses the request to figure out format of the request data
+	 * @return iFormat any class that implements iFormat
+	 * @example JsonFormat
+	 */
+	protected function getRequestFormat()
+	{
+		$format = null;
+		//check if client has sent any information on request format
+		if (isset($_SERVER['CONTENT_TYPE'])) {
+			$mime = explode(';', $_SERVER['CONTENT_TYPE']);
+			$mime = $mime[0];
+			if ($mime == UrlEncodedFormat::MIME) {
+				$format = new UrlEncodedFormat();
+			} else {
+				if (isset($this->format_map[$mime])) {
+					$format = $this->format_map[$mime];
+					$format = is_string($format) ? new $format : $format;
+					$format->setMIME($mime);
+				}
+			}
+		}
+		return $format;
+	}
+
+
+	/**
+	 * Parses the request to figure out the best format for response
+	 * @return iFormat any class that implements iFormat
+	 * @example JsonFormat
+	 */
+	protected function getResponseFormat()
+	{
+		//check if client has specified an extension
+		/**
+		 * @var iFormat
+		 */
+		$format = null;
+		$extensions = explode('.',
+			parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
+		while ($extensions) {
+			$extension = array_pop($extensions);
+			$extension = explode('/', $extension);
+			$extension = array_shift($extension);
+			if ($extension && isset($this->format_map[$extension])) {
+				$format = $this->format_map[$extension];
+				$format = is_string($format) ? new $format : $format;
+				$format->setExtension($extension);
+				//echo "Extension $extension";
+				return $format;
+			}
+		}
+		//check if client has sent list of accepted data formats
+		if (isset($_SERVER['HTTP_ACCEPT'])) {
+			$acceptList = array();
+			$accepts = explode(',', strtolower($_SERVER['HTTP_ACCEPT']));
+			if (!is_array($accepts)) {
+				$accepts = array($accepts);
+			}
+			foreach ($accepts as $pos => $accept) {
+				$parts = explode(';q=', trim($accept));
+				$type = array_shift($parts);
+				$quality = count($parts) ? 
+					floatval(array_shift($parts)) : 
+					(1000 - $pos) / 1000;
+				$acceptList[$type] = $quality;
+			}
+			arsort($acceptList);
+			foreach ($acceptList as $accept => $quality) {
+				if (isset($this->format_map[$accept])) {
+					$format = $this->format_map[$accept];
+					$format = is_string($format) ? new $format : $format;
+					$format->setMIME($accept);
+					//echo "MIME $accept";
+					// Tell cache content is based on Accept header
+					header("Vary: Accept"); 
+					return $format;
+				}
+			}
+		} else {
+			// RFC 2616: If no Accept header field is
+			// present, then it is assumed that the
+			// client accepts all media types.
+			$_SERVER['HTTP_ACCEPT'] = '*/*';
+		}
+		if (strpos($_SERVER['HTTP_ACCEPT'], '*') !== false) {
+			if (strpos($_SERVER['HTTP_ACCEPT'], 'application/*') !== false) {
+				$format = new JsonFormat;
+			} else if (strpos($_SERVER['HTTP_ACCEPT'], 'text/*') !== false) {
+				$format = new XmlFormat;
+			} else if (strpos($_SERVER['HTTP_ACCEPT'], '*/*') !== false) {
+				$format = new $this->format_map['default'];
+			}
+		}
+		if (empty($format)) {
+			// RFC 2616: If an Accept header field is present, and if the 
+			// server cannot send a response which is acceptable according to 
+			// the combined Accept field value, then the server SHOULD send 
+			// a 406 (not acceptable) response.
+			header('HTTP/1.1 406 Not Acceptable');
+			die('406 Not Acceptable: The server was unable to ' . 
+					'negotiate content for this request.');
+		} else {
+			// Tell cache content is based ot Accept header
+			header("Vary: Accept"); 
+			return $format;
+		}
+	}
+
+
+	/**
+	 * Parses the request data and returns it
+	 * @return array php data
+	 */
+	protected function getRequestData()
+	{
+		try {
+			$r = file_get_contents('php://input');
+			if (is_null($r)) {
+				return $_GET;
+			}
+			$r = $this->request_format->decode($r);
+			return is_null($r) ? array() : $r;
+		} catch (RestException $e) {
+			$this->handleError($e->getCode(), $e->getMessage());
+		}
+	}
+
+
+	protected function mapUrlToMethod()
+	{
+		if (!isset($this->routes[$this->request_method])) {
+			return array();
+		}
+		$urls = $this->routes[$this->request_method];
+		if (!$urls) {
+			return array();
+		}
+
+		$found = false;
+		$this->request_data += $_GET;
+		$params = array('request_data' => $this->request_data);
+		$params += $this->request_data;
+		$lc = strtolower($this->url);
+		foreach ($urls as $url => $call) {
+			//echo PHP_EOL.$url.' = '.$this->url.PHP_EOL;
+			$call = (object) $call;
+			if (strstr($url, ':')) {
+				$regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)',
+					preg_quote($url));
+				if (preg_match(":^$regex$:i", $this->url, $matches)) {
+					foreach ($matches as $arg => $match) {
+						if (isset($call->arguments[$arg])) {
+							//flog("$arg => $match $args[$arg]");
+							$params[$arg] = $match;
+						}
+					}
+					$found = true;
+					break;
+				}
+			} else if ($url == $lc) {
+				$found = true;
+				break;
+			}
+		}
+		if ($found) {
+			//echo PHP_EOL."Found $url ";
+			//print_r($call);
+			$p = $call->defaults;
+			foreach ($call->arguments as $key => $value) {
+				//echo "$key => $value \n";
+				if (isset($params[$key])) {
+					$p[$value] = $params[$key];
+				}
+			}
+			$call->arguments = $p;
+			return $call;
+		}
+	}
+
+
+	/**
+	 * Apply static and non-static properties defined in
+	 * the method information anotation
+	 * @param String $class_name
+	 * @param Object $instance instance of that class
+	 * @param Object $method_info method information and metadata
+	 */
+	protected function applyClassMetadata($class_name, $instance, $method_info)
+	{
+		if (isset($method_info->metadata[$class_name])
+			&& is_array($method_info->metadata[$class_name])
+		) {
+			foreach ($method_info->metadata[$class_name] as
+					$property => $value) {
+				if (property_exists($class_name, $property)) {
+					$reflection_property = 
+						new ReflectionProperty($class_name, $property);
+					$reflection_property->setValue($instance, $value);
+				}
+			}
+		}
+	}
+
+
+	protected function loadCache()
+	{
+		if ($this->cached !== null) {
+			return;
+		}
+		$file = $this->cache_dir . '/routes.php';
+		$this->cached = false;
+
+		if ($this->production_mode) {
+			if (file_exists($file)) {
+				$routes = include($file);
+			}
+			if (isset($routes) && is_array($routes)) {
+				$this->routes = $routes;
+				$this->cached = true;
+			}
+		} else {
+			//@unlink($this->cache_dir . "/$name.php");
+		}
+	}
+
+
+	/**
+	 * Generates cachable url to method mapping
+	 * @param string $class_name
+	 * @param string $base_path
+	 */
+	protected function generateMap($class_name, $base_path = '')
+	{
+		$reflection = new ReflectionClass($class_name);
+		$class_metadata = parse_doc($reflection->getDocComment());
+		$methods = $reflection->getMethods(
+			ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED
+		);
+		foreach ($methods as $method) {
+			$doc = $method->getDocComment();
+			$arguments = array();
+			$defaults = array();
+			$metadata = $class_metadata + parse_doc($doc);
+			$params = $method->getParameters();
+			$position = 0;
+			foreach ($params as $param) {
+				$arguments[$param->getName()] = $position;
+				$defaults[$position] = $param->isDefaultValueAvailable() ? 
+					$param->getDefaultValue() : null;
+				$position++;
+			}
+			$method_flag = $method->isProtected() ? 
+				(isRestlerCompatibilityModeEnabled() ? 2 : 3) : 
+				(isset($metadata['protected']) ? 1 : 0);
+
+			//take note of the order
+			$call = array(
+				'class_name' => $class_name,
+				'method_name' => $method->getName(),
+				'arguments' => $arguments,
+				'defaults' => $defaults,
+				'metadata' => $metadata,
+				'method_flag' => $method_flag
+			);
+			$method_url = strtolower($method->getName());
+			if (preg_match_all(
+				'/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s',
+					$doc, $matches, PREG_SET_ORDER)
+			) {
+				foreach ($matches as $match) {
+					$http_method = $match[1];
+					$url = rtrim($base_path . $match[2], '/');
+					$this->routes[$http_method][$url] = $call;
+				}
+			} elseif ($method_url[0] != '_') { 
+				//not prefixed with underscore
+				// no configuration found so use convention
+				if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i',
+						$method_url, $matches)
+				) {
+					$http_method = strtoupper($matches[0][0]);
+					$method_url = substr($method_url, strlen($http_method));
+				} else {
+					$http_method = 'GET';
+				}
+				$url = $base_path
+					. ($method_url == 'index' || $method_url == 'default' ? '' :
+						$method_url);
+				$url = rtrim($url, '/');
+				$this->routes[$http_method][$url] = $call;
+				foreach ($params as $param) {
+					if ($param->getName() == 'request_data') {
+						break;
+					}
+					$url .= $url == '' ? ':' : '/:';
+					$url .= $param->getName();
+					$this->routes[$http_method][$url] = $call;
+				}
+			}
+		}
+	}
 
 }
 
 if (version_compare(PHP_VERSION, '5.3.0') < 0) {
-    require_once 'compat.php';
+	require_once 'compat.php';
 }
 
 // ==================================================================
@@ -916,10 +916,10 @@ 
 {
 
 
-    public function __construct($http_status_code, $error_message = null)
-    {
-        parent::__construct($error_message, $http_status_code);
-    }
+	public function __construct($http_status_code, $error_message = null)
+	{
+		parent::__construct($error_message, $http_status_code);
+	}
 
 }
 
@@ -937,21 +937,21 @@ 
 {
 
 
-    /**
-     * Result of an api call is passed to this method
-     * to create a standard structure for the data
-     * @param unknown_type $result can be a primitive or array or object
-     */
-    public function __formatResponse($result);
+	/**
+	 * Result of an api call is passed to this method
+	 * to create a standard structure for the data
+	 * @param unknown_type $result can be a primitive or array or object
+	 */
+	public function __formatResponse($result);
 
 
-    /**
-     * When the api call results in RestException this method
-     * will be called to return the error message
-     * @param int $status_code
-     * @param String $message
-     */
-    public function __formatError($status_code, $message);
+	/**
+	 * When the api call results in RestException this method
+	 * will be called to return the error message
+	 * @param int $status_code
+	 * @param String $message
+	 */
+	public function __formatError($status_code, $message);
 }
 
 /**
@@ -968,21 +968,21 @@ 
 {
 
 
-    public function __formatResponse($result)
-    {
-        return $result;
-    }
+	public function __formatResponse($result)
+	{
+		return $result;
+	}
 
 
-    public function __formatError($statusCode, $message)
-    {
-        return array(
-            'error' => array(
-                'code' => $statusCode,
-                'message' => $message
-            )
-        );
-    }
+	public function __formatError($statusCode, $message)
+	{
+		return array(
+			'error' => array(
+				'code' => $statusCode,
+				'message' => $message
+			)
+		);
+	}
 
 }
 
@@ -1000,11 +1000,11 @@ 
 {
 
 
-    /**
-     * Auth function that is called when a protected method is requested
-     * @return boolean true or false
-     */
-    public function __isAuthenticated();
+	/**
+	 * Auth function that is called when a protected method is requested
+	 * @return boolean true or false
+	 */
+	public function __isAuthenticated();
 }
 
 /**
@@ -1022,60 +1022,60 @@ 
 {
 
 
-    /**
-     * Get Extension => MIME type mappings as an associative array
-     * @return array list of mime strings for the format
-     * @example array('json'=>'application/json');
-     */
-    public function getMIMEMap();
+	/**
+	 * Get Extension => MIME type mappings as an associative array
+	 * @return array list of mime strings for the format
+	 * @example array('json'=>'application/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);
 
 
-    /**
-     * 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 $human_readable 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, $human_readable = false);
+	/**
+	 * Encode the given data in the format
+	 * @param array $data resulting data that needs to
+	 * be encoded in the given format
+	 * @param boolean $human_readable 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, $human_readable = 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);
 }
 
 /**
@@ -1091,57 +1091,57 @@ 
 class UrlEncodedFormat implements iFormat
 {
 
-    const MIME = 'application/x-www-form-urlencoded';
-    const EXTENSION = 'post';
+	const MIME = 'application/x-www-form-urlencoded';
+	const EXTENSION = 'post';
 
 
-    public function getMIMEMap()
-    {
-        return array(self::EXTENSION => self::MIME);
-    }
+	public function getMIMEMap()
+	{
+		return array(self::EXTENSION => self::MIME);
+	}
 
 
-    public function getMIME()
-    {
-        return self::MIME;
-    }
+	public function getMIME()
+	{
+		return self::MIME;
+	}
 
 
-    public function getExtension()
-    {
-        return self::EXTENSION;
-    }
+	public function getExtension()
+	{
+		return self::EXTENSION;
+	}
 
 
-    public function setMIME($mime)
-    {
-        //do nothing
-    }
+	public function setMIME($mime)
+	{
+		//do nothing
+	}
 
 
-    public function setExtension($extension)
-    {
-        //do nothing
-    }
+	public function setExtension($extension)
+	{
+		//do nothing
+	}
 
 
-    public function encode($data, $human_readable = false)
-    {
-        return http_build_query($data);
-    }
+	public function encode($data, $human_readable = false)
+	{
+		return http_build_query($data);
+	}
 
 
-    public function decode($data)
-    {
-        parse_str($data, $r);
-        return $r;
-    }
+	public function decode($data)
+	{
+		parse_str($data, $r);
+		return $r;
+	}
 
 
-    public function __toString()
-    {
-        return $this->getExtension();
-    }
+	public function __toString()
+	{
+		return $this->getExtension();
+	}
 
 }
 
@@ -1158,158 +1158,158 @@ 
 class JsonFormat implements iFormat
 {
 
-    const MIME = 'application/json,application/javascript';
-
-    static $mime = 'application/json';
-
-    const EXTENSION = 'json';
-
-
-    public function getMIMEMap()
-    {
-        return array(self::EXTENSION => self::MIME);
-    }
-
-
-    public function getMIME()
-    {
-        return self::$mime;
-    }
-
-
-    public function getExtension()
-    {
-        return self::EXTENSION;
-    }
-
-
-    public function setMIME($mime)
-    {
-        self::$mime = $mime;
-    }
-
-
-    public function setExtension($extension)
-    {
-        //do nothing
-    }
-
-
-    public function encode($data, $human_readable = false)
-    {
-        return $human_readable ? 
-            $this->json_format(json_encode(object_to_array($data))) : 
-            json_encode(object_to_array($data));
-    }
-
-
-    public function decode($data)
-    {
-        $decoded = json_decode($data);
-        if (function_exists('json_last_error')) {
-            $message = '';
-            switch (json_last_error()) {
-                case JSON_ERROR_NONE:
-                    return object_to_array($decoded);
-                    break;
-                case JSON_ERROR_DEPTH:
-                    $message = 'maximum stack depth exceeded';
-                    break;
-                case JSON_ERROR_STATE_MISMATCH:
-                    $message = 'underflow or the modes mismatch';
-                    break;
-                case JSON_ERROR_CTRL_CHAR:
-                    $message = 'unexpected control character found';
-                    break;
-                case JSON_ERROR_SYNTAX:
-                    $message = 'malformed JSON';
-                    break;
-                case JSON_ERROR_UTF8:
-                    $message = 'malformed UTF-8 characters, '.
-                        'possibly incorrectly encoded';
-                    break;
-                default:
-                    $message = 'unknown error';
-                    break;
-            }
-            throw new RestException(400, 'Error parsing JSON, ' . $message);
-        } else if (strlen($data) && $decoded === null || $decoded === $data) {
-            throw new RestException(400, 'Error parsing JSON');
-        }
-        return object_to_array($decoded);
-    }
-
-
-    /**
-     * Pretty print JSON string
-     * @param string $json
-     * @return string formated json
-     */
-    private function json_format($json)
-    {
-        $tab = "  ";
-        $new_json = "";
-        $indent_level = 0;
-        $in_string = false;
-        $len = strlen($json);
-
-        for ($c = 0; $c < $len; $c++) {
-            $char = $json[$c];
-            switch ($char) {
-                case '{':
-                case '[':
-                    if (!$in_string) {
-                        $new_json .= $char . "\n" .
-                            str_repeat($tab, $indent_level + 1);
-                        $indent_level++;
-                    } else {
-                        $new_json .= $char;
-                    }
-                    break;
-                case '}':
-                case ']':
-                    if (!$in_string) {
-                        $indent_level--;
-                        $new_json .= "\n" . str_repeat($tab, $indent_level) 
-                            . $char;
-                    } else {
-                        $new_json .= $char;
-                    }
-                    break;
-                case ',':
-                    if (!$in_string) {
-                        $new_json .= ",\n" . str_repeat($tab, $indent_level);
-                    } else {
-                        $new_json .= $char;
-                    }
-                    break;
-                case ':':
-                    if (!$in_string) {
-                        $new_json .= ": ";
-                    } else {
-                        $new_json .= $char;
-                    }
-                    break;
-                case '"':
-                    if ($c == 0) {
-                        $in_string = true;
-                    } else if ($c > 0 && $json[$c - 1] != '\\') {
-                        $in_string = !$in_string;
-                    }
-                default:
-                    $new_json .= $char;
-                    break;
-            }
-        }
-
-        return $new_json;
-    }
-
-
-    public function __toString()
-    {
-        return $this->getExtension();
-    }
+	const MIME = 'application/json,application/javascript';
+
+	static $mime = 'application/json';
+
+	const EXTENSION = 'json';
+
+
+	public function getMIMEMap()
+	{
+		return array(self::EXTENSION => self::MIME);
+	}
+
+
+	public function getMIME()
+	{
+		return self::$mime;
+	}
+
+
+	public function getExtension()
+	{
+		return self::EXTENSION;
+	}
+
+
+	public function setMIME($mime)
+	{
+		self::$mime = $mime;
+	}
+
+
+	public function setExtension($extension)
+	{
+		//do nothing
+	}
+
+
+	public function encode($data, $human_readable = false)
+	{
+		return $human_readable ? 
+			$this->json_format(json_encode(object_to_array($data))) : 
+			json_encode(object_to_array($data));
+	}
+
+
+	public function decode($data)
+	{
+		$decoded = json_decode($data);
+		if (function_exists('json_last_error')) {
+			$message = '';
+			switch (json_last_error()) {
+				case JSON_ERROR_NONE:
+					return object_to_array($decoded);
+					break;
+				case JSON_ERROR_DEPTH:
+					$message = 'maximum stack depth exceeded';
+					break;
+				case JSON_ERROR_STATE_MISMATCH:
+					$message = 'underflow or the modes mismatch';
+					break;
+				case JSON_ERROR_CTRL_CHAR:
+					$message = 'unexpected control character found';
+					break;
+				case JSON_ERROR_SYNTAX:
+					$message = 'malformed JSON';
+					break;
+				case JSON_ERROR_UTF8:
+					$message = 'malformed UTF-8 characters, '.
+						'possibly incorrectly encoded';
+					break;
+				default:
+					$message = 'unknown error';
+					break;
+			}
+			throw new RestException(400, 'Error parsing JSON, ' . $message);
+		} else if (strlen($data) && $decoded === null || $decoded === $data) {
+			throw new RestException(400, 'Error parsing JSON');
+		}
+		return object_to_array($decoded);
+	}
+
+
+	/**
+	 * Pretty print JSON string
+	 * @param string $json
+	 * @return string formated json
+	 */
+	private function json_format($json)
+	{
+		$tab = "  ";
+		$new_json = "";
+		$indent_level = 0;
+		$in_string = false;
+		$len = strlen($json);
+
+		for ($c = 0; $c < $len; $c++) {
+			$char = $json[$c];
+			switch ($char) {
+				case '{':
+				case '[':
+					if (!$in_string) {
+						$new_json .= $char . "\n" .
+							str_repeat($tab, $indent_level + 1);
+						$indent_level++;
+					} else {
+						$new_json .= $char;
+					}
+					break;
+				case '}':
+				case ']':
+					if (!$in_string) {
+						$indent_level--;
+						$new_json .= "\n" . str_repeat($tab, $indent_level) 
+							. $char;
+					} else {
+						$new_json .= $char;
+					}
+					break;
+				case ',':
+					if (!$in_string) {
+						$new_json .= ",\n" . str_repeat($tab, $indent_level);
+					} else {
+						$new_json .= $char;
+					}
+					break;
+				case ':':
+					if (!$in_string) {
+						$new_json .= ": ";
+					} else {
+						$new_json .= $char;
+					}
+					break;
+				case '"':
+					if ($c == 0) {
+						$in_string = true;
+					} else if ($c > 0 && $json[$c - 1] != '\\') {
+						$in_string = !$in_string;
+					}
+				default:
+					$new_json .= $char;
+					break;
+			}
+		}
+
+		return $new_json;
+	}
+
+
+	public function __toString()
+	{
+		return $this->getExtension();
+	}
 
 }
 
@@ -1327,123 +1327,123 @@ 
 class DocParser
 {
 
-    private $params = array();
-
-
-    public function parse($doc = '')
-    {
-        if ($doc == '') {
-            return $this->params;
-        }
-        //Get the comment
-        if (preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) {
-            return $this->params;
-        }
-        $comment = trim($comment[1]);
-        //Get all the lines and strip the * from the first character
-        if (preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) {
-            return $this->params;
-        }
-        $this->parseLines($lines[1]);
-        return $this->params;
-    }
-
-
-    private function parseLines($lines)
-    {
-        foreach ($lines as $line) {
-            $parsedLine = $this->parseLine($line); //Parse the line
-
-            if ($parsedLine === false && !isset($this->params['description'])) {
-                if (isset($desc)) {
-                    //Store the first line in the short description
-                    $this->params['description'] = implode(PHP_EOL, $desc);
-                }
-                $desc = array();
-            } else if ($parsedLine !== false) {
-                $desc[] = $parsedLine; //Store the line in the long description
-            }
-        }
-        $desc = implode(' ', $desc);
-        if (!empty($desc)) {
-            $this->params['long_description'] = $desc;
-        }
-    }
-
-
-    private function parseLine($line)
-    {
-        //trim the whitespace from the line
-        $line = trim($line);
-
-        if (empty($line)) {
-            return false; //Empty line
-        }
-
-        if (strpos($line, '@') === 0) {
-            if (strpos($line, ' ') > 0) {
-                //Get the parameter name
-                $param = substr($line, 1, strpos($line, ' ') - 1);
-                $value = substr($line, strlen($param) + 2); //Get the value
-            } else {
-                $param = substr($line, 1);
-                $value = '';
-            }
-            //Parse the line and return false if the parameter is valid
-            if ($this->setParam($param, $value)) {
-                return false;
-            }
-        }
-        return $line;
-    }
-
-
-    private function setParam($param, $value)
-    {
-        if ($param == 'param' || $param == 'return') {
-            $value = $this->formatParamOrReturn($value);
-        }
-        if ($param == 'class') {
-            list($param, $value) = $this->formatClass($value);
-        }
-
-        if (empty($this->params[$param])) {
-            $this->params[$param] = $value;
-        } else if ($param == 'param') {
-            $arr = array($this->params[$param], $value);
-            $this->params[$param] = $arr;
-        } else {
-            $this->params[$param] = $value + $this->params[$param];
-        }
-        return true;
-    }
-
-
-    private function formatClass($value)
-    {
-        $r = preg_split("[\(|\)]", $value);
-        if (count($r) > 1) {
-            $param = $r[0];
-            parse_str($r[1], $value);
-            foreach ($value as $key => $val) {
-                $val = explode(',', $val);
-                if (count($val) > 1) {
-                    $value[$key] = $val;
-                }
-            }
-        } else {
-            $param = 'Unknown';
-        }
-        return array($param, $value);
-    }
-
-
-    private function formatParamOrReturn($string)
-    {
-        $pos = strpos($string, ' ');
-        $type = substr($string, 0, $pos);
-        return '(' . $type . ')' . substr($string, $pos + 1);
-    }
+	private $params = array();
+
+
+	public function parse($doc = '')
+	{
+		if ($doc == '') {
+			return $this->params;
+		}
+		//Get the comment
+		if (preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) {
+			return $this->params;
+		}
+		$comment = trim($comment[1]);
+		//Get all the lines and strip the * from the first character
+		if (preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) {
+			return $this->params;
+		}
+		$this->parseLines($lines[1]);
+		return $this->params;
+	}
+
+
+	private function parseLines($lines)
+	{
+		foreach ($lines as $line) {
+			$parsedLine = $this->parseLine($line); //Parse the line
+
+			if ($parsedLine === false && !isset($this->params['description'])) {
+				if (isset($desc)) {
+					//Store the first line in the short description
+					$this->params['description'] = implode(PHP_EOL, $desc);
+				}
+				$desc = array();
+			} else if ($parsedLine !== false) {
+				$desc[] = $parsedLine; //Store the line in the long description
+			}
+		}
+		$desc = implode(' ', $desc);
+		if (!empty($desc)) {
+			$this->params['long_description'] = $desc;
+		}
+	}
+
+
+	private function parseLine($line)
+	{
+		//trim the whitespace from the line
+		$line = trim($line);
+
+		if (empty($line)) {
+			return false; //Empty line
+		}
+
+		if (strpos($line, '@') === 0) {
+			if (strpos($line, ' ') > 0) {
+				//Get the parameter name
+				$param = substr($line, 1, strpos($line, ' ') - 1);
+				$value = substr($line, strlen($param) + 2); //Get the value
+			} else {
+				$param = substr($line, 1);
+				$value = '';
+			}
+			//Parse the line and return false if the parameter is valid
+			if ($this->setParam($param, $value)) {
+				return false;
+			}
+		}
+		return $line;
+	}
+
+
+	private function setParam($param, $value)
+	{
+		if ($param == 'param' || $param == 'return') {
+			$value = $this->formatParamOrReturn($value);
+		}
+		if ($param == 'class') {
+			list($param, $value) = $this->formatClass($value);
+		}
+
+		if (empty($this->params[$param])) {
+			$this->params[$param] = $value;
+		} else if ($param == 'param') {
+			$arr = array($this->params[$param], $value);
+			$this->params[$param] = $arr;
+		} else {
+			$this->params[$param] = $value + $this->params[$param];
+		}
+		return true;
+	}
+
+
+	private function formatClass($value)
+	{
+		$r = preg_split("[\(|\)]", $value);
+		if (count($r) > 1) {
+			$param = $r[0];
+			parse_str($r[1], $value);
+			foreach ($value as $key => $val) {
+				$val = explode(',', $val);
+				if (count($val) > 1) {
+					$value[$key] = $val;
+				}
+			}
+		} else {
+			$param = 'Unknown';
+		}
+		return array($param, $value);
+	}
+
+
+	private function formatParamOrReturn($string)
+	{
+		$pos = strpos($string, ' ');
+		$type = substr($string, 0, $pos);
+		return '(' . $type . ')' . substr($string, $pos + 1);
+	}
 
 }
 
@@ -1456,30 +1456,30 @@ 
 
 function parse_doc($php_doc_comment)
 {
-    $p = new DocParser();
-    return $p->parse($php_doc_comment);
+	$p = new DocParser();
+	return $p->parse($php_doc_comment);
 
-    $p = new Parser($php_doc_comment);
-    return $p;
+	$p = new Parser($php_doc_comment);
+	return $p;
 
-    $php_doc_comment = preg_replace(
-        "/(^[\\s]*\\/\\*\\*)
+	$php_doc_comment = preg_replace(
+		"/(^[\\s]*\\/\\*\\*)
         |(^[\\s]\\*\\/)
         |(^[\\s]*\\*?\\s)
         |(^[\\s]*)
         |(^[\\t]*)/ixm",
-        "", $php_doc_comment);
-    $php_doc_comment = str_replace("\r", "", $php_doc_comment);
-    $php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment);
-    return explode("\n", $php_doc_comment);
-
-    $php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', 
-            $php_doc_comment));
-    return $php_doc_comment;
-
-    preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', $php_doc_comment,
-        $matches);
-    return array_combine($matches[1], $matches[2]);
+		"", $php_doc_comment);
+	$php_doc_comment = str_replace("\r", "", $php_doc_comment);
+	$php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment);
+	return explode("\n", $php_doc_comment);
+
+	$php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', 
+			$php_doc_comment));
+	return $php_doc_comment;
+
+	preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', $php_doc_comment,
+		$matches);
+	return array_combine($matches[1], $matches[2]);
 }
 
 
@@ -1498,21 +1498,21 @@ 
  */
 function object_to_array($object, $utf_encode = false)
 {
-    if (is_array($object)
-        || (is_object($object)
-        && !($object instanceof JsonSerializable))
-    ) {
-        $array = array();
-        foreach ($object as $key => $value) {
-            $value = object_to_array($value, $utf_encode);
-            if ($utf_encode && is_string($value)) {
-                $value = utf8_encode($value);
-            }
-            $array[$key] = $value;
-        }
-        return $array;
-    }
-    return $object;
+	if (is_array($object)
+		|| (is_object($object)
+		&& !($object instanceof JsonSerializable))
+	) {
+		$array = array();
+		foreach ($object as $key => $value) {
+			$value = object_to_array($value, $utf_encode);
+			if ($utf_encode && is_string($value)) {
+				$value = utf8_encode($value);
+			}
+			$array[$key] = $value;
+		}
+		return $array;
+	}
+	return $object;
 }
 
 
@@ -1522,21 +1522,21 @@ 
  */
 function autoload_formats($class_name)
 {
-    $class_name = strtolower($class_name);
+	$class_name = strtolower($class_name);
 	
-    $file = RESTLER_PATH . "../../../api/mobile_services/$class_name.php";
-    if (file_exists($file)) {
-        require_once ($file);
-    } else {
+	$file = RESTLER_PATH . "../../../api/mobile_services/$class_name.php";
+	if (file_exists($file)) {
+		require_once ($file);
+	} else {
 		$file = RESTLER_PATH . "/../../api/mobile_services/$class_name.php";
-        if (file_exists($file)) {
-            require_once ($file);
-        } elseif (file_exists(RESTLER_PATH . "/../api/mobile_services/$class_name.php")) {
-            require_once ("/../api/mobile_services/$class_name.php");
-        } elseif (file_exists("$class_name.php")) {
-            require_once ("$class_name.php");
-        }
-    }
+		if (file_exists($file)) {
+			require_once ($file);
+		} elseif (file_exists(RESTLER_PATH . "/../api/mobile_services/$class_name.php")) {
+			require_once ("/../api/mobile_services/$class_name.php");
+		} elseif (file_exists("$class_name.php")) {
+			require_once ("$class_name.php");
+		}
+	}
 }
 
 // ==================================================================
@@ -1553,10 +1553,10 @@ 
 if (!function_exists('isRestlerCompatibilityModeEnabled')) {
 
 
-    function isRestlerCompatibilityModeEnabled()
-    {
-        return false;
-    }
+	function isRestlerCompatibilityModeEnabled()
+	{
+		return false;
+	}
 
 }
 define('RESTLER_PATH', dirname(__FILE__));

libraries/SabreDAV/Uri/functions.php

Indentation +186 added lines, -186 removed lines

@@ -22,80 +22,80 @@ 
  */
 function resolve($basePath, $newPath) {
 
-    $base = parse($basePath);
-    $delta = parse($newPath);
-
-    $pick = function($part) use ($base, $delta) {
-
-        if ($delta[$part]) {
-            return $delta[$part];
-        } elseif ($base[$part]) {
-            return $base[$part];
-        }
-        return null;
-
-    };
-
-    // If the new path defines a scheme, it's absolute and we can just return
-    // that.
-    if ($delta['scheme']) {
-        return build($delta);
-    }
-
-    $newParts = [];
-
-    $newParts['scheme'] = $pick('scheme');
-    $newParts['host']   = $pick('host');
-    $newParts['port']   = $pick('port');
-
-    $path = '';
-    if ($delta['path']) {
-        // If the path starts with a slash
-        if ($delta['path'][0] === '/') {
-            $path = $delta['path'];
-        } else {
-            // Removing last component from base path.
-            $path = $base['path'];
-            if (strpos($path, '/') !== false) {
-                $path = substr($path, 0, strrpos($path, '/'));
-            }
-            $path .= '/' . $delta['path'];
-        }
-    } else {
-        $path = $base['path'] ?: '/';
-    }
-    // Removing .. and .
-    $pathParts = explode('/', $path);
-    $newPathParts = [];
-    foreach ($pathParts as $pathPart) {
-
-        switch ($pathPart) {
-            //case '' :
-            case '.' :
-                break;
-            case '..' :
-                array_pop($newPathParts);
-                break;
-            default :
-                $newPathParts[] = $pathPart;
-                break;
-        }
-    }
-
-    $path = implode('/', $newPathParts);
-
-    // If the source url ended with a /, we want to preserve that.
-    $newParts['path'] = $path;
-    if ($delta['query']) {
-        $newParts['query'] = $delta['query'];
-    } elseif (!empty($base['query']) && empty($delta['host']) && empty($delta['path'])) {
-        // Keep the old query if host and path didn't change
-        $newParts['query'] = $base['query'];
-    }
-    if ($delta['fragment']) {
-        $newParts['fragment'] = $delta['fragment'];
-    }
-    return build($newParts);
+	$base = parse($basePath);
+	$delta = parse($newPath);
+
+	$pick = function($part) use ($base, $delta) {
+
+		if ($delta[$part]) {
+			return $delta[$part];
+		} elseif ($base[$part]) {
+			return $base[$part];
+		}
+		return null;
+
+	};
+
+	// If the new path defines a scheme, it's absolute and we can just return
+	// that.
+	if ($delta['scheme']) {
+		return build($delta);
+	}
+
+	$newParts = [];
+
+	$newParts['scheme'] = $pick('scheme');
+	$newParts['host']   = $pick('host');
+	$newParts['port']   = $pick('port');
+
+	$path = '';
+	if ($delta['path']) {
+		// If the path starts with a slash
+		if ($delta['path'][0] === '/') {
+			$path = $delta['path'];
+		} else {
+			// Removing last component from base path.
+			$path = $base['path'];
+			if (strpos($path, '/') !== false) {
+				$path = substr($path, 0, strrpos($path, '/'));
+			}
+			$path .= '/' . $delta['path'];
+		}
+	} else {
+		$path = $base['path'] ?: '/';
+	}
+	// Removing .. and .
+	$pathParts = explode('/', $path);
+	$newPathParts = [];
+	foreach ($pathParts as $pathPart) {
+
+		switch ($pathPart) {
+			//case '' :
+			case '.' :
+				break;
+			case '..' :
+				array_pop($newPathParts);
+				break;
+			default :
+				$newPathParts[] = $pathPart;
+				break;
+		}
+	}
+
+	$path = implode('/', $newPathParts);
+
+	// If the source url ended with a /, we want to preserve that.
+	$newParts['path'] = $path;
+	if ($delta['query']) {
+		$newParts['query'] = $delta['query'];
+	} elseif (!empty($base['query']) && empty($delta['host']) && empty($delta['path'])) {
+		// Keep the old query if host and path didn't change
+		$newParts['query'] = $base['query'];
+	}
+	if ($delta['fragment']) {
+		$newParts['fragment'] = $delta['fragment'];
+	}
+	return build($newParts);
 
 }
 
@@ -113,55 +113,55 @@ 
  */
 function normalize($uri) {
 
-    $parts = parse($uri);
-
-    if (!empty($parts['path'])) {
-        $pathParts = explode('/', ltrim($parts['path'], '/'));
-        $newPathParts = [];
-        foreach ($pathParts as $pathPart) {
-            switch ($pathPart) {
-                case '.':
-                    // skip
-                    break;
-                case '..' :
-                    // One level up in the hierarchy
-                    array_pop($newPathParts);
-                    break;
-                default :
-                    // Ensuring that everything is correctly percent-encoded.
-                    $newPathParts[] = rawurlencode(rawurldecode($pathPart));
-                    break;
-            }
-        }
-        $parts['path'] = '/' . implode('/', $newPathParts);
-    }
-
-    if ($parts['scheme']) {
-        $parts['scheme'] = strtolower($parts['scheme']);
-        $defaultPorts = [
-            'http'  => '80',
-            'https' => '443',
-        ];
-
-        if (!empty($parts['port']) && isset($defaultPorts[$parts['scheme']]) && $defaultPorts[$parts['scheme']] == $parts['port']) {
-            // Removing default ports.
-            unset($parts['port']);
-        }
-        // A few HTTP specific rules.
-        switch ($parts['scheme']) {
-            case 'http' :
-            case 'https' :
-                if (empty($parts['path'])) {
-                    // An empty path is equivalent to / in http.
-                    $parts['path'] = '/';
-                }
-                break;
-        }
-    }
-
-    if ($parts['host']) $parts['host'] = strtolower($parts['host']);
-
-    return build($parts);
+	$parts = parse($uri);
+
+	if (!empty($parts['path'])) {
+		$pathParts = explode('/', ltrim($parts['path'], '/'));
+		$newPathParts = [];
+		foreach ($pathParts as $pathPart) {
+			switch ($pathPart) {
+				case '.':
+					// skip
+					break;
+				case '..' :
+					// One level up in the hierarchy
+					array_pop($newPathParts);
+					break;
+				default :
+					// Ensuring that everything is correctly percent-encoded.
+					$newPathParts[] = rawurlencode(rawurldecode($pathPart));
+					break;
+			}
+		}
+		$parts['path'] = '/' . implode('/', $newPathParts);
+	}
+
+	if ($parts['scheme']) {
+		$parts['scheme'] = strtolower($parts['scheme']);
+		$defaultPorts = [
+			'http'  => '80',
+			'https' => '443',
+		];
+
+		if (!empty($parts['port']) && isset($defaultPorts[$parts['scheme']]) && $defaultPorts[$parts['scheme']] == $parts['port']) {
+			// Removing default ports.
+			unset($parts['port']);
+		}
+		// A few HTTP specific rules.
+		switch ($parts['scheme']) {
+			case 'http' :
+			case 'https' :
+				if (empty($parts['path'])) {
+					// An empty path is equivalent to / in http.
+					$parts['path'] = '/';
+				}
+				break;
+		}
+	}
+
+	if ($parts['host']) $parts['host'] = strtolower($parts['host']);
+
+	return build($parts);
 
 }
 
@@ -180,29 +180,29 @@ 
  */
 function parse($uri) {
 
-    // Normally a URI must be ASCII, however. However, often it's not and
-    // parse_url might corrupt these strings.
-    //
-    // For that reason we take any non-ascii characters from the uri and
-    // uriencode them first.
-    $uri = preg_replace_callback(
-        '/[^[:ascii:]]/u',
-        function($matches) {
-            return rawurlencode($matches[0]);
-        },
-        $uri
-    );
-
-    return
-        parse_url($uri) + [
-            'scheme'   => null,
-            'host'     => null,
-            'path'     => null,
-            'port'     => null,
-            'user'     => null,
-            'query'    => null,
-            'fragment' => null,
-        ];
+	// Normally a URI must be ASCII, however. However, often it's not and
+	// parse_url might corrupt these strings.
+	//
+	// For that reason we take any non-ascii characters from the uri and
+	// uriencode them first.
+	$uri = preg_replace_callback(
+		'/[^[:ascii:]]/u',
+		function($matches) {
+			return rawurlencode($matches[0]);
+		},
+		$uri
+	);
+
+	return
+		parse_url($uri) + [
+			'scheme'   => null,
+			'host'     => null,
+			'path'     => null,
+			'port'     => null,
+			'user'     => null,
+			'query'    => null,
+			'fragment' => null,
+		];
 
 }
 
@@ -215,41 +215,41 @@ 
  */
 function build(array $parts) {
 
-    $uri = '';
-
-    $authority = '';
-    if (!empty($parts['host'])) {
-        $authority = $parts['host'];
-        if (!empty($parts['user'])) {
-            $authority = $parts['user'] . '@' . $authority;
-        }
-        if (!empty($parts['port'])) {
-            $authority = $authority . ':' . $parts['port'];
-        }
-    }
-
-    if (!empty($parts['scheme'])) {
-        // If there's a scheme, there's also a host.
-        $uri = $parts['scheme'] . ':';
-
-    }
-    if ($authority) {
-        // No scheme, but there is a host.
-        $uri .= '//' . $authority;
-
-    }
-
-    if (!empty($parts['path'])) {
-        $uri .= $parts['path'];
-    }
-    if (!empty($parts['query'])) {
-        $uri .= '?' . $parts['query'];
-    }
-    if (!empty($parts['fragment'])) {
-        $uri .= '#' . $parts['fragment'];
-    }
-
-    return $uri;
+	$uri = '';
+
+	$authority = '';
+	if (!empty($parts['host'])) {
+		$authority = $parts['host'];
+		if (!empty($parts['user'])) {
+			$authority = $parts['user'] . '@' . $authority;
+		}
+		if (!empty($parts['port'])) {
+			$authority = $authority . ':' . $parts['port'];
+		}
+	}
+
+	if (!empty($parts['scheme'])) {
+		// If there's a scheme, there's also a host.
+		$uri = $parts['scheme'] . ':';
+
+	}
+	if ($authority) {
+		// No scheme, but there is a host.
+		$uri .= '//' . $authority;
+
+	}
+
+	if (!empty($parts['path'])) {
+		$uri .= $parts['path'];
+	}
+	if (!empty($parts['query'])) {
+		$uri .= '?' . $parts['query'];
+	}
+	if (!empty($parts['fragment'])) {
+		$uri .= '#' . $parts['fragment'];
+	}
+
+	return $uri;
 
 }
 
@@ -273,10 +273,10 @@ 
  */
 function split($path) {
 
-    $matches = [];
-    if (preg_match('/^(?:(?:(.*)(?:\/+))?([^\/]+))(?:\/?)$/u', $path, $matches)) {
-        return [$matches[1], $matches[2]];
-    }
-    return [null,null];
+	$matches = [];
+	if (preg_match('/^(?:(?:(.*)(?:\/+))?([^\/]+))(?:\/?)$/u', $path, $matches)) {
+		return [$matches[1], $matches[2]];
+	}
+	return [null,null];
 
 }

libraries/SabreDAV/CalDAV/ICSExportPlugin.php

Unused Use Statements +3 added lines, -3 removed lines

@@ -2,13 +2,13 @@
 
 namespace Sabre\CalDAV;
 
+use DateTime;
 use DateTimeZone;
 use Sabre\DAV;
-use Sabre\VObject;
+use Sabre\DAV\Exception\BadRequest;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
-use Sabre\DAV\Exception\BadRequest;
-use DateTime;
+use Sabre\VObject;
 
 /**
  * ICS Exporter

Doc Comments +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
      *
      * @param RequestInterface $request
      * @param ResponseInterface $response
-     * @return bool
+     * @return null|false
      */
     function httpGet(RequestInterface $request, ResponseInterface $response) {
 

Indentation +316 added lines, -316 removed lines

@@ -46,321 +46,321 @@
  */
 class ICSExportPlugin extends DAV\ServerPlugin {
 
-    /**
-     * Reference to Server class
-     *
-     * @var \Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * Initializes the plugin and registers event handlers
-     *
-     * @param \Sabre\DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        $this->server = $server;
-        $server->on('method:GET', [$this, 'httpGet'], 90);
-        $server->on('browserButtonActions', function($path, $node, &$actions) {
-            if ($node instanceof ICalendar) {
-                $actions .= '<a href="' . htmlspecialchars($path, ENT_QUOTES, 'UTF-8') . '?export"><span class="oi" data-glyph="calendar"></span></a>';
-            }
-        });
-
-    }
-
-    /**
-     * Intercepts GET requests on calendar urls ending with ?export.
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function httpGet(RequestInterface $request, ResponseInterface $response) {
-
-        $queryParams = $request->getQueryParameters();
-        if (!array_key_exists('export', $queryParams)) return;
-
-        $path = $request->getPath();
-
-        $node = $this->server->getProperties($path, [
-            '{DAV:}resourcetype',
-            '{DAV:}displayname',
-            '{http://sabredav.org/ns}sync-token',
-            '{DAV:}sync-token',
-            '{http://apple.com/ns/ical/}calendar-color',
-        ]);
-
-        if (!isset($node['{DAV:}resourcetype']) || !$node['{DAV:}resourcetype']->is('{' . Plugin::NS_CALDAV . '}calendar')) {
-            return;
-        }
-        // Marking the transactionType, for logging purposes.
-        $this->server->transactionType = 'get-calendar-export';
-
-        $properties = $node;
-
-        $start = null;
-        $end = null;
-        $expand = false;
-        $componentType = false;
-        if (isset($queryParams['start'])) {
-            if (!ctype_digit($queryParams['start'])) {
-                throw new BadRequest('The start= parameter must contain a unix timestamp');
-            }
-            $start = DateTime::createFromFormat('U', $queryParams['start']);
-        }
-        if (isset($queryParams['end'])) {
-            if (!ctype_digit($queryParams['end'])) {
-                throw new BadRequest('The end= parameter must contain a unix timestamp');
-            }
-            $end = DateTime::createFromFormat('U', $queryParams['end']);
-        }
-        if (isset($queryParams['expand']) && !!$queryParams['expand']) {
-            if (!$start || !$end) {
-                throw new BadRequest('If you\'d like to expand recurrences, you must specify both a start= and end= parameter.');
-            }
-            $expand = true;
-            $componentType = 'VEVENT';
-        }
-        if (isset($queryParams['componentType'])) {
-            if (!in_array($queryParams['componentType'], ['VEVENT', 'VTODO', 'VJOURNAL'])) {
-                throw new BadRequest('You are not allowed to search for components of type: ' . $queryParams['componentType'] . ' here');
-            }
-            $componentType = $queryParams['componentType'];
-        }
-
-        $format = \Sabre\HTTP\Util::Negotiate(
-            $request->getHeader('Accept'),
-            [
-                'text/calendar',
-                'application/calendar+json',
-            ]
-        );
-
-        if (isset($queryParams['accept'])) {
-            if ($queryParams['accept'] === 'application/calendar+json' || $queryParams['accept'] === 'jcal') {
-                $format = 'application/calendar+json';
-            }
-        }
-        if (!$format) {
-            $format = 'text/calendar';
-        }
-
-        $this->generateResponse($path, $start, $end, $expand, $componentType, $format, $properties, $response);
-
-        // Returning false to break the event chain
-        return false;
-
-    }
-
-    /**
-     * This method is responsible for generating the actual, full response.
-     *
-     * @param string $path
-     * @param DateTime|null $start
-     * @param DateTime|null $end
-     * @param bool $expand
-     * @param string $componentType
-     * @param string $format
-     * @param array $properties
-     * @param ResponseInterface $response
-     */
-    protected function generateResponse($path, $start, $end, $expand, $componentType, $format, $properties, ResponseInterface $response) {
-
-        $calDataProp = '{' . Plugin::NS_CALDAV . '}calendar-data';
-
-        $blobs = [];
-        if ($start || $end || $componentType) {
-
-            // If there was a start or end filter, we need to enlist
-            // calendarQuery for speed.
-            $calendarNode = $this->server->tree->getNodeForPath($path);
-            $queryResult = $calendarNode->calendarQuery([
-                'name'         => 'VCALENDAR',
-                'comp-filters' => [
-                    [
-                        'name'           => $componentType,
-                        'comp-filters'   => [],
-                        'prop-filters'   => [],
-                        'is-not-defined' => false,
-                        'time-range'     => [
-                            'start' => $start,
-                            'end'   => $end,
-                        ],
-                    ],
-                ],
-                'prop-filters'   => [],
-                'is-not-defined' => false,
-                'time-range'     => null,
-            ]);
-
-            // queryResult is just a list of base urls. We need to prefix the
-            // calendar path.
-            $queryResult = array_map(
-                function($item) use ($path) {
-                    return $path . '/' . $item;
-                },
-                $queryResult
-            );
-            $nodes = $this->server->getPropertiesForMultiplePaths($queryResult, [$calDataProp]);
-            unset($queryResult);
-
-        } else {
-            $nodes = $this->server->getPropertiesForPath($path, [$calDataProp], 1);
-        }
-
-        // Flattening the arrays
-        foreach ($nodes as $node) {
-            if (isset($node[200][$calDataProp])) {
-                $blobs[$node['href']] = $node[200][$calDataProp];
-            }
-        }
-        unset($nodes);
-
-        $mergedCalendar = $this->mergeObjects(
-            $properties,
-            $blobs
-        );
-
-        if ($expand) {
-            $calendarTimeZone = null;
-            // We're expanding, and for that we need to figure out the
-            // calendar's timezone.
-            $tzProp = '{' . Plugin::NS_CALDAV . '}calendar-timezone';
-            $tzResult = $this->server->getProperties($path, [$tzProp]);
-            if (isset($tzResult[$tzProp])) {
-                // This property contains a VCALENDAR with a single
-                // VTIMEZONE.
-                $vtimezoneObj = VObject\Reader::read($tzResult[$tzProp]);
-                $calendarTimeZone = $vtimezoneObj->VTIMEZONE->getTimeZone();
-                // Destroy circular references to PHP will GC the object.
-                $vtimezoneObj->destroy();
-                unset($vtimezoneObj);
-            } else {
-                // Defaulting to UTC.
-                $calendarTimeZone = new DateTimeZone('UTC');
-            }
-
-            $mergedCalendar = $mergedCalendar->expand($start, $end, $calendarTimeZone);
-        }
-
-        $response->setHeader('Content-Type', $format);
-
-        switch ($format) {
-            case 'text/calendar' :
-                $mergedCalendar = $mergedCalendar->serialize();
-                break;
-            case 'application/calendar+json' :
-                $mergedCalendar = json_encode($mergedCalendar->jsonSerialize());
-                break;
-        }
-
-        $response->setStatus(200);
-        $response->setBody($mergedCalendar);
-
-    }
-
-    /**
-     * Merges all calendar objects, and builds one big iCalendar blob.
-     *
-     * @param array $properties Some CalDAV properties
-     * @param array $inputObjects
-     * @return VObject\Component\VCalendar
-     */
-    public function mergeObjects(array $properties, array $inputObjects) {
-
-        $calendar = new VObject\Component\VCalendar();
-        $calendar->version = '2.0';
-        if (DAV\Server::$exposeVersion) {
-            $calendar->prodid = '-//SabreDAV//SabreDAV ' . DAV\Version::VERSION . '//EN';
-        } else {
-            $calendar->prodid = '-//SabreDAV//SabreDAV//EN';
-        }
-        if (isset($properties['{DAV:}displayname'])) {
-            $calendar->{'X-WR-CALNAME'} = $properties['{DAV:}displayname'];
-        }
-        if (isset($properties['{http://apple.com/ns/ical/}calendar-color'])) {
-            $calendar->{'X-APPLE-CALENDAR-COLOR'} = $properties['{http://apple.com/ns/ical/}calendar-color'];
-        }
-
-        $collectedTimezones = [];
-
-        $timezones = [];
-        $objects = [];
-
-        foreach ($inputObjects as $href => $inputObject) {
-
-            $nodeComp = VObject\Reader::read($inputObject);
-
-            foreach ($nodeComp->children() as $child) {
-
-                switch ($child->name) {
-                    case 'VEVENT' :
-                    case 'VTODO' :
-                    case 'VJOURNAL' :
-                        $objects[] = clone $child;
-                        break;
-
-                    // VTIMEZONE is special, because we need to filter out the duplicates
-                    case 'VTIMEZONE' :
-                        // Naively just checking tzid.
-                        if (in_array((string)$child->TZID, $collectedTimezones)) continue;
-
-                        $timezones[] = clone $child;
-                        $collectedTimezones[] = $child->TZID;
-                        break;
-
-                }
-
-            }
-            // Destroy circular references to PHP will GC the object.
-            $nodeComp->destroy();
-            unset($nodeComp);
-
-        }
-
-        foreach ($timezones as $tz) $calendar->add($tz);
-        foreach ($objects as $obj) $calendar->add($obj);
-
-        return $calendar;
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using \Sabre\DAV\Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'ics-export';
-
-    }
-
-    /**
-     * Returns a bunch of meta-data about the plugin.
-     *
-     * Providing this information is optional, and is mainly displayed by the
-     * Browser plugin.
-     *
-     * The description key in the returned array may contain html and will not
-     * be sanitized.
-     *
-     * @return array
-     */
-    public function getPluginInfo() {
-
-        return [
-            'name'        => $this->getPluginName(),
-            'description' => 'Adds the ability to export CalDAV calendars as a single iCalendar file.',
-            'link'        => 'http://sabre.io/dav/ics-export-plugin/',
-        ];
-
-    }
+	/**
+	 * Reference to Server class
+	 *
+	 * @var \Sabre\DAV\Server
+	 */
+	protected $server;
+
+	/**
+	 * Initializes the plugin and registers event handlers
+	 *
+	 * @param \Sabre\DAV\Server $server
+	 * @return void
+	 */
+	public function initialize(DAV\Server $server) {
+
+		$this->server = $server;
+		$server->on('method:GET', [$this, 'httpGet'], 90);
+		$server->on('browserButtonActions', function($path, $node, &$actions) {
+			if ($node instanceof ICalendar) {
+				$actions .= '<a href="' . htmlspecialchars($path, ENT_QUOTES, 'UTF-8') . '?export"><span class="oi" data-glyph="calendar"></span></a>';
+			}
+		});
+
+	}
+
+	/**
+	 * Intercepts GET requests on calendar urls ending with ?export.
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function httpGet(RequestInterface $request, ResponseInterface $response) {
+
+		$queryParams = $request->getQueryParameters();
+		if (!array_key_exists('export', $queryParams)) return;
+
+		$path = $request->getPath();
+
+		$node = $this->server->getProperties($path, [
+			'{DAV:}resourcetype',
+			'{DAV:}displayname',
+			'{http://sabredav.org/ns}sync-token',
+			'{DAV:}sync-token',
+			'{http://apple.com/ns/ical/}calendar-color',
+		]);
+
+		if (!isset($node['{DAV:}resourcetype']) || !$node['{DAV:}resourcetype']->is('{' . Plugin::NS_CALDAV . '}calendar')) {
+			return;
+		}
+		// Marking the transactionType, for logging purposes.
+		$this->server->transactionType = 'get-calendar-export';
+
+		$properties = $node;
+
+		$start = null;
+		$end = null;
+		$expand = false;
+		$componentType = false;
+		if (isset($queryParams['start'])) {
+			if (!ctype_digit($queryParams['start'])) {
+				throw new BadRequest('The start= parameter must contain a unix timestamp');
+			}
+			$start = DateTime::createFromFormat('U', $queryParams['start']);
+		}
+		if (isset($queryParams['end'])) {
+			if (!ctype_digit($queryParams['end'])) {
+				throw new BadRequest('The end= parameter must contain a unix timestamp');
+			}
+			$end = DateTime::createFromFormat('U', $queryParams['end']);
+		}
+		if (isset($queryParams['expand']) && !!$queryParams['expand']) {
+			if (!$start || !$end) {
+				throw new BadRequest('If you\'d like to expand recurrences, you must specify both a start= and end= parameter.');
+			}
+			$expand = true;
+			$componentType = 'VEVENT';
+		}
+		if (isset($queryParams['componentType'])) {
+			if (!in_array($queryParams['componentType'], ['VEVENT', 'VTODO', 'VJOURNAL'])) {
+				throw new BadRequest('You are not allowed to search for components of type: ' . $queryParams['componentType'] . ' here');
+			}
+			$componentType = $queryParams['componentType'];
+		}
+
+		$format = \Sabre\HTTP\Util::Negotiate(
+			$request->getHeader('Accept'),
+			[
+				'text/calendar',
+				'application/calendar+json',
+			]
+		);
+
+		if (isset($queryParams['accept'])) {
+			if ($queryParams['accept'] === 'application/calendar+json' || $queryParams['accept'] === 'jcal') {
+				$format = 'application/calendar+json';
+			}
+		}
+		if (!$format) {
+			$format = 'text/calendar';
+		}
+
+		$this->generateResponse($path, $start, $end, $expand, $componentType, $format, $properties, $response);
+
+		// Returning false to break the event chain
+		return false;
+
+	}
+
+	/**
+	 * This method is responsible for generating the actual, full response.
+	 *
+	 * @param string $path
+	 * @param DateTime|null $start
+	 * @param DateTime|null $end
+	 * @param bool $expand
+	 * @param string $componentType
+	 * @param string $format
+	 * @param array $properties
+	 * @param ResponseInterface $response
+	 */
+	protected function generateResponse($path, $start, $end, $expand, $componentType, $format, $properties, ResponseInterface $response) {
+
+		$calDataProp = '{' . Plugin::NS_CALDAV . '}calendar-data';
+
+		$blobs = [];
+		if ($start || $end || $componentType) {
+
+			// If there was a start or end filter, we need to enlist
+			// calendarQuery for speed.
+			$calendarNode = $this->server->tree->getNodeForPath($path);
+			$queryResult = $calendarNode->calendarQuery([
+				'name'         => 'VCALENDAR',
+				'comp-filters' => [
+					[
+						'name'           => $componentType,
+						'comp-filters'   => [],
+						'prop-filters'   => [],
+						'is-not-defined' => false,
+						'time-range'     => [
+							'start' => $start,
+							'end'   => $end,
+						],
+					],
+				],
+				'prop-filters'   => [],
+				'is-not-defined' => false,
+				'time-range'     => null,
+			]);
+
+			// queryResult is just a list of base urls. We need to prefix the
+			// calendar path.
+			$queryResult = array_map(
+				function($item) use ($path) {
+					return $path . '/' . $item;
+				},
+				$queryResult
+			);
+			$nodes = $this->server->getPropertiesForMultiplePaths($queryResult, [$calDataProp]);
+			unset($queryResult);
+
+		} else {
+			$nodes = $this->server->getPropertiesForPath($path, [$calDataProp], 1);
+		}
+
+		// Flattening the arrays
+		foreach ($nodes as $node) {
+			if (isset($node[200][$calDataProp])) {
+				$blobs[$node['href']] = $node[200][$calDataProp];
+			}
+		}
+		unset($nodes);
+
+		$mergedCalendar = $this->mergeObjects(
+			$properties,
+			$blobs
+		);
+
+		if ($expand) {
+			$calendarTimeZone = null;
+			// We're expanding, and for that we need to figure out the
+			// calendar's timezone.
+			$tzProp = '{' . Plugin::NS_CALDAV . '}calendar-timezone';
+			$tzResult = $this->server->getProperties($path, [$tzProp]);
+			if (isset($tzResult[$tzProp])) {
+				// This property contains a VCALENDAR with a single
+				// VTIMEZONE.
+				$vtimezoneObj = VObject\Reader::read($tzResult[$tzProp]);
+				$calendarTimeZone = $vtimezoneObj->VTIMEZONE->getTimeZone();
+				// Destroy circular references to PHP will GC the object.
+				$vtimezoneObj->destroy();
+				unset($vtimezoneObj);
+			} else {
+				// Defaulting to UTC.
+				$calendarTimeZone = new DateTimeZone('UTC');
+			}
+
+			$mergedCalendar = $mergedCalendar->expand($start, $end, $calendarTimeZone);
+		}
+
+		$response->setHeader('Content-Type', $format);
+
+		switch ($format) {
+			case 'text/calendar' :
+				$mergedCalendar = $mergedCalendar->serialize();
+				break;
+			case 'application/calendar+json' :
+				$mergedCalendar = json_encode($mergedCalendar->jsonSerialize());
+				break;
+		}
+
+		$response->setStatus(200);
+		$response->setBody($mergedCalendar);
+
+	}
+
+	/**
+	 * Merges all calendar objects, and builds one big iCalendar blob.
+	 *
+	 * @param array $properties Some CalDAV properties
+	 * @param array $inputObjects
+	 * @return VObject\Component\VCalendar
+	 */
+	public function mergeObjects(array $properties, array $inputObjects) {
+
+		$calendar = new VObject\Component\VCalendar();
+		$calendar->version = '2.0';
+		if (DAV\Server::$exposeVersion) {
+			$calendar->prodid = '-//SabreDAV//SabreDAV ' . DAV\Version::VERSION . '//EN';
+		} else {
+			$calendar->prodid = '-//SabreDAV//SabreDAV//EN';
+		}
+		if (isset($properties['{DAV:}displayname'])) {
+			$calendar->{'X-WR-CALNAME'} = $properties['{DAV:}displayname'];
+		}
+		if (isset($properties['{http://apple.com/ns/ical/}calendar-color'])) {
+			$calendar->{'X-APPLE-CALENDAR-COLOR'} = $properties['{http://apple.com/ns/ical/}calendar-color'];
+		}
+
+		$collectedTimezones = [];
+
+		$timezones = [];
+		$objects = [];
+
+		foreach ($inputObjects as $href => $inputObject) {
+
+			$nodeComp = VObject\Reader::read($inputObject);
+
+			foreach ($nodeComp->children() as $child) {
+
+				switch ($child->name) {
+					case 'VEVENT' :
+					case 'VTODO' :
+					case 'VJOURNAL' :
+						$objects[] = clone $child;
+						break;
+
+					// VTIMEZONE is special, because we need to filter out the duplicates
+					case 'VTIMEZONE' :
+						// Naively just checking tzid.
+						if (in_array((string)$child->TZID, $collectedTimezones)) continue;
+
+						$timezones[] = clone $child;
+						$collectedTimezones[] = $child->TZID;
+						break;
+
+				}
+
+			}
+			// Destroy circular references to PHP will GC the object.
+			$nodeComp->destroy();
+			unset($nodeComp);
+
+		}
+
+		foreach ($timezones as $tz) $calendar->add($tz);
+		foreach ($objects as $obj) $calendar->add($obj);
+
+		return $calendar;
+
+	}
+
+	/**
+	 * Returns a plugin name.
+	 *
+	 * Using this name other plugins will be able to access other plugins
+	 * using \Sabre\DAV\Server::getPlugin
+	 *
+	 * @return string
+	 */
+	public function getPluginName() {
+
+		return 'ics-export';
+
+	}
+
+	/**
+	 * Returns a bunch of meta-data about the plugin.
+	 *
+	 * Providing this information is optional, and is mainly displayed by the
+	 * Browser plugin.
+	 *
+	 * The description key in the returned array may contain html and will not
+	 * be sanitized.
+	 *
+	 * @return array
+	 */
+	public function getPluginInfo() {
+
+		return [
+			'name'        => $this->getPluginName(),
+			'description' => 'Adds the ability to export CalDAV calendars as a single iCalendar file.',
+			'link'        => 'http://sabre.io/dav/ics-export-plugin/',
+		];
+
+	}
 
 }

libraries/SabreDAV/Event/coroutine.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,8 +2,8 @@
 
 namespace Sabre\Event;
 
-use Generator;
 use Exception;
+use Generator;
 
 /**
  * Turn asynchronous promise-based code into something that looks synchronous

Indentation +60 added lines, -60 removed lines

@@ -46,75 +46,75 @@
  */
 function coroutine(callable $gen) {
 
-    $generator = $gen();
-    if (!$generator instanceof Generator) {
-        throw new \InvalidArgumentException('You must pass a generator function');
-    }
+	$generator = $gen();
+	if (!$generator instanceof Generator) {
+		throw new \InvalidArgumentException('You must pass a generator function');
+	}
 
-    // This is the value we're returning.
-    $promise = new Promise();
+	// This is the value we're returning.
+	$promise = new Promise();
 
-    $lastYieldResult = null;
+	$lastYieldResult = null;
 
-    /**
-     * So tempted to use the mythical y-combinator here, but it's not needed in
-     * PHP.
-     */
-    $advanceGenerator = function() use (&$advanceGenerator, $generator, $promise, &$lastYieldResult) {
+	/**
+	 * So tempted to use the mythical y-combinator here, but it's not needed in
+	 * PHP.
+	 */
+	$advanceGenerator = function() use (&$advanceGenerator, $generator, $promise, &$lastYieldResult) {
 
-        while ($generator->valid()) {
+		while ($generator->valid()) {
 
-            $yieldedValue = $generator->current();
-            if ($yieldedValue instanceof Promise) {
-                $yieldedValue->then(
-                    function($value) use ($generator, &$advanceGenerator, &$lastYieldResult) {
-                        $lastYieldResult = $value;
-                        $generator->send($value);
-                        $advanceGenerator();
-                    },
-                    function($reason) use ($generator, $advanceGenerator) {
-                        if ($reason instanceof Exception) {
-                            $generator->throw($reason);
-                        } elseif (is_scalar($reason)) {
-                            $generator->throw(new Exception($reason));
-                        } else {
-                            $type = is_object($reason) ? get_class($reason) : gettype($reason);
-                            $generator->throw(new Exception('Promise was rejected with reason of type: ' . $type));
-                        }
-                        $advanceGenerator();
-                    }
-                )->error(function($reason) use ($promise) {
-                    // This error handler would be called, if something in the
-                    // generator throws an exception, and it's not caught
-                    // locally.
-                    $promise->reject($reason);
-                });
-                // We need to break out of the loop, because $advanceGenerator
-                // will be called asynchronously when the promise has a result.
-                break;
-            } else {
-                // If the value was not a promise, we'll just let it pass through.
-                $lastYieldResult = $yieldedValue;
-                $generator->send($yieldedValue);
-            }
+			$yieldedValue = $generator->current();
+			if ($yieldedValue instanceof Promise) {
+				$yieldedValue->then(
+					function($value) use ($generator, &$advanceGenerator, &$lastYieldResult) {
+						$lastYieldResult = $value;
+						$generator->send($value);
+						$advanceGenerator();
+					},
+					function($reason) use ($generator, $advanceGenerator) {
+						if ($reason instanceof Exception) {
+							$generator->throw($reason);
+						} elseif (is_scalar($reason)) {
+							$generator->throw(new Exception($reason));
+						} else {
+							$type = is_object($reason) ? get_class($reason) : gettype($reason);
+							$generator->throw(new Exception('Promise was rejected with reason of type: ' . $type));
+						}
+						$advanceGenerator();
+					}
+				)->error(function($reason) use ($promise) {
+					// This error handler would be called, if something in the
+					// generator throws an exception, and it's not caught
+					// locally.
+					$promise->reject($reason);
+				});
+				// We need to break out of the loop, because $advanceGenerator
+				// will be called asynchronously when the promise has a result.
+				break;
+			} else {
+				// If the value was not a promise, we'll just let it pass through.
+				$lastYieldResult = $yieldedValue;
+				$generator->send($yieldedValue);
+			}
 
-        }
+		}
 
-        // If the generator is at the end, and we didn't run into an exception,
-        // we can fullfill the promise with the last thing that was yielded to
-        // us.
-        if (!$generator->valid() && $promise->state === Promise::PENDING) {
-            $promise->fulfill($lastYieldResult);
-        }
+		// If the generator is at the end, and we didn't run into an exception,
+		// we can fullfill the promise with the last thing that was yielded to
+		// us.
+		if (!$generator->valid() && $promise->state === Promise::PENDING) {
+			$promise->fulfill($lastYieldResult);
+		}
 
-    };
+	};
 
-    try {
-        $advanceGenerator();
-    } catch (Exception $e) {
-        $promise->reject($e);
-    }
+	try {
+		$advanceGenerator();
+	} catch (Exception $e) {
+		$promise->reject($e);
+	}
 
-    return $promise;
+	return $promise;
 
 }

libraries/SabreDAV/VObject/Cli.php

Unused Use Statements +1 added lines, -2 removed lines

@@ -2,8 +2,7 @@
 
 namespace Sabre\VObject;
 
-use
-    InvalidArgumentException;
+use InvalidArgumentException;
 
 /**
  * This is the CLI interface for sabre-vobject.

Indentation +748 added lines, -748 removed lines

@@ -3,7 +3,7 @@ 
 namespace Sabre\VObject;
 
 use
-    InvalidArgumentException;
+	InvalidArgumentException;
 
 /**
  * This is the CLI interface for sabre-vobject.
@@ -14,758 +14,758 @@ 
  */
 class Cli {
 
-    /**
-     * No output.
-     *
-     * @var bool
-     */
-    protected $quiet = false;
-
-    /**
-     * Help display.
-     *
-     * @var bool
-     */
-    protected $showHelp = false;
-
-    /**
-     * Wether to spit out 'mimedir' or 'json' format.
-     *
-     * @var string
-     */
-    protected $format;
-
-    /**
-     * JSON pretty print.
-     *
-     * @var bool
-     */
-    protected $pretty;
-
-    /**
-     * Source file.
-     *
-     * @var string
-     */
-    protected $inputPath;
-
-    /**
-     * Destination file.
-     *
-     * @var string
-     */
-    protected $outputPath;
-
-    /**
-     * output stream.
-     *
-     * @var resource
-     */
-    protected $stdout;
-
-    /**
-     * stdin.
-     *
-     * @var resource
-     */
-    protected $stdin;
-
-    /**
-     * stderr.
-     *
-     * @var resource
-     */
-    protected $stderr;
-
-    /**
-     * Input format (one of json or mimedir).
-     *
-     * @var string
-     */
-    protected $inputFormat;
-
-    /**
-     * Makes the parser less strict.
-     *
-     * @var bool
-     */
-    protected $forgiving = false;
-
-    /**
-     * Main function.
-     *
-     * @return int
-     */
-    public function main(array $argv) {
-
-        // @codeCoverageIgnoreStart
-        // We cannot easily test this, so we'll skip it. Pretty basic anyway.
-
-        if (!$this->stderr) {
-            $this->stderr = fopen('php://stderr', 'w');
-        }
-        if (!$this->stdout) {
-            $this->stdout = fopen('php://stdout', 'w');
-        }
-        if (!$this->stdin) {
-            $this->stdin = fopen('php://stdin', 'r');
-        }
-
-        // @codeCoverageIgnoreEnd
-
-
-        try {
-
-            list($options, $positional) = $this->parseArguments($argv);
-
-            if (isset($options['q'])) {
-                $this->quiet = true;
-            }
-            $this->log($this->colorize('green', "sabre/vobject ") . $this->colorize('yellow', Version::VERSION));
-
-            foreach ($options as $name => $value) {
-
-                switch ($name) {
-
-                    case 'q' :
-                        // Already handled earlier.
-                        break;
-                    case 'h' :
-                    case 'help' :
-                        $this->showHelp();
-                        return 0;
-                        break;
-                    case 'format' :
-                        switch ($value) {
-
-                            // jcard/jcal documents
-                            case 'jcard' :
-                            case 'jcal' :
-
-                            // specific document versions
-                            case 'vcard21' :
-                            case 'vcard30' :
-                            case 'vcard40' :
-                            case 'icalendar20' :
-
-                            // specific formats
-                            case 'json' :
-                            case 'mimedir' :
-
-                            // icalendar/vcad
-                            case 'icalendar' :
-                            case 'vcard' :
-                                $this->format = $value;
-                                break;
-
-                            default :
-                                throw new InvalidArgumentException('Unknown format: ' . $value);
-
-                        }
-                        break;
-                    case 'pretty' :
-                        if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
-                            $this->pretty = true;
-                        }
-                        break;
-                    case 'forgiving' :
-                        $this->forgiving = true;
-                        break;
-                    case 'inputformat' :
-                        switch ($value) {
-                            // json formats
-                            case 'jcard' :
-                            case 'jcal' :
-                            case 'json' :
-                                $this->inputFormat = 'json';
-                                break;
-
-                            // mimedir formats
-                            case 'mimedir' :
-                            case 'icalendar' :
-                            case 'vcard' :
-                            case 'vcard21' :
-                            case 'vcard30' :
-                            case 'vcard40' :
-                            case 'icalendar20' :
-
-                                $this->inputFormat = 'mimedir';
-                                break;
-
-                            default :
-                                throw new InvalidArgumentException('Unknown format: ' . $value);
-
-                        }
-                        break;
-                    default :
-                        throw new InvalidArgumentException('Unknown option: ' . $name);
-
-                }
-
-            }
-
-            if (count($positional) === 0) {
-                $this->showHelp();
-                return 1;
-            }
-
-            if (count($positional) === 1) {
-                throw new InvalidArgumentException('Inputfile is a required argument');
-            }
-
-            if (count($positional) > 3) {
-                throw new InvalidArgumentException('Too many arguments');
-            }
-
-            if (!in_array($positional[0], ['validate', 'repair', 'convert', 'color'])) {
-                throw new InvalidArgumentException('Uknown command: ' . $positional[0]);
-            }
-
-        } catch (InvalidArgumentException $e) {
-            $this->showHelp();
-            $this->log('Error: ' . $e->getMessage(), 'red');
-            return 1;
-        }
-
-        $command = $positional[0];
-
-        $this->inputPath = $positional[1];
-        $this->outputPath = isset($positional[2]) ? $positional[2] : '-';
-
-        if ($this->outputPath !== '-') {
-            $this->stdout = fopen($this->outputPath, 'w');
-        }
-
-        if (!$this->inputFormat) {
-            if (substr($this->inputPath, -5) === '.json') {
-                $this->inputFormat = 'json';
-            } else {
-                $this->inputFormat = 'mimedir';
-            }
-        }
-        if (!$this->format) {
-            if (substr($this->outputPath, -5) === '.json') {
-                $this->format = 'json';
-            } else {
-                $this->format = 'mimedir';
-            }
-        }
-
-
-        $realCode = 0;
-
-        try {
-
-            while ($input = $this->readInput()) {
-
-                $returnCode = $this->$command($input);
-                if ($returnCode !== 0) $realCode = $returnCode;
-
-            }
-
-        } catch (EofException $e) {
-            // end of file
-        } catch (\Exception $e) {
-            $this->log('Error: ' . $e->getMessage(), 'red');
-            return 2;
-        }
-
-        return $realCode;
-
-    }
-
-    /**
-     * Shows the help message.
-     *
-     * @return void
-     */
-    protected function showHelp() {
-
-        $this->log('Usage:', 'yellow');
-        $this->log("  vobject [options] command [arguments]");
-        $this->log('');
-        $this->log('Options:', 'yellow');
-        $this->log($this->colorize('green', '  -q            ') . "Don't output anything.");
-        $this->log($this->colorize('green', '  -help -h      ') . "Display this help message.");
-        $this->log($this->colorize('green', '  --format      ') . "Convert to a specific format. Must be one of: vcard, vcard21,");
-        $this->log($this->colorize('green', '  --forgiving   ') . "Makes the parser less strict.");
-        $this->log("                vcard30, vcard40, icalendar20, jcal, jcard, json, mimedir.");
-        $this->log($this->colorize('green', '  --inputformat ') . "If the input format cannot be guessed from the extension, it");
-        $this->log("                must be specified here.");
-        // Only PHP 5.4 and up
-        if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
-            $this->log($this->colorize('green', '  --pretty      ') . "json pretty-print.");
-        }
-        $this->log('');
-        $this->log('Commands:', 'yellow');
-        $this->log($this->colorize('green', '  validate') . ' source_file              Validates a file for correctness.');
-        $this->log($this->colorize('green', '  repair') . ' source_file [output_file]  Repairs a file.');
-        $this->log($this->colorize('green', '  convert') . ' source_file [output_file] Converts a file.');
-        $this->log($this->colorize('green', '  color') . ' source_file                 Colorize a file, useful for debbugging.');
-        $this->log(
-        <<<HELP
+	/**
+	 * No output.
+	 *
+	 * @var bool
+	 */
+	protected $quiet = false;
+
+	/**
+	 * Help display.
+	 *
+	 * @var bool
+	 */
+	protected $showHelp = false;
+
+	/**
+	 * Wether to spit out 'mimedir' or 'json' format.
+	 *
+	 * @var string
+	 */
+	protected $format;
+
+	/**
+	 * JSON pretty print.
+	 *
+	 * @var bool
+	 */
+	protected $pretty;
+
+	/**
+	 * Source file.
+	 *
+	 * @var string
+	 */
+	protected $inputPath;
+
+	/**
+	 * Destination file.
+	 *
+	 * @var string
+	 */
+	protected $outputPath;
+
+	/**
+	 * output stream.
+	 *
+	 * @var resource
+	 */
+	protected $stdout;
+
+	/**
+	 * stdin.
+	 *
+	 * @var resource
+	 */
+	protected $stdin;
+
+	/**
+	 * stderr.
+	 *
+	 * @var resource
+	 */
+	protected $stderr;
+
+	/**
+	 * Input format (one of json or mimedir).
+	 *
+	 * @var string
+	 */
+	protected $inputFormat;
+
+	/**
+	 * Makes the parser less strict.
+	 *
+	 * @var bool
+	 */
+	protected $forgiving = false;
+
+	/**
+	 * Main function.
+	 *
+	 * @return int
+	 */
+	public function main(array $argv) {
+
+		// @codeCoverageIgnoreStart
+		// We cannot easily test this, so we'll skip it. Pretty basic anyway.
+
+		if (!$this->stderr) {
+			$this->stderr = fopen('php://stderr', 'w');
+		}
+		if (!$this->stdout) {
+			$this->stdout = fopen('php://stdout', 'w');
+		}
+		if (!$this->stdin) {
+			$this->stdin = fopen('php://stdin', 'r');
+		}
+
+		// @codeCoverageIgnoreEnd
+
+
+		try {
+
+			list($options, $positional) = $this->parseArguments($argv);
+
+			if (isset($options['q'])) {
+				$this->quiet = true;
+			}
+			$this->log($this->colorize('green', "sabre/vobject ") . $this->colorize('yellow', Version::VERSION));
+
+			foreach ($options as $name => $value) {
+
+				switch ($name) {
+
+					case 'q' :
+						// Already handled earlier.
+						break;
+					case 'h' :
+					case 'help' :
+						$this->showHelp();
+						return 0;
+						break;
+					case 'format' :
+						switch ($value) {
+
+							// jcard/jcal documents
+							case 'jcard' :
+							case 'jcal' :
+
+							// specific document versions
+							case 'vcard21' :
+							case 'vcard30' :
+							case 'vcard40' :
+							case 'icalendar20' :
+
+							// specific formats
+							case 'json' :
+							case 'mimedir' :
+
+							// icalendar/vcad
+							case 'icalendar' :
+							case 'vcard' :
+								$this->format = $value;
+								break;
+
+							default :
+								throw new InvalidArgumentException('Unknown format: ' . $value);
+
+						}
+						break;
+					case 'pretty' :
+						if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
+							$this->pretty = true;
+						}
+						break;
+					case 'forgiving' :
+						$this->forgiving = true;
+						break;
+					case 'inputformat' :
+						switch ($value) {
+							// json formats
+							case 'jcard' :
+							case 'jcal' :
+							case 'json' :
+								$this->inputFormat = 'json';
+								break;
+
+							// mimedir formats
+							case 'mimedir' :
+							case 'icalendar' :
+							case 'vcard' :
+							case 'vcard21' :
+							case 'vcard30' :
+							case 'vcard40' :
+							case 'icalendar20' :
+
+								$this->inputFormat = 'mimedir';
+								break;
+
+							default :
+								throw new InvalidArgumentException('Unknown format: ' . $value);
+
+						}
+						break;
+					default :
+						throw new InvalidArgumentException('Unknown option: ' . $name);
+
+				}
+
+			}
+
+			if (count($positional) === 0) {
+				$this->showHelp();
+				return 1;
+			}
+
+			if (count($positional) === 1) {
+				throw new InvalidArgumentException('Inputfile is a required argument');
+			}
+
+			if (count($positional) > 3) {
+				throw new InvalidArgumentException('Too many arguments');
+			}
+
+			if (!in_array($positional[0], ['validate', 'repair', 'convert', 'color'])) {
+				throw new InvalidArgumentException('Uknown command: ' . $positional[0]);
+			}
+
+		} catch (InvalidArgumentException $e) {
+			$this->showHelp();
+			$this->log('Error: ' . $e->getMessage(), 'red');
+			return 1;
+		}
+
+		$command = $positional[0];
+
+		$this->inputPath = $positional[1];
+		$this->outputPath = isset($positional[2]) ? $positional[2] : '-';
+
+		if ($this->outputPath !== '-') {
+			$this->stdout = fopen($this->outputPath, 'w');
+		}
+
+		if (!$this->inputFormat) {
+			if (substr($this->inputPath, -5) === '.json') {
+				$this->inputFormat = 'json';
+			} else {
+				$this->inputFormat = 'mimedir';
+			}
+		}
+		if (!$this->format) {
+			if (substr($this->outputPath, -5) === '.json') {
+				$this->format = 'json';
+			} else {
+				$this->format = 'mimedir';
+			}
+		}
+
+
+		$realCode = 0;
+
+		try {
+
+			while ($input = $this->readInput()) {
+
+				$returnCode = $this->$command($input);
+				if ($returnCode !== 0) $realCode = $returnCode;
+
+			}
+
+		} catch (EofException $e) {
+			// end of file
+		} catch (\Exception $e) {
+			$this->log('Error: ' . $e->getMessage(), 'red');
+			return 2;
+		}
+
+		return $realCode;
+
+	}
+
+	/**
+	 * Shows the help message.
+	 *
+	 * @return void
+	 */
+	protected function showHelp() {
+
+		$this->log('Usage:', 'yellow');
+		$this->log("  vobject [options] command [arguments]");
+		$this->log('');
+		$this->log('Options:', 'yellow');
+		$this->log($this->colorize('green', '  -q            ') . "Don't output anything.");
+		$this->log($this->colorize('green', '  -help -h      ') . "Display this help message.");
+		$this->log($this->colorize('green', '  --format      ') . "Convert to a specific format. Must be one of: vcard, vcard21,");
+		$this->log($this->colorize('green', '  --forgiving   ') . "Makes the parser less strict.");
+		$this->log("                vcard30, vcard40, icalendar20, jcal, jcard, json, mimedir.");
+		$this->log($this->colorize('green', '  --inputformat ') . "If the input format cannot be guessed from the extension, it");
+		$this->log("                must be specified here.");
+		// Only PHP 5.4 and up
+		if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
+			$this->log($this->colorize('green', '  --pretty      ') . "json pretty-print.");
+		}
+		$this->log('');
+		$this->log('Commands:', 'yellow');
+		$this->log($this->colorize('green', '  validate') . ' source_file              Validates a file for correctness.');
+		$this->log($this->colorize('green', '  repair') . ' source_file [output_file]  Repairs a file.');
+		$this->log($this->colorize('green', '  convert') . ' source_file [output_file] Converts a file.');
+		$this->log($this->colorize('green', '  color') . ' source_file                 Colorize a file, useful for debbugging.');
+		$this->log(
+		<<<HELP
 
 If source_file is set as '-', STDIN will be used.
 If output_file is omitted, STDOUT will be used.
 All other output is sent to STDERR.
 
 HELP
-        );
-
-        $this->log('Examples:', 'yellow');
-        $this->log('   vobject convert contact.vcf contact.json');
-        $this->log('   vobject convert --format=vcard40 old.vcf new.vcf');
-        $this->log('   vobject convert --inputformat=json --format=mimedir - -');
-        $this->log('   vobject color calendar.ics');
-        $this->log('');
-        $this->log('https://github.com/fruux/sabre-vobject', 'purple');
-
-    }
-
-    /**
-     * Validates a VObject file.
-     *
-     * @param Component $vObj
-     *
-     * @return int
-     */
-    protected function validate(Component $vObj) {
-
-        $returnCode = 0;
-
-        switch ($vObj->name) {
-            case 'VCALENDAR' :
-                $this->log("iCalendar: " . (string)$vObj->VERSION);
-                break;
-            case 'VCARD' :
-                $this->log("vCard: " . (string)$vObj->VERSION);
-                break;
-        }
-
-        $warnings = $vObj->validate();
-        if (!count($warnings)) {
-            $this->log("  No warnings!");
-        } else {
-
-            $levels = [
-                1 => 'REPAIRED',
-                2 => 'WARNING',
-                3 => 'ERROR',
-            ];
-            $returnCode = 2;
-            foreach ($warnings as $warn) {
-
-                $extra = '';
-                if ($warn['node'] instanceof Property) {
-                    $extra = ' (property: "' . $warn['node']->name . '")';
-                }
-                $this->log("  [" . $levels[$warn['level']] . '] ' . $warn['message'] . $extra);
-
-            }
-
-        }
-
-        return $returnCode;
-
-    }
-
-    /**
-     * Repairs a VObject file.
-     *
-     * @param Component $vObj
-     *
-     * @return int
-     */
-    protected function repair(Component $vObj) {
-
-        $returnCode = 0;
-
-        switch ($vObj->name) {
-            case 'VCALENDAR' :
-                $this->log("iCalendar: " . (string)$vObj->VERSION);
-                break;
-            case 'VCARD' :
-                $this->log("vCard: " . (string)$vObj->VERSION);
-                break;
-        }
-
-        $warnings = $vObj->validate(Node::REPAIR);
-        if (!count($warnings)) {
-            $this->log("  No warnings!");
-        } else {
-
-            $levels = [
-                1 => 'REPAIRED',
-                2 => 'WARNING',
-                3 => 'ERROR',
-            ];
-            $returnCode = 2;
-            foreach ($warnings as $warn) {
-
-                $extra = '';
-                if ($warn['node'] instanceof Property) {
-                    $extra = ' (property: "' . $warn['node']->name . '")';
-                }
-                $this->log("  [" . $levels[$warn['level']] . '] ' . $warn['message'] . $extra);
-
-            }
-
-        }
-        fwrite($this->stdout, $vObj->serialize());
-
-        return $returnCode;
-
-    }
-
-    /**
-     * Converts a vObject file to a new format.
-     *
-     * @param Component $vObj
-     *
-     * @return int
-     */
-    protected function convert($vObj) {
-
-        $json = false;
-        $convertVersion = null;
-        $forceInput = null;
-
-        switch ($this->format) {
-            case 'json' :
-                $json = true;
-                if ($vObj->name === 'VCARD') {
-                    $convertVersion = Document::VCARD40;
-                }
-                break;
-            case 'jcard' :
-                $json = true;
-                $forceInput = 'VCARD';
-                $convertVersion = Document::VCARD40;
-                break;
-            case 'jcal' :
-                $json = true;
-                $forceInput = 'VCALENDAR';
-                break;
-            case 'mimedir' :
-            case 'icalendar' :
-            case 'icalendar20' :
-            case 'vcard' :
-                break;
-            case 'vcard21' :
-                $convertVersion = Document::VCARD21;
-                break;
-            case 'vcard30' :
-                $convertVersion = Document::VCARD30;
-                break;
-            case 'vcard40' :
-                $convertVersion = Document::VCARD40;
-                break;
-
-        }
-
-        if ($forceInput && $vObj->name !== $forceInput) {
-            throw new \Exception('You cannot convert a ' . strtolower($vObj->name) . ' to ' . $this->format);
-        }
-        if ($convertVersion) {
-            $vObj = $vObj->convert($convertVersion);
-        }
-        if ($json) {
-            $jsonOptions = 0;
-            if ($this->pretty) {
-                $jsonOptions = JSON_PRETTY_PRINT;
-            }
-            fwrite($this->stdout, json_encode($vObj->jsonSerialize(), $jsonOptions));
-        } else {
-            fwrite($this->stdout, $vObj->serialize());
-        }
-
-        return 0;
-
-    }
-
-    /**
-     * Colorizes a file.
-     *
-     * @param Component $vObj
-     *
-     * @return int
-     */
-    protected function color($vObj) {
-
-        fwrite($this->stdout, $this->serializeComponent($vObj));
-
-    }
-
-    /**
-     * Returns an ansi color string for a color name.
-     *
-     * @param string $color
-     *
-     * @return string
-     */
-    protected function colorize($color, $str, $resetTo = 'default') {
-
-        $colors = [
-            'cyan'    => '1;36',
-            'red'     => '1;31',
-            'yellow'  => '1;33',
-            'blue'    => '0;34',
-            'green'   => '0;32',
-            'default' => '0',
-            'purple'  => '0;35',
-        ];
-        return "\033[" . $colors[$color] . 'm' . $str . "\033[" . $colors[$resetTo] . "m";
-
-    }
-
-    /**
-     * Writes out a string in specific color.
-     *
-     * @param string $color
-     * @param string $str
-     *
-     * @return void
-     */
-    protected function cWrite($color, $str) {
-
-        fwrite($this->stdout, $this->colorize($color, $str));
-
-    }
-
-    protected function serializeComponent(Component $vObj) {
-
-        $this->cWrite('cyan', 'BEGIN');
-        $this->cWrite('red', ':');
-        $this->cWrite('yellow', $vObj->name . "\n");
-
-        /**
-         * Gives a component a 'score' for sorting purposes.
-         *
-         * This is solely used by the childrenSort method.
-         *
-         * A higher score means the item will be lower in the list.
-         * To avoid score collisions, each "score category" has a reasonable
-         * space to accomodate elements. The $key is added to the $score to
-         * preserve the original relative order of elements.
-         *
-         * @param int $key
-         * @param array $array
-         *
-         * @return int
-         */
-        $sortScore = function($key, $array) {
-
-            if ($array[$key] instanceof Component) {
-
-                // We want to encode VTIMEZONE first, this is a personal
-                // preference.
-                if ($array[$key]->name === 'VTIMEZONE') {
-                    $score = 300000000;
-                    return $score + $key;
-                } else {
-                    $score = 400000000;
-                    return $score + $key;
-                }
-            } else {
-                // Properties get encoded first
-                // VCARD version 4.0 wants the VERSION property to appear first
-                if ($array[$key] instanceof Property) {
-                    if ($array[$key]->name === 'VERSION') {
-                        $score = 100000000;
-                        return $score + $key;
-                    } else {
-                        // All other properties
-                        $score = 200000000;
-                        return $score + $key;
-                    }
-                }
-            }
-
-        };
-
-        $children = $vObj->children();
-        $tmp = $children;
-        uksort(
-            $children,
-            function($a, $b) use ($sortScore, $tmp) {
-
-                $sA = $sortScore($a, $tmp);
-                $sB = $sortScore($b, $tmp);
-
-                return $sA - $sB;
-
-            }
-        );
-
-        foreach ($children as $child) {
-            if ($child instanceof Component) {
-                $this->serializeComponent($child);
-            } else {
-                $this->serializeProperty($child);
-            }
-        }
-
-        $this->cWrite('cyan', 'END');
-        $this->cWrite('red', ':');
-        $this->cWrite('yellow', $vObj->name . "\n");
-
-    }
-
-    /**
-     * Colorizes a property.
-     *
-     * @param Property $property
-     *
-     * @return void
-     */
-    protected function serializeProperty(Property $property) {
-
-        if ($property->group) {
-            $this->cWrite('default', $property->group);
-            $this->cWrite('red', '.');
-        }
-
-        $this->cWrite('yellow', $property->name);
-
-        foreach ($property->parameters as $param) {
-
-            $this->cWrite('red', ';');
-            $this->cWrite('blue', $param->serialize());
-
-        }
-        $this->cWrite('red', ':');
-
-        if ($property instanceof Property\Binary) {
-
-            $this->cWrite('default', 'embedded binary stripped. (' . strlen($property->getValue()) . ' bytes)');
-
-        } else {
-
-            $parts = $property->getParts();
-            $first1 = true;
-            // Looping through property values
-            foreach ($parts as $part) {
-                if ($first1) {
-                    $first1 = false;
-                } else {
-                    $this->cWrite('red', $property->delimiter);
-                }
-                $first2 = true;
-                // Looping through property sub-values
-                foreach ((array)$part as $subPart) {
-                    if ($first2) {
-                        $first2 = false;
-                    } else {
-                        // The sub-value delimiter is always comma
-                        $this->cWrite('red', ',');
-                    }
-
-                    $subPart = strtr(
-                        $subPart,
-                        [
-                            '\\' => $this->colorize('purple', '\\\\', 'green'),
-                            ';'  => $this->colorize('purple', '\;', 'green'),
-                            ','  => $this->colorize('purple', '\,', 'green'),
-                            "\n" => $this->colorize('purple', "\\n\n\t", 'green'),
-                            "\r" => "",
-                        ]
-                    );
-
-                    $this->cWrite('green', $subPart);
-                }
-            }
-
-        }
-        $this->cWrite("default", "\n");
-
-    }
-
-    /**
-     * Parses the list of arguments.
-     *
-     * @param array $argv
-     *
-     * @return void
-     */
-    protected function parseArguments(array $argv) {
-
-        $positional = [];
-        $options = [];
-
-        for ($ii = 0; $ii < count($argv); $ii++) {
-
-            // Skipping the first argument.
-            if ($ii === 0) continue;
-
-            $v = $argv[$ii];
-
-            if (substr($v, 0, 2) === '--') {
-                // This is a long-form option.
-                $optionName = substr($v, 2);
-                $optionValue = true;
-                if (strpos($optionName, '=')) {
-                    list($optionName, $optionValue) = explode('=', $optionName);
-                }
-                $options[$optionName] = $optionValue;
-            } elseif (substr($v, 0, 1) === '-' && strlen($v) > 1) {
-                // This is a short-form option.
-                foreach (str_split(substr($v, 1)) as $option) {
-                    $options[$option] = true;
-                }
-
-            } else {
-
-                $positional[] = $v;
-
-            }
-
-        }
-
-        return [$options, $positional];
-
-    }
-
-    protected $parser;
-
-    /**
-     * Reads the input file.
-     *
-     * @return Component
-     */
-    protected function readInput() {
-
-        if (!$this->parser) {
-            if ($this->inputPath !== '-') {
-                $this->stdin = fopen($this->inputPath, 'r');
-            }
-
-            if ($this->inputFormat === 'mimedir') {
-                $this->parser = new Parser\MimeDir($this->stdin, ($this->forgiving ? Reader::OPTION_FORGIVING : 0));
-            } else {
-                $this->parser = new Parser\Json($this->stdin, ($this->forgiving ? Reader::OPTION_FORGIVING : 0));
-            }
-        }
-
-        return $this->parser->parse();
-
-    }
-
-    /**
-     * Sends a message to STDERR.
-     *
-     * @param string $msg
-     *
-     * @return void
-     */
-    protected function log($msg, $color = 'default') {
-
-        if (!$this->quiet) {
-            if ($color !== 'default') {
-                $msg = $this->colorize($color, $msg);
-            }
-            fwrite($this->stderr, $msg . "\n");
-        }
-
-    }
+		);
+
+		$this->log('Examples:', 'yellow');
+		$this->log('   vobject convert contact.vcf contact.json');
+		$this->log('   vobject convert --format=vcard40 old.vcf new.vcf');
+		$this->log('   vobject convert --inputformat=json --format=mimedir - -');
+		$this->log('   vobject color calendar.ics');
+		$this->log('');
+		$this->log('https://github.com/fruux/sabre-vobject', 'purple');
+
+	}
+
+	/**
+	 * Validates a VObject file.
+	 *
+	 * @param Component $vObj
+	 *
+	 * @return int
+	 */
+	protected function validate(Component $vObj) {
+
+		$returnCode = 0;
+
+		switch ($vObj->name) {
+			case 'VCALENDAR' :
+				$this->log("iCalendar: " . (string)$vObj->VERSION);
+				break;
+			case 'VCARD' :
+				$this->log("vCard: " . (string)$vObj->VERSION);
+				break;
+		}
+
+		$warnings = $vObj->validate();
+		if (!count($warnings)) {
+			$this->log("  No warnings!");
+		} else {
+
+			$levels = [
+				1 => 'REPAIRED',
+				2 => 'WARNING',
+				3 => 'ERROR',
+			];
+			$returnCode = 2;
+			foreach ($warnings as $warn) {
+
+				$extra = '';
+				if ($warn['node'] instanceof Property) {
+					$extra = ' (property: "' . $warn['node']->name . '")';
+				}
+				$this->log("  [" . $levels[$warn['level']] . '] ' . $warn['message'] . $extra);
+
+			}
+
+		}
+
+		return $returnCode;
+
+	}
+
+	/**
+	 * Repairs a VObject file.
+	 *
+	 * @param Component $vObj
+	 *
+	 * @return int
+	 */
+	protected function repair(Component $vObj) {
+
+		$returnCode = 0;
+
+		switch ($vObj->name) {
+			case 'VCALENDAR' :
+				$this->log("iCalendar: " . (string)$vObj->VERSION);
+				break;
+			case 'VCARD' :
+				$this->log("vCard: " . (string)$vObj->VERSION);
+				break;
+		}
+
+		$warnings = $vObj->validate(Node::REPAIR);
+		if (!count($warnings)) {
+			$this->log("  No warnings!");
+		} else {
+
+			$levels = [
+				1 => 'REPAIRED',
+				2 => 'WARNING',
+				3 => 'ERROR',
+			];
+			$returnCode = 2;
+			foreach ($warnings as $warn) {
+
+				$extra = '';
+				if ($warn['node'] instanceof Property) {
+					$extra = ' (property: "' . $warn['node']->name . '")';
+				}
+				$this->log("  [" . $levels[$warn['level']] . '] ' . $warn['message'] . $extra);
+
+			}
+
+		}
+		fwrite($this->stdout, $vObj->serialize());
+
+		return $returnCode;
+
+	}
+
+	/**
+	 * Converts a vObject file to a new format.
+	 *
+	 * @param Component $vObj
+	 *
+	 * @return int
+	 */
+	protected function convert($vObj) {
+
+		$json = false;
+		$convertVersion = null;
+		$forceInput = null;
+
+		switch ($this->format) {
+			case 'json' :
+				$json = true;
+				if ($vObj->name === 'VCARD') {
+					$convertVersion = Document::VCARD40;
+				}
+				break;
+			case 'jcard' :
+				$json = true;
+				$forceInput = 'VCARD';
+				$convertVersion = Document::VCARD40;
+				break;
+			case 'jcal' :
+				$json = true;
+				$forceInput = 'VCALENDAR';
+				break;
+			case 'mimedir' :
+			case 'icalendar' :
+			case 'icalendar20' :
+			case 'vcard' :
+				break;
+			case 'vcard21' :
+				$convertVersion = Document::VCARD21;
+				break;
+			case 'vcard30' :
+				$convertVersion = Document::VCARD30;
+				break;
+			case 'vcard40' :
+				$convertVersion = Document::VCARD40;
+				break;
+
+		}
+
+		if ($forceInput && $vObj->name !== $forceInput) {
+			throw new \Exception('You cannot convert a ' . strtolower($vObj->name) . ' to ' . $this->format);
+		}
+		if ($convertVersion) {
+			$vObj = $vObj->convert($convertVersion);
+		}
+		if ($json) {
+			$jsonOptions = 0;
+			if ($this->pretty) {
+				$jsonOptions = JSON_PRETTY_PRINT;
+			}
+			fwrite($this->stdout, json_encode($vObj->jsonSerialize(), $jsonOptions));
+		} else {
+			fwrite($this->stdout, $vObj->serialize());
+		}
+
+		return 0;
+
+	}
+
+	/**
+	 * Colorizes a file.
+	 *
+	 * @param Component $vObj
+	 *
+	 * @return int
+	 */
+	protected function color($vObj) {
+
+		fwrite($this->stdout, $this->serializeComponent($vObj));
+
+	}
+
+	/**
+	 * Returns an ansi color string for a color name.
+	 *
+	 * @param string $color
+	 *
+	 * @return string
+	 */
+	protected function colorize($color, $str, $resetTo = 'default') {
+
+		$colors = [
+			'cyan'    => '1;36',
+			'red'     => '1;31',
+			'yellow'  => '1;33',
+			'blue'    => '0;34',
+			'green'   => '0;32',
+			'default' => '0',
+			'purple'  => '0;35',
+		];
+		return "\033[" . $colors[$color] . 'm' . $str . "\033[" . $colors[$resetTo] . "m";
+
+	}
+
+	/**
+	 * Writes out a string in specific color.
+	 *
+	 * @param string $color
+	 * @param string $str
+	 *
+	 * @return void
+	 */
+	protected function cWrite($color, $str) {
+
+		fwrite($this->stdout, $this->colorize($color, $str));
+
+	}
+
+	protected function serializeComponent(Component $vObj) {
+
+		$this->cWrite('cyan', 'BEGIN');
+		$this->cWrite('red', ':');
+		$this->cWrite('yellow', $vObj->name . "\n");
+
+		/**
+		 * Gives a component a 'score' for sorting purposes.
+		 *
+		 * This is solely used by the childrenSort method.
+		 *
+		 * A higher score means the item will be lower in the list.
+		 * To avoid score collisions, each "score category" has a reasonable
+		 * space to accomodate elements. The $key is added to the $score to
+		 * preserve the original relative order of elements.
+		 *
+		 * @param int $key
+		 * @param array $array
+		 *
+		 * @return int
+		 */
+		$sortScore = function($key, $array) {
+
+			if ($array[$key] instanceof Component) {
+
+				// We want to encode VTIMEZONE first, this is a personal
+				// preference.
+				if ($array[$key]->name === 'VTIMEZONE') {
+					$score = 300000000;
+					return $score + $key;
+				} else {
+					$score = 400000000;
+					return $score + $key;
+				}
+			} else {
+				// Properties get encoded first
+				// VCARD version 4.0 wants the VERSION property to appear first
+				if ($array[$key] instanceof Property) {
+					if ($array[$key]->name === 'VERSION') {
+						$score = 100000000;
+						return $score + $key;
+					} else {
+						// All other properties
+						$score = 200000000;
+						return $score + $key;
+					}
+				}
+			}
+
+		};
+
+		$children = $vObj->children();
+		$tmp = $children;
+		uksort(
+			$children,
+			function($a, $b) use ($sortScore, $tmp) {
+
+				$sA = $sortScore($a, $tmp);
+				$sB = $sortScore($b, $tmp);
+
+				return $sA - $sB;
+
+			}
+		);
+
+		foreach ($children as $child) {
+			if ($child instanceof Component) {
+				$this->serializeComponent($child);
+			} else {
+				$this->serializeProperty($child);
+			}
+		}
+
+		$this->cWrite('cyan', 'END');
+		$this->cWrite('red', ':');
+		$this->cWrite('yellow', $vObj->name . "\n");
+
+	}
+
+	/**
+	 * Colorizes a property.
+	 *
+	 * @param Property $property
+	 *
+	 * @return void
+	 */
+	protected function serializeProperty(Property $property) {
+
+		if ($property->group) {
+			$this->cWrite('default', $property->group);
+			$this->cWrite('red', '.');
+		}
+
+		$this->cWrite('yellow', $property->name);
+
+		foreach ($property->parameters as $param) {
+
+			$this->cWrite('red', ';');
+			$this->cWrite('blue', $param->serialize());
+
+		}
+		$this->cWrite('red', ':');
+
+		if ($property instanceof Property\Binary) {
+
+			$this->cWrite('default', 'embedded binary stripped. (' . strlen($property->getValue()) . ' bytes)');
+
+		} else {
+
+			$parts = $property->getParts();
+			$first1 = true;
+			// Looping through property values
+			foreach ($parts as $part) {
+				if ($first1) {
+					$first1 = false;
+				} else {
+					$this->cWrite('red', $property->delimiter);
+				}
+				$first2 = true;
+				// Looping through property sub-values
+				foreach ((array)$part as $subPart) {
+					if ($first2) {
+						$first2 = false;
+					} else {
+						// The sub-value delimiter is always comma
+						$this->cWrite('red', ',');
+					}
+
+					$subPart = strtr(
+						$subPart,
+						[
+							'\\' => $this->colorize('purple', '\\\\', 'green'),
+							';'  => $this->colorize('purple', '\;', 'green'),
+							','  => $this->colorize('purple', '\,', 'green'),
+							"\n" => $this->colorize('purple', "\\n\n\t", 'green'),
+							"\r" => "",
+						]
+					);
+
+					$this->cWrite('green', $subPart);
+				}
+			}
+
+		}
+		$this->cWrite("default", "\n");
+
+	}
+
+	/**
+	 * Parses the list of arguments.
+	 *
+	 * @param array $argv
+	 *
+	 * @return void
+	 */
+	protected function parseArguments(array $argv) {
+
+		$positional = [];
+		$options = [];
+
+		for ($ii = 0; $ii < count($argv); $ii++) {
+
+			// Skipping the first argument.
+			if ($ii === 0) continue;
+
+			$v = $argv[$ii];
+
+			if (substr($v, 0, 2) === '--') {
+				// This is a long-form option.
+				$optionName = substr($v, 2);
+				$optionValue = true;
+				if (strpos($optionName, '=')) {
+					list($optionName, $optionValue) = explode('=', $optionName);
+				}
+				$options[$optionName] = $optionValue;
+			} elseif (substr($v, 0, 1) === '-' && strlen($v) > 1) {
+				// This is a short-form option.
+				foreach (str_split(substr($v, 1)) as $option) {
+					$options[$option] = true;
+				}
+
+			} else {
+
+				$positional[] = $v;
+
+			}
+
+		}
+
+		return [$options, $positional];
+
+	}
+
+	protected $parser;
+
+	/**
+	 * Reads the input file.
+	 *
+	 * @return Component
+	 */
+	protected function readInput() {
+
+		if (!$this->parser) {
+			if ($this->inputPath !== '-') {
+				$this->stdin = fopen($this->inputPath, 'r');
+			}
+
+			if ($this->inputFormat === 'mimedir') {
+				$this->parser = new Parser\MimeDir($this->stdin, ($this->forgiving ? Reader::OPTION_FORGIVING : 0));
+			} else {
+				$this->parser = new Parser\Json($this->stdin, ($this->forgiving ? Reader::OPTION_FORGIVING : 0));
+			}
+		}
+
+		return $this->parser->parse();
+
+	}
+
+	/**
+	 * Sends a message to STDERR.
+	 *
+	 * @param string $msg
+	 *
+	 * @return void
+	 */
+	protected function log($msg, $color = 'default') {
+
+		if (!$this->quiet) {
+			if ($color !== 'default') {
+				$msg = $this->colorize($color, $msg);
+			}
+			fwrite($this->stderr, $msg . "\n");
+		}
+
+	}
 
 }

libraries/SabreDAV/VObject/Parameter.php

Doc Comments +2 added lines, -2 removed lines

@@ -176,7 +176,7 @@ 
      *
      * This may be either a single, or multiple strings in an array.
      *
-     * @param string|array $value
+     * @param string|null $value
      *
      * @return void
      */
@@ -342,7 +342,7 @@ 
      * This method returns an array, with the representation as it should be
      * encoded in JSON. This is used to create jCard or jCal documents.
      *
-     * @return array
+     * @return string
      */
     function jsonSerialize() {
 

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,8 +2,8 @@
 
 namespace Sabre\VObject;
 
-use Sabre\Xml;
 use ArrayIterator;
+use Sabre\Xml;
 
 /**
  * VObject Parameter.

Indentation +371 added lines, -371 removed lines

@@ -19,376 +19,376 @@
  */
 class Parameter extends Node {
 
-    /**
-     * Parameter name.
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * vCard 2.1 allows parameters to be encoded without a name.
-     *
-     * We can deduce the parameter name based on it's value.
-     *
-     * @var bool
-     */
-    public $noName = false;
-
-    /**
-     * Parameter value.
-     *
-     * @var string
-     */
-    protected $value;
-
-    /**
-     * Sets up the object.
-     *
-     * It's recommended to use the create:: factory method instead.
-     *
-     * @param string $name
-     * @param string $value
-     */
-    public function __construct(Document $root, $name, $value = null) {
-
-        $this->name = strtoupper($name);
-        $this->root = $root;
-        if (is_null($name)) {
-            $this->noName = true;
-            $this->name = static::guessParameterNameByValue($value);
-        }
-
-        // If guessParameterNameByValue() returns an empty string
-        // above, we're actually dealing with a parameter that has no value.
-        // In that case we have to move the value to the name.
-        if ($this->name === '') {
-            $this->noName = false;
-            $this->name = strtoupper($value);
-        } else {
-            $this->setValue($value);
-        }
-
-    }
-
-    /**
-     * Try to guess property name by value, can be used for vCard 2.1 nameless parameters.
-     *
-     * Figuring out what the name should have been. Note that a ton of
-     * these are rather silly in 2014 and would probably rarely be
-     * used, but we like to be complete.
-     *
-     * @param string $value
-     *
-     * @return string
-     */
-    static function guessParameterNameByValue($value) {
-        switch (strtoupper($value)) {
-
-            // Encodings
-            case '7-BIT' :
-            case 'QUOTED-PRINTABLE' :
-            case 'BASE64' :
-                $name = 'ENCODING';
-                break;
-
-            // Common types
-            case 'WORK' :
-            case 'HOME' :
-            case 'PREF' :
-
-            // Delivery Label Type
-            case 'DOM' :
-            case 'INTL' :
-            case 'POSTAL' :
-            case 'PARCEL' :
-
-            // Telephone types
-            case 'VOICE' :
-            case 'FAX' :
-            case 'MSG' :
-            case 'CELL' :
-            case 'PAGER' :
-            case 'BBS' :
-            case 'MODEM' :
-            case 'CAR' :
-            case 'ISDN' :
-            case 'VIDEO' :
-
-            // EMAIL types (lol)
-            case 'AOL' :
-            case 'APPLELINK' :
-            case 'ATTMAIL' :
-            case 'CIS' :
-            case 'EWORLD' :
-            case 'INTERNET' :
-            case 'IBMMAIL' :
-            case 'MCIMAIL' :
-            case 'POWERSHARE' :
-            case 'PRODIGY' :
-            case 'TLX' :
-            case 'X400' :
-
-            // Photo / Logo format types
-            case 'GIF' :
-            case 'CGM' :
-            case 'WMF' :
-            case 'BMP' :
-            case 'DIB' :
-            case 'PICT' :
-            case 'TIFF' :
-            case 'PDF' :
-            case 'PS' :
-            case 'JPEG' :
-            case 'MPEG' :
-            case 'MPEG2' :
-            case 'AVI' :
-            case 'QTIME' :
-
-            // Sound Digital Audio Type
-            case 'WAVE' :
-            case 'PCM' :
-            case 'AIFF' :
-
-            // Key types
-            case 'X509' :
-            case 'PGP' :
-                $name = 'TYPE';
-                break;
-
-            // Value types
-            case 'INLINE' :
-            case 'URL' :
-            case 'CONTENT-ID' :
-            case 'CID' :
-                $name = 'VALUE';
-                break;
-
-            default:
-                $name = '';
-        }
-
-        return $name;
-    }
-
-    /**
-     * Updates the current value.
-     *
-     * This may be either a single, or multiple strings in an array.
-     *
-     * @param string|array $value
-     *
-     * @return void
-     */
-    public function setValue($value) {
-
-        $this->value = $value;
-
-    }
-
-    /**
-     * Returns the current value.
-     *
-     * This method will always return a string, or null. If there were multiple
-     * values, it will automatically concatenate them (separated by comma).
-     *
-     * @return string|null
-     */
-    public function getValue() {
-
-        if (is_array($this->value)) {
-            return implode(',', $this->value);
-        } else {
-            return $this->value;
-        }
-
-    }
-
-    /**
-     * Sets multiple values for this parameter.
-     *
-     * @param array $value
-     *
-     * @return void
-     */
-    public function setParts(array $value) {
-
-        $this->value = $value;
-
-    }
-
-    /**
-     * Returns all values for this parameter.
-     *
-     * If there were no values, an empty array will be returned.
-     *
-     * @return array
-     */
-    public function getParts() {
-
-        if (is_array($this->value)) {
-            return $this->value;
-        } elseif (is_null($this->value)) {
-            return [];
-        } else {
-            return [$this->value];
-        }
-
-    }
-
-    /**
-     * Adds a value to this parameter.
-     *
-     * If the argument is specified as an array, all items will be added to the
-     * parameter value list.
-     *
-     * @param string|array $part
-     *
-     * @return void
-     */
-    public function addValue($part) {
-
-        if (is_null($this->value)) {
-            $this->value = $part;
-        } else {
-            $this->value = array_merge((array)$this->value, (array)$part);
-        }
-
-    }
-
-    /**
-     * Checks if this parameter contains the specified value.
-     *
-     * This is a case-insensitive match. It makes sense to call this for for
-     * instance the TYPE parameter, to see if it contains a keyword such as
-     * 'WORK' or 'FAX'.
-     *
-     * @param string $value
-     *
-     * @return bool
-     */
-    public function has($value) {
-
-        return in_array(
-            strtolower($value),
-            array_map('strtolower', (array)$this->value)
-        );
-
-    }
-
-    /**
-     * Turns the object back into a serialized blob.
-     *
-     * @return string
-     */
-    public function serialize() {
-
-        $value = $this->getParts();
-
-        if (count($value) === 0) {
-            return $this->name . '=';
-        }
-
-        if ($this->root->getDocumentType() === Document::VCARD21 && $this->noName) {
-
-            return implode(';', $value);
-
-        }
-
-        return $this->name . '=' . array_reduce(
-            $value,
-            function($out, $item) {
-
-                if (!is_null($out)) $out .= ',';
-
-                // If there's no special characters in the string, we'll use the simple
-                // format.
-                //
-                // The list of special characters is defined as:
-                //
-                // Any character except CONTROL, DQUOTE, ";", ":", ","
-                //
-                // by the iCalendar spec:
-                // https://tools.ietf.org/html/rfc5545#section-3.1
-                //
-                // And we add ^ to that because of:
-                // https://tools.ietf.org/html/rfc6868
-                //
-                // But we've found that iCal (7.0, shipped with OSX 10.9)
-                // severaly trips on + characters not being quoted, so we
-                // added + as well.
-                if (!preg_match('#(?: [\n":;\^,\+] )#x', $item)) {
-                    return $out . $item;
-                } else {
-                    // Enclosing in double-quotes, and using RFC6868 for encoding any
-                    // special characters
-                    $out .= '"' . strtr(
-                        $item,
-                        [
-                            '^'  => '^^',
-                            "\n" => '^n',
-                            '"'  => '^\'',
-                        ]
-                    ) . '"';
-                    return $out;
-                }
-
-            }
-        );
-
-    }
-
-    /**
-     * This method returns an array, with the representation as it should be
-     * encoded in JSON. This is used to create jCard or jCal documents.
-     *
-     * @return array
-     */
-    public function jsonSerialize() {
-
-        return $this->value;
-
-    }
-
-    /**
-     * This method serializes the data into XML. This is used to create xCard or
-     * xCal documents.
-     *
-     * @param Xml\Writer $writer  XML writer.
-     *
-     * @return void
-     */
-    public function xmlSerialize(Xml\Writer $writer) {
-
-        foreach (explode(',', $this->value) as $value) {
-            $writer->writeElement('text', $value);
-        }
-
-    }
-
-    /**
-     * Called when this object is being cast to a string.
-     *
-     * @return string
-     */
-    public function __toString() {
-
-        return (string)$this->getValue();
-
-    }
-
-    /**
-     * Returns the iterator for this object.
-     *
-     * @return ElementList
-     */
-    public function getIterator() {
-
-        if (!is_null($this->iterator))
-            return $this->iterator;
-
-        return $this->iterator = new ArrayIterator((array)$this->value);
-
-    }
+	/**
+	 * Parameter name.
+	 *
+	 * @var string
+	 */
+	public $name;
+
+	/**
+	 * vCard 2.1 allows parameters to be encoded without a name.
+	 *
+	 * We can deduce the parameter name based on it's value.
+	 *
+	 * @var bool
+	 */
+	public $noName = false;
+
+	/**
+	 * Parameter value.
+	 *
+	 * @var string
+	 */
+	protected $value;
+
+	/**
+	 * Sets up the object.
+	 *
+	 * It's recommended to use the create:: factory method instead.
+	 *
+	 * @param string $name
+	 * @param string $value
+	 */
+	public function __construct(Document $root, $name, $value = null) {
+
+		$this->name = strtoupper($name);
+		$this->root = $root;
+		if (is_null($name)) {
+			$this->noName = true;
+			$this->name = static::guessParameterNameByValue($value);
+		}
+
+		// If guessParameterNameByValue() returns an empty string
+		// above, we're actually dealing with a parameter that has no value.
+		// In that case we have to move the value to the name.
+		if ($this->name === '') {
+			$this->noName = false;
+			$this->name = strtoupper($value);
+		} else {
+			$this->setValue($value);
+		}
+
+	}
+
+	/**
+	 * Try to guess property name by value, can be used for vCard 2.1 nameless parameters.
+	 *
+	 * Figuring out what the name should have been. Note that a ton of
+	 * these are rather silly in 2014 and would probably rarely be
+	 * used, but we like to be complete.
+	 *
+	 * @param string $value
+	 *
+	 * @return string
+	 */
+	static function guessParameterNameByValue($value) {
+		switch (strtoupper($value)) {
+
+			// Encodings
+			case '7-BIT' :
+			case 'QUOTED-PRINTABLE' :
+			case 'BASE64' :
+				$name = 'ENCODING';
+				break;
+
+			// Common types
+			case 'WORK' :
+			case 'HOME' :
+			case 'PREF' :
+
+			// Delivery Label Type
+			case 'DOM' :
+			case 'INTL' :
+			case 'POSTAL' :
+			case 'PARCEL' :
+
+			// Telephone types
+			case 'VOICE' :
+			case 'FAX' :
+			case 'MSG' :
+			case 'CELL' :
+			case 'PAGER' :
+			case 'BBS' :
+			case 'MODEM' :
+			case 'CAR' :
+			case 'ISDN' :
+			case 'VIDEO' :
+
+			// EMAIL types (lol)
+			case 'AOL' :
+			case 'APPLELINK' :
+			case 'ATTMAIL' :
+			case 'CIS' :
+			case 'EWORLD' :
+			case 'INTERNET' :
+			case 'IBMMAIL' :
+			case 'MCIMAIL' :
+			case 'POWERSHARE' :
+			case 'PRODIGY' :
+			case 'TLX' :
+			case 'X400' :
+
+			// Photo / Logo format types
+			case 'GIF' :
+			case 'CGM' :
+			case 'WMF' :
+			case 'BMP' :
+			case 'DIB' :
+			case 'PICT' :
+			case 'TIFF' :
+			case 'PDF' :
+			case 'PS' :
+			case 'JPEG' :
+			case 'MPEG' :
+			case 'MPEG2' :
+			case 'AVI' :
+			case 'QTIME' :
+
+			// Sound Digital Audio Type
+			case 'WAVE' :
+			case 'PCM' :
+			case 'AIFF' :
+
+			// Key types
+			case 'X509' :
+			case 'PGP' :
+				$name = 'TYPE';
+				break;
+
+			// Value types
+			case 'INLINE' :
+			case 'URL' :
+			case 'CONTENT-ID' :
+			case 'CID' :
+				$name = 'VALUE';
+				break;
+
+			default:
+				$name = '';
+		}
+
+		return $name;
+	}
+
+	/**
+	 * Updates the current value.
+	 *
+	 * This may be either a single, or multiple strings in an array.
+	 *
+	 * @param string|array $value
+	 *
+	 * @return void
+	 */
+	public function setValue($value) {
+
+		$this->value = $value;
+
+	}
+
+	/**
+	 * Returns the current value.
+	 *
+	 * This method will always return a string, or null. If there were multiple
+	 * values, it will automatically concatenate them (separated by comma).
+	 *
+	 * @return string|null
+	 */
+	public function getValue() {
+
+		if (is_array($this->value)) {
+			return implode(',', $this->value);
+		} else {
+			return $this->value;
+		}
+
+	}
+
+	/**
+	 * Sets multiple values for this parameter.
+	 *
+	 * @param array $value
+	 *
+	 * @return void
+	 */
+	public function setParts(array $value) {
+
+		$this->value = $value;
+
+	}
+
+	/**
+	 * Returns all values for this parameter.
+	 *
+	 * If there were no values, an empty array will be returned.
+	 *
+	 * @return array
+	 */
+	public function getParts() {
+
+		if (is_array($this->value)) {
+			return $this->value;
+		} elseif (is_null($this->value)) {
+			return [];
+		} else {
+			return [$this->value];
+		}
+
+	}
+
+	/**
+	 * Adds a value to this parameter.
+	 *
+	 * If the argument is specified as an array, all items will be added to the
+	 * parameter value list.
+	 *
+	 * @param string|array $part
+	 *
+	 * @return void
+	 */
+	public function addValue($part) {
+
+		if (is_null($this->value)) {
+			$this->value = $part;
+		} else {
+			$this->value = array_merge((array)$this->value, (array)$part);
+		}
+
+	}
+
+	/**
+	 * Checks if this parameter contains the specified value.
+	 *
+	 * This is a case-insensitive match. It makes sense to call this for for
+	 * instance the TYPE parameter, to see if it contains a keyword such as
+	 * 'WORK' or 'FAX'.
+	 *
+	 * @param string $value
+	 *
+	 * @return bool
+	 */
+	public function has($value) {
+
+		return in_array(
+			strtolower($value),
+			array_map('strtolower', (array)$this->value)
+		);
+
+	}
+
+	/**
+	 * Turns the object back into a serialized blob.
+	 *
+	 * @return string
+	 */
+	public function serialize() {
+
+		$value = $this->getParts();
+
+		if (count($value) === 0) {
+			return $this->name . '=';
+		}
+
+		if ($this->root->getDocumentType() === Document::VCARD21 && $this->noName) {
+
+			return implode(';', $value);
+
+		}
+
+		return $this->name . '=' . array_reduce(
+			$value,
+			function($out, $item) {
+
+				if (!is_null($out)) $out .= ',';
+
+				// If there's no special characters in the string, we'll use the simple
+				// format.
+				//
+				// The list of special characters is defined as:
+				//
+				// Any character except CONTROL, DQUOTE, ";", ":", ","
+				//
+				// by the iCalendar spec:
+				// https://tools.ietf.org/html/rfc5545#section-3.1
+				//
+				// And we add ^ to that because of:
+				// https://tools.ietf.org/html/rfc6868
+				//
+				// But we've found that iCal (7.0, shipped with OSX 10.9)
+				// severaly trips on + characters not being quoted, so we
+				// added + as well.
+				if (!preg_match('#(?: [\n":;\^,\+] )#x', $item)) {
+					return $out . $item;
+				} else {
+					// Enclosing in double-quotes, and using RFC6868 for encoding any
+					// special characters
+					$out .= '"' . strtr(
+						$item,
+						[
+							'^'  => '^^',
+							"\n" => '^n',
+							'"'  => '^\'',
+						]
+					) . '"';
+					return $out;
+				}
+
+			}
+		);
+
+	}
+
+	/**
+	 * This method returns an array, with the representation as it should be
+	 * encoded in JSON. This is used to create jCard or jCal documents.
+	 *
+	 * @return array
+	 */
+	public function jsonSerialize() {
+
+		return $this->value;
+
+	}
+
+	/**
+	 * This method serializes the data into XML. This is used to create xCard or
+	 * xCal documents.
+	 *
+	 * @param Xml\Writer $writer  XML writer.
+	 *
+	 * @return void
+	 */
+	public function xmlSerialize(Xml\Writer $writer) {
+
+		foreach (explode(',', $this->value) as $value) {
+			$writer->writeElement('text', $value);
+		}
+
+	}
+
+	/**
+	 * Called when this object is being cast to a string.
+	 *
+	 * @return string
+	 */
+	public function __toString() {
+
+		return (string)$this->getValue();
+
+	}
+
+	/**
+	 * Returns the iterator for this object.
+	 *
+	 * @return ElementList
+	 */
+	public function getIterator() {
+
+		if (!is_null($this->iterator))
+			return $this->iterator;
+
+		return $this->iterator = new ArrayIterator((array)$this->value);
+
+	}
 
 }

libraries/SabreDAV/VObject/Parser/MimeDir.php

Doc Comments +2 added lines, -1 removed lines

@@ -331,6 +331,7 @@ 
     /**
      * Reads a property or component from a line.
      *
+     * @param string $line
      * @return void
      */
     protected function readProperty($line) {
@@ -623,7 +624,7 @@ 
      *
      * @param string $input
      *
-     * @return void
+     * @return string
      */
     private function unescapeParam($input) {
 

Unused Use Statements +2 added lines, -2 removed lines

@@ -2,12 +2,12 @@
 
 namespace Sabre\VObject\Parser;
 
-use Sabre\VObject\ParseException;
-use Sabre\VObject\EofException;
 use Sabre\VObject\Component;
 use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\Component\VCard;
 use Sabre\VObject\Document;
+use Sabre\VObject\EofException;
+use Sabre\VObject\ParseException;
 
 /**
  * MimeDir parser.

Indentation +646 added lines, -646 removed lines

@@ -24,328 +24,328 @@ 
  */
 class MimeDir extends Parser {
 
-    /**
-     * The input stream.
-     *
-     * @var resource
-     */
-    protected $input;
-
-    /**
-     * Root component.
-     *
-     * @var Component
-     */
-    protected $root;
-
-    /**
-     * By default all input will be assumed to be UTF-8.
-     *
-     * However, both iCalendar and vCard might be encoded using different
-     * character sets. The character set is usually set in the mime-type.
-     *
-     * If this is the case, use setEncoding to specify that a different
-     * encoding will be used. If this is set, the parser will automatically
-     * convert all incoming data to UTF-8.
-     *
-     * @var string
-     */
-    protected $charset = 'UTF-8';
-
-    /**
-     * The list of character sets we support when decoding.
-     *
-     * This would be a const expression but for now we need to support PHP 5.5
-     */
-    protected static $SUPPORTED_CHARSETS = [
-        'UTF-8',
-        'ISO-8859-1',
-        'Windows-1252',
-    ];
-
-    /**
-     * Parses an iCalendar or vCard file.
-     *
-     * Pass a stream or a string. If null is parsed, the existing buffer is
-     * used.
-     *
-     * @param string|resource|null $input
-     * @param int $options
-     *
-     * @return Sabre\VObject\Document
-     */
-    public function parse($input = null, $options = 0) {
-
-        $this->root = null;
-
-        if (!is_null($input)) {
-            $this->setInput($input);
-        }
-
-        if (0 !== $options) {
-            $this->options = $options;
-        }
-
-        $this->parseDocument();
-
-        return $this->root;
-
-    }
-
-    /**
-     * By default all input will be assumed to be UTF-8.
-     *
-     * However, both iCalendar and vCard might be encoded using different
-     * character sets. The character set is usually set in the mime-type.
-     *
-     * If this is the case, use setEncoding to specify that a different
-     * encoding will be used. If this is set, the parser will automatically
-     * convert all incoming data to UTF-8.
-     *
-     * @param string $charset
-     */
-    public function setCharset($charset) {
-
-        if (!in_array($charset, self::$SUPPORTED_CHARSETS)) {
-            throw new \InvalidArgumentException('Unsupported encoding. (Supported encodings: ' . implode(', ', self::$SUPPORTED_CHARSETS) . ')');
-        }
-        $this->charset = $charset;
-
-    }
-
-    /**
-     * Sets the input buffer. Must be a string or stream.
-     *
-     * @param resource|string $input
-     *
-     * @return void
-     */
-    public function setInput($input) {
-
-        // Resetting the parser
-        $this->lineIndex = 0;
-        $this->startLine = 0;
-
-        if (is_string($input)) {
-            // Convering to a stream.
-            $stream = fopen('php://temp', 'r+');
-            fwrite($stream, $input);
-            rewind($stream);
-            $this->input = $stream;
-        } elseif (is_resource($input)) {
-            $this->input = $input;
-        } else {
-            throw new \InvalidArgumentException('This parser can only read from strings or streams.');
-        }
-
-    }
-
-    /**
-     * Parses an entire document.
-     *
-     * @return void
-     */
-    protected function parseDocument() {
-
-        $line = $this->readLine();
-
-        // BOM is ZERO WIDTH NO-BREAK SPACE (U+FEFF).
-        // It's 0xEF 0xBB 0xBF in UTF-8 hex.
-        if (3 <= strlen($line)
-            && ord($line[0]) === 0xef
-            && ord($line[1]) === 0xbb
-            && ord($line[2]) === 0xbf) {
-            $line = substr($line, 3);
-        }
-
-        switch (strtoupper($line)) {
-            case 'BEGIN:VCALENDAR' :
-                $class = VCalendar::$componentMap['VCALENDAR'];
-                break;
-            case 'BEGIN:VCARD' :
-                $class = VCard::$componentMap['VCARD'];
-                break;
-            default :
-                throw new ParseException('This parser only supports VCARD and VCALENDAR files');
-        }
-
-        $this->root = new $class([], false);
-
-        while (true) {
-
-            // Reading until we hit END:
-            $line = $this->readLine();
-            if (strtoupper(substr($line, 0, 4)) === 'END:') {
-                break;
-            }
-            $result = $this->parseLine($line);
-            if ($result) {
-                $this->root->add($result);
-            }
-
-        }
-
-        $name = strtoupper(substr($line, 4));
-        if ($name !== $this->root->name) {
-            throw new ParseException('Invalid MimeDir file. expected: "END:' . $this->root->name . '" got: "END:' . $name . '"');
-        }
-
-    }
-
-    /**
-     * Parses a line, and if it hits a component, it will also attempt to parse
-     * the entire component.
-     *
-     * @param string $line Unfolded line
-     *
-     * @return Node
-     */
-    protected function parseLine($line) {
-
-        // Start of a new component
-        if (strtoupper(substr($line, 0, 6)) === 'BEGIN:') {
-
-            $component = $this->root->createComponent(substr($line, 6), [], false);
-
-            while (true) {
-
-                // Reading until we hit END:
-                $line = $this->readLine();
-                if (strtoupper(substr($line, 0, 4)) === 'END:') {
-                    break;
-                }
-                $result = $this->parseLine($line);
-                if ($result) {
-                    $component->add($result);
-                }
-
-            }
-
-            $name = strtoupper(substr($line, 4));
-            if ($name !== $component->name) {
-                throw new ParseException('Invalid MimeDir file. expected: "END:' . $component->name . '" got: "END:' . $name . '"');
-            }
-
-            return $component;
-
-        } else {
-
-            // Property reader
-            $property = $this->readProperty($line);
-            if (!$property) {
-                // Ignored line
-                return false;
-            }
-            return $property;
-
-        }
-
-    }
-
-    /**
-     * We need to look ahead 1 line every time to see if we need to 'unfold'
-     * the next line.
-     *
-     * If that was not the case, we store it here.
-     *
-     * @var null|string
-     */
-    protected $lineBuffer;
-
-    /**
-     * The real current line number.
-     */
-    protected $lineIndex = 0;
-
-    /**
-     * In the case of unfolded lines, this property holds the line number for
-     * the start of the line.
-     *
-     * @var int
-     */
-    protected $startLine = 0;
-
-    /**
-     * Contains a 'raw' representation of the current line.
-     *
-     * @var string
-     */
-    protected $rawLine;
-
-    /**
-     * Reads a single line from the buffer.
-     *
-     * This method strips any newlines and also takes care of unfolding.
-     *
-     * @throws \Sabre\VObject\EofException
-     *
-     * @return string
-     */
-    protected function readLine() {
-
-        if (!is_null($this->lineBuffer)) {
-            $rawLine = $this->lineBuffer;
-            $this->lineBuffer = null;
-        } else {
-            do {
-                $eof = feof($this->input);
-
-                $rawLine = fgets($this->input);
-
-                if ($eof || (feof($this->input) && $rawLine === false)) {
-                    throw new EofException('End of document reached prematurely');
-                }
-                if ($rawLine === false) {
-                    throw new ParseException('Error reading from input stream');
-                }
-                $rawLine = rtrim($rawLine, "\r\n");
-            } while ($rawLine === ''); // Skipping empty lines
-            $this->lineIndex++;
-        }
-        $line = $rawLine;
-
-        $this->startLine = $this->lineIndex;
-
-        // Looking ahead for folded lines.
-        while (true) {
-
-            $nextLine = rtrim(fgets($this->input), "\r\n");
-            $this->lineIndex++;
-            if (!$nextLine) {
-                break;
-            }
-            if ($nextLine[0] === "\t" || $nextLine[0] === " ") {
-                $line .= substr($nextLine, 1);
-                $rawLine .= "\n " . substr($nextLine, 1);
-            } else {
-                $this->lineBuffer = $nextLine;
-                break;
-            }
-
-        }
-        $this->rawLine = $rawLine;
-        return $line;
-
-    }
-
-    /**
-     * Reads a property or component from a line.
-     *
-     * @return void
-     */
-    protected function readProperty($line) {
-
-        if ($this->options & self::OPTION_FORGIVING) {
-            $propNameToken = 'A-Z0-9\-\._\\/';
-        } else {
-            $propNameToken = 'A-Z0-9\-\.';
-        }
-
-        $paramNameToken = 'A-Z0-9\-';
-        $safeChar = '^";:,';
-        $qSafeChar = '^"';
-
-        $regex = "/
+	/**
+	 * The input stream.
+	 *
+	 * @var resource
+	 */
+	protected $input;
+
+	/**
+	 * Root component.
+	 *
+	 * @var Component
+	 */
+	protected $root;
+
+	/**
+	 * By default all input will be assumed to be UTF-8.
+	 *
+	 * However, both iCalendar and vCard might be encoded using different
+	 * character sets. The character set is usually set in the mime-type.
+	 *
+	 * If this is the case, use setEncoding to specify that a different
+	 * encoding will be used. If this is set, the parser will automatically
+	 * convert all incoming data to UTF-8.
+	 *
+	 * @var string
+	 */
+	protected $charset = 'UTF-8';
+
+	/**
+	 * The list of character sets we support when decoding.
+	 *
+	 * This would be a const expression but for now we need to support PHP 5.5
+	 */
+	protected static $SUPPORTED_CHARSETS = [
+		'UTF-8',
+		'ISO-8859-1',
+		'Windows-1252',
+	];
+
+	/**
+	 * Parses an iCalendar or vCard file.
+	 *
+	 * Pass a stream or a string. If null is parsed, the existing buffer is
+	 * used.
+	 *
+	 * @param string|resource|null $input
+	 * @param int $options
+	 *
+	 * @return Sabre\VObject\Document
+	 */
+	public function parse($input = null, $options = 0) {
+
+		$this->root = null;
+
+		if (!is_null($input)) {
+			$this->setInput($input);
+		}
+
+		if (0 !== $options) {
+			$this->options = $options;
+		}
+
+		$this->parseDocument();
+
+		return $this->root;
+
+	}
+
+	/**
+	 * By default all input will be assumed to be UTF-8.
+	 *
+	 * However, both iCalendar and vCard might be encoded using different
+	 * character sets. The character set is usually set in the mime-type.
+	 *
+	 * If this is the case, use setEncoding to specify that a different
+	 * encoding will be used. If this is set, the parser will automatically
+	 * convert all incoming data to UTF-8.
+	 *
+	 * @param string $charset
+	 */
+	public function setCharset($charset) {
+
+		if (!in_array($charset, self::$SUPPORTED_CHARSETS)) {
+			throw new \InvalidArgumentException('Unsupported encoding. (Supported encodings: ' . implode(', ', self::$SUPPORTED_CHARSETS) . ')');
+		}
+		$this->charset = $charset;
+
+	}
+
+	/**
+	 * Sets the input buffer. Must be a string or stream.
+	 *
+	 * @param resource|string $input
+	 *
+	 * @return void
+	 */
+	public function setInput($input) {
+
+		// Resetting the parser
+		$this->lineIndex = 0;
+		$this->startLine = 0;
+
+		if (is_string($input)) {
+			// Convering to a stream.
+			$stream = fopen('php://temp', 'r+');
+			fwrite($stream, $input);
+			rewind($stream);
+			$this->input = $stream;
+		} elseif (is_resource($input)) {
+			$this->input = $input;
+		} else {
+			throw new \InvalidArgumentException('This parser can only read from strings or streams.');
+		}
+
+	}
+
+	/**
+	 * Parses an entire document.
+	 *
+	 * @return void
+	 */
+	protected function parseDocument() {
+
+		$line = $this->readLine();
+
+		// BOM is ZERO WIDTH NO-BREAK SPACE (U+FEFF).
+		// It's 0xEF 0xBB 0xBF in UTF-8 hex.
+		if (3 <= strlen($line)
+			&& ord($line[0]) === 0xef
+			&& ord($line[1]) === 0xbb
+			&& ord($line[2]) === 0xbf) {
+			$line = substr($line, 3);
+		}
+
+		switch (strtoupper($line)) {
+			case 'BEGIN:VCALENDAR' :
+				$class = VCalendar::$componentMap['VCALENDAR'];
+				break;
+			case 'BEGIN:VCARD' :
+				$class = VCard::$componentMap['VCARD'];
+				break;
+			default :
+				throw new ParseException('This parser only supports VCARD and VCALENDAR files');
+		}
+
+		$this->root = new $class([], false);
+
+		while (true) {
+
+			// Reading until we hit END:
+			$line = $this->readLine();
+			if (strtoupper(substr($line, 0, 4)) === 'END:') {
+				break;
+			}
+			$result = $this->parseLine($line);
+			if ($result) {
+				$this->root->add($result);
+			}
+
+		}
+
+		$name = strtoupper(substr($line, 4));
+		if ($name !== $this->root->name) {
+			throw new ParseException('Invalid MimeDir file. expected: "END:' . $this->root->name . '" got: "END:' . $name . '"');
+		}
+
+	}
+
+	/**
+	 * Parses a line, and if it hits a component, it will also attempt to parse
+	 * the entire component.
+	 *
+	 * @param string $line Unfolded line
+	 *
+	 * @return Node
+	 */
+	protected function parseLine($line) {
+
+		// Start of a new component
+		if (strtoupper(substr($line, 0, 6)) === 'BEGIN:') {
+
+			$component = $this->root->createComponent(substr($line, 6), [], false);
+
+			while (true) {
+
+				// Reading until we hit END:
+				$line = $this->readLine();
+				if (strtoupper(substr($line, 0, 4)) === 'END:') {
+					break;
+				}
+				$result = $this->parseLine($line);
+				if ($result) {
+					$component->add($result);
+				}
+
+			}
+
+			$name = strtoupper(substr($line, 4));
+			if ($name !== $component->name) {
+				throw new ParseException('Invalid MimeDir file. expected: "END:' . $component->name . '" got: "END:' . $name . '"');
+			}
+
+			return $component;
+
+		} else {
+
+			// Property reader
+			$property = $this->readProperty($line);
+			if (!$property) {
+				// Ignored line
+				return false;
+			}
+			return $property;
+
+		}
+
+	}
+
+	/**
+	 * We need to look ahead 1 line every time to see if we need to 'unfold'
+	 * the next line.
+	 *
+	 * If that was not the case, we store it here.
+	 *
+	 * @var null|string
+	 */
+	protected $lineBuffer;
+
+	/**
+	 * The real current line number.
+	 */
+	protected $lineIndex = 0;
+
+	/**
+	 * In the case of unfolded lines, this property holds the line number for
+	 * the start of the line.
+	 *
+	 * @var int
+	 */
+	protected $startLine = 0;
+
+	/**
+	 * Contains a 'raw' representation of the current line.
+	 *
+	 * @var string
+	 */
+	protected $rawLine;
+
+	/**
+	 * Reads a single line from the buffer.
+	 *
+	 * This method strips any newlines and also takes care of unfolding.
+	 *
+	 * @throws \Sabre\VObject\EofException
+	 *
+	 * @return string
+	 */
+	protected function readLine() {
+
+		if (!is_null($this->lineBuffer)) {
+			$rawLine = $this->lineBuffer;
+			$this->lineBuffer = null;
+		} else {
+			do {
+				$eof = feof($this->input);
+
+				$rawLine = fgets($this->input);
+
+				if ($eof || (feof($this->input) && $rawLine === false)) {
+					throw new EofException('End of document reached prematurely');
+				}
+				if ($rawLine === false) {
+					throw new ParseException('Error reading from input stream');
+				}
+				$rawLine = rtrim($rawLine, "\r\n");
+			} while ($rawLine === ''); // Skipping empty lines
+			$this->lineIndex++;
+		}
+		$line = $rawLine;
+
+		$this->startLine = $this->lineIndex;
+
+		// Looking ahead for folded lines.
+		while (true) {
+
+			$nextLine = rtrim(fgets($this->input), "\r\n");
+			$this->lineIndex++;
+			if (!$nextLine) {
+				break;
+			}
+			if ($nextLine[0] === "\t" || $nextLine[0] === " ") {
+				$line .= substr($nextLine, 1);
+				$rawLine .= "\n " . substr($nextLine, 1);
+			} else {
+				$this->lineBuffer = $nextLine;
+				break;
+			}
+
+		}
+		$this->rawLine = $rawLine;
+		return $line;
+
+	}
+
+	/**
+	 * Reads a property or component from a line.
+	 *
+	 * @return void
+	 */
+	protected function readProperty($line) {
+
+		if ($this->options & self::OPTION_FORGIVING) {
+			$propNameToken = 'A-Z0-9\-\._\\/';
+		} else {
+			$propNameToken = 'A-Z0-9\-\.';
+		}
+
+		$paramNameToken = 'A-Z0-9\-';
+		$safeChar = '^";:,';
+		$qSafeChar = '^"';
+
+		$regex = "/
             ^(?P<name> [$propNameToken]+ ) (?=[;:])        # property name
             |
             (?<=:)(?P<propValue> .+)$                      # property value
@@ -358,339 +358,339 @@ 
             ) (?=[;:,])
             /xi";
 
-        //echo $regex, "\n"; die();
-        preg_match_all($regex, $line, $matches,  PREG_SET_ORDER);
-
-        $property = [
-            'name'       => null,
-            'parameters' => [],
-            'value'      => null
-        ];
-
-        $lastParam = null;
-
-        /**
-         * Looping through all the tokens.
-         *
-         * Note that we are looping through them in reverse order, because if a
-         * sub-pattern matched, the subsequent named patterns will not show up
-         * in the result.
-         */
-        foreach ($matches as $match) {
-
-            if (isset($match['paramValue'])) {
-                if ($match['paramValue'] && $match['paramValue'][0] === '"') {
-                    $value = substr($match['paramValue'], 1, -1);
-                } else {
-                    $value = $match['paramValue'];
-                }
-
-                $value = $this->unescapeParam($value);
-
-                if (is_null($lastParam)) {
-                    throw new ParseException('Invalid Mimedir file. Line starting at ' . $this->startLine . ' did not follow iCalendar/vCard conventions');
-                }
-                if (is_null($property['parameters'][$lastParam])) {
-                    $property['parameters'][$lastParam] = $value;
-                } elseif (is_array($property['parameters'][$lastParam])) {
-                    $property['parameters'][$lastParam][] = $value;
-                } else {
-                    $property['parameters'][$lastParam] = [
-                        $property['parameters'][$lastParam],
-                        $value
-                    ];
-                }
-                continue;
-            }
-            if (isset($match['paramName'])) {
-                $lastParam = strtoupper($match['paramName']);
-                if (!isset($property['parameters'][$lastParam])) {
-                    $property['parameters'][$lastParam] = null;
-                }
-                continue;
-            }
-            if (isset($match['propValue'])) {
-                $property['value'] = $match['propValue'];
-                continue;
-            }
-            if (isset($match['name']) && $match['name']) {
-                $property['name'] = strtoupper($match['name']);
-                continue;
-            }
-
-            // @codeCoverageIgnoreStart
-            throw new \LogicException('This code should not be reachable');
-            // @codeCoverageIgnoreEnd
-
-        }
-
-        if (is_null($property['value'])) {
-            $property['value'] = '';
-        }
-        if (!$property['name']) {
-            if ($this->options & self::OPTION_IGNORE_INVALID_LINES) {
-                return false;
-            }
-            throw new ParseException('Invalid Mimedir file. Line starting at ' . $this->startLine . ' did not follow iCalendar/vCard conventions');
-        }
-
-        // vCard 2.1 states that parameters may appear without a name, and only
-        // a value. We can deduce the value based on it's name.
-        //
-        // Our parser will get those as parameters without a value instead, so
-        // we're filtering these parameters out first.
-        $namedParameters = [];
-        $namelessParameters = [];
-
-        foreach ($property['parameters'] as $name => $value) {
-            if (!is_null($value)) {
-                $namedParameters[$name] = $value;
-            } else {
-                $namelessParameters[] = $name;
-            }
-        }
-
-        $propObj = $this->root->createProperty($property['name'], null, $namedParameters);
-
-        foreach ($namelessParameters as $namelessParameter) {
-            $propObj->add(null, $namelessParameter);
-        }
-
-        if (strtoupper($propObj['ENCODING']) === 'QUOTED-PRINTABLE') {
-            $propObj->setQuotedPrintableValue($this->extractQuotedPrintableValue());
-        } else {
-            $charset = $this->charset;
-            if ($this->root->getDocumentType() === Document::VCARD21 && isset($propObj['CHARSET'])) {
-                // vCard 2.1 allows the character set to be specified per property.
-                $charset = (string)$propObj['CHARSET'];
-            }
-            switch ($charset) {
-                case 'UTF-8' :
-                    break;
-                case 'ISO-8859-1' :
-                    $property['value'] = utf8_encode($property['value']);
-                    break;
-                case 'Windows-1252' :
-                    $property['value'] = mb_convert_encoding($property['value'], 'UTF-8', $charset);
-                    break;
-                default :
-                    throw new ParseException('Unsupported CHARSET: ' . $propObj['CHARSET']);
-            }
-            $propObj->setRawMimeDirValue($property['value']);
-        }
-
-        return $propObj;
-
-    }
-
-    /**
-     * Unescapes a property value.
-     *
-     * vCard 2.1 says:
-     *   * Semi-colons must be escaped in some property values, specifically
-     *     ADR, ORG and N.
-     *   * Semi-colons must be escaped in parameter values, because semi-colons
-     *     are also use to separate values.
-     *   * No mention of escaping backslashes with another backslash.
-     *   * newlines are not escaped either, instead QUOTED-PRINTABLE is used to
-     *     span values over more than 1 line.
-     *
-     * vCard 3.0 says:
-     *   * (rfc2425) Backslashes, newlines (\n or \N) and comma's must be
-     *     escaped, all time time.
-     *   * Comma's are used for delimeters in multiple values
-     *   * (rfc2426) Adds to to this that the semi-colon MUST also be escaped,
-     *     as in some properties semi-colon is used for separators.
-     *   * Properties using semi-colons: N, ADR, GEO, ORG
-     *   * Both ADR and N's individual parts may be broken up further with a
-     *     comma.
-     *   * Properties using commas: NICKNAME, CATEGORIES
-     *
-     * vCard 4.0 (rfc6350) says:
-     *   * Commas must be escaped.
-     *   * Semi-colons may be escaped, an unescaped semi-colon _may_ be a
-     *     delimiter, depending on the property.
-     *   * Backslashes must be escaped
-     *   * Newlines must be escaped as either \N or \n.
-     *   * Some compound properties may contain multiple parts themselves, so a
-     *     comma within a semi-colon delimited property may also be unescaped
-     *     to denote multiple parts _within_ the compound property.
-     *   * Text-properties using semi-colons: N, ADR, ORG, CLIENTPIDMAP.
-     *   * Text-properties using commas: NICKNAME, RELATED, CATEGORIES, PID.
-     *
-     * Even though the spec says that commas must always be escaped, the
-     * example for GEO in Section 6.5.2 seems to violate this.
-     *
-     * iCalendar 2.0 (rfc5545) says:
-     *   * Commas or semi-colons may be used as delimiters, depending on the
-     *     property.
-     *   * Commas, semi-colons, backslashes, newline (\N or \n) are always
-     *     escaped, unless they are delimiters.
-     *   * Colons shall not be escaped.
-     *   * Commas can be considered the 'default delimiter' and is described as
-     *     the delimiter in cases where the order of the multiple values is
-     *     insignificant.
-     *   * Semi-colons are described as the delimiter for 'structured values'.
-     *     They are specifically used in Semi-colons are used as a delimiter in
-     *     REQUEST-STATUS, RRULE, GEO and EXRULE. EXRULE is deprecated however.
-     *
-     * Now for the parameters
-     *
-     * If delimiter is not set (null) this method will just return a string.
-     * If it's a comma or a semi-colon the string will be split on those
-     * characters, and always return an array.
-     *
-     * @param string $input
-     * @param string $delimiter
-     *
-     * @return string|string[]
-     */
-    static function unescapeValue($input, $delimiter = ';') {
-
-        $regex = '#  (?: (\\\\ (?: \\\\ | N | n | ; | , ) )';
-        if ($delimiter) {
-            $regex .= ' | (' . $delimiter . ')';
-        }
-        $regex .= ') #x';
-
-        $matches = preg_split($regex, $input, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-
-        $resultArray = [];
-        $result = '';
-
-        foreach ($matches as $match) {
-
-            switch ($match) {
-                case '\\\\' :
-                    $result .= '\\';
-                    break;
-                case '\N' :
-                case '\n' :
-                    $result .= "\n";
-                    break;
-                case '\;' :
-                    $result .= ';';
-                    break;
-                case '\,' :
-                    $result .= ',';
-                    break;
-                case $delimiter :
-                    $resultArray[] = $result;
-                    $result = '';
-                    break;
-                default :
-                    $result .= $match;
-                    break;
-
-            }
-
-        }
-
-        $resultArray[] = $result;
-        return $delimiter ? $resultArray : $result;
-
-    }
-
-    /**
-     * Unescapes a parameter value.
-     *
-     * vCard 2.1:
-     *   * Does not mention a mechanism for this. In addition, double quotes
-     *     are never used to wrap values.
-     *   * This means that parameters can simply not contain colons or
-     *     semi-colons.
-     *
-     * vCard 3.0 (rfc2425, rfc2426):
-     *   * Parameters _may_ be surrounded by double quotes.
-     *   * If this is not the case, semi-colon, colon and comma may simply not
-     *     occur (the comma used for multiple parameter values though).
-     *   * If it is surrounded by double-quotes, it may simply not contain
-     *     double-quotes.
-     *   * This means that a parameter can in no case encode double-quotes, or
-     *     newlines.
-     *
-     * vCard 4.0 (rfc6350)
-     *   * Behavior seems to be identical to vCard 3.0
-     *
-     * iCalendar 2.0 (rfc5545)
-     *   * Behavior seems to be identical to vCard 3.0
-     *
-     * Parameter escaping mechanism (rfc6868) :
-     *   * This rfc describes a new way to escape parameter values.
-     *   * New-line is encoded as ^n
-     *   * ^ is encoded as ^^.
-     *   * " is encoded as ^'
-     *
-     * @param string $input
-     *
-     * @return void
-     */
-    private function unescapeParam($input) {
-
-        return
-            preg_replace_callback(
-                '#(\^(\^|n|\'))#',
-                function($matches) {
-                    switch ($matches[2]) {
-                        case 'n' :
-                            return "\n";
-                        case '^' :
-                            return '^';
-                        case '\'' :
-                            return '"';
-
-                    // @codeCoverageIgnoreStart
-                    }
-                    // @codeCoverageIgnoreEnd
-                },
-                $input
-            );
-    }
-
-    /**
-     * Gets the full quoted printable value.
-     *
-     * We need a special method for this, because newlines have both a meaning
-     * in vCards, and in QuotedPrintable.
-     *
-     * This method does not do any decoding.
-     *
-     * @return string
-     */
-    private function extractQuotedPrintableValue() {
-
-        // We need to parse the raw line again to get the start of the value.
-        //
-        // We are basically looking for the first colon (:), but we need to
-        // skip over the parameters first, as they may contain one.
-        $regex = '/^
+		//echo $regex, "\n"; die();
+		preg_match_all($regex, $line, $matches,  PREG_SET_ORDER);
+
+		$property = [
+			'name'       => null,
+			'parameters' => [],
+			'value'      => null
+		];
+
+		$lastParam = null;
+
+		/**
+		 * Looping through all the tokens.
+		 *
+		 * Note that we are looping through them in reverse order, because if a
+		 * sub-pattern matched, the subsequent named patterns will not show up
+		 * in the result.
+		 */
+		foreach ($matches as $match) {
+
+			if (isset($match['paramValue'])) {
+				if ($match['paramValue'] && $match['paramValue'][0] === '"') {
+					$value = substr($match['paramValue'], 1, -1);
+				} else {
+					$value = $match['paramValue'];
+				}
+
+				$value = $this->unescapeParam($value);
+
+				if (is_null($lastParam)) {
+					throw new ParseException('Invalid Mimedir file. Line starting at ' . $this->startLine . ' did not follow iCalendar/vCard conventions');
+				}
+				if (is_null($property['parameters'][$lastParam])) {
+					$property['parameters'][$lastParam] = $value;
+				} elseif (is_array($property['parameters'][$lastParam])) {
+					$property['parameters'][$lastParam][] = $value;
+				} else {
+					$property['parameters'][$lastParam] = [
+						$property['parameters'][$lastParam],
+						$value
+					];
+				}
+				continue;
+			}
+			if (isset($match['paramName'])) {
+				$lastParam = strtoupper($match['paramName']);
+				if (!isset($property['parameters'][$lastParam])) {
+					$property['parameters'][$lastParam] = null;
+				}
+				continue;
+			}
+			if (isset($match['propValue'])) {
+				$property['value'] = $match['propValue'];
+				continue;
+			}
+			if (isset($match['name']) && $match['name']) {
+				$property['name'] = strtoupper($match['name']);
+				continue;
+			}
+
+			// @codeCoverageIgnoreStart
+			throw new \LogicException('This code should not be reachable');
+			// @codeCoverageIgnoreEnd
+
+		}
+
+		if (is_null($property['value'])) {
+			$property['value'] = '';
+		}
+		if (!$property['name']) {
+			if ($this->options & self::OPTION_IGNORE_INVALID_LINES) {
+				return false;
+			}
+			throw new ParseException('Invalid Mimedir file. Line starting at ' . $this->startLine . ' did not follow iCalendar/vCard conventions');
+		}
+
+		// vCard 2.1 states that parameters may appear without a name, and only
+		// a value. We can deduce the value based on it's name.
+		//
+		// Our parser will get those as parameters without a value instead, so
+		// we're filtering these parameters out first.
+		$namedParameters = [];
+		$namelessParameters = [];
+
+		foreach ($property['parameters'] as $name => $value) {
+			if (!is_null($value)) {
+				$namedParameters[$name] = $value;
+			} else {
+				$namelessParameters[] = $name;
+			}
+		}
+
+		$propObj = $this->root->createProperty($property['name'], null, $namedParameters);
+
+		foreach ($namelessParameters as $namelessParameter) {
+			$propObj->add(null, $namelessParameter);
+		}
+
+		if (strtoupper($propObj['ENCODING']) === 'QUOTED-PRINTABLE') {
+			$propObj->setQuotedPrintableValue($this->extractQuotedPrintableValue());
+		} else {
+			$charset = $this->charset;
+			if ($this->root->getDocumentType() === Document::VCARD21 && isset($propObj['CHARSET'])) {
+				// vCard 2.1 allows the character set to be specified per property.
+				$charset = (string)$propObj['CHARSET'];
+			}
+			switch ($charset) {
+				case 'UTF-8' :
+					break;
+				case 'ISO-8859-1' :
+					$property['value'] = utf8_encode($property['value']);
+					break;
+				case 'Windows-1252' :
+					$property['value'] = mb_convert_encoding($property['value'], 'UTF-8', $charset);
+					break;
+				default :
+					throw new ParseException('Unsupported CHARSET: ' . $propObj['CHARSET']);
+			}
+			$propObj->setRawMimeDirValue($property['value']);
+		}
+
+		return $propObj;
+
+	}
+
+	/**
+	 * Unescapes a property value.
+	 *
+	 * vCard 2.1 says:
+	 *   * Semi-colons must be escaped in some property values, specifically
+	 *     ADR, ORG and N.
+	 *   * Semi-colons must be escaped in parameter values, because semi-colons
+	 *     are also use to separate values.
+	 *   * No mention of escaping backslashes with another backslash.
+	 *   * newlines are not escaped either, instead QUOTED-PRINTABLE is used to
+	 *     span values over more than 1 line.
+	 *
+	 * vCard 3.0 says:
+	 *   * (rfc2425) Backslashes, newlines (\n or \N) and comma's must be
+	 *     escaped, all time time.
+	 *   * Comma's are used for delimeters in multiple values
+	 *   * (rfc2426) Adds to to this that the semi-colon MUST also be escaped,
+	 *     as in some properties semi-colon is used for separators.
+	 *   * Properties using semi-colons: N, ADR, GEO, ORG
+	 *   * Both ADR and N's individual parts may be broken up further with a
+	 *     comma.
+	 *   * Properties using commas: NICKNAME, CATEGORIES
+	 *
+	 * vCard 4.0 (rfc6350) says:
+	 *   * Commas must be escaped.
+	 *   * Semi-colons may be escaped, an unescaped semi-colon _may_ be a
+	 *     delimiter, depending on the property.
+	 *   * Backslashes must be escaped
+	 *   * Newlines must be escaped as either \N or \n.
+	 *   * Some compound properties may contain multiple parts themselves, so a
+	 *     comma within a semi-colon delimited property may also be unescaped
+	 *     to denote multiple parts _within_ the compound property.
+	 *   * Text-properties using semi-colons: N, ADR, ORG, CLIENTPIDMAP.
+	 *   * Text-properties using commas: NICKNAME, RELATED, CATEGORIES, PID.
+	 *
+	 * Even though the spec says that commas must always be escaped, the
+	 * example for GEO in Section 6.5.2 seems to violate this.
+	 *
+	 * iCalendar 2.0 (rfc5545) says:
+	 *   * Commas or semi-colons may be used as delimiters, depending on the
+	 *     property.
+	 *   * Commas, semi-colons, backslashes, newline (\N or \n) are always
+	 *     escaped, unless they are delimiters.
+	 *   * Colons shall not be escaped.
+	 *   * Commas can be considered the 'default delimiter' and is described as
+	 *     the delimiter in cases where the order of the multiple values is
+	 *     insignificant.
+	 *   * Semi-colons are described as the delimiter for 'structured values'.
+	 *     They are specifically used in Semi-colons are used as a delimiter in
+	 *     REQUEST-STATUS, RRULE, GEO and EXRULE. EXRULE is deprecated however.
+	 *
+	 * Now for the parameters
+	 *
+	 * If delimiter is not set (null) this method will just return a string.
+	 * If it's a comma or a semi-colon the string will be split on those
+	 * characters, and always return an array.
+	 *
+	 * @param string $input
+	 * @param string $delimiter
+	 *
+	 * @return string|string[]
+	 */
+	static function unescapeValue($input, $delimiter = ';') {
+
+		$regex = '#  (?: (\\\\ (?: \\\\ | N | n | ; | , ) )';
+		if ($delimiter) {
+			$regex .= ' | (' . $delimiter . ')';
+		}
+		$regex .= ') #x';
+
+		$matches = preg_split($regex, $input, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+
+		$resultArray = [];
+		$result = '';
+
+		foreach ($matches as $match) {
+
+			switch ($match) {
+				case '\\\\' :
+					$result .= '\\';
+					break;
+				case '\N' :
+				case '\n' :
+					$result .= "\n";
+					break;
+				case '\;' :
+					$result .= ';';
+					break;
+				case '\,' :
+					$result .= ',';
+					break;
+				case $delimiter :
+					$resultArray[] = $result;
+					$result = '';
+					break;
+				default :
+					$result .= $match;
+					break;
+
+			}
+
+		}
+
+		$resultArray[] = $result;
+		return $delimiter ? $resultArray : $result;
+
+	}
+
+	/**
+	 * Unescapes a parameter value.
+	 *
+	 * vCard 2.1:
+	 *   * Does not mention a mechanism for this. In addition, double quotes
+	 *     are never used to wrap values.
+	 *   * This means that parameters can simply not contain colons or
+	 *     semi-colons.
+	 *
+	 * vCard 3.0 (rfc2425, rfc2426):
+	 *   * Parameters _may_ be surrounded by double quotes.
+	 *   * If this is not the case, semi-colon, colon and comma may simply not
+	 *     occur (the comma used for multiple parameter values though).
+	 *   * If it is surrounded by double-quotes, it may simply not contain
+	 *     double-quotes.
+	 *   * This means that a parameter can in no case encode double-quotes, or
+	 *     newlines.
+	 *
+	 * vCard 4.0 (rfc6350)
+	 *   * Behavior seems to be identical to vCard 3.0
+	 *
+	 * iCalendar 2.0 (rfc5545)
+	 *   * Behavior seems to be identical to vCard 3.0
+	 *
+	 * Parameter escaping mechanism (rfc6868) :
+	 *   * This rfc describes a new way to escape parameter values.
+	 *   * New-line is encoded as ^n
+	 *   * ^ is encoded as ^^.
+	 *   * " is encoded as ^'
+	 *
+	 * @param string $input
+	 *
+	 * @return void
+	 */
+	private function unescapeParam($input) {
+
+		return
+			preg_replace_callback(
+				'#(\^(\^|n|\'))#',
+				function($matches) {
+					switch ($matches[2]) {
+						case 'n' :
+							return "\n";
+						case '^' :
+							return '^';
+						case '\'' :
+							return '"';
+
+					// @codeCoverageIgnoreStart
+					}
+					// @codeCoverageIgnoreEnd
+				},
+				$input
+			);
+	}
+
+	/**
+	 * Gets the full quoted printable value.
+	 *
+	 * We need a special method for this, because newlines have both a meaning
+	 * in vCards, and in QuotedPrintable.
+	 *
+	 * This method does not do any decoding.
+	 *
+	 * @return string
+	 */
+	private function extractQuotedPrintableValue() {
+
+		// We need to parse the raw line again to get the start of the value.
+		//
+		// We are basically looking for the first colon (:), but we need to
+		// skip over the parameters first, as they may contain one.
+		$regex = '/^
             (?: [^:])+ # Anything but a colon
             (?: "[^"]")* # A parameter in double quotes
             : # start of the value we really care about
             (.*)$
         /xs';
 
-        preg_match($regex, $this->rawLine, $matches);
+		preg_match($regex, $this->rawLine, $matches);
 
-        $value = $matches[1];
-        // Removing the first whitespace character from every line. Kind of
-        // like unfolding, but we keep the newline.
-        $value = str_replace("\n ", "\n", $value);
+		$value = $matches[1];
+		// Removing the first whitespace character from every line. Kind of
+		// like unfolding, but we keep the newline.
+		$value = str_replace("\n ", "\n", $value);
 
-        // Microsoft products don't always correctly fold lines, they may be
-        // missing a whitespace. So if 'forgiving' is turned on, we will take
-        // those as well.
-        if ($this->options & self::OPTION_FORGIVING) {
-            while (substr($value, -1) === '=') {
-                // Reading the line
-                $this->readLine();
-                // Grabbing the raw form
-                $value .= "\n" . $this->rawLine;
-            }
-        }
+		// Microsoft products don't always correctly fold lines, they may be
+		// missing a whitespace. So if 'forgiving' is turned on, we will take
+		// those as well.
+		if ($this->options & self::OPTION_FORGIVING) {
+			while (substr($value, -1) === '=') {
+				// Reading the line
+				$this->readLine();
+				// Grabbing the raw form
+				$value .= "\n" . $this->rawLine;
+			}
+		}
 
-        return $value;
+		return $value;
 
-    }
+	}
 
 }

libraries/SabreDAV/Event/Promise/functions.php

Indentation +55 added lines, -55 removed lines

@@ -31,30 +31,30 @@ 
  */
 function all(array $promises) {
 
-    return new Promise(function($success, $fail) use ($promises) {
-
-        $successCount = 0;
-        $completeResult = [];
-
-        foreach ($promises as $promiseIndex => $subPromise) {
-
-            $subPromise->then(
-                function($result) use ($promiseIndex, &$completeResult, &$successCount, $success, $promises) {
-                    $completeResult[$promiseIndex] = $result;
-                    $successCount++;
-                    if ($successCount === count($promises)) {
-                        $success($completeResult);
-                    }
-                    return $result;
-                }
-            )->error(
-                function($reason) use ($fail) {
-                    $fail($reason);
-                }
-            );
-
-        }
-    });
+	return new Promise(function($success, $fail) use ($promises) {
+
+		$successCount = 0;
+		$completeResult = [];
+
+		foreach ($promises as $promiseIndex => $subPromise) {
+
+			$subPromise->then(
+				function($result) use ($promiseIndex, &$completeResult, &$successCount, $success, $promises) {
+					$completeResult[$promiseIndex] = $result;
+					$successCount++;
+					if ($successCount === count($promises)) {
+						$success($completeResult);
+					}
+					return $result;
+				}
+			)->error(
+				function($reason) use ($fail) {
+					$fail($reason);
+				}
+			);
+
+		}
+	});
 
 }
 
@@ -70,31 +70,31 @@ 
  */
 function race(array $promises) {
 
-    return new Promise(function($success, $fail) use ($promises) {
+	return new Promise(function($success, $fail) use ($promises) {
 
-        $alreadyDone = false;
-        foreach ($promises as $promise) {
+		$alreadyDone = false;
+		foreach ($promises as $promise) {
 
-            $promise->then(
-                function($result) use ($success, &$alreadyDone) {
-                    if ($alreadyDone) {
-                        return;
-                    }
-                    $alreadyDone = true;
-                    $success($result);
-                },
-                function($reason) use ($fail, &$alreadyDone) {
-                    if ($alreadyDone) {
-                        return;
-                    }
-                    $alreadyDone = true;
-                    $fail($reason);
-                }
-            );
+			$promise->then(
+				function($result) use ($success, &$alreadyDone) {
+					if ($alreadyDone) {
+						return;
+					}
+					$alreadyDone = true;
+					$success($result);
+				},
+				function($reason) use ($fail, &$alreadyDone) {
+					if ($alreadyDone) {
+						return;
+					}
+					$alreadyDone = true;
+					$fail($reason);
+				}
+			);
 
-        }
+		}
 
-    });
+	});
 
 }
 
@@ -110,13 +110,13 @@ 
  */
 function resolve($value) {
 
-    if ($value instanceof Promise) {
-        return $value->then();
-    } else {
-        $promise = new Promise();
-        $promise->fulfill($value);
-        return $promise;
-    }
+	if ($value instanceof Promise) {
+		return $value->then();
+	} else {
+		$promise = new Promise();
+		$promise->fulfill($value);
+		return $promise;
+	}
 
 }
 
@@ -128,8 +128,8 @@ 
  */
 function reject($reason) {
 
-    $promise = new Promise();
-    $promise->reject($reason);
-    return $promise;
+	$promise = new Promise();
+	$promise->reject($reason);
+	return $promise;
 
 }

libraries/SabreDAV/VObject/FreeBusyGenerator.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,8 +2,8 @@
 
 namespace Sabre\VObject\Recur;
 
-use DateTimeInterface;
 use DateTimeImmutable;
+use DateTimeInterface;
 use Iterator;
 use Sabre\VObject\DateTimeParser;
 use Sabre\VObject\InvalidDataException;

Indentation +553 added lines, -553 removed lines

@@ -25,580 +25,580 @@
  */
 class FreeBusyGenerator {
 
-    /**
-     * Input objects.
-     *
-     * @var array
-     */
-    protected $objects = [];
-
-    /**
-     * Start of range.
-     *
-     * @var DateTimeInterface|null
-     */
-    protected $start;
-
-    /**
-     * End of range.
-     *
-     * @var DateTimeInterface|null
-     */
-    protected $end;
-
-    /**
-     * VCALENDAR object.
-     *
-     * @var Document
-     */
-    protected $baseObject;
-
-    /**
-     * Reference timezone.
-     *
-     * When we are calculating busy times, and we come across so-called
-     * floating times (times without a timezone), we use the reference timezone
-     * instead.
-     *
-     * This is also used for all-day events.
-     *
-     * This defaults to UTC.
-     *
-     * @var DateTimeZone
-     */
-    protected $timeZone;
-
-    /**
-     * A VAVAILABILITY document.
-     *
-     * If this is set, it's information will be included when calculating
-     * freebusy time.
-     *
-     * @var Document
-     */
-    protected $vavailability;
-
-    /**
-     * Creates the generator.
-     *
-     * Check the setTimeRange and setObjects methods for details about the
-     * arguments.
-     *
-     * @param DateTimeInterface $start
-     * @param DateTimeInterface $end
-     * @param mixed $objects
-     * @param DateTimeZone $timeZone
-     */
-    public function __construct(DateTimeInterface $start = null, DateTimeInterface $end = null, $objects = null, DateTimeZone $timeZone = null) {
-
-        $this->setTimeRange($start, $end);
-
-        if ($objects) {
-            $this->setObjects($objects);
-        }
-        if (is_null($timeZone)) {
-            $timeZone = new DateTimeZone('UTC');
-        }
-        $this->setTimeZone($timeZone);
-
-    }
-
-    /**
-     * Sets the VCALENDAR object.
-     *
-     * If this is set, it will not be generated for you. You are responsible
-     * for setting things like the METHOD, CALSCALE, VERSION, etc..
-     *
-     * The VFREEBUSY object will be automatically added though.
-     *
-     * @param Document $vcalendar
-     * @return void
-     */
-    public function setBaseObject(Document $vcalendar) {
-
-        $this->baseObject = $vcalendar;
-
-    }
-
-    /**
-     * Sets a VAVAILABILITY document.
-     *
-     * @param Document $vcalendar
-     * @return void
-     */
-    public function setVAvailability(Document $vcalendar) {
-
-        $this->vavailability = $vcalendar;
-
-    }
-
-    /**
-     * Sets the input objects.
-     *
-     * You must either specify a valendar object as a string, or as the parse
-     * Component.
-     * It's also possible to specify multiple objects as an array.
-     *
-     * @param mixed $objects
-     *
-     * @return void
-     */
-    public function setObjects($objects) {
-
-        if (!is_array($objects)) {
-            $objects = [$objects];
-        }
-
-        $this->objects = [];
-        foreach ($objects as $object) {
-
-            if (is_string($object)) {
-                $this->objects[] = Reader::read($object);
-            } elseif ($object instanceof Component) {
-                $this->objects[] = $object;
-            } else {
-                throw new \InvalidArgumentException('You can only pass strings or \\Sabre\\VObject\\Component arguments to setObjects');
-            }
-
-        }
-
-    }
-
-    /**
-     * Sets the time range.
-     *
-     * Any freebusy object falling outside of this time range will be ignored.
-     *
-     * @param DateTimeInterface $start
-     * @param DateTimeInterface $end
-     *
-     * @return void
-     */
-    public function setTimeRange(DateTimeInterface $start = null, DateTimeInterface $end = null) {
-
-        if (!$start) {
-            $start = new DateTimeImmutable(Settings::$minDate);
-        }
-        if (!$end) {
-            $end = new DateTimeImmutable(Settings::$maxDate);
-        }
-        $this->start = $start;
-        $this->end = $end;
-
-    }
-
-    /**
-     * Sets the reference timezone for floating times.
-     *
-     * @param DateTimeZone $timeZone
-     *
-     * @return void
-     */
-    public function setTimeZone(DateTimeZone $timeZone) {
-
-        $this->timeZone = $timeZone;
-
-    }
-
-    /**
-     * Parses the input data and returns a correct VFREEBUSY object, wrapped in
-     * a VCALENDAR.
-     *
-     * @return Component
-     */
-    public function getResult() {
-
-        $fbData = new FreeBusyData(
-            $this->start->getTimeStamp(),
-            $this->end->getTimeStamp()
-        );
-        if ($this->vavailability) {
-
-            $this->calculateAvailability($fbData, $this->vavailability);
-
-        }
-
-        $this->calculateBusy($fbData, $this->objects);
-
-        return $this->generateFreeBusyCalendar($fbData);
-
-
-    }
-
-    /**
-     * This method takes a VAVAILABILITY component and figures out all the
-     * available times.
-     *
-     * @param FreeBusyData $fbData
-     * @param VCalendar $vavailability
-     * @return void
-     */
-    protected function calculateAvailability(FreeBusyData $fbData, VCalendar $vavailability) {
-
-        $vavailComps = iterator_to_array($vavailability->VAVAILABILITY);
-        usort(
-            $vavailComps,
-            function($a, $b) {
-
-                // We need to order the components by priority. Priority 1
-                // comes first, up until priority 9. Priority 0 comes after
-                // priority 9. No priority implies priority 0.
-                //
-                // Yes, I'm serious.
-                $priorityA = isset($a->PRIORITY) ? (int)$a->PRIORITY->getValue() : 0;
-                $priorityB = isset($b->PRIORITY) ? (int)$b->PRIORITY->getValue() : 0;
-
-                if ($priorityA === 0) $priorityA = 10;
-                if ($priorityB === 0) $priorityB = 10;
-
-                return $priorityA - $priorityB;
-
-            }
-        );
-
-        // Now we go over all the VAVAILABILITY components and figure if
-        // there's any we don't need to consider.
-        //
-        // This is can be because of one of two reasons: either the
-        // VAVAILABILITY component falls outside the time we are interested in,
-        // or a different VAVAILABILITY component with a higher priority has
-        // already completely covered the time-range.
-        $old = $vavailComps;
-        $new = [];
-
-        foreach ($old as $vavail) {
-
-            list($compStart, $compEnd) = $vavail->getEffectiveStartEnd();
-
-            // We don't care about datetimes that are earlier or later than the
-            // start and end of the freebusy report, so this gets normalized
-            // first.
-            if (is_null($compStart) || $compStart < $this->start) {
-                $compStart = $this->start;
-            }
-            if (is_null($compEnd) || $compEnd > $this->end) {
-                $compEnd = $this->end;
-            }
-
-            // If the item fell out of the timerange, we can just skip it.
-            if ($compStart > $this->end || $compEnd < $this->start) {
-                continue;
-            }
-
-            // Going through our existing list of components to see if there's
-            // a higher priority component that already fully covers this one.
-            foreach ($new as $higherVavail) {
-
-                list($higherStart, $higherEnd) = $higherVavail->getEffectiveStartEnd();
-                if (
-                    (is_null($higherStart) || $higherStart < $compStart) &&
-                    (is_null($higherEnd)   || $higherEnd > $compEnd)
-                ) {
-
-                    // Component is fully covered by a higher priority
-                    // component. We can skip this component.
-                    continue 2;
-
-                }
-
-            }
-
-            // We're keeping it!
-            $new[] = $vavail;
+	/**
+	 * Input objects.
+	 *
+	 * @var array
+	 */
+	protected $objects = [];
+
+	/**
+	 * Start of range.
+	 *
+	 * @var DateTimeInterface|null
+	 */
+	protected $start;
+
+	/**
+	 * End of range.
+	 *
+	 * @var DateTimeInterface|null
+	 */
+	protected $end;
+
+	/**
+	 * VCALENDAR object.
+	 *
+	 * @var Document
+	 */
+	protected $baseObject;
+
+	/**
+	 * Reference timezone.
+	 *
+	 * When we are calculating busy times, and we come across so-called
+	 * floating times (times without a timezone), we use the reference timezone
+	 * instead.
+	 *
+	 * This is also used for all-day events.
+	 *
+	 * This defaults to UTC.
+	 *
+	 * @var DateTimeZone
+	 */
+	protected $timeZone;
+
+	/**
+	 * A VAVAILABILITY document.
+	 *
+	 * If this is set, it's information will be included when calculating
+	 * freebusy time.
+	 *
+	 * @var Document
+	 */
+	protected $vavailability;
+
+	/**
+	 * Creates the generator.
+	 *
+	 * Check the setTimeRange and setObjects methods for details about the
+	 * arguments.
+	 *
+	 * @param DateTimeInterface $start
+	 * @param DateTimeInterface $end
+	 * @param mixed $objects
+	 * @param DateTimeZone $timeZone
+	 */
+	public function __construct(DateTimeInterface $start = null, DateTimeInterface $end = null, $objects = null, DateTimeZone $timeZone = null) {
+
+		$this->setTimeRange($start, $end);
+
+		if ($objects) {
+			$this->setObjects($objects);
+		}
+		if (is_null($timeZone)) {
+			$timeZone = new DateTimeZone('UTC');
+		}
+		$this->setTimeZone($timeZone);
+
+	}
+
+	/**
+	 * Sets the VCALENDAR object.
+	 *
+	 * If this is set, it will not be generated for you. You are responsible
+	 * for setting things like the METHOD, CALSCALE, VERSION, etc..
+	 *
+	 * The VFREEBUSY object will be automatically added though.
+	 *
+	 * @param Document $vcalendar
+	 * @return void
+	 */
+	public function setBaseObject(Document $vcalendar) {
+
+		$this->baseObject = $vcalendar;
+
+	}
+
+	/**
+	 * Sets a VAVAILABILITY document.
+	 *
+	 * @param Document $vcalendar
+	 * @return void
+	 */
+	public function setVAvailability(Document $vcalendar) {
+
+		$this->vavailability = $vcalendar;
+
+	}
+
+	/**
+	 * Sets the input objects.
+	 *
+	 * You must either specify a valendar object as a string, or as the parse
+	 * Component.
+	 * It's also possible to specify multiple objects as an array.
+	 *
+	 * @param mixed $objects
+	 *
+	 * @return void
+	 */
+	public function setObjects($objects) {
+
+		if (!is_array($objects)) {
+			$objects = [$objects];
+		}
+
+		$this->objects = [];
+		foreach ($objects as $object) {
+
+			if (is_string($object)) {
+				$this->objects[] = Reader::read($object);
+			} elseif ($object instanceof Component) {
+				$this->objects[] = $object;
+			} else {
+				throw new \InvalidArgumentException('You can only pass strings or \\Sabre\\VObject\\Component arguments to setObjects');
+			}
+
+		}
+
+	}
+
+	/**
+	 * Sets the time range.
+	 *
+	 * Any freebusy object falling outside of this time range will be ignored.
+	 *
+	 * @param DateTimeInterface $start
+	 * @param DateTimeInterface $end
+	 *
+	 * @return void
+	 */
+	public function setTimeRange(DateTimeInterface $start = null, DateTimeInterface $end = null) {
+
+		if (!$start) {
+			$start = new DateTimeImmutable(Settings::$minDate);
+		}
+		if (!$end) {
+			$end = new DateTimeImmutable(Settings::$maxDate);
+		}
+		$this->start = $start;
+		$this->end = $end;
+
+	}
+
+	/**
+	 * Sets the reference timezone for floating times.
+	 *
+	 * @param DateTimeZone $timeZone
+	 *
+	 * @return void
+	 */
+	public function setTimeZone(DateTimeZone $timeZone) {
+
+		$this->timeZone = $timeZone;
+
+	}
+
+	/**
+	 * Parses the input data and returns a correct VFREEBUSY object, wrapped in
+	 * a VCALENDAR.
+	 *
+	 * @return Component
+	 */
+	public function getResult() {
+
+		$fbData = new FreeBusyData(
+			$this->start->getTimeStamp(),
+			$this->end->getTimeStamp()
+		);
+		if ($this->vavailability) {
+
+			$this->calculateAvailability($fbData, $this->vavailability);
+
+		}
+
+		$this->calculateBusy($fbData, $this->objects);
+
+		return $this->generateFreeBusyCalendar($fbData);
+
+
+	}
+
+	/**
+	 * This method takes a VAVAILABILITY component and figures out all the
+	 * available times.
+	 *
+	 * @param FreeBusyData $fbData
+	 * @param VCalendar $vavailability
+	 * @return void
+	 */
+	protected function calculateAvailability(FreeBusyData $fbData, VCalendar $vavailability) {
+
+		$vavailComps = iterator_to_array($vavailability->VAVAILABILITY);
+		usort(
+			$vavailComps,
+			function($a, $b) {
+
+				// We need to order the components by priority. Priority 1
+				// comes first, up until priority 9. Priority 0 comes after
+				// priority 9. No priority implies priority 0.
+				//
+				// Yes, I'm serious.
+				$priorityA = isset($a->PRIORITY) ? (int)$a->PRIORITY->getValue() : 0;
+				$priorityB = isset($b->PRIORITY) ? (int)$b->PRIORITY->getValue() : 0;
+
+				if ($priorityA === 0) $priorityA = 10;
+				if ($priorityB === 0) $priorityB = 10;
+
+				return $priorityA - $priorityB;
+
+			}
+		);
+
+		// Now we go over all the VAVAILABILITY components and figure if
+		// there's any we don't need to consider.
+		//
+		// This is can be because of one of two reasons: either the
+		// VAVAILABILITY component falls outside the time we are interested in,
+		// or a different VAVAILABILITY component with a higher priority has
+		// already completely covered the time-range.
+		$old = $vavailComps;
+		$new = [];
+
+		foreach ($old as $vavail) {
+
+			list($compStart, $compEnd) = $vavail->getEffectiveStartEnd();
+
+			// We don't care about datetimes that are earlier or later than the
+			// start and end of the freebusy report, so this gets normalized
+			// first.
+			if (is_null($compStart) || $compStart < $this->start) {
+				$compStart = $this->start;
+			}
+			if (is_null($compEnd) || $compEnd > $this->end) {
+				$compEnd = $this->end;
+			}
+
+			// If the item fell out of the timerange, we can just skip it.
+			if ($compStart > $this->end || $compEnd < $this->start) {
+				continue;
+			}
+
+			// Going through our existing list of components to see if there's
+			// a higher priority component that already fully covers this one.
+			foreach ($new as $higherVavail) {
+
+				list($higherStart, $higherEnd) = $higherVavail->getEffectiveStartEnd();
+				if (
+					(is_null($higherStart) || $higherStart < $compStart) &&
+					(is_null($higherEnd)   || $higherEnd > $compEnd)
+				) {
+
+					// Component is fully covered by a higher priority
+					// component. We can skip this component.
+					continue 2;
+
+				}
+
+			}
+
+			// We're keeping it!
+			$new[] = $vavail;
 
-        }
+		}
 
-        // Lastly, we need to traverse the remaining components and fill in the
-        // freebusydata slots.
-        //
-        // We traverse the components in reverse, because we want the higher
-        // priority components to override the lower ones.
-        foreach (array_reverse($new) as $vavail) {
-
-            $busyType = isset($vavail->BUSYTYPE) ? strtoupper($vavail->BUSYTYPE) : 'BUSY-UNAVAILABLE';
-            list($vavailStart, $vavailEnd) = $vavail->getEffectiveStartEnd();
-
-            // Making the component size no larger than the requested free-busy
-            // report range.
-            if (!$vavailStart || $vavailStart < $this->start) {
-                $vavailStart = $this->start;
-            }
-            if (!$vavailEnd || $vavailEnd > $this->end) {
-                $vavailEnd = $this->end;
-            }
-
-            // Marking the entire time range of the VAVAILABILITY component as
-            // busy.
-            $fbData->add(
-                $vavailStart->getTimeStamp(),
-                $vavailEnd->getTimeStamp(),
-                $busyType
-            );
-
-            // Looping over the AVAILABLE components.
-            if (isset($vavail->AVAILABLE)) foreach ($vavail->AVAILABLE as $available) {
-
-                list($availStart, $availEnd) = $available->getEffectiveStartEnd();
-                $fbData->add(
-                    $availStart->getTimeStamp(),
-                    $availEnd->getTimeStamp(),
-                    'FREE'
-                );
-
-                if ($available->RRULE) {
-                    // Our favourite thing: recurrence!!
-
-                    $rruleIterator = new Recur\RRuleIterator(
-                        $available->RRULE->getValue(),
-                        $availStart
-                    );
-                    $rruleIterator->fastForward($vavailStart);
-
-                    $startEndDiff = $availStart->diff($availEnd);
-
-                    while ($rruleIterator->valid()) {
-
-                        $recurStart = $rruleIterator->current();
-                        $recurEnd = $recurStart->add($startEndDiff);
-
-                        if ($recurStart > $vavailEnd) {
-                            // We're beyond the legal timerange.
-                            break;
-                        }
-
-                        if ($recurEnd > $vavailEnd) {
-                            // Truncating the end if it exceeds the
-                            // VAVAILABILITY end.
-                            $recurEnd = $vavailEnd;
-                        }
-
-                        $fbData->add(
-                            $recurStart->getTimeStamp(),
-                            $recurEnd->getTimeStamp(),
-                            'FREE'
-                        );
-
-                        $rruleIterator->next();
-
-                    }
-                }
-
-            }
-
-        }
-
-    }
-
-    /**
-     * This method takes an array of iCalendar objects and applies its busy
-     * times on fbData.
-     *
-     * @param FreeBusyData $fbData
-     * @param VCalendar[] $objects
-     */
-    protected function calculateBusy(FreeBusyData $fbData, array $objects) {
-
-        foreach ($objects as $key => $object) {
-
-            foreach ($object->getBaseComponents() as $component) {
-
-                switch ($component->name) {
-
-                    case 'VEVENT' :
-
-                        $FBTYPE = 'BUSY';
-                        if (isset($component->TRANSP) && (strtoupper($component->TRANSP) === 'TRANSPARENT')) {
-                            break;
-                        }
-                        if (isset($component->STATUS)) {
-                            $status = strtoupper($component->STATUS);
-                            if ($status === 'CANCELLED') {
-                                break;
-                            }
-                            if ($status === 'TENTATIVE') {
-                                $FBTYPE = 'BUSY-TENTATIVE';
-                            }
-                        }
-
-                        $times = [];
-
-                        if ($component->RRULE) {
-                            try {
-                                $iterator = new EventIterator($object, (string)$component->UID, $this->timeZone);
-                            } catch (NoInstancesException $e) {
-                                // This event is recurring, but it doesn't have a single
-                                // instance. We are skipping this event from the output
-                                // entirely.
-                                unset($this->objects[$key]);
-                                continue;
-                            }
-
-                            if ($this->start) {
-                                $iterator->fastForward($this->start);
-                            }
+		// Lastly, we need to traverse the remaining components and fill in the
+		// freebusydata slots.
+		//
+		// We traverse the components in reverse, because we want the higher
+		// priority components to override the lower ones.
+		foreach (array_reverse($new) as $vavail) {
+
+			$busyType = isset($vavail->BUSYTYPE) ? strtoupper($vavail->BUSYTYPE) : 'BUSY-UNAVAILABLE';
+			list($vavailStart, $vavailEnd) = $vavail->getEffectiveStartEnd();
+
+			// Making the component size no larger than the requested free-busy
+			// report range.
+			if (!$vavailStart || $vavailStart < $this->start) {
+				$vavailStart = $this->start;
+			}
+			if (!$vavailEnd || $vavailEnd > $this->end) {
+				$vavailEnd = $this->end;
+			}
+
+			// Marking the entire time range of the VAVAILABILITY component as
+			// busy.
+			$fbData->add(
+				$vavailStart->getTimeStamp(),
+				$vavailEnd->getTimeStamp(),
+				$busyType
+			);
+
+			// Looping over the AVAILABLE components.
+			if (isset($vavail->AVAILABLE)) foreach ($vavail->AVAILABLE as $available) {
+
+				list($availStart, $availEnd) = $available->getEffectiveStartEnd();
+				$fbData->add(
+					$availStart->getTimeStamp(),
+					$availEnd->getTimeStamp(),
+					'FREE'
+				);
+
+				if ($available->RRULE) {
+					// Our favourite thing: recurrence!!
+
+					$rruleIterator = new Recur\RRuleIterator(
+						$available->RRULE->getValue(),
+						$availStart
+					);
+					$rruleIterator->fastForward($vavailStart);
+
+					$startEndDiff = $availStart->diff($availEnd);
+
+					while ($rruleIterator->valid()) {
+
+						$recurStart = $rruleIterator->current();
+						$recurEnd = $recurStart->add($startEndDiff);
+
+						if ($recurStart > $vavailEnd) {
+							// We're beyond the legal timerange.
+							break;
+						}
+
+						if ($recurEnd > $vavailEnd) {
+							// Truncating the end if it exceeds the
+							// VAVAILABILITY end.
+							$recurEnd = $vavailEnd;
+						}
+
+						$fbData->add(
+							$recurStart->getTimeStamp(),
+							$recurEnd->getTimeStamp(),
+							'FREE'
+						);
+
+						$rruleIterator->next();
+
+					}
+				}
+
+			}
+
+		}
+
+	}
+
+	/**
+	 * This method takes an array of iCalendar objects and applies its busy
+	 * times on fbData.
+	 *
+	 * @param FreeBusyData $fbData
+	 * @param VCalendar[] $objects
+	 */
+	protected function calculateBusy(FreeBusyData $fbData, array $objects) {
+
+		foreach ($objects as $key => $object) {
+
+			foreach ($object->getBaseComponents() as $component) {
+
+				switch ($component->name) {
+
+					case 'VEVENT' :
+
+						$FBTYPE = 'BUSY';
+						if (isset($component->TRANSP) && (strtoupper($component->TRANSP) === 'TRANSPARENT')) {
+							break;
+						}
+						if (isset($component->STATUS)) {
+							$status = strtoupper($component->STATUS);
+							if ($status === 'CANCELLED') {
+								break;
+							}
+							if ($status === 'TENTATIVE') {
+								$FBTYPE = 'BUSY-TENTATIVE';
+							}
+						}
+
+						$times = [];
+
+						if ($component->RRULE) {
+							try {
+								$iterator = new EventIterator($object, (string)$component->UID, $this->timeZone);
+							} catch (NoInstancesException $e) {
+								// This event is recurring, but it doesn't have a single
+								// instance. We are skipping this event from the output
+								// entirely.
+								unset($this->objects[$key]);
+								continue;
+							}
+
+							if ($this->start) {
+								$iterator->fastForward($this->start);
+							}
 
-                            $maxRecurrences = Settings::$maxRecurrences;
-
-                            while ($iterator->valid() && --$maxRecurrences) {
-
-                                $startTime = $iterator->getDTStart();
-                                if ($this->end && $startTime > $this->end) {
-                                    break;
-                                }
-                                $times[] = [
-                                    $iterator->getDTStart(),
-                                    $iterator->getDTEnd(),
-                                ];
-
-                                $iterator->next();
-
-                            }
+							$maxRecurrences = Settings::$maxRecurrences;
+
+							while ($iterator->valid() && --$maxRecurrences) {
+
+								$startTime = $iterator->getDTStart();
+								if ($this->end && $startTime > $this->end) {
+									break;
+								}
+								$times[] = [
+									$iterator->getDTStart(),
+									$iterator->getDTEnd(),
+								];
+
+								$iterator->next();
+
+							}
 
-                        } else {
-
-                            $startTime = $component->DTSTART->getDateTime($this->timeZone);
-                            if ($this->end && $startTime > $this->end) {
-                                break;
-                            }
-                            $endTime = null;
-                            if (isset($component->DTEND)) {
-                                $endTime = $component->DTEND->getDateTime($this->timeZone);
-                            } elseif (isset($component->DURATION)) {
-                                $duration = DateTimeParser::parseDuration((string)$component->DURATION);
-                                $endTime = clone $startTime;
-                                $endTime = $endTime->add($duration);
-                            } elseif (!$component->DTSTART->hasTime()) {
-                                $endTime = clone $startTime;
-                                $endTime = $endTime->modify('+1 day');
-                            } else {
-                                // The event had no duration (0 seconds)
-                                break;
-                            }
-
-                            $times[] = [$startTime, $endTime];
-
-                        }
-
-                        foreach ($times as $time) {
-
-                            if ($this->end && $time[0] > $this->end) break;
-                            if ($this->start && $time[1] < $this->start) break;
-
-                            $fbData->add(
-                                $time[0]->getTimeStamp(),
-                                $time[1]->getTimeStamp(),
-                                $FBTYPE
-                            );
-                        }
-                        break;
-
-                    case 'VFREEBUSY' :
-                        foreach ($component->FREEBUSY as $freebusy) {
-
-                            $fbType = isset($freebusy['FBTYPE']) ? strtoupper($freebusy['FBTYPE']) : 'BUSY';
-
-                            // Skipping intervals marked as 'free'
-                            if ($fbType === 'FREE')
-                                continue;
-
-                            $values = explode(',', $freebusy);
-                            foreach ($values as $value) {
-                                list($startTime, $endTime) = explode('/', $value);
-                                $startTime = DateTimeParser::parseDateTime($startTime);
-
-                                if (substr($endTime, 0, 1) === 'P' || substr($endTime, 0, 2) === '-P') {
-                                    $duration = DateTimeParser::parseDuration($endTime);
-                                    $endTime = clone $startTime;
-                                    $endTime = $endTime->add($duration);
-                                } else {
-                                    $endTime = DateTimeParser::parseDateTime($endTime);
-                                }
-
-                                if ($this->start && $this->start > $endTime) continue;
-                                if ($this->end && $this->end < $startTime) continue;
-                                $fbData->add(
-                                    $startTime->getTimeStamp(),
-                                    $endTime->getTimeStamp(),
-                                    $fbType
-                                );
-
-                            }
-
-
-                        }
-                        break;
-
-                }
+						} else {
+
+							$startTime = $component->DTSTART->getDateTime($this->timeZone);
+							if ($this->end && $startTime > $this->end) {
+								break;
+							}
+							$endTime = null;
+							if (isset($component->DTEND)) {
+								$endTime = $component->DTEND->getDateTime($this->timeZone);
+							} elseif (isset($component->DURATION)) {
+								$duration = DateTimeParser::parseDuration((string)$component->DURATION);
+								$endTime = clone $startTime;
+								$endTime = $endTime->add($duration);
+							} elseif (!$component->DTSTART->hasTime()) {
+								$endTime = clone $startTime;
+								$endTime = $endTime->modify('+1 day');
+							} else {
+								// The event had no duration (0 seconds)
+								break;
+							}
+
+							$times[] = [$startTime, $endTime];
+
+						}
+
+						foreach ($times as $time) {
+
+							if ($this->end && $time[0] > $this->end) break;
+							if ($this->start && $time[1] < $this->start) break;
+
+							$fbData->add(
+								$time[0]->getTimeStamp(),
+								$time[1]->getTimeStamp(),
+								$FBTYPE
+							);
+						}
+						break;
+
+					case 'VFREEBUSY' :
+						foreach ($component->FREEBUSY as $freebusy) {
+
+							$fbType = isset($freebusy['FBTYPE']) ? strtoupper($freebusy['FBTYPE']) : 'BUSY';
+
+							// Skipping intervals marked as 'free'
+							if ($fbType === 'FREE')
+								continue;
+
+							$values = explode(',', $freebusy);
+							foreach ($values as $value) {
+								list($startTime, $endTime) = explode('/', $value);
+								$startTime = DateTimeParser::parseDateTime($startTime);
+
+								if (substr($endTime, 0, 1) === 'P' || substr($endTime, 0, 2) === '-P') {
+									$duration = DateTimeParser::parseDuration($endTime);
+									$endTime = clone $startTime;
+									$endTime = $endTime->add($duration);
+								} else {
+									$endTime = DateTimeParser::parseDateTime($endTime);
+								}
+
+								if ($this->start && $this->start > $endTime) continue;
+								if ($this->end && $this->end < $startTime) continue;
+								$fbData->add(
+									$startTime->getTimeStamp(),
+									$endTime->getTimeStamp(),
+									$fbType
+								);
+
+							}
+
+
+						}
+						break;
+
+				}
 
 
-            }
+			}
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * This method takes a FreeBusyData object and generates the VCALENDAR
-     * object associated with it.
-     *
-     * @return VCalendar
-     */
-    protected function generateFreeBusyCalendar(FreeBusyData $fbData) {
-
-        if ($this->baseObject) {
-            $calendar = $this->baseObject;
-        } else {
-            $calendar = new VCalendar();
-        }
+	/**
+	 * This method takes a FreeBusyData object and generates the VCALENDAR
+	 * object associated with it.
+	 *
+	 * @return VCalendar
+	 */
+	protected function generateFreeBusyCalendar(FreeBusyData $fbData) {
+
+		if ($this->baseObject) {
+			$calendar = $this->baseObject;
+		} else {
+			$calendar = new VCalendar();
+		}
 
-        $vfreebusy = $calendar->createComponent('VFREEBUSY');
-        $calendar->add($vfreebusy);
+		$vfreebusy = $calendar->createComponent('VFREEBUSY');
+		$calendar->add($vfreebusy);
 
-        if ($this->start) {
-            $dtstart = $calendar->createProperty('DTSTART');
-            $dtstart->setDateTime($this->start);
-            $vfreebusy->add($dtstart);
-        }
-        if ($this->end) {
-            $dtend = $calendar->createProperty('DTEND');
-            $dtend->setDateTime($this->end);
-            $vfreebusy->add($dtend);
-        }
+		if ($this->start) {
+			$dtstart = $calendar->createProperty('DTSTART');
+			$dtstart->setDateTime($this->start);
+			$vfreebusy->add($dtstart);
+		}
+		if ($this->end) {
+			$dtend = $calendar->createProperty('DTEND');
+			$dtend->setDateTime($this->end);
+			$vfreebusy->add($dtend);
+		}
 
-        $tz = new \DateTimeZone('UTC');
-        $dtstamp = $calendar->createProperty('DTSTAMP');
-        $dtstamp->setDateTime(new DateTimeImmutable('now', $tz));
-        $vfreebusy->add($dtstamp);
+		$tz = new \DateTimeZone('UTC');
+		$dtstamp = $calendar->createProperty('DTSTAMP');
+		$dtstamp->setDateTime(new DateTimeImmutable('now', $tz));
+		$vfreebusy->add($dtstamp);
 
-        foreach ($fbData->getData() as $busyTime) {
+		foreach ($fbData->getData() as $busyTime) {
 
-            $busyType = strtoupper($busyTime['type']);
+			$busyType = strtoupper($busyTime['type']);
 
-            // Ignoring all the FREE parts, because those are already assumed.
-            if ($busyType === 'FREE') {
-                continue;
-            }
+			// Ignoring all the FREE parts, because those are already assumed.
+			if ($busyType === 'FREE') {
+				continue;
+			}
 
-            $busyTime[0] = new \DateTimeImmutable('@' . $busyTime['start'], $tz);
-            $busyTime[1] = new \DateTimeImmutable('@' . $busyTime['end'], $tz);
+			$busyTime[0] = new \DateTimeImmutable('@' . $busyTime['start'], $tz);
+			$busyTime[1] = new \DateTimeImmutable('@' . $busyTime['end'], $tz);
 
-            $prop = $calendar->createProperty(
-                'FREEBUSY',
-                $busyTime[0]->format('Ymd\\THis\\Z') . '/' . $busyTime[1]->format('Ymd\\THis\\Z')
-            );
+			$prop = $calendar->createProperty(
+				'FREEBUSY',
+				$busyTime[0]->format('Ymd\\THis\\Z') . '/' . $busyTime[1]->format('Ymd\\THis\\Z')
+			);
 
-            // Only setting FBTYPE if it's not BUSY, because BUSY is the
-            // default anyway.
-            if ($busyType !== 'BUSY') {
-                $prop['FBTYPE'] = $busyType;
-            }
-            $vfreebusy->add($prop);
+			// Only setting FBTYPE if it's not BUSY, because BUSY is the
+			// default anyway.
+			if ($busyType !== 'BUSY') {
+				$prop['FBTYPE'] = $busyType;
+			}
+			$vfreebusy->add($prop);
 
-        }
+		}
 
-        return $calendar;
+		return $calendar;
 
 
-    }
+	}
 
 }