nextcloud / server

lib/private/Search/Result/Image.php

Indentation +8 added lines, -8 removed lines

@@ -29,13 +29,13 @@
  */
 class Image extends File {
 
-	/**
-	 * Type name; translated in templates
-	 * @var string 
-	 */
-	public $type = 'image';
+    /**
+     * Type name; translated in templates
+     * @var string 
+     */
+    public $type = 'image';
 	
-	/**
-	 * @TODO add EXIF information
-	 */
+    /**
+     * @TODO add EXIF information
+     */
 }

lib/private/Search/Result/Audio.php

Indentation +8 added lines, -8 removed lines

@@ -29,13 +29,13 @@
  */
 class Audio extends File {
 
-	/**
-	 * Type name; translated in templates
-	 * @var string 
-	 */
-	public $type = 'audio';
+    /**
+     * Type name; translated in templates
+     * @var string 
+     */
+    public $type = 'audio';
 	
-	/**
-	 * @TODO add ID3 information
-	 */
+    /**
+     * @TODO add ID3 information
+     */
 }

lib/private/Search/Result/Folder.php

Indentation +5 added lines, -5 removed lines

@@ -29,10 +29,10 @@
  */
 class Folder extends File {
 
-	/**
-	 * Type name; translated in templates
-	 * @var string 
-	 */
-	public $type = 'folder';
+    /**
+     * Type name; translated in templates
+     * @var string 
+     */
+    public $type = 'folder';
 	
 }

lib/private/AvatarManager.php

Indentation +53 added lines, -53 removed lines

@@ -40,66 +40,66 @@
  */
 class AvatarManager implements IAvatarManager {
 
-	/** @var  IUserManager */
-	private $userManager;
+    /** @var  IUserManager */
+    private $userManager;
 
-	/** @var IAppData */
-	private $appData;
+    /** @var IAppData */
+    private $appData;
 
-	/** @var IL10N */
-	private $l;
+    /** @var IL10N */
+    private $l;
 
-	/** @var ILogger  */
-	private $logger;
+    /** @var ILogger  */
+    private $logger;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * AvatarManager constructor.
-	 *
-	 * @param IUserManager $userManager
-	 * @param IAppData $appData
-	 * @param IL10N $l
-	 * @param ILogger $logger
-	 * @param IConfig $config
-	 */
-	public function __construct(
-			IUserManager $userManager,
-			IAppData $appData,
-			IL10N $l,
-			ILogger $logger,
-			IConfig $config) {
-		$this->userManager = $userManager;
-		$this->appData = $appData;
-		$this->l = $l;
-		$this->logger = $logger;
-		$this->config = $config;
-	}
+    /**
+     * AvatarManager constructor.
+     *
+     * @param IUserManager $userManager
+     * @param IAppData $appData
+     * @param IL10N $l
+     * @param ILogger $logger
+     * @param IConfig $config
+     */
+    public function __construct(
+            IUserManager $userManager,
+            IAppData $appData,
+            IL10N $l,
+            ILogger $logger,
+            IConfig $config) {
+        $this->userManager = $userManager;
+        $this->appData = $appData;
+        $this->l = $l;
+        $this->logger = $logger;
+        $this->config = $config;
+    }
 
-	/**
-	 * return a user specific instance of \OCP\IAvatar
-	 * @see \OCP\IAvatar
-	 * @param string $userId the ownCloud user id
-	 * @return \OCP\IAvatar
-	 * @throws \Exception In case the username is potentially dangerous
-	 * @throws NotFoundException In case there is no user folder yet
-	 */
-	public function getAvatar($userId) {
-		$user = $this->userManager->get($userId);
-		if (is_null($user)) {
-			throw new \Exception('user does not exist');
-		}
+    /**
+     * return a user specific instance of \OCP\IAvatar
+     * @see \OCP\IAvatar
+     * @param string $userId the ownCloud user id
+     * @return \OCP\IAvatar
+     * @throws \Exception In case the username is potentially dangerous
+     * @throws NotFoundException In case there is no user folder yet
+     */
+    public function getAvatar($userId) {
+        $user = $this->userManager->get($userId);
+        if (is_null($user)) {
+            throw new \Exception('user does not exist');
+        }
 
-		// sanitize userID - fixes casing issue (needed for the filesystem stuff that is done below)
-		$userId = $user->getUID();
+        // sanitize userID - fixes casing issue (needed for the filesystem stuff that is done below)
+        $userId = $user->getUID();
 
-		try {
-			$folder = $this->appData->getFolder($userId);
-		} catch (NotFoundException $e) {
-			$folder = $this->appData->newFolder($userId);
-		}
+        try {
+            $folder = $this->appData->getFolder($userId);
+        } catch (NotFoundException $e) {
+            $folder = $this->appData->newFolder($userId);
+        }
 
-		return new Avatar($folder, $this->l, $user, $this->logger, $this->config);
-	}
+        return new Avatar($folder, $this->l, $user, $this->logger, $this->config);
+    }
 }

lib/private/AppFramework/Utility/SimpleContainer.php

Indentation +129 added lines, -129 removed lines

@@ -42,137 +42,137 @@
 class SimpleContainer extends Container implements IContainer {
 
 
-	/**
-	 * @param ReflectionClass $class the class to instantiate
-	 * @return \stdClass the created class
-	 */
-	private function buildClass(ReflectionClass $class) {
-		$constructor = $class->getConstructor();
-		if ($constructor === null) {
-			return $class->newInstance();
-		} else {
-			$parameters = [];
-			foreach ($constructor->getParameters() as $parameter) {
-				$parameterClass = $parameter->getClass();
-
-				// try to find out if it is a class or a simple parameter
-				if ($parameterClass === null) {
-					$resolveName = $parameter->getName();
-				} else {
-					$resolveName = $parameterClass->name;
-				}
-
-				try {
-					$parameters[] = $this->query($resolveName);
-				} catch (\Exception $e) {
-					// Service not found, use the default value when available
-					if ($parameter->isDefaultValueAvailable()) {
-						$parameters[] = $parameter->getDefaultValue();
-					} else if ($parameterClass !== null) {
-						$resolveName = $parameter->getName();
-						$parameters[] = $this->query($resolveName);
-					} else {
-						throw $e;
-					}
-				}
-			}
-			return $class->newInstanceArgs($parameters);
-		}
-	}
-
-
-	/**
-	 * If a parameter is not registered in the container try to instantiate it
-	 * by using reflection to find out how to build the class
-	 * @param string $name the class name to resolve
-	 * @return \stdClass
-	 * @throws QueryException if the class could not be found or instantiated
-	 */
-	public function resolve($name) {
-		$baseMsg = 'Could not resolve ' . $name . '!';
-		try {
-			$class = new ReflectionClass($name);
-			if ($class->isInstantiable()) {
-				return $this->buildClass($class);
-			} else {
-				throw new QueryException($baseMsg .
-					' Class can not be instantiated');
-			}
-		} catch(ReflectionException $e) {
-			throw new QueryException($baseMsg . ' ' . $e->getMessage());
-		}
-	}
-
-
-	/**
-	 * @param string $name name of the service to query for
-	 * @return mixed registered service for the given $name
-	 * @throws QueryException if the query could not be resolved
-	 */
-	public function query($name) {
-		$name = $this->sanitizeName($name);
-		if ($this->offsetExists($name)) {
-			return $this->offsetGet($name);
-		} else {
-			$object = $this->resolve($name);
-			$this->registerService($name, function () use ($object) {
-				return $object;
-			});
-			return $object;
-		}
-	}
-
-	/**
-	 * @param string $name
-	 * @param mixed $value
-	 */
-	public function registerParameter($name, $value) {
-		$this[$name] = $value;
-	}
-
-	/**
-	 * The given closure is call the first time the given service is queried.
-	 * The closure has to return the instance for the given service.
-	 * Created instance will be cached in case $shared is true.
-	 *
-	 * @param string $name name of the service to register another backend for
-	 * @param Closure $closure the closure to be called on service creation
-	 * @param bool $shared
-	 */
-	public function registerService($name, Closure $closure, $shared = true) {
-		$name = $this->sanitizeName($name);
-		if (isset($this[$name]))  {
-			unset($this[$name]);
-		}
-		if ($shared) {
-			$this[$name] = $closure;
-		} else {
-			$this[$name] = parent::factory($closure);
-		}
-	}
-
-	/**
-	 * Shortcut for returning a service from a service under a different key,
-	 * e.g. to tell the container to return a class when queried for an
-	 * interface
-	 * @param string $alias the alias that should be registered
-	 * @param string $target the target that should be resolved instead
-	 */
-	public function registerAlias($alias, $target) {
-		$this->registerService($alias, function (IContainer $container) use ($target) {
-			return $container->query($target);
-		}, false);
-	}
-
-	/*
+    /**
+     * @param ReflectionClass $class the class to instantiate
+     * @return \stdClass the created class
+     */
+    private function buildClass(ReflectionClass $class) {
+        $constructor = $class->getConstructor();
+        if ($constructor === null) {
+            return $class->newInstance();
+        } else {
+            $parameters = [];
+            foreach ($constructor->getParameters() as $parameter) {
+                $parameterClass = $parameter->getClass();
+
+                // try to find out if it is a class or a simple parameter
+                if ($parameterClass === null) {
+                    $resolveName = $parameter->getName();
+                } else {
+                    $resolveName = $parameterClass->name;
+                }
+
+                try {
+                    $parameters[] = $this->query($resolveName);
+                } catch (\Exception $e) {
+                    // Service not found, use the default value when available
+                    if ($parameter->isDefaultValueAvailable()) {
+                        $parameters[] = $parameter->getDefaultValue();
+                    } else if ($parameterClass !== null) {
+                        $resolveName = $parameter->getName();
+                        $parameters[] = $this->query($resolveName);
+                    } else {
+                        throw $e;
+                    }
+                }
+            }
+            return $class->newInstanceArgs($parameters);
+        }
+    }
+
+
+    /**
+     * If a parameter is not registered in the container try to instantiate it
+     * by using reflection to find out how to build the class
+     * @param string $name the class name to resolve
+     * @return \stdClass
+     * @throws QueryException if the class could not be found or instantiated
+     */
+    public function resolve($name) {
+        $baseMsg = 'Could not resolve ' . $name . '!';
+        try {
+            $class = new ReflectionClass($name);
+            if ($class->isInstantiable()) {
+                return $this->buildClass($class);
+            } else {
+                throw new QueryException($baseMsg .
+                    ' Class can not be instantiated');
+            }
+        } catch(ReflectionException $e) {
+            throw new QueryException($baseMsg . ' ' . $e->getMessage());
+        }
+    }
+
+
+    /**
+     * @param string $name name of the service to query for
+     * @return mixed registered service for the given $name
+     * @throws QueryException if the query could not be resolved
+     */
+    public function query($name) {
+        $name = $this->sanitizeName($name);
+        if ($this->offsetExists($name)) {
+            return $this->offsetGet($name);
+        } else {
+            $object = $this->resolve($name);
+            $this->registerService($name, function () use ($object) {
+                return $object;
+            });
+            return $object;
+        }
+    }
+
+    /**
+     * @param string $name
+     * @param mixed $value
+     */
+    public function registerParameter($name, $value) {
+        $this[$name] = $value;
+    }
+
+    /**
+     * The given closure is call the first time the given service is queried.
+     * The closure has to return the instance for the given service.
+     * Created instance will be cached in case $shared is true.
+     *
+     * @param string $name name of the service to register another backend for
+     * @param Closure $closure the closure to be called on service creation
+     * @param bool $shared
+     */
+    public function registerService($name, Closure $closure, $shared = true) {
+        $name = $this->sanitizeName($name);
+        if (isset($this[$name]))  {
+            unset($this[$name]);
+        }
+        if ($shared) {
+            $this[$name] = $closure;
+        } else {
+            $this[$name] = parent::factory($closure);
+        }
+    }
+
+    /**
+     * Shortcut for returning a service from a service under a different key,
+     * e.g. to tell the container to return a class when queried for an
+     * interface
+     * @param string $alias the alias that should be registered
+     * @param string $target the target that should be resolved instead
+     */
+    public function registerAlias($alias, $target) {
+        $this->registerService($alias, function (IContainer $container) use ($target) {
+            return $container->query($target);
+        }, false);
+    }
+
+    /*
 	 * @param string $name
 	 * @return string
 	 */
-	protected function sanitizeName($name) {
-		if (isset($name[0]) && $name[0] === '\\') {
-			return ltrim($name, '\\');
-		}
-		return $name;
-	}
+    protected function sanitizeName($name) {
+        if (isset($name[0]) && $name[0] === '\\') {
+            return ltrim($name, '\\');
+        }
+        return $name;
+    }
 
 }

lib/private/AppFramework/Utility/TimeFactory.php

Indentation +6 added lines, -6 removed lines

@@ -34,12 +34,12 @@
 class TimeFactory implements ITimeFactory {
 
 
-	/**
-	 * @return int the result of a call to time()
-	 */
-	public function getTime() {
-		return time();
-	}
+    /**
+     * @return int the result of a call to time()
+     */
+    public function getTime() {
+        return time();
+    }
 
 
 }

lib/private/AppFramework/Core/API.php

Indentation +143 added lines, -143 removed lines

@@ -40,149 +40,149 @@
  */
 class API implements IApi{
 
-	private $appName;
-
-	/**
-	 * constructor
-	 * @param string $appName the name of your application
-	 */
-	public function __construct($appName){
-		$this->appName = $appName;
-	}
-
-
-	/**
-	 * Gets the userid of the current user
-	 * @return string the user id of the current user
-	 * @deprecated Use \OC::$server->getUserSession()->getUser()->getUID()
-	 */
-	public function getUserId(){
-		return \OCP\User::getUser();
-	}
-
-
-	/**
-	 * Adds a new javascript file
-	 * @deprecated include javascript and css in template files
-	 * @param string $scriptName the name of the javascript in js/ without the suffix
-	 * @param string $appName the name of the app, defaults to the current one
-	 */
-	public function addScript($scriptName, $appName=null){
-		if($appName === null){
-			$appName = $this->appName;
-		}
-		\OCP\Util::addScript($appName, $scriptName);
-	}
-
-
-	/**
-	 * Adds a new css file
-	 * @deprecated include javascript and css in template files
-	 * @param string $styleName the name of the css file in css/without the suffix
-	 * @param string $appName the name of the app, defaults to the current one
-	 */
-	public function addStyle($styleName, $appName=null){
-		if($appName === null){
-			$appName = $this->appName;
-		}
-		\OCP\Util::addStyle($appName, $styleName);
-	}
-
-
-	/**
-	 * @deprecated include javascript and css in template files
-	 * shorthand for addScript for files in the 3rdparty directory
-	 * @param string $name the name of the file without the suffix
-	 */
-	public function add3rdPartyScript($name){
-		\OCP\Util::addScript($this->appName . '/3rdparty', $name);
-	}
-
-
-	/**
-	 * @deprecated include javascript and css in template files
-	 * shorthand for addStyle for files in the 3rdparty directory
-	 * @param string $name the name of the file without the suffix
-	 */
-	public function add3rdPartyStyle($name){
-		\OCP\Util::addStyle($this->appName . '/3rdparty', $name);
-	}
-
-
-	/**
-	 * @deprecated communication between apps should happen over built in
-	 * callbacks or interfaces (check the contacts and calendar managers)
-	 * Checks if an app is enabled
-	 * also use \OC::$server->getAppManager()->isEnabledForUser($appName)
-	 * @param string $appName the name of an app
-	 * @return bool true if app is enabled
-	 */
-	public function isAppEnabled($appName){
-		return \OCP\App::isEnabled($appName);
-	}
-
-
-	/**
-	 * used to return and open a new event source
-	 * @return \OCP\IEventSource a new open EventSource class
-	 * @deprecated Use \OC::$server->createEventSource();
-	 */
-	public function openEventSource(){
-		return \OC::$server->createEventSource();
-	}
-
-	/**
-	 * @deprecated register hooks directly for class that build in hook interfaces
-	 * connects a function to a hook
-	 * @param string $signalClass class name of emitter
-	 * @param string $signalName name of signal
-	 * @param string $slotClass class name of slot
-	 * @param string $slotName name of slot, in another word, this is the
-	 *               name of the method that will be called when registered
-	 *               signal is emitted.
-	 * @return bool always true
-	 */
-	public function connectHook($signalClass, $signalName, $slotClass, $slotName) {
-		return \OCP\Util::connectHook($signalClass, $signalName, $slotClass, $slotName);
-	}
-
-	/**
-	 * @deprecated implement the emitter interface instead
-	 * Emits a signal. To get data from the slot use references!
-	 * @param string $signalClass class name of emitter
-	 * @param string $signalName name of signal
-	 * @param array $params default: array() array with additional data
-	 * @return bool true if slots exists or false if not
-	 */
-	public function emitHook($signalClass, $signalName, $params = array()) {
-		return  \OCP\Util::emitHook($signalClass, $signalName, $params);
-	}
-
-	/**
-	 * clear hooks
-	 * @deprecated clear hooks directly for class that build in hook interfaces
-	 * @param string $signalClass
-	 * @param string $signalName
-	 */
-	public function clearHook($signalClass=false, $signalName=false) {
-		if ($signalClass) {
-			\OC_Hook::clear($signalClass, $signalName);
-		}
-	}
-
-	/**
-	 * Tells ownCloud to include a template in the admin overview
-	 * @param string $mainPath the path to the main php file without the php
-	 * suffix, relative to your apps directory! not the template directory
-	 * @param string $appName the name of the app, defaults to the current one
-	 */
-	public function registerAdmin($mainPath, $appName=null) {
-		if($appName === null){
-			$appName = $this->appName;
-		}
-
-		\OCP\App::registerAdmin($appName, $mainPath);
-	}
+    private $appName;
+
+    /**
+     * constructor
+     * @param string $appName the name of your application
+     */
+    public function __construct($appName){
+        $this->appName = $appName;
+    }
+
+
+    /**
+     * Gets the userid of the current user
+     * @return string the user id of the current user
+     * @deprecated Use \OC::$server->getUserSession()->getUser()->getUID()
+     */
+    public function getUserId(){
+        return \OCP\User::getUser();
+    }
+
+
+    /**
+     * Adds a new javascript file
+     * @deprecated include javascript and css in template files
+     * @param string $scriptName the name of the javascript in js/ without the suffix
+     * @param string $appName the name of the app, defaults to the current one
+     */
+    public function addScript($scriptName, $appName=null){
+        if($appName === null){
+            $appName = $this->appName;
+        }
+        \OCP\Util::addScript($appName, $scriptName);
+    }
+
+
+    /**
+     * Adds a new css file
+     * @deprecated include javascript and css in template files
+     * @param string $styleName the name of the css file in css/without the suffix
+     * @param string $appName the name of the app, defaults to the current one
+     */
+    public function addStyle($styleName, $appName=null){
+        if($appName === null){
+            $appName = $this->appName;
+        }
+        \OCP\Util::addStyle($appName, $styleName);
+    }
+
+
+    /**
+     * @deprecated include javascript and css in template files
+     * shorthand for addScript for files in the 3rdparty directory
+     * @param string $name the name of the file without the suffix
+     */
+    public function add3rdPartyScript($name){
+        \OCP\Util::addScript($this->appName . '/3rdparty', $name);
+    }
+
+
+    /**
+     * @deprecated include javascript and css in template files
+     * shorthand for addStyle for files in the 3rdparty directory
+     * @param string $name the name of the file without the suffix
+     */
+    public function add3rdPartyStyle($name){
+        \OCP\Util::addStyle($this->appName . '/3rdparty', $name);
+    }
+
+
+    /**
+     * @deprecated communication between apps should happen over built in
+     * callbacks or interfaces (check the contacts and calendar managers)
+     * Checks if an app is enabled
+     * also use \OC::$server->getAppManager()->isEnabledForUser($appName)
+     * @param string $appName the name of an app
+     * @return bool true if app is enabled
+     */
+    public function isAppEnabled($appName){
+        return \OCP\App::isEnabled($appName);
+    }
+
+
+    /**
+     * used to return and open a new event source
+     * @return \OCP\IEventSource a new open EventSource class
+     * @deprecated Use \OC::$server->createEventSource();
+     */
+    public function openEventSource(){
+        return \OC::$server->createEventSource();
+    }
+
+    /**
+     * @deprecated register hooks directly for class that build in hook interfaces
+     * connects a function to a hook
+     * @param string $signalClass class name of emitter
+     * @param string $signalName name of signal
+     * @param string $slotClass class name of slot
+     * @param string $slotName name of slot, in another word, this is the
+     *               name of the method that will be called when registered
+     *               signal is emitted.
+     * @return bool always true
+     */
+    public function connectHook($signalClass, $signalName, $slotClass, $slotName) {
+        return \OCP\Util::connectHook($signalClass, $signalName, $slotClass, $slotName);
+    }
+
+    /**
+     * @deprecated implement the emitter interface instead
+     * Emits a signal. To get data from the slot use references!
+     * @param string $signalClass class name of emitter
+     * @param string $signalName name of signal
+     * @param array $params default: array() array with additional data
+     * @return bool true if slots exists or false if not
+     */
+    public function emitHook($signalClass, $signalName, $params = array()) {
+        return  \OCP\Util::emitHook($signalClass, $signalName, $params);
+    }
+
+    /**
+     * clear hooks
+     * @deprecated clear hooks directly for class that build in hook interfaces
+     * @param string $signalClass
+     * @param string $signalName
+     */
+    public function clearHook($signalClass=false, $signalName=false) {
+        if ($signalClass) {
+            \OC_Hook::clear($signalClass, $signalName);
+        }
+    }
+
+    /**
+     * Tells ownCloud to include a template in the admin overview
+     * @param string $mainPath the path to the main php file without the php
+     * suffix, relative to your apps directory! not the template directory
+     * @param string $appName the name of the app, defaults to the current one
+     */
+    public function registerAdmin($mainPath, $appName=null) {
+        if($appName === null){
+            $appName = $this->appName;
+        }
+
+        \OCP\App::registerAdmin($appName, $mainPath);
+    }
 
 
 }

lib/private/AppFramework/Http/Output.php

Indentation +58 added lines, -58 removed lines

@@ -30,70 +30,70 @@
  * Very thin wrapper class to make output testable
  */
 class Output implements IOutput {
-	/** @var string */
-	private $webRoot;
+    /** @var string */
+    private $webRoot;
 
-	/**
-	 * @param $webRoot
-	 */
-	public function __construct($webRoot) {
-		$this->webRoot = $webRoot;
-	}
+    /**
+     * @param $webRoot
+     */
+    public function __construct($webRoot) {
+        $this->webRoot = $webRoot;
+    }
 
-	/**
-	 * @param string $out
-	 */
-	public function setOutput($out) {
-		print($out);
-	}
+    /**
+     * @param string $out
+     */
+    public function setOutput($out) {
+        print($out);
+    }
 
-	/**
-	 * @param string|resource $path or file handle
-	 *
-	 * @return bool false if an error occurred
-	 */
-	public function setReadfile($path) {
-		if (is_resource($path)) {
-			$output = fopen('php://output', 'w');
-			return stream_copy_to_stream($path, $output) > 0;
-		} else {
-			return @readfile($path);
-		}
-	}
+    /**
+     * @param string|resource $path or file handle
+     *
+     * @return bool false if an error occurred
+     */
+    public function setReadfile($path) {
+        if (is_resource($path)) {
+            $output = fopen('php://output', 'w');
+            return stream_copy_to_stream($path, $output) > 0;
+        } else {
+            return @readfile($path);
+        }
+    }
 
-	/**
-	 * @param string $header
-	 */
-	public function setHeader($header) {
-		header($header);
-	}
+    /**
+     * @param string $header
+     */
+    public function setHeader($header) {
+        header($header);
+    }
 
-	/**
-	 * @param int $code sets the http status code
-	 */
-	public function setHttpResponseCode($code) {
-		http_response_code($code);
-	}
+    /**
+     * @param int $code sets the http status code
+     */
+    public function setHttpResponseCode($code) {
+        http_response_code($code);
+    }
 
-	/**
-	 * @return int returns the current http response code
-	 */
-	public function getHttpResponseCode() {
-		return http_response_code();
-	}
+    /**
+     * @return int returns the current http response code
+     */
+    public function getHttpResponseCode() {
+        return http_response_code();
+    }
 
-	/**
-	 * @param string $name
-	 * @param string $value
-	 * @param int $expire
-	 * @param string $path
-	 * @param string $domain
-	 * @param bool $secure
-	 * @param bool $httpOnly
-	 */
-	public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly) {
-		$path = $this->webRoot ? : '/';
-		setcookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);
-	}
+    /**
+     * @param string $name
+     * @param string $value
+     * @param int $expire
+     * @param string $path
+     * @param string $domain
+     * @param bool $secure
+     * @param bool $httpOnly
+     */
+    public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly) {
+        $path = $this->webRoot ? : '/';
+        setcookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);
+    }
 
 }

lib/private/AppFramework/Http/Dispatcher.php

Indentation +137 added lines, -137 removed lines

@@ -43,142 +43,142 @@
  */
 class Dispatcher {
 
-	private $middlewareDispatcher;
-	private $protocol;
-	private $reflector;
-	private $request;
-
-	/**
-	 * @param Http $protocol the http protocol with contains all status headers
-	 * @param MiddlewareDispatcher $middlewareDispatcher the dispatcher which
-	 * runs the middleware
-	 * @param ControllerMethodReflector $reflector the reflector that is used to inject
-	 * the arguments for the controller
-	 * @param IRequest $request the incoming request
-	 */
-	public function __construct(Http $protocol,
-								MiddlewareDispatcher $middlewareDispatcher,
-								ControllerMethodReflector $reflector,
-								IRequest $request) {
-		$this->protocol = $protocol;
-		$this->middlewareDispatcher = $middlewareDispatcher;
-		$this->reflector = $reflector;
-		$this->request = $request;
-	}
-
-
-	/**
-	 * Handles a request and calls the dispatcher on the controller
-	 * @param Controller $controller the controller which will be called
-	 * @param string $methodName the method name which will be called on
-	 * the controller
-	 * @return array $array[0] contains a string with the http main header,
-	 * $array[1] contains headers in the form: $key => value, $array[2] contains
-	 * the response output
-	 * @throws \Exception
-	 */
-	public function dispatch(Controller $controller, $methodName) {
-		$out = array(null, array(), null);
-
-		try {
-			// prefill reflector with everything thats needed for the
-			// middlewares
-			$this->reflector->reflect($controller, $methodName);
-
-			$this->middlewareDispatcher->beforeController($controller,
-				$methodName);
-			$response = $this->executeController($controller, $methodName);
-
-			// if an exception appears, the middleware checks if it can handle the
-			// exception and creates a response. If no response is created, it is
-			// assumed that theres no middleware who can handle it and the error is
-			// thrown again
-		} catch(\Exception $exception){
-			$response = $this->middlewareDispatcher->afterException(
-				$controller, $methodName, $exception);
-			if (is_null($response)) {
-				throw $exception;
-			}
-		}
-
-		$response = $this->middlewareDispatcher->afterController(
-			$controller, $methodName, $response);
-
-		// depending on the cache object the headers need to be changed
-		$out[0] = $this->protocol->getStatusHeader($response->getStatus(),
-			$response->getLastModified(), $response->getETag());
-		$out[1] = array_merge($response->getHeaders());
-		$out[2] = $response->getCookies();
-		$out[3] = $this->middlewareDispatcher->beforeOutput(
-			$controller, $methodName, $response->render()
-		);
-		$out[4] = $response;
-
-		return $out;
-	}
-
-
-	/**
-	 * Uses the reflected parameters, types and request parameters to execute
-	 * the controller
-	 * @param Controller $controller the controller to be executed
-	 * @param string $methodName the method on the controller that should be executed
-	 * @return Response
-	 */
-	private function executeController($controller, $methodName) {
-		$arguments = array();
-
-		// valid types that will be casted
-		$types = array('int', 'integer', 'bool', 'boolean', 'float');
-
-		foreach($this->reflector->getParameters() as $param => $default) {
-
-			// try to get the parameter from the request object and cast
-			// it to the type annotated in the @param annotation
-			$value = $this->request->getParam($param, $default);
-			$type = $this->reflector->getType($param);
-
-			// if this is submitted using GET or a POST form, 'false' should be
-			// converted to false
-			if(($type === 'bool' || $type === 'boolean') &&
-				$value === 'false' &&
-				(
-					$this->request->method === 'GET' ||
-					strpos($this->request->getHeader('Content-Type'),
-						'application/x-www-form-urlencoded') !== false
-				)
-			) {
-				$value = false;
-
-			} elseif($value !== null && in_array($type, $types)) {
-				settype($value, $type);
-			}
-
-			$arguments[] = $value;
-		}
-
-		$response = call_user_func_array(array($controller, $methodName), $arguments);
-
-		// format response
-		if($response instanceof DataResponse || !($response instanceof Response)) {
-
-			// get format from the url format or request format parameter
-			$format = $this->request->getParam('format');
-
-			// if none is given try the first Accept header
-			if($format === null) {
-				$headers = $this->request->getHeader('Accept');
-				$format = $controller->getResponderByHTTPHeader($headers, null);
-			}
-
-			if ($format !== null) {
-				$response = $controller->buildResponse($response, $format);
-			} else {
-				$response = $controller->buildResponse($response);
-			}
-		}
-
-		return $response;
-	}
+    private $middlewareDispatcher;
+    private $protocol;
+    private $reflector;
+    private $request;
+
+    /**
+     * @param Http $protocol the http protocol with contains all status headers
+     * @param MiddlewareDispatcher $middlewareDispatcher the dispatcher which
+     * runs the middleware
+     * @param ControllerMethodReflector $reflector the reflector that is used to inject
+     * the arguments for the controller
+     * @param IRequest $request the incoming request
+     */
+    public function __construct(Http $protocol,
+                                MiddlewareDispatcher $middlewareDispatcher,
+                                ControllerMethodReflector $reflector,
+                                IRequest $request) {
+        $this->protocol = $protocol;
+        $this->middlewareDispatcher = $middlewareDispatcher;
+        $this->reflector = $reflector;
+        $this->request = $request;
+    }
+
+
+    /**
+     * Handles a request and calls the dispatcher on the controller
+     * @param Controller $controller the controller which will be called
+     * @param string $methodName the method name which will be called on
+     * the controller
+     * @return array $array[0] contains a string with the http main header,
+     * $array[1] contains headers in the form: $key => value, $array[2] contains
+     * the response output
+     * @throws \Exception
+     */
+    public function dispatch(Controller $controller, $methodName) {
+        $out = array(null, array(), null);
+
+        try {
+            // prefill reflector with everything thats needed for the
+            // middlewares
+            $this->reflector->reflect($controller, $methodName);
+
+            $this->middlewareDispatcher->beforeController($controller,
+                $methodName);
+            $response = $this->executeController($controller, $methodName);
+
+            // if an exception appears, the middleware checks if it can handle the
+            // exception and creates a response. If no response is created, it is
+            // assumed that theres no middleware who can handle it and the error is
+            // thrown again
+        } catch(\Exception $exception){
+            $response = $this->middlewareDispatcher->afterException(
+                $controller, $methodName, $exception);
+            if (is_null($response)) {
+                throw $exception;
+            }
+        }
+
+        $response = $this->middlewareDispatcher->afterController(
+            $controller, $methodName, $response);
+
+        // depending on the cache object the headers need to be changed
+        $out[0] = $this->protocol->getStatusHeader($response->getStatus(),
+            $response->getLastModified(), $response->getETag());
+        $out[1] = array_merge($response->getHeaders());
+        $out[2] = $response->getCookies();
+        $out[3] = $this->middlewareDispatcher->beforeOutput(
+            $controller, $methodName, $response->render()
+        );
+        $out[4] = $response;
+
+        return $out;
+    }
+
+
+    /**
+     * Uses the reflected parameters, types and request parameters to execute
+     * the controller
+     * @param Controller $controller the controller to be executed
+     * @param string $methodName the method on the controller that should be executed
+     * @return Response
+     */
+    private function executeController($controller, $methodName) {
+        $arguments = array();
+
+        // valid types that will be casted
+        $types = array('int', 'integer', 'bool', 'boolean', 'float');
+
+        foreach($this->reflector->getParameters() as $param => $default) {
+
+            // try to get the parameter from the request object and cast
+            // it to the type annotated in the @param annotation
+            $value = $this->request->getParam($param, $default);
+            $type = $this->reflector->getType($param);
+
+            // if this is submitted using GET or a POST form, 'false' should be
+            // converted to false
+            if(($type === 'bool' || $type === 'boolean') &&
+                $value === 'false' &&
+                (
+                    $this->request->method === 'GET' ||
+                    strpos($this->request->getHeader('Content-Type'),
+                        'application/x-www-form-urlencoded') !== false
+                )
+            ) {
+                $value = false;
+
+            } elseif($value !== null && in_array($type, $types)) {
+                settype($value, $type);
+            }
+
+            $arguments[] = $value;
+        }
+
+        $response = call_user_func_array(array($controller, $methodName), $arguments);
+
+        // format response
+        if($response instanceof DataResponse || !($response instanceof Response)) {
+
+            // get format from the url format or request format parameter
+            $format = $this->request->getParam('format');
+
+            // if none is given try the first Accept header
+            if($format === null) {
+                $headers = $this->request->getHeader('Accept');
+                $format = $controller->getResponderByHTTPHeader($headers, null);
+            }
+
+            if ($format !== null) {
+                $response = $controller->buildResponse($response, $format);
+            } else {
+                $response = $controller->buildResponse($response);
+            }
+        }
+
+        return $response;
+    }
 
 }