horros / agavi2

src/dispatcher/Dispatcher.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -324,7 +324,7 @@ 
 	 * @param      string $moduleName A module name.
 	 * @param      string $controllerName An controller name.
 	 *
-	 * @return     mixed  the path to the controller file if the controller file
+	 * @return     string|false  the path to the controller file if the controller file
 	 *                    exists and is readable, false in any other case
 	 *
 	 * @author     Felix Gilcher <felix.gilcher@bitextender.com>
@@ -414,7 +414,7 @@ 
 	 * @param      string $moduleName A module name.
 	 * @param      string $viewName A view name.
 	 *
-	 * @return     mixed  the path to the view file if the view file 
+	 * @return     string|false  the path to the view file if the view file 
 	 *                    exists and is readable, false in any other case
 	 * 
 	 * @author     Felix Gilcher <felix.gilcher@bitextender.com>

Indentation +584 added lines, -584 removed lines

@@ -50,671 +50,671 @@
  */
 class Dispatcher extends ParameterHolder
 {
-	/**
-	 * @var        int The number of execution containers run so far.
-	 */
-	protected $numExecutions = 0;
+    /**
+     * @var        int The number of execution containers run so far.
+     */
+    protected $numExecutions = 0;
 	
-	/**
-	 * @var        Context An Context instance.
-	 */
-	protected $context = null;
+    /**
+     * @var        Context An Context instance.
+     */
+    protected $context = null;
 	
-	/**
-	 * @var        Response The global response.
-	 */
-	protected $response = null;
+    /**
+     * @var        Response The global response.
+     */
+    protected $response = null;
 	
-	/**
-	 * @var        FilterChain The global filter chain.
-	 */
-	protected $filterChain = null;
+    /**
+     * @var        FilterChain The global filter chain.
+     */
+    protected $filterChain = null;
 	
-	/**
-	 * @var        array An array of filter instances for reuse.
-	 */
-	protected $filters = array(
-		'global' => array(),
-		'controller' => array(
-			'*' => null
-		),
-		'dispatch' => null,
-		'execution' => null,
-		'security' => null
-	);
+    /**
+     * @var        array An array of filter instances for reuse.
+     */
+    protected $filters = array(
+        'global' => array(),
+        'controller' => array(
+            '*' => null
+        ),
+        'dispatch' => null,
+        'execution' => null,
+        'security' => null
+    );
 	
-	/**
-	 * @var        string The default Output Type.
-	 */
-	protected $defaultOutputType = null;
+    /**
+     * @var        string The default Output Type.
+     */
+    protected $defaultOutputType = null;
 	
-	/**
-	 * @var        array An array of registered Output Types.
-	 */
-	protected $outputTypes = array();
+    /**
+     * @var        array An array of registered Output Types.
+     */
+    protected $outputTypes = array();
 	
-	/**
-	 * @var        array Ref to the request data object from the request.
-	 */
-	private $requestData = null;
+    /**
+     * @var        array Ref to the request data object from the request.
+     */
+    private $requestData = null;
 	
-	/**
-	 * Increment the execution counter.
-	 * Will throw an exception if the maximum amount of runs is exceeded.
-	 *
-	 * @throws     DispatcherException If too many execution runs were made.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function countExecution()
-	{
-		$maxExecutions = $this->getParameter('max_executions');
+    /**
+     * Increment the execution counter.
+     * Will throw an exception if the maximum amount of runs is exceeded.
+     *
+     * @throws     DispatcherException If too many execution runs were made.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function countExecution()
+    {
+        $maxExecutions = $this->getParameter('max_executions');
 		
-		if(++$this->numExecutions > $maxExecutions && $maxExecutions > 0) {
-			throw new DispatcherException('Too many execution runs have been detected for this Context.');
-		}
-	}
+        if(++$this->numExecutions > $maxExecutions && $maxExecutions > 0) {
+            throw new DispatcherException('Too many execution runs have been detected for this Context.');
+        }
+    }
 	
-	/**
-	 * Create and initialize new execution container instance.
-	 *
-	 * @param      string                 $moduleName    The name of the module.
-	 * @param      string                 $controllerName    The name of the controller.
-	 * @param      RequestDataHolder      $arguments     A RequestDataHolder with additional
-	 *                                    request arguments.
-	 * @param      string                 $outputType    Optional name of an initial output type
-	 *                                    to set.
-	 * @param      string                 $requestMethod Optional name of the request method to
-	 *                                    be used in this container.
-	 *
-	 * @return     ExecutionContainer A new execution container instance,
-	 *                                     fully initialized.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function createExecutionContainer($moduleName = null, $controllerName = null, RequestDataHolder $arguments = null, $outputType = null, $requestMethod = null)
-	{
-		// create a new execution container
+    /**
+     * Create and initialize new execution container instance.
+     *
+     * @param      string                 $moduleName    The name of the module.
+     * @param      string                 $controllerName    The name of the controller.
+     * @param      RequestDataHolder      $arguments     A RequestDataHolder with additional
+     *                                    request arguments.
+     * @param      string                 $outputType    Optional name of an initial output type
+     *                                    to set.
+     * @param      string                 $requestMethod Optional name of the request method to
+     *                                    be used in this container.
+     *
+     * @return     ExecutionContainer A new execution container instance,
+     *                                     fully initialized.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function createExecutionContainer($moduleName = null, $controllerName = null, RequestDataHolder $arguments = null, $outputType = null, $requestMethod = null)
+    {
+        // create a new execution container
         /** @var ExecutionContainer $container */
-		$container = $this->context->createInstanceFor('execution_container');
-		$container->setModuleName($moduleName);
-		$container->setControllerName($controllerName);
-		$container->setRequestData($this->requestData);
-		if($arguments !== null) {
-			$container->setArguments($arguments);
-		}
-		$container->setOutputType($this->context->getDispatcher()->getOutputType($outputType));
-		if($requestMethod === null) {
-			$requestMethod = $this->context->getRequest()->getMethod();
-		}
-		$container->setRequestMethod($requestMethod);
-		return $container;
-	}
+        $container = $this->context->createInstanceFor('execution_container');
+        $container->setModuleName($moduleName);
+        $container->setControllerName($controllerName);
+        $container->setRequestData($this->requestData);
+        if($arguments !== null) {
+            $container->setArguments($arguments);
+        }
+        $container->setOutputType($this->context->getDispatcher()->getOutputType($outputType));
+        if($requestMethod === null) {
+            $requestMethod = $this->context->getRequest()->getMethod();
+        }
+        $container->setRequestMethod($requestMethod);
+        return $container;
+    }
 	
-	/**
-	 * Initialize a module and load its autoload, module config etc.
-	 *
-	 * @param      string $moduleName The name of the module to initialize.
-	 *
-	 * @author     Felix Gilcher <felix.gilcher@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function initializeModule($moduleName)
-	{
-		$lowerModuleName = strtolower($moduleName);
+    /**
+     * Initialize a module and load its autoload, module config etc.
+     *
+     * @param      string $moduleName The name of the module to initialize.
+     *
+     * @author     Felix Gilcher <felix.gilcher@bitextender.com>
+     * @since      1.0.0
+     */
+    public function initializeModule($moduleName)
+    {
+        $lowerModuleName = strtolower($moduleName);
 		
-		if(null === Config::get('modules.' . $lowerModuleName . '.enabled')) {
-			// set some defaults first
-			Config::fromArray(array(
-				'modules.' . $lowerModuleName . '.agavi.controller.path' => '%core.module_dir%/${moduleName}/controllers/${controllerName}Controller.class.php',
-				'modules.' . $lowerModuleName . '.agavi.cache.path' => '%core.module_dir%/${moduleName}/cache/${controllerName}.xml',
-				'modules.' . $lowerModuleName . '.agavi.template.directory' => '%core.module_dir%/${module}/templates',
-				'modules.' . $lowerModuleName . '.agavi.validate.path' => '%core.module_dir%/${moduleName}/validate/${controllerName}.xml',
-				'modules.' . $lowerModuleName . '.agavi.view.path' => '%core.module_dir%/${moduleName}/views/${viewName}View.class.php',
-				'modules.' . $lowerModuleName . '.agavi.view.name' => '${controllerName}${viewName}',
-			));
-			// include the module configuration
-			// loaded only once due to the way load() (former import()) works
-			if(is_readable(Config::get('core.module_dir') . '/' . $moduleName . '/config/module.xml')) {
-				include_once(ConfigCache::checkConfig(Config::get('core.module_dir') . '/' . $moduleName . '/config/module.xml'));
-			} else {
-				Config::set('modules.' . $lowerModuleName . '.enabled', true);
-			}
+        if(null === Config::get('modules.' . $lowerModuleName . '.enabled')) {
+            // set some defaults first
+            Config::fromArray(array(
+                'modules.' . $lowerModuleName . '.agavi.controller.path' => '%core.module_dir%/${moduleName}/controllers/${controllerName}Controller.class.php',
+                'modules.' . $lowerModuleName . '.agavi.cache.path' => '%core.module_dir%/${moduleName}/cache/${controllerName}.xml',
+                'modules.' . $lowerModuleName . '.agavi.template.directory' => '%core.module_dir%/${module}/templates',
+                'modules.' . $lowerModuleName . '.agavi.validate.path' => '%core.module_dir%/${moduleName}/validate/${controllerName}.xml',
+                'modules.' . $lowerModuleName . '.agavi.view.path' => '%core.module_dir%/${moduleName}/views/${viewName}View.class.php',
+                'modules.' . $lowerModuleName . '.agavi.view.name' => '${controllerName}${viewName}',
+            ));
+            // include the module configuration
+            // loaded only once due to the way load() (former import()) works
+            if(is_readable(Config::get('core.module_dir') . '/' . $moduleName . '/config/module.xml')) {
+                include_once(ConfigCache::checkConfig(Config::get('core.module_dir') . '/' . $moduleName . '/config/module.xml'));
+            } else {
+                Config::set('modules.' . $lowerModuleName . '.enabled', true);
+            }
 			
-			$moduleAutoload = Config::get('core.module_dir') . '/' . $moduleName . '/config/autoload.xml';
-			if(is_readable($moduleAutoload)) {
-				ConfigCache::load($moduleAutoload);
-			}
+            $moduleAutoload = Config::get('core.module_dir') . '/' . $moduleName . '/config/autoload.xml';
+            if(is_readable($moduleAutoload)) {
+                ConfigCache::load($moduleAutoload);
+            }
 			
-			if(Config::get('modules.' . $lowerModuleName . '.enabled')) {
-				$moduleConfigHandlers = Config::get('core.module_dir') . '/' . $moduleName . '/config/config_handlers.xml';
-				if(is_readable($moduleConfigHandlers)) {
-					ConfigCache::addConfigHandlersFile($moduleConfigHandlers);
-				}
-			}
-		}
+            if(Config::get('modules.' . $lowerModuleName . '.enabled')) {
+                $moduleConfigHandlers = Config::get('core.module_dir') . '/' . $moduleName . '/config/config_handlers.xml';
+                if(is_readable($moduleConfigHandlers)) {
+                    ConfigCache::addConfigHandlersFile($moduleConfigHandlers);
+                }
+            }
+        }
 		
-		if(!Config::get('modules.' . $lowerModuleName . '.enabled')) {
-			throw new DisabledModuleException(sprintf('The module "%1$s" is disabled.', $moduleName));
-		}
+        if(!Config::get('modules.' . $lowerModuleName . '.enabled')) {
+            throw new DisabledModuleException(sprintf('The module "%1$s" is disabled.', $moduleName));
+        }
 		
-		// check for a module config.php
-		$moduleConfig = Config::get('core.module_dir') . '/' . $moduleName . '/config.php';
-		if(is_readable($moduleConfig)) {
-			require_once($moduleConfig);
-		}
-	}
+        // check for a module config.php
+        $moduleConfig = Config::get('core.module_dir') . '/' . $moduleName . '/config.php';
+        if(is_readable($moduleConfig)) {
+            require_once($moduleConfig);
+        }
+    }
 	
-	/**
-	 * Dispatch a request
-	 *
-	 * @param      RequestDataHolder  $arguments An optional request data holder object
-	 *                                with additional request data.
-	 * @param      ExecutionContainer $container An optional execution container that,
-	 *                                if given, will be executed right away,
-	 *                                skipping routing execution.
-	 *
-	 * @return     Response The response produced during this dispatch call.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.9.0
-	 */
-	public function dispatch(RequestDataHolder $arguments = null, ExecutionContainer $container = null)
-	{
-		try {
+    /**
+     * Dispatch a request
+     *
+     * @param      RequestDataHolder  $arguments An optional request data holder object
+     *                                with additional request data.
+     * @param      ExecutionContainer $container An optional execution container that,
+     *                                if given, will be executed right away,
+     *                                skipping routing execution.
+     *
+     * @return     Response The response produced during this dispatch call.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.9.0
+     */
+    public function dispatch(RequestDataHolder $arguments = null, ExecutionContainer $container = null)
+    {
+        try {
 			
-			$rq = $this->context->getRequest();
-			$rd = $rq->getRequestData();
+            $rq = $this->context->getRequest();
+            $rd = $rq->getRequestData();
 			
-			if($container === null) {
-				// match routes and assign returned initial execution container
-				$container = $this->context->getRouting()->execute();
-			}
+            if($container === null) {
+                // match routes and assign returned initial execution container
+                $container = $this->context->getRouting()->execute();
+            }
 			
-			if($container instanceof ExecutionContainer) {
-				// merge in any arguments given. they need to have precedence over what the routing found
-				if($arguments !== null) {
-					$rd->merge($arguments);
-				}
+            if($container instanceof ExecutionContainer) {
+                // merge in any arguments given. they need to have precedence over what the routing found
+                if($arguments !== null) {
+                    $rd->merge($arguments);
+                }
 				
-				// next, we have to see if the routing did anything useful, i.e. whether or not it was enabled.
-				$moduleName = $container->getModuleName();
-				$controllerName = $container->getControllerName();
-				if(!$moduleName) {
-					// no module has been specified; that means the routing did not run, as it would otherwise have the 404 controller's module name
+                // next, we have to see if the routing did anything useful, i.e. whether or not it was enabled.
+                $moduleName = $container->getModuleName();
+                $controllerName = $container->getControllerName();
+                if(!$moduleName) {
+                    // no module has been specified; that means the routing did not run, as it would otherwise have the 404 controller's module name
 					
-					// lets see if our request data has values for module and controller
-					$ma = $rq->getParameter('module_accessor');
-					$aa = $rq->getParameter('controller_accessor');
-					if($rd->hasParameter($ma) && $rd->hasParameter($aa)) {
-						// yup. grab those
-						$moduleName = $rd->getParameter($ma);
-						$controllerName = $rd->getParameter($aa);
-					} else {
-						// nope. then its time for the default controller
-						$moduleName = Config::get('controllers.default_module');
-						$controllerName = Config::get('controllers.default_controller');
-					}
+                    // lets see if our request data has values for module and controller
+                    $ma = $rq->getParameter('module_accessor');
+                    $aa = $rq->getParameter('controller_accessor');
+                    if($rd->hasParameter($ma) && $rd->hasParameter($aa)) {
+                        // yup. grab those
+                        $moduleName = $rd->getParameter($ma);
+                        $controllerName = $rd->getParameter($aa);
+                    } else {
+                        // nope. then its time for the default controller
+                        $moduleName = Config::get('controllers.default_module');
+                        $controllerName = Config::get('controllers.default_controller');
+                    }
 					
                     // so by now we hopefully have something reasonable for module and controller names - let's set them on the container
-					$container->setModuleName($moduleName);
-					$container->setControllerName($controllerName);
-				}
+                    $container->setModuleName($moduleName);
+                    $container->setControllerName($controllerName);
+                }
 				
-				if(!Config::get('core.available', false)) {
-					$container = $container->createSystemControllerForwardContainer('unavailable');
-				}
+                if(!Config::get('core.available', false)) {
+                    $container = $container->createSystemControllerForwardContainer('unavailable');
+                }
 				
-				// create a new filter chain
-				/** @var FilterChain $filterChain */
-				$filterChain = $this->getFilterChain();
+                // create a new filter chain
+                /** @var FilterChain $filterChain */
+                $filterChain = $this->getFilterChain();
 				
-				$this->loadFilters($filterChain, 'global');
+                $this->loadFilters($filterChain, 'global');
 				
-				// register the dispatch filter
-				$filterChain->register($this->filters['dispatch'], 'agavi_dispatch_filter');
+                // register the dispatch filter
+                $filterChain->register($this->filters['dispatch'], 'agavi_dispatch_filter');
 				
-				// go, go, go!
-				$filterChain->execute($container);
+                // go, go, go!
+                $filterChain->execute($container);
 				
-				$response = $container->getResponse();
-			} elseif($container instanceof Response) {
-				// the routing returned a response!
-				$response = $container;
-				// set $container to null so Exception::render() won't think it is a container if an exception happens later!
-				$container = null;
-			} else {
-				throw new AgaviException('AgaviRouting::execute() returned neither ExecutionContainer nor Response object.');
-			}
-			$response->merge($this->response);
+                $response = $container->getResponse();
+            } elseif($container instanceof Response) {
+                // the routing returned a response!
+                $response = $container;
+                // set $container to null so Exception::render() won't think it is a container if an exception happens later!
+                $container = null;
+            } else {
+                throw new AgaviException('AgaviRouting::execute() returned neither ExecutionContainer nor Response object.');
+            }
+            $response->merge($this->response);
 			
-			if($this->getParameter('send_response')) {
-				$response->send();
-			}
+            if($this->getParameter('send_response')) {
+                $response->send();
+            }
 			
-			return $response;
+            return $response;
 			
-		} catch(\Exception $e) {
-			AgaviException::render($e, $this->context, $container);
-		}
-	}
+        } catch(\Exception $e) {
+            AgaviException::render($e, $this->context, $container);
+        }
+    }
 	
-	/**
-	 * Get the global response instance.
-	 *
-	 * @return     Response The global response.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getGlobalResponse()
-	{
-		return $this->response;
-	}
+    /**
+     * Get the global response instance.
+     *
+     * @return     Response The global response.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getGlobalResponse()
+    {
+        return $this->response;
+    }
 	
 	
-	/**
-	 * Indicates whether or not a module has a specific controller file.
-	 * 
-	 * Please note that this is only a cursory check and does not 
-	 * check whether the file actually contains the proper class
-	 *
-	 * @param      string $moduleName A module name.
-	 * @param      string $controllerName An controller name.
-	 *
-	 * @return     mixed  the path to the controller file if the controller file
-	 *                    exists and is readable, false in any other case
-	 *
-	 * @author     Felix Gilcher <felix.gilcher@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function checkControllerFile($moduleName, $controllerName)
-	{
-		$this->initializeModule($moduleName);
+    /**
+     * Indicates whether or not a module has a specific controller file.
+     * 
+     * Please note that this is only a cursory check and does not 
+     * check whether the file actually contains the proper class
+     *
+     * @param      string $moduleName A module name.
+     * @param      string $controllerName An controller name.
+     *
+     * @return     mixed  the path to the controller file if the controller file
+     *                    exists and is readable, false in any other case
+     *
+     * @author     Felix Gilcher <felix.gilcher@bitextender.com>
+     * @since      1.0.0
+     */
+    public function checkControllerFile($moduleName, $controllerName)
+    {
+        $this->initializeModule($moduleName);
 		
-		$controllerName = Toolkit::canonicalName($controllerName);
-		$file = Toolkit::evaluateModuleDirective(
-			$moduleName,
-			'agavi.controller.path',
-			array(
-				'moduleName' => $moduleName,
-				'controllerName' => $controllerName,
-			)
-		);
+        $controllerName = Toolkit::canonicalName($controllerName);
+        $file = Toolkit::evaluateModuleDirective(
+            $moduleName,
+            'agavi.controller.path',
+            array(
+                'moduleName' => $moduleName,
+                'controllerName' => $controllerName,
+            )
+        );
 		
-		if(is_readable($file) && substr($controllerName, 0, 1) !== '/') {
-			return $file;
-		}
+        if(is_readable($file) && substr($controllerName, 0, 1) !== '/') {
+            return $file;
+        }
 		
-		return false;
-	}
+        return false;
+    }
 	
-	/**
-	 * Retrieve an Controller implementation instance.
-	 *
-	 * @param      string $moduleName A module name.
-	 * @param      string $controllerName An controller name.
-	 *
-	 * @return     Controller An Controller implementation instance
-	 *
-	 * @throws     FileNotFoundException|ClassNotFoundException if the controller could not be found.
-	 *
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @author     Mike Vincent <mike@agavi.org>
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.9.0
-	 */
-	public function createControllerInstance($moduleName, $controllerName)
-	{
-		$this->initializeModule($moduleName);
+    /**
+     * Retrieve an Controller implementation instance.
+     *
+     * @param      string $moduleName A module name.
+     * @param      string $controllerName An controller name.
+     *
+     * @return     Controller An Controller implementation instance
+     *
+     * @throws     FileNotFoundException|ClassNotFoundException if the controller could not be found.
+     *
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @author     Mike Vincent <mike@agavi.org>
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.9.0
+     */
+    public function createControllerInstance($moduleName, $controllerName)
+    {
+        $this->initializeModule($moduleName);
 		
-		$controllerName = Toolkit::canonicalName($controllerName);
-		$longControllerName = str_replace('/', '_', $controllerName);
+        $controllerName = Toolkit::canonicalName($controllerName);
+        $longControllerName = str_replace('/', '_', $controllerName);
 		
-		$class = $moduleName . '_' . $longControllerName . 'Controller';
+        $class = $moduleName . '_' . $longControllerName . 'Controller';
 		
-		if(!class_exists($class)) {
-			if(false !== ($file = $this->checkControllerFile($moduleName, $controllerName))) {
-				require($file);
-			} else {
-				throw new FileNotFoundException(sprintf('Could not find file for Controller "%s" in Module "%s".', $controllerName, $moduleName));
-			}
+        if(!class_exists($class)) {
+            if(false !== ($file = $this->checkControllerFile($moduleName, $controllerName))) {
+                require($file);
+            } else {
+                throw new FileNotFoundException(sprintf('Could not find file for Controller "%s" in Module "%s".', $controllerName, $moduleName));
+            }
 			
-			if(!class_exists($class, false)) {
-				throw new ClassNotFoundException(sprintf('Failed to instantiate Controller "%s" in Module "%s" because file "%s" does not contain class "%s".', $controllerName, $moduleName, $file, $class));
-			}
-		} 
+            if(!class_exists($class, false)) {
+                throw new ClassNotFoundException(sprintf('Failed to instantiate Controller "%s" in Module "%s" because file "%s" does not contain class "%s".', $controllerName, $moduleName, $file, $class));
+            }
+        } 
 		
-		return new $class();
-	}
+        return new $class();
+    }
 
-	/**
-	 * Retrieve the current application context.
-	 *
-	 * @return     Context An Context instance.
-	 *
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @since      0.9.0
-	 */
-	public final function getContext()
-	{
-		return $this->context;
-	}
+    /**
+     * Retrieve the current application context.
+     *
+     * @return     Context An Context instance.
+     *
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @since      0.9.0
+     */
+    public final function getContext()
+    {
+        return $this->context;
+    }
 
 
 	
-	/**
-	 * Indicates whether or not a module has a specific view file.
-	 * 
-	 * Please note that this is only a cursory check and does not 
-	 * check whether the file actually contains the proper class
-	 *
-	 * @param      string $moduleName A module name.
-	 * @param      string $viewName A view name.
-	 *
-	 * @return     mixed  the path to the view file if the view file 
-	 *                    exists and is readable, false in any other case
-	 * 
-	 * @author     Felix Gilcher <felix.gilcher@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function checkViewFile($moduleName, $viewName)
-	{
-		$this->initializeModule($moduleName);
+    /**
+     * Indicates whether or not a module has a specific view file.
+     * 
+     * Please note that this is only a cursory check and does not 
+     * check whether the file actually contains the proper class
+     *
+     * @param      string $moduleName A module name.
+     * @param      string $viewName A view name.
+     *
+     * @return     mixed  the path to the view file if the view file 
+     *                    exists and is readable, false in any other case
+     * 
+     * @author     Felix Gilcher <felix.gilcher@bitextender.com>
+     * @since      1.0.0
+     */
+    public function checkViewFile($moduleName, $viewName)
+    {
+        $this->initializeModule($moduleName);
 		
-		$viewName = Toolkit::canonicalName($viewName);
-		$file = Toolkit::evaluateModuleDirective(
-			$moduleName,
-			'agavi.view.path',
-			array(
-				'moduleName' => $moduleName,
-				'viewName' => $viewName,
-			)
-		);
+        $viewName = Toolkit::canonicalName($viewName);
+        $file = Toolkit::evaluateModuleDirective(
+            $moduleName,
+            'agavi.view.path',
+            array(
+                'moduleName' => $moduleName,
+                'viewName' => $viewName,
+            )
+        );
 		
-		if(is_readable($file) && substr($viewName, 0, 1) !== '/') {
-			return $file;
-		}
+        if(is_readable($file) && substr($viewName, 0, 1) !== '/') {
+            return $file;
+        }
 		
-		return false;
-	}
+        return false;
+    }
 	
-	/**
-	 * Retrieve a View implementation instance.
-	 *
-	 * @param      string $moduleName A module name.
-	 * @param      string $viewName A view name.
-	 *
-	 * @return     View A View implementation instance,
-	 *
-	 * @throws     AgaviException if the view could not be found.
-	 *
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @author     Mike Vincent <mike@agavi.org>
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.9.0
-	 */
-	public function createViewInstance($moduleName, $viewName)
-	{
-		try {
-			$this->initializeModule($moduleName);
-		} catch(DisabledModuleException $e) {
-			// views from disabled modules should be usable by definition
-			// swallow
-		}
+    /**
+     * Retrieve a View implementation instance.
+     *
+     * @param      string $moduleName A module name.
+     * @param      string $viewName A view name.
+     *
+     * @return     View A View implementation instance,
+     *
+     * @throws     AgaviException if the view could not be found.
+     *
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @author     Mike Vincent <mike@agavi.org>
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.9.0
+     */
+    public function createViewInstance($moduleName, $viewName)
+    {
+        try {
+            $this->initializeModule($moduleName);
+        } catch(DisabledModuleException $e) {
+            // views from disabled modules should be usable by definition
+            // swallow
+        }
 		
-		$viewName = Toolkit::canonicalName($viewName);
-		$longViewName = str_replace('/', '_', $viewName);
+        $viewName = Toolkit::canonicalName($viewName);
+        $longViewName = str_replace('/', '_', $viewName);
 		
-		$class = $moduleName . '_' . $longViewName . 'View';
+        $class = $moduleName . '_' . $longViewName . 'View';
 		
-		if(!class_exists($class)) {
+        if(!class_exists($class)) {
 			
-			if(false !== ($file = $this->checkViewFile($moduleName, $viewName))) {
-				require($file);
-			} else {
-				throw new FileNotFoundException(sprintf('Could not find file for View "%s" in Module "%s".', $viewName, $moduleName));
-			}
+            if(false !== ($file = $this->checkViewFile($moduleName, $viewName))) {
+                require($file);
+            } else {
+                throw new FileNotFoundException(sprintf('Could not find file for View "%s" in Module "%s".', $viewName, $moduleName));
+            }
 			
-			if(!class_exists($class, false)) {
-				throw new ClassNotFoundException(sprintf('Failed to instantiate View "%s" in Module "%s" because file "%s" does not contain class "%s".', $viewName, $moduleName, $file, $class));
-			}
-		} 
+            if(!class_exists($class, false)) {
+                throw new ClassNotFoundException(sprintf('Failed to instantiate View "%s" in Module "%s" because file "%s" does not contain class "%s".', $viewName, $moduleName, $file, $class));
+            }
+        } 
 		
-		return new $class();
-	}
+        return new $class();
+    }
 
-	/**
-	 * Constructor.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->setParameters(array(
-			'max_executions' => 20,
-			'send_response' => true,
-		));
-	}
+    /**
+     * Constructor.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->setParameters(array(
+            'max_executions' => 20,
+            'send_response' => true,
+        ));
+    }
 	
-	/**
-	 * Initialize this Dispatcher.
-	 *
-	 * @param      Context $context A Context instance.
-	 * @param      array   $parameters An array of initialization parameters.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.9.0
-	 */
-	public function initialize(Context $context, array $parameters = array())
-	{
-		$this->context = $context;
+    /**
+     * Initialize this Dispatcher.
+     *
+     * @param      Context $context A Context instance.
+     * @param      array   $parameters An array of initialization parameters.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.9.0
+     */
+    public function initialize(Context $context, array $parameters = array())
+    {
+        $this->context = $context;
 		
-		$this->setParameters($parameters);
+        $this->setParameters($parameters);
 		
-		$this->response = $this->context->createInstanceFor('response');
+        $this->response = $this->context->createInstanceFor('response');
 		
-		$cfg = Config::get('core.config_dir') . '/output_types.xml';
-		require(ConfigCache::checkConfig($cfg, $this->context->getName()));
+        $cfg = Config::get('core.config_dir') . '/output_types.xml';
+        require(ConfigCache::checkConfig($cfg, $this->context->getName()));
 		
-		if(Config::get('core.use_security', false)) {
-			$this->filters['security'] = $this->context->createInstanceFor('security_filter');
-		}
+        if(Config::get('core.use_security', false)) {
+            $this->filters['security'] = $this->context->createInstanceFor('security_filter');
+        }
 		
-		$this->filters['dispatch'] = $this->context->createInstanceFor('dispatch_filter');
+        $this->filters['dispatch'] = $this->context->createInstanceFor('dispatch_filter');
 		
-		$this->filters['execution'] = $this->context->createInstanceFor('execution_filter');
-	}
+        $this->filters['execution'] = $this->context->createInstanceFor('execution_filter');
+    }
 	
-	/**
-	 * Get a filter.
-	 *
-	 * @param      string $which The name of the filter list section.
-	 *
-	 * @return     Filter A filter instance, or null.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getFilter($which)
-	{
-		return (isset($this->filters[$which]) ? $this->filters[$which] : null);
-	}
+    /**
+     * Get a filter.
+     *
+     * @param      string $which The name of the filter list section.
+     *
+     * @return     Filter A filter instance, or null.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getFilter($which)
+    {
+        return (isset($this->filters[$which]) ? $this->filters[$which] : null);
+    }
 	
-	/**
-	 * Get the global filter chain.
-	 *
-	 * @return     FilterChain The global filter chain.
-	 *
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      1.1.0
-	 */
-	public function getFilterChain()
-	{
-		if($this->filterChain === null) {
-			$this->filterChain = $this->context->createInstanceFor('filter_chain');
-			$this->filterChain->setType(FilterChain::TYPE_GLOBAL);
-		}
+    /**
+     * Get the global filter chain.
+     *
+     * @return     FilterChain The global filter chain.
+     *
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      1.1.0
+     */
+    public function getFilterChain()
+    {
+        if($this->filterChain === null) {
+            $this->filterChain = $this->context->createInstanceFor('filter_chain');
+            $this->filterChain->setType(FilterChain::TYPE_GLOBAL);
+        }
 		
-		return $this->filterChain;
-	}
+        return $this->filterChain;
+    }
 	
-	/**
-	 * Load filters.
-	 *
-	 * @param      FilterChain $filterChain A FilterChain instance.
-	 * @param      string      $which "global" or "controller".
-	 * @param      string      $module A module name, or "*" for the generic config.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function loadFilters(FilterChain $filterChain, $which = 'global', $module = null)
-	{
-		if($module === null) {
-			$module = '*';
-		}
+    /**
+     * Load filters.
+     *
+     * @param      FilterChain $filterChain A FilterChain instance.
+     * @param      string      $which "global" or "controller".
+     * @param      string      $module A module name, or "*" for the generic config.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function loadFilters(FilterChain $filterChain, $which = 'global', $module = null)
+    {
+        if($module === null) {
+            $module = '*';
+        }
 		
-		if(($which != 'global' && !isset($this->filters[$which][$module])) || $which == 'global' && $this->filters[$which] == null) {
-			if($which == 'global') {
-				$this->filters[$which] = array();
-				$filters =& $this->filters[$which];
-			} else {
-				$this->filters[$which][$module] = array();
-				$filters =& $this->filters[$which][$module];
-			}
-			$config = ($module == '*' ? Config::get('core.config_dir') : Config::get('core.module_dir') . '/' . $module . '/config') . '/' . $which . '_filters.xml';
-			if(is_readable($config)) {
-				require(ConfigCache::checkConfig($config, $this->context->getName()));
-			}
-		} else {
-			if($which == 'global') {
-				$filters =& $this->filters[$which];
-			} else {
-				$filters =& $this->filters[$which][$module];
-			}
-		}
+        if(($which != 'global' && !isset($this->filters[$which][$module])) || $which == 'global' && $this->filters[$which] == null) {
+            if($which == 'global') {
+                $this->filters[$which] = array();
+                $filters =& $this->filters[$which];
+            } else {
+                $this->filters[$which][$module] = array();
+                $filters =& $this->filters[$which][$module];
+            }
+            $config = ($module == '*' ? Config::get('core.config_dir') : Config::get('core.module_dir') . '/' . $module . '/config') . '/' . $which . '_filters.xml';
+            if(is_readable($config)) {
+                require(ConfigCache::checkConfig($config, $this->context->getName()));
+            }
+        } else {
+            if($which == 'global') {
+                $filters =& $this->filters[$which];
+            } else {
+                $filters =& $this->filters[$which][$module];
+            }
+        }
 		
-		foreach($filters as $name => $filter) {
-			$filterChain->register($filter, $name);
-		}
-	}
+        foreach($filters as $name => $filter) {
+            $filterChain->register($filter, $name);
+        }
+    }
 
-	/**
-	 * Indicates whether or not a module has a specific model.
-	 *
-	 * @param      string $moduleName A module name.
-	 * @param      string $modelName A model name.
-	 *
-	 * @return     bool true, if the model exists, otherwise false.
-	 *
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @since      0.9.0
-	 */
-	public function modelExists($moduleName, $modelName)
-	{
-		$modelName = Toolkit::canonicalName($modelName);
-		$file = Config::get('core.module_dir') . '/' . $moduleName . '/models/' . $modelName .	'Model.class.php';
-		return is_readable($file);
-	}
+    /**
+     * Indicates whether or not a module has a specific model.
+     *
+     * @param      string $moduleName A module name.
+     * @param      string $modelName A model name.
+     *
+     * @return     bool true, if the model exists, otherwise false.
+     *
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @since      0.9.0
+     */
+    public function modelExists($moduleName, $modelName)
+    {
+        $modelName = Toolkit::canonicalName($modelName);
+        $file = Config::get('core.module_dir') . '/' . $moduleName . '/models/' . $modelName .	'Model.class.php';
+        return is_readable($file);
+    }
 
-	/**
-	 * Indicates whether or not a module exists.
-	 *
-	 * @param      string $moduleName A module name.
-	 *
-	 * @return     bool true, if the module exists, otherwise false.
-	 *
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @since      0.9.0
-	 */
-	public function moduleExists($moduleName)
-	{
-		$file = Config::get('core.module_dir') . '/' . $moduleName . '/config/module.xml';
-		return is_readable($file);
-	}
+    /**
+     * Indicates whether or not a module exists.
+     *
+     * @param      string $moduleName A module name.
+     *
+     * @return     bool true, if the module exists, otherwise false.
+     *
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @since      0.9.0
+     */
+    public function moduleExists($moduleName)
+    {
+        $file = Config::get('core.module_dir') . '/' . $moduleName . '/config/module.xml';
+        return is_readable($file);
+    }
 
-	/**
-	 * Do any necessary startup work after initialization.
-	 *
-	 * This method is not called directly after initialize().
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function startup()
-	{
-		// grab a pointer to the request data
-		$this->requestData = $this->context->getRequest()->getRequestData();
-	}
+    /**
+     * Do any necessary startup work after initialization.
+     *
+     * This method is not called directly after initialize().
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function startup()
+    {
+        // grab a pointer to the request data
+        $this->requestData = $this->context->getRequest()->getRequestData();
+    }
 
-	/**
-	 * Execute the shutdown procedure for this Dispatcher.
-	 *
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @since      0.9.0
-	 */
-	public function shutdown()
-	{
-	}
+    /**
+     * Execute the shutdown procedure for this Dispatcher.
+     *
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @since      0.9.0
+     */
+    public function shutdown()
+    {
+    }
 
-	/**
-	 * Indicates whether or not a module has a specific controller.
-	 *
-	 * @param      string $moduleName A module name.
-	 * @param      string $controllerName A view name.
-	 *
-	 * @return     bool true, if the controller exists, otherwise false.
-	 *
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      1.0.1
-	 */
-	public function controllerExists($moduleName, $controllerName)
-	{
-		return $this->checkControllerFile($moduleName, $controllerName) !== false;
-	}
+    /**
+     * Indicates whether or not a module has a specific controller.
+     *
+     * @param      string $moduleName A module name.
+     * @param      string $controllerName A view name.
+     *
+     * @return     bool true, if the controller exists, otherwise false.
+     *
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      1.0.1
+     */
+    public function controllerExists($moduleName, $controllerName)
+    {
+        return $this->checkControllerFile($moduleName, $controllerName) !== false;
+    }
 
-	/**
-	 * Indicates whether or not a module has a specific view.
-	 *
-	 * @param      string $moduleName A module name.
-	 * @param      string $viewName A view name.
-	 *
-	 * @return     bool true, if the view exists, otherwise false.
-	 *
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @since      0.9.0
-	 */
-	public function viewExists($moduleName, $viewName)
-	{
-		return $this->checkViewFile($moduleName, $viewName) !== false;
-	}
+    /**
+     * Indicates whether or not a module has a specific view.
+     *
+     * @param      string $moduleName A module name.
+     * @param      string $viewName A view name.
+     *
+     * @return     bool true, if the view exists, otherwise false.
+     *
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @since      0.9.0
+     */
+    public function viewExists($moduleName, $viewName)
+    {
+        return $this->checkViewFile($moduleName, $viewName) !== false;
+    }
 	
-	/**
-	 * Retrieve an Output Type object
-	 *
-	 * @param      string $name The optional output type name.
-	 *
-	 * @return     OutputType An Output Type object.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getOutputType($name = null)
-	{
-		if($name === null) {
-			$name = $this->defaultOutputType;
-		}
-		if(isset($this->outputTypes[$name])) {
-			return $this->outputTypes[$name];
-		} else {
-			throw new AgaviException('Output Type "' . $name . '" has not been configured.');
-		}
-	}
+    /**
+     * Retrieve an Output Type object
+     *
+     * @param      string $name The optional output type name.
+     *
+     * @return     OutputType An Output Type object.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getOutputType($name = null)
+    {
+        if($name === null) {
+            $name = $this->defaultOutputType;
+        }
+        if(isset($this->outputTypes[$name])) {
+            return $this->outputTypes[$name];
+        } else {
+            throw new AgaviException('Output Type "' . $name . '" has not been configured.');
+        }
+    }
 }
 
 ?>
\ No newline at end of file

Spacing +43 added lines, -43 removed lines

@@ -111,7 +111,7 @@ 
 	{
 		$maxExecutions = $this->getParameter('max_executions');
 		
-		if(++$this->numExecutions > $maxExecutions && $maxExecutions > 0) {
+		if (++$this->numExecutions > $maxExecutions && $maxExecutions > 0) {
 			throw new DispatcherException('Too many execution runs have been detected for this Context.');
 		}
 	}
@@ -142,11 +142,11 @@ 
 		$container->setModuleName($moduleName);
 		$container->setControllerName($controllerName);
 		$container->setRequestData($this->requestData);
-		if($arguments !== null) {
+		if ($arguments !== null) {
 			$container->setArguments($arguments);
 		}
 		$container->setOutputType($this->context->getDispatcher()->getOutputType($outputType));
-		if($requestMethod === null) {
+		if ($requestMethod === null) {
 			$requestMethod = $this->context->getRequest()->getMethod();
 		}
 		$container->setRequestMethod($requestMethod);
@@ -165,7 +165,7 @@ 
 	{
 		$lowerModuleName = strtolower($moduleName);
 		
-		if(null === Config::get('modules.' . $lowerModuleName . '.enabled')) {
+		if (null === Config::get('modules.' . $lowerModuleName . '.enabled')) {
 			// set some defaults first
 			Config::fromArray(array(
 				'modules.' . $lowerModuleName . '.agavi.controller.path' => '%core.module_dir%/${moduleName}/controllers/${controllerName}Controller.class.php',
@@ -177,32 +177,32 @@ 
 			));
 			// include the module configuration
 			// loaded only once due to the way load() (former import()) works
-			if(is_readable(Config::get('core.module_dir') . '/' . $moduleName . '/config/module.xml')) {
+			if (is_readable(Config::get('core.module_dir') . '/' . $moduleName . '/config/module.xml')) {
 				include_once(ConfigCache::checkConfig(Config::get('core.module_dir') . '/' . $moduleName . '/config/module.xml'));
 			} else {
 				Config::set('modules.' . $lowerModuleName . '.enabled', true);
 			}
 			
 			$moduleAutoload = Config::get('core.module_dir') . '/' . $moduleName . '/config/autoload.xml';
-			if(is_readable($moduleAutoload)) {
+			if (is_readable($moduleAutoload)) {
 				ConfigCache::load($moduleAutoload);
 			}
 			
-			if(Config::get('modules.' . $lowerModuleName . '.enabled')) {
+			if (Config::get('modules.' . $lowerModuleName . '.enabled')) {
 				$moduleConfigHandlers = Config::get('core.module_dir') . '/' . $moduleName . '/config/config_handlers.xml';
-				if(is_readable($moduleConfigHandlers)) {
+				if (is_readable($moduleConfigHandlers)) {
 					ConfigCache::addConfigHandlersFile($moduleConfigHandlers);
 				}
 			}
 		}
 		
-		if(!Config::get('modules.' . $lowerModuleName . '.enabled')) {
+		if (!Config::get('modules.' . $lowerModuleName . '.enabled')) {
 			throw new DisabledModuleException(sprintf('The module "%1$s" is disabled.', $moduleName));
 		}
 		
 		// check for a module config.php
 		$moduleConfig = Config::get('core.module_dir') . '/' . $moduleName . '/config.php';
-		if(is_readable($moduleConfig)) {
+		if (is_readable($moduleConfig)) {
 			require_once($moduleConfig);
 		}
 	}
@@ -228,27 +228,27 @@ 
 			$rq = $this->context->getRequest();
 			$rd = $rq->getRequestData();
 			
-			if($container === null) {
+			if ($container === null) {
 				// match routes and assign returned initial execution container
 				$container = $this->context->getRouting()->execute();
 			}
 			
-			if($container instanceof ExecutionContainer) {
+			if ($container instanceof ExecutionContainer) {
 				// merge in any arguments given. they need to have precedence over what the routing found
-				if($arguments !== null) {
+				if ($arguments !== null) {
 					$rd->merge($arguments);
 				}
 				
 				// next, we have to see if the routing did anything useful, i.e. whether or not it was enabled.
 				$moduleName = $container->getModuleName();
 				$controllerName = $container->getControllerName();
-				if(!$moduleName) {
+				if (!$moduleName) {
 					// no module has been specified; that means the routing did not run, as it would otherwise have the 404 controller's module name
 					
 					// lets see if our request data has values for module and controller
 					$ma = $rq->getParameter('module_accessor');
 					$aa = $rq->getParameter('controller_accessor');
-					if($rd->hasParameter($ma) && $rd->hasParameter($aa)) {
+					if ($rd->hasParameter($ma) && $rd->hasParameter($aa)) {
 						// yup. grab those
 						$moduleName = $rd->getParameter($ma);
 						$controllerName = $rd->getParameter($aa);
@@ -263,7 +263,7 @@ 
 					$container->setControllerName($controllerName);
 				}
 				
-				if(!Config::get('core.available', false)) {
+				if (!Config::get('core.available', false)) {
 					$container = $container->createSystemControllerForwardContainer('unavailable');
 				}
 				
@@ -280,7 +280,7 @@ 
 				$filterChain->execute($container);
 				
 				$response = $container->getResponse();
-			} elseif($container instanceof Response) {
+			} elseif ($container instanceof Response) {
 				// the routing returned a response!
 				$response = $container;
 				// set $container to null so Exception::render() won't think it is a container if an exception happens later!
@@ -290,13 +290,13 @@ 
 			}
 			$response->merge($this->response);
 			
-			if($this->getParameter('send_response')) {
+			if ($this->getParameter('send_response')) {
 				$response->send();
 			}
 			
 			return $response;
 			
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			AgaviException::render($e, $this->context, $container);
 		}
 	}
@@ -344,7 +344,7 @@ 
 			)
 		);
 		
-		if(is_readable($file) && substr($controllerName, 0, 1) !== '/') {
+		if (is_readable($file) && substr($controllerName, 0, 1) !== '/') {
 			return $file;
 		}
 		
@@ -375,14 +375,14 @@ 
 		
 		$class = $moduleName . '_' . $longControllerName . 'Controller';
 		
-		if(!class_exists($class)) {
-			if(false !== ($file = $this->checkControllerFile($moduleName, $controllerName))) {
+		if (!class_exists($class)) {
+			if (false !== ($file = $this->checkControllerFile($moduleName, $controllerName))) {
 				require($file);
 			} else {
 				throw new FileNotFoundException(sprintf('Could not find file for Controller "%s" in Module "%s".', $controllerName, $moduleName));
 			}
 			
-			if(!class_exists($class, false)) {
+			if (!class_exists($class, false)) {
 				throw new ClassNotFoundException(sprintf('Failed to instantiate Controller "%s" in Module "%s" because file "%s" does not contain class "%s".', $controllerName, $moduleName, $file, $class));
 			}
 		} 
@@ -434,7 +434,7 @@ 
 			)
 		);
 		
-		if(is_readable($file) && substr($viewName, 0, 1) !== '/') {
+		if (is_readable($file) && substr($viewName, 0, 1) !== '/') {
 			return $file;
 		}
 		
@@ -460,7 +460,7 @@ 
 	{
 		try {
 			$this->initializeModule($moduleName);
-		} catch(DisabledModuleException $e) {
+		} catch (DisabledModuleException $e) {
 			// views from disabled modules should be usable by definition
 			// swallow
 		}
@@ -470,15 +470,15 @@ 
 		
 		$class = $moduleName . '_' . $longViewName . 'View';
 		
-		if(!class_exists($class)) {
+		if (!class_exists($class)) {
 			
-			if(false !== ($file = $this->checkViewFile($moduleName, $viewName))) {
+			if (false !== ($file = $this->checkViewFile($moduleName, $viewName))) {
 				require($file);
 			} else {
 				throw new FileNotFoundException(sprintf('Could not find file for View "%s" in Module "%s".', $viewName, $moduleName));
 			}
 			
-			if(!class_exists($class, false)) {
+			if (!class_exists($class, false)) {
 				throw new ClassNotFoundException(sprintf('Failed to instantiate View "%s" in Module "%s" because file "%s" does not contain class "%s".', $viewName, $moduleName, $file, $class));
 			}
 		} 
@@ -521,7 +521,7 @@ 
 		$cfg = Config::get('core.config_dir') . '/output_types.xml';
 		require(ConfigCache::checkConfig($cfg, $this->context->getName()));
 		
-		if(Config::get('core.use_security', false)) {
+		if (Config::get('core.use_security', false)) {
 			$this->filters['security'] = $this->context->createInstanceFor('security_filter');
 		}
 		
@@ -555,7 +555,7 @@ 
 	 */
 	public function getFilterChain()
 	{
-		if($this->filterChain === null) {
+		if ($this->filterChain === null) {
 			$this->filterChain = $this->context->createInstanceFor('filter_chain');
 			$this->filterChain->setType(FilterChain::TYPE_GLOBAL);
 		}
@@ -575,31 +575,31 @@ 
 	 */
 	public function loadFilters(FilterChain $filterChain, $which = 'global', $module = null)
 	{
-		if($module === null) {
+		if ($module === null) {
 			$module = '*';
 		}
 		
-		if(($which != 'global' && !isset($this->filters[$which][$module])) || $which == 'global' && $this->filters[$which] == null) {
-			if($which == 'global') {
+		if (($which != 'global' && !isset($this->filters[$which][$module])) || $which == 'global' && $this->filters[$which] == null) {
+			if ($which == 'global') {
 				$this->filters[$which] = array();
-				$filters =& $this->filters[$which];
+				$filters = & $this->filters[$which];
 			} else {
 				$this->filters[$which][$module] = array();
-				$filters =& $this->filters[$which][$module];
+				$filters = & $this->filters[$which][$module];
 			}
 			$config = ($module == '*' ? Config::get('core.config_dir') : Config::get('core.module_dir') . '/' . $module . '/config') . '/' . $which . '_filters.xml';
-			if(is_readable($config)) {
+			if (is_readable($config)) {
 				require(ConfigCache::checkConfig($config, $this->context->getName()));
 			}
 		} else {
-			if($which == 'global') {
-				$filters =& $this->filters[$which];
+			if ($which == 'global') {
+				$filters = & $this->filters[$which];
 			} else {
-				$filters =& $this->filters[$which][$module];
+				$filters = & $this->filters[$which][$module];
 			}
 		}
 		
-		foreach($filters as $name => $filter) {
+		foreach ($filters as $name => $filter) {
 			$filterChain->register($filter, $name);
 		}
 	}
@@ -618,7 +618,7 @@ 
 	public function modelExists($moduleName, $modelName)
 	{
 		$modelName = Toolkit::canonicalName($modelName);
-		$file = Config::get('core.module_dir') . '/' . $moduleName . '/models/' . $modelName .	'Model.class.php';
+		$file = Config::get('core.module_dir') . '/' . $moduleName . '/models/' . $modelName . 'Model.class.php';
 		return is_readable($file);
 	}
 
@@ -706,10 +706,10 @@ 
 	 */
 	public function getOutputType($name = null)
 	{
-		if($name === null) {
+		if ($name === null) {
 			$name = $this->defaultOutputType;
 		}
-		if(isset($this->outputTypes[$name])) {
+		if (isset($this->outputTypes[$name])) {
 			return $this->outputTypes[$name];
 		} else {
 			throw new AgaviException('Output Type "' . $name . '" has not been configured.');

src/filter/FormPopulationFilter.class.php

Unused Use Statements -1 removed lines

@@ -16,7 +16,6 @@
 use Agavi\Core\Context;
 use Agavi\Dispatcher\ExecutionContainer;
 use Agavi\Exception\AgaviException;
-use Agavi\Exception\FilterException;
 use Agavi\Exception\ParseException;
 use Agavi\Logging\LoggerInterface;
 use Agavi\Request\RequestDataHolder;

Indentation +1001 added lines, -1001 removed lines

@@ -57,25 +57,25 @@ 
  */
 class FormPopulationFilter extends Filter implements GlobalFilterInterface
 {
-	const ENCODING_UTF_8 = 'utf-8';
+    const ENCODING_UTF_8 = 'utf-8';
 
-	const ENCODING_ISO_8859_1 = 'iso-8859-1';
+    const ENCODING_ISO_8859_1 = 'iso-8859-1';
 
-	/**
-	 * @var        \DOMDocument Our (X)HTML document.
-	 */
-	protected $doc;
+    /**
+     * @var        \DOMDocument Our (X)HTML document.
+     */
+    protected $doc;
 
-	/**
-	 * @var        \DOMXPath Our XPath instance for the document.
-	 */
-	protected $xpath;
+    /**
+     * @var        \DOMXPath Our XPath instance for the document.
+     */
+    protected $xpath;
 
-	/**
-	 * @var        string The XML NS prefix we're working on with XPath, including
-	 *                    a colon (or empty string if document has no NS).
-	 */
-	protected $xmlnsPrefix = '';
+    /**
+     * @var        string The XML NS prefix we're working on with XPath, including
+     *                    a colon (or empty string if document has no NS).
+     */
+    protected $xmlnsPrefix = '';
 
     /**
      * Execute this filter.
@@ -88,1018 +88,1018 @@ 
      * @author     David Zülke <dz@bitxtender.com>
      * @since      0.11.0
      */
-	public function execute(FilterChain $filterChain, ExecutionContainer $container)
-	{
-		$filterChain->execute($container);
-		$response = $container->getResponse();
-
-		if(!$response->isContentMutable() || !($output = $response->getContent())) {
-			return;
-		}
-
-		$rq = $this->getContext()->getRequest();
-
-		$cfg = $rq->getAttributes('org.agavi.filter.FormPopulationFilter');
-
-		$ot = $response->getOutputType();
-
-		if(is_array($cfg['output_types']) && !in_array($ot->getName(), $cfg['output_types'])) {
-			return;
-		}
-
-		if(is_array($cfg['populate']) || $cfg['populate'] instanceof ParameterHolder) {
-			$populate = $cfg['populate'];
-		} elseif($cfg['populate'] === true || (in_array($container->getRequestMethod(), $cfg['methods']) && $cfg['populate'] !== false)) {
-			$populate = $rq->getRequestData();
-		} else {
-			return;
-		}
-
-		$skip = null;
-		if($cfg['skip'] instanceof ParameterHolder) {
-			$cfg['skip'] = $cfg['skip']->getParameters();
-		} elseif($cfg['skip'] !== null && !is_array($cfg['skip'])) {
-			$cfg['skip'] = null;
-		}
-		if($cfg['skip'] !== null && count($cfg['skip'])) {
-			$skip = '/(\A' . str_replace('\[\]', '\[[^\]]*\]', implode('|\A', array_map('preg_quote', $cfg['skip'], array_fill(0, count($cfg['skip']), '/')))) . ')/';
-		}
-
-		if($cfg['force_request_uri'] !== false) {
-			$ruri = $cfg['force_request_uri'];
-		} else {
-			$ruri = $rq->getRequestUri();
-		}
-		if($cfg['force_request_url'] !== false) {
-			$rurl = $cfg['force_request_url'];
-		} else {
-			$rurl = $rq->getUrl();
-		}
-
-		if(isset($cfg['validation_report']) && $cfg['validation_report'] instanceof ValidationReport) {
-			$vr = $cfg['validation_report'];
-		} else {
-			$vr = $container->getValidationManager()->getReport();
-		}
-
-		$errorMessageRules = array();
-		if(isset($cfg['error_messages']) && is_array($cfg['error_messages'])) {
-			$errorMessageRules = $cfg['error_messages'];
-		}
-		$fieldErrorMessageRules = $errorMessageRules;
-		if(isset($cfg['field_error_messages']) && is_array($cfg['field_error_messages']) && count($cfg['field_error_messages'])) {
-			$fieldErrorMessageRules = $cfg['field_error_messages'];
-		}
-		$multiFieldErrorMessageRules = $fieldErrorMessageRules;
-		if(isset($cfg['multi_field_error_messages']) && is_array($cfg['multi_field_error_messages']) && count($cfg['multi_field_error_messages'])) {
-			$multiFieldErrorMessageRules = $cfg['multi_field_error_messages'];
-		}
-
-		$luie = libxml_use_internal_errors(true);
-		libxml_clear_errors();
-
-		$this->doc = new \DOMDocument();
-
-		$this->doc->substituteEntities = $cfg['dom_substitute_entities'];
-		$this->doc->resolveExternals   = $cfg['dom_resolve_externals'];
-		$this->doc->validateOnParse    = $cfg['dom_validate_on_parse'];
-		$this->doc->preserveWhiteSpace = $cfg['dom_preserve_white_space'];
-		$this->doc->formatOutput       = $cfg['dom_format_output'];
-
-		$xhtml = (preg_match('/<!DOCTYPE[^>]+XHTML[^>]+/', $output) > 0 && strtolower($cfg['force_output_mode']) != 'html') || strtolower($cfg['force_output_mode']) == 'xhtml';
-
-		$hasXmlProlog = false;
-		if($xhtml && preg_match('/^<\?xml[^\?]*\?>/', $output)) {
-			$hasXmlProlog = true;
-		} elseif($xhtml && preg_match('/;\s*charset=(")?(?P<charset>.+?(?(1)(?=(?<!\\\\)")|($|(?=[;\s]))))(?(1)")/i', $ot->getParameter('http_headers[Content-Type]'), $matches)) {
-			// media-type = type "/" subtype *( ";" parameter ), says http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7
-			// add an XML prolog with the char encoding, works around issues with ISO-8859-1 etc
-			$output = "<?xml version='1.0' encoding='" . $matches['charset'] . "' ?>\n" . $output;
-		}
-
-		if($xhtml && $cfg['parse_xhtml_as_xml']) {
-			$this->doc->loadXML($output);
-			$this->xpath = new \DOMXPath($this->doc);
-			if($this->doc->documentElement && $this->doc->documentElement->namespaceURI) {
-				$this->xpath->registerNamespace('html', $this->doc->documentElement->namespaceURI);
-				$this->xmlnsPrefix = 'html:';
-			} else {
-				$this->xmlnsPrefix = '';
-			}
-		} else {
-			$this->doc->loadHTML($output);
-			$this->xpath = new \DOMXPath($this->doc);
-			$this->xmlnsPrefix = '';
-		}
-
-		if(libxml_get_last_error() !== false) {
-			$errors = array();
-			$maxError = LIBXML_ERR_NONE;
-			foreach(libxml_get_errors() as $error) {
-				$errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
-				$maxError = max($maxError, $error->level);
-			}
-			libxml_clear_errors();
-			libxml_use_internal_errors($luie);
-			$emsg = sprintf(
-				"Form Population Filter encountered the following error%s while parsing the document:\n\n"
-				. "%s\n\n"
-				. "Non-fatal errors are typically recoverable; you may set the 'ignore_parse_errors' configuration parameter to LIBXML_ERR_WARNING or LIBXML_ERR_ERROR (default) to suppress them.\n"
-				. "If you set 'ignore_parse_errors' to LIBXML_ERR_FATAL (recommended for production), Form Population Filter will silently abort execution in the event of fatal errors.\n"
-				. "Regardless of the setting, all errors encountered will be logged.",
-				count($errors) > 1 ? 's' : '',
-				implode("\n", $errors)
-			);
-			if(Config::get('core.use_logging') && $cfg['log_parse_errors'] !== false && $maxError >= $cfg['log_parse_errors']) {
-				$severity = LoggerInterface::INFO;
-				switch($maxError) {
-					case LIBXML_ERR_WARNING:
-						$severity = LoggerInterface::WARN;
-						break;
-					case LIBXML_ERR_ERROR:
-						$severity = LoggerInterface::ERROR;
-						break;
-					case LIBXML_ERR_FATAL:
-						$severity = LoggerInterface::FATAL;
-						break;
-				}
-				$lmsg = $emsg . "\n\nResponse content:\n\n" . $response->getContent();
-				$lm = $this->context->getLoggerManager();
-				$mc = $lm->getDefaultMessageClass();
-				$m = new $mc($lmsg, $severity);
-				$lm->log($m, $cfg['logging_logger']);
-			}
+    public function execute(FilterChain $filterChain, ExecutionContainer $container)
+    {
+        $filterChain->execute($container);
+        $response = $container->getResponse();
+
+        if(!$response->isContentMutable() || !($output = $response->getContent())) {
+            return;
+        }
+
+        $rq = $this->getContext()->getRequest();
+
+        $cfg = $rq->getAttributes('org.agavi.filter.FormPopulationFilter');
+
+        $ot = $response->getOutputType();
+
+        if(is_array($cfg['output_types']) && !in_array($ot->getName(), $cfg['output_types'])) {
+            return;
+        }
+
+        if(is_array($cfg['populate']) || $cfg['populate'] instanceof ParameterHolder) {
+            $populate = $cfg['populate'];
+        } elseif($cfg['populate'] === true || (in_array($container->getRequestMethod(), $cfg['methods']) && $cfg['populate'] !== false)) {
+            $populate = $rq->getRequestData();
+        } else {
+            return;
+        }
+
+        $skip = null;
+        if($cfg['skip'] instanceof ParameterHolder) {
+            $cfg['skip'] = $cfg['skip']->getParameters();
+        } elseif($cfg['skip'] !== null && !is_array($cfg['skip'])) {
+            $cfg['skip'] = null;
+        }
+        if($cfg['skip'] !== null && count($cfg['skip'])) {
+            $skip = '/(\A' . str_replace('\[\]', '\[[^\]]*\]', implode('|\A', array_map('preg_quote', $cfg['skip'], array_fill(0, count($cfg['skip']), '/')))) . ')/';
+        }
+
+        if($cfg['force_request_uri'] !== false) {
+            $ruri = $cfg['force_request_uri'];
+        } else {
+            $ruri = $rq->getRequestUri();
+        }
+        if($cfg['force_request_url'] !== false) {
+            $rurl = $cfg['force_request_url'];
+        } else {
+            $rurl = $rq->getUrl();
+        }
+
+        if(isset($cfg['validation_report']) && $cfg['validation_report'] instanceof ValidationReport) {
+            $vr = $cfg['validation_report'];
+        } else {
+            $vr = $container->getValidationManager()->getReport();
+        }
+
+        $errorMessageRules = array();
+        if(isset($cfg['error_messages']) && is_array($cfg['error_messages'])) {
+            $errorMessageRules = $cfg['error_messages'];
+        }
+        $fieldErrorMessageRules = $errorMessageRules;
+        if(isset($cfg['field_error_messages']) && is_array($cfg['field_error_messages']) && count($cfg['field_error_messages'])) {
+            $fieldErrorMessageRules = $cfg['field_error_messages'];
+        }
+        $multiFieldErrorMessageRules = $fieldErrorMessageRules;
+        if(isset($cfg['multi_field_error_messages']) && is_array($cfg['multi_field_error_messages']) && count($cfg['multi_field_error_messages'])) {
+            $multiFieldErrorMessageRules = $cfg['multi_field_error_messages'];
+        }
+
+        $luie = libxml_use_internal_errors(true);
+        libxml_clear_errors();
+
+        $this->doc = new \DOMDocument();
+
+        $this->doc->substituteEntities = $cfg['dom_substitute_entities'];
+        $this->doc->resolveExternals   = $cfg['dom_resolve_externals'];
+        $this->doc->validateOnParse    = $cfg['dom_validate_on_parse'];
+        $this->doc->preserveWhiteSpace = $cfg['dom_preserve_white_space'];
+        $this->doc->formatOutput       = $cfg['dom_format_output'];
+
+        $xhtml = (preg_match('/<!DOCTYPE[^>]+XHTML[^>]+/', $output) > 0 && strtolower($cfg['force_output_mode']) != 'html') || strtolower($cfg['force_output_mode']) == 'xhtml';
+
+        $hasXmlProlog = false;
+        if($xhtml && preg_match('/^<\?xml[^\?]*\?>/', $output)) {
+            $hasXmlProlog = true;
+        } elseif($xhtml && preg_match('/;\s*charset=(")?(?P<charset>.+?(?(1)(?=(?<!\\\\)")|($|(?=[;\s]))))(?(1)")/i', $ot->getParameter('http_headers[Content-Type]'), $matches)) {
+            // media-type = type "/" subtype *( ";" parameter ), says http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7
+            // add an XML prolog with the char encoding, works around issues with ISO-8859-1 etc
+            $output = "<?xml version='1.0' encoding='" . $matches['charset'] . "' ?>\n" . $output;
+        }
+
+        if($xhtml && $cfg['parse_xhtml_as_xml']) {
+            $this->doc->loadXML($output);
+            $this->xpath = new \DOMXPath($this->doc);
+            if($this->doc->documentElement && $this->doc->documentElement->namespaceURI) {
+                $this->xpath->registerNamespace('html', $this->doc->documentElement->namespaceURI);
+                $this->xmlnsPrefix = 'html:';
+            } else {
+                $this->xmlnsPrefix = '';
+            }
+        } else {
+            $this->doc->loadHTML($output);
+            $this->xpath = new \DOMXPath($this->doc);
+            $this->xmlnsPrefix = '';
+        }
+
+        if(libxml_get_last_error() !== false) {
+            $errors = array();
+            $maxError = LIBXML_ERR_NONE;
+            foreach(libxml_get_errors() as $error) {
+                $errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
+                $maxError = max($maxError, $error->level);
+            }
+            libxml_clear_errors();
+            libxml_use_internal_errors($luie);
+            $emsg = sprintf(
+                "Form Population Filter encountered the following error%s while parsing the document:\n\n"
+                . "%s\n\n"
+                . "Non-fatal errors are typically recoverable; you may set the 'ignore_parse_errors' configuration parameter to LIBXML_ERR_WARNING or LIBXML_ERR_ERROR (default) to suppress them.\n"
+                . "If you set 'ignore_parse_errors' to LIBXML_ERR_FATAL (recommended for production), Form Population Filter will silently abort execution in the event of fatal errors.\n"
+                . "Regardless of the setting, all errors encountered will be logged.",
+                count($errors) > 1 ? 's' : '',
+                implode("\n", $errors)
+            );
+            if(Config::get('core.use_logging') && $cfg['log_parse_errors'] !== false && $maxError >= $cfg['log_parse_errors']) {
+                $severity = LoggerInterface::INFO;
+                switch($maxError) {
+                    case LIBXML_ERR_WARNING:
+                        $severity = LoggerInterface::WARN;
+                        break;
+                    case LIBXML_ERR_ERROR:
+                        $severity = LoggerInterface::ERROR;
+                        break;
+                    case LIBXML_ERR_FATAL:
+                        $severity = LoggerInterface::FATAL;
+                        break;
+                }
+                $lmsg = $emsg . "\n\nResponse content:\n\n" . $response->getContent();
+                $lm = $this->context->getLoggerManager();
+                $mc = $lm->getDefaultMessageClass();
+                $m = new $mc($lmsg, $severity);
+                $lm->log($m, $cfg['logging_logger']);
+            }
 			
-			// should we throw an exception, or carry on?
-			if($maxError > $cfg['ignore_parse_errors']) {
-				throw new ParseException($emsg);
-			} elseif($maxError == LIBXML_ERR_FATAL) {
-				// for fatal errors, we cannot continue populating, so we must silently abort
-				return;
-			}
-		}
-
-		libxml_clear_errors();
-		libxml_use_internal_errors($luie);
-
-		$properXhtml = false;
-		/** @var \DOMElement $meta */
-		foreach($this->xpath->query(sprintf('//%1$shead/%1$smeta', $this->xmlnsPrefix)) as $meta) {
-			if(strtolower($meta->getAttribute('http-equiv')) == 'content-type') {
-				if($this->doc->encoding === null) {
-					// media-type = type "/" subtype *( ";" parameter ), says http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7
-					if(preg_match('/;\s*charset=(")?(?P<charset>.+?(?(1)(?=(?<!\\\\)")|($|(?=[;\s]))))(?(1)")/i', $meta->getAttribute('content'), $matches)) {
-						$this->doc->encoding = $matches['charset'];
-					} else {
-						$this->doc->encoding = self::ENCODING_UTF_8;
-					}
-				}
-				if(strpos($meta->getAttribute('content'), 'application/xhtml+xml') !== false) {
-					$properXhtml = true;
-				}
-				break;
-			}
-		}
-
-		if(($encoding = $cfg['force_encoding']) === false) {
-			if($this->doc->actualEncoding) {
-				$encoding = $this->doc->actualEncoding;
-			} elseif($this->doc->encoding) {
-				$encoding = $this->doc->encoding;
-			} else {
-				$encoding = $this->doc->encoding = self::ENCODING_UTF_8;
-			}
-		} else {
-			$this->doc->encoding = $encoding;
-		}
-		$encoding = strtolower($encoding);
-		$utf8 = $encoding == self::ENCODING_UTF_8;
-		if(!$utf8 && $encoding != self::ENCODING_ISO_8859_1 && !function_exists('iconv')) {
-			throw new AgaviException('No iconv module available, input encoding "' . $encoding . '" cannot be handled.');
-		}
-
-		$base = $this->xpath->query(sprintf('/%1$shtml/%1$shead/%1$sbase[@href]', $this->xmlnsPrefix));
-		if($base->length) {
-			$baseHref = $base->item(0)->getAttribute('href');
-		} else {
-			$baseHref = $rq->getUrl();
-		}
-		$baseHref = substr($baseHref, 0, strrpos($baseHref, '/') + 1);
-
-		$forms = array();
-		if(is_array($populate)) {
-			$queries = array();
-			foreach($populate as $id => $data) {
-				if(is_string($id)) {
-					$id = sprintf('@id="%s"', $id);
-					if($data === true) {
-						// prepend to the array to give re-populates preferential treatment, see #1461
-						array_unshift($queries, $id);
-					} else {
-						$queries[] = $id;
-					}
-				}
-			}
-			if($queries) {
-				// we must assemble the array by hand as neither '//form[@id="foo"] or //form[@id="bar"]' nor '//form[@id="foo"] || //form[@id="bar"]' will order the elements as given in the query (order of element in the document is used instead and that can be a problem for error insertion, see #1461)
-				$forms = array();
-				foreach($queries as $query) {
-					$form = $this->xpath->query(sprintf('//%1$sform[%2$s]', $this->xmlnsPrefix, $query));
-					if($form->length) {
-						$forms[] = $form->item(0);
-					}
-				}
-			}
-		} else {
-			$forms = $this->xpath->query(Toolkit::expandVariables($cfg['forms_xpath'], array('htmlnsPrefix' => $this->xmlnsPrefix)));
-		}
-
-		// an array of all validation incidents; errors inserted for fields or multiple fields will be removed in here
-		$allIncidents = $vr->getIncidents();
-
-		foreach($forms as $form) {
-			if($form->tagName == 'form') {
-				if($populate instanceof ParameterHolder) {
-					$action = preg_replace('/#.*$/', '', trim($form->getAttribute('action')));
-					if(!(
-						$action == $rurl ||
-						(strpos($action, '/') === 0 && preg_replace(array('#/\./#', '#/\.$#', '#[^\./]+/\.\.(/|\z)#', '#/{2,}#'), array('/', '/', '', '/'), $action) == $ruri) ||
-						$baseHref . preg_replace(array('#/\./#', '#/\.$#', '#[^\./]+/\.\.(/|\z)#', '#/{2,}#'), array('/', '/', '', '/'), $action) == $rurl
-					)) {
-						continue;
-					}
-					$p = $populate;
-				} else {
-					if(isset($populate[$form->getAttribute('id')])) {
-						if($populate[$form->getAttribute('id')] instanceof ParameterHolder) {
-							$p = $populate[$form->getAttribute('id')];
-						} elseif($populate[$form->getAttribute('id')] === true) {
-							$p = $rq->getRequestData();
-						} else {
-							continue;
-						}
-					} else {
-						continue;
-					}
-				}
-			} else {
-				if($populate === true) {
-					$p = $rq->getRequestData();
-				} else {
-					$p = $populate;
-				}
-			}
-
-			// our array for remembering foo[] field's indices
-			$remember = array();
-
-			// build the XPath query
-			// we select descendants of the given form
-			// as well as any element in the document associated with the form using a "form" attribute that contains the ID of the current form
-			// provided they match the following criteria:
-			// * <textarea> with a "name" attribute
-			// * <select> with a "name" attribute
-			// * <button type="submit"> with a "name" attribute
-			// * <input> with a "name" attribute except for the following:
-			//  * <input type="checkbox"> elements with a "name" attribute that contains the character sequence "[]" and no "value" attribute
-			//  * <input type="hidden"> unless config option "include_hidden_inputs" is true (defaults to true)
-			$query = sprintf('
+            // should we throw an exception, or carry on?
+            if($maxError > $cfg['ignore_parse_errors']) {
+                throw new ParseException($emsg);
+            } elseif($maxError == LIBXML_ERR_FATAL) {
+                // for fatal errors, we cannot continue populating, so we must silently abort
+                return;
+            }
+        }
+
+        libxml_clear_errors();
+        libxml_use_internal_errors($luie);
+
+        $properXhtml = false;
+        /** @var \DOMElement $meta */
+        foreach($this->xpath->query(sprintf('//%1$shead/%1$smeta', $this->xmlnsPrefix)) as $meta) {
+            if(strtolower($meta->getAttribute('http-equiv')) == 'content-type') {
+                if($this->doc->encoding === null) {
+                    // media-type = type "/" subtype *( ";" parameter ), says http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7
+                    if(preg_match('/;\s*charset=(")?(?P<charset>.+?(?(1)(?=(?<!\\\\)")|($|(?=[;\s]))))(?(1)")/i', $meta->getAttribute('content'), $matches)) {
+                        $this->doc->encoding = $matches['charset'];
+                    } else {
+                        $this->doc->encoding = self::ENCODING_UTF_8;
+                    }
+                }
+                if(strpos($meta->getAttribute('content'), 'application/xhtml+xml') !== false) {
+                    $properXhtml = true;
+                }
+                break;
+            }
+        }
+
+        if(($encoding = $cfg['force_encoding']) === false) {
+            if($this->doc->actualEncoding) {
+                $encoding = $this->doc->actualEncoding;
+            } elseif($this->doc->encoding) {
+                $encoding = $this->doc->encoding;
+            } else {
+                $encoding = $this->doc->encoding = self::ENCODING_UTF_8;
+            }
+        } else {
+            $this->doc->encoding = $encoding;
+        }
+        $encoding = strtolower($encoding);
+        $utf8 = $encoding == self::ENCODING_UTF_8;
+        if(!$utf8 && $encoding != self::ENCODING_ISO_8859_1 && !function_exists('iconv')) {
+            throw new AgaviException('No iconv module available, input encoding "' . $encoding . '" cannot be handled.');
+        }
+
+        $base = $this->xpath->query(sprintf('/%1$shtml/%1$shead/%1$sbase[@href]', $this->xmlnsPrefix));
+        if($base->length) {
+            $baseHref = $base->item(0)->getAttribute('href');
+        } else {
+            $baseHref = $rq->getUrl();
+        }
+        $baseHref = substr($baseHref, 0, strrpos($baseHref, '/') + 1);
+
+        $forms = array();
+        if(is_array($populate)) {
+            $queries = array();
+            foreach($populate as $id => $data) {
+                if(is_string($id)) {
+                    $id = sprintf('@id="%s"', $id);
+                    if($data === true) {
+                        // prepend to the array to give re-populates preferential treatment, see #1461
+                        array_unshift($queries, $id);
+                    } else {
+                        $queries[] = $id;
+                    }
+                }
+            }
+            if($queries) {
+                // we must assemble the array by hand as neither '//form[@id="foo"] or //form[@id="bar"]' nor '//form[@id="foo"] || //form[@id="bar"]' will order the elements as given in the query (order of element in the document is used instead and that can be a problem for error insertion, see #1461)
+                $forms = array();
+                foreach($queries as $query) {
+                    $form = $this->xpath->query(sprintf('//%1$sform[%2$s]', $this->xmlnsPrefix, $query));
+                    if($form->length) {
+                        $forms[] = $form->item(0);
+                    }
+                }
+            }
+        } else {
+            $forms = $this->xpath->query(Toolkit::expandVariables($cfg['forms_xpath'], array('htmlnsPrefix' => $this->xmlnsPrefix)));
+        }
+
+        // an array of all validation incidents; errors inserted for fields or multiple fields will be removed in here
+        $allIncidents = $vr->getIncidents();
+
+        foreach($forms as $form) {
+            if($form->tagName == 'form') {
+                if($populate instanceof ParameterHolder) {
+                    $action = preg_replace('/#.*$/', '', trim($form->getAttribute('action')));
+                    if(!(
+                        $action == $rurl ||
+                        (strpos($action, '/') === 0 && preg_replace(array('#/\./#', '#/\.$#', '#[^\./]+/\.\.(/|\z)#', '#/{2,}#'), array('/', '/', '', '/'), $action) == $ruri) ||
+                        $baseHref . preg_replace(array('#/\./#', '#/\.$#', '#[^\./]+/\.\.(/|\z)#', '#/{2,}#'), array('/', '/', '', '/'), $action) == $rurl
+                    )) {
+                        continue;
+                    }
+                    $p = $populate;
+                } else {
+                    if(isset($populate[$form->getAttribute('id')])) {
+                        if($populate[$form->getAttribute('id')] instanceof ParameterHolder) {
+                            $p = $populate[$form->getAttribute('id')];
+                        } elseif($populate[$form->getAttribute('id')] === true) {
+                            $p = $rq->getRequestData();
+                        } else {
+                            continue;
+                        }
+                    } else {
+                        continue;
+                    }
+                }
+            } else {
+                if($populate === true) {
+                    $p = $rq->getRequestData();
+                } else {
+                    $p = $populate;
+                }
+            }
+
+            // our array for remembering foo[] field's indices
+            $remember = array();
+
+            // build the XPath query
+            // we select descendants of the given form
+            // as well as any element in the document associated with the form using a "form" attribute that contains the ID of the current form
+            // provided they match the following criteria:
+            // * <textarea> with a "name" attribute
+            // * <select> with a "name" attribute
+            // * <button type="submit"> with a "name" attribute
+            // * <input> with a "name" attribute except for the following:
+            //  * <input type="checkbox"> elements with a "name" attribute that contains the character sequence "[]" and no "value" attribute
+            //  * <input type="hidden"> unless config option "include_hidden_inputs" is true (defaults to true)
+            $query = sprintf('
 				descendant::%1$stextarea[@name] |
 				descendant::%1$sselect[@name] |
 				descendant::%1$sbutton[@name and @type="submit"] |
 				descendant::%1$sinput[@name and (not(@type="checkbox") or (not(contains(@name, "[]")) or (contains(@name, "[]") and @value)))]',
-				$this->xmlnsPrefix
-			);
+                $this->xmlnsPrefix
+            );
 			
-			if(($formId = $form->hasAttribute('id')) != "") {
-				// find elements associated with this form as well
-				$query .= sprintf(' |
+            if(($formId = $form->hasAttribute('id')) != "") {
+                // find elements associated with this form as well
+                $query .= sprintf(' |
 					//%1$stextarea[@form="%2$s" and @name] |
 					//%1$sselect[@form="%2$s" and @name] |
 					//%1$sbutton[@form="%2$s" and @name and @type="submit"] |
 					//%1$sinput[@form="%2$s" and @name and (not(@type="checkbox") or (not(contains(@name, "[]")) or (contains(@name, "[]") and @value)))]',
-					$this->xmlnsPrefix,
-					$formId
-				);
-			}
+                    $this->xmlnsPrefix,
+                    $formId
+                );
+            }
 			
-			foreach($this->xpath->query($query, $form) as $element) {
-
-				$pname = $name = $element->getAttribute('name');
-
-				$multiple = $element->nodeName == 'select' && $element->hasAttribute('multiple');
-
-				$checkValue = false;
-				if($element->getAttribute('type') == 'checkbox' || $element->getAttribute('type') == 'radio') {
-					if(($pos = strpos($pname, '[]')) && ($pos + 2 != strlen($pname))) {
-						// foo[][3] checkboxes etc not possible, [] must occur only once and at the end
-						continue;
-					} elseif($pos !== false) {
-						$checkValue = true;
-						$pname = substr($pname, 0, $pos);
-					}
-				}
-				if(preg_match_all('/([^\[]+)?(?:\[([^\]]*)\])/', $pname, $matches)) {
-					$pname = $matches[1][0];
-
-					if($multiple) {
-						$count = count($matches[2]) - 1;
-					} else {
-						$count = count($matches[2]);
-					}
-					for($i = 0; $i < $count; $i++) {
-						$val = $matches[2][$i];
-						if((string)$matches[2][$i] === (string)(int)$matches[2][$i]) {
-							$val = (int)$val;
-						}
-						if(!isset($remember[$pname])) {
-							$add = ($val !== "" ? $val : 0);
-							if(is_int($add)) {
-								$remember[$pname] = $add;
-							}
-						} else {
-							if($val !== "") {
-								$add = $val;
-								if(is_int($val) && $add > $remember[$pname]) {
-									$remember[$pname] = $add;
-								}
-							} else {
-								$add = ++$remember[$pname];
-							}
-						}
-						$pname .= '[' . $add . ']';
-					}
-				}
-
-				if(!$utf8) {
-					$pname = $this->fromUtf8($pname, $encoding);
-				}
-
-				if($skip !== null && preg_match($skip, $pname . ($checkValue ? '[]' : ''))) {
-					// skip field
-					continue;
-				}
-
-				$argument = new ValidationArgument(
-					$pname,
-					($element->nodeName == 'input' && $element->getAttribute('type') == 'file')
-						? WebRequestDataHolder::SOURCE_FILES
-						: RequestDataHolder::SOURCE_PARAMETERS
-				);
+            foreach($this->xpath->query($query, $form) as $element) {
+
+                $pname = $name = $element->getAttribute('name');
+
+                $multiple = $element->nodeName == 'select' && $element->hasAttribute('multiple');
+
+                $checkValue = false;
+                if($element->getAttribute('type') == 'checkbox' || $element->getAttribute('type') == 'radio') {
+                    if(($pos = strpos($pname, '[]')) && ($pos + 2 != strlen($pname))) {
+                        // foo[][3] checkboxes etc not possible, [] must occur only once and at the end
+                        continue;
+                    } elseif($pos !== false) {
+                        $checkValue = true;
+                        $pname = substr($pname, 0, $pos);
+                    }
+                }
+                if(preg_match_all('/([^\[]+)?(?:\[([^\]]*)\])/', $pname, $matches)) {
+                    $pname = $matches[1][0];
+
+                    if($multiple) {
+                        $count = count($matches[2]) - 1;
+                    } else {
+                        $count = count($matches[2]);
+                    }
+                    for($i = 0; $i < $count; $i++) {
+                        $val = $matches[2][$i];
+                        if((string)$matches[2][$i] === (string)(int)$matches[2][$i]) {
+                            $val = (int)$val;
+                        }
+                        if(!isset($remember[$pname])) {
+                            $add = ($val !== "" ? $val : 0);
+                            if(is_int($add)) {
+                                $remember[$pname] = $add;
+                            }
+                        } else {
+                            if($val !== "") {
+                                $add = $val;
+                                if(is_int($val) && $add > $remember[$pname]) {
+                                    $remember[$pname] = $add;
+                                }
+                            } else {
+                                $add = ++$remember[$pname];
+                            }
+                        }
+                        $pname .= '[' . $add . ']';
+                    }
+                }
+
+                if(!$utf8) {
+                    $pname = $this->fromUtf8($pname, $encoding);
+                }
+
+                if($skip !== null && preg_match($skip, $pname . ($checkValue ? '[]' : ''))) {
+                    // skip field
+                    continue;
+                }
+
+                $argument = new ValidationArgument(
+                    $pname,
+                    ($element->nodeName == 'input' && $element->getAttribute('type') == 'file')
+                        ? WebRequestDataHolder::SOURCE_FILES
+                        : RequestDataHolder::SOURCE_PARAMETERS
+                );
 				
-				// there's an error with the element's name in the request? good. let's give the baby a class!
-				if($vr->getAuthoritativeArgumentSeverity($argument) > Validator::SILENT) {
-					// a collection of all elements that need an error class
-					$errorClassElements = array();
-					// the element itself of course
-					$errorClassElements[] = $element;
-					// all implicit labels
-					foreach($this->xpath->query(sprintf('ancestor::%1$slabel[not(@for)]', $this->xmlnsPrefix), $element) as $label) {
-						$errorClassElements[] = $label;
-					}
-					// and all explicit labels
-					if(($id = $element->getAttribute('id')) != '') {
-						// we use // and not descendant: because it doesn't have to be a child of the form element
-						foreach($this->xpath->query(sprintf('//%1$slabel[@for="%2$s"]', $this->xmlnsPrefix, $id), $form) as $label) {
-							$errorClassElements[] = $label;
-						}
-					}
-
-					// now loop over all those elements and assign the class
-					foreach($errorClassElements as $errorClassElement) {
-						// go over all the elements in the error class map
-						foreach($cfg['error_class_map'] as $xpathExpression => $errorClassName) {
-							// evaluate each xpath expression
-							$errorClassResults = $this->xpath->query(Toolkit::expandVariables($xpathExpression, array('htmlnsPrefix' => $this->xmlnsPrefix)), $errorClassElement);
-							if($errorClassResults && $errorClassResults->length) {
-								// we have results. the xpath expressions are used to locale the actual elements we set the error class on - doesn't necessarily have to be the erroneous element or the label!
-								foreach($errorClassResults as $errorClassDestinationElement) {
-									$errorClassDestinationElement->setAttribute('class', preg_replace('/\s*$/', ' ' . $errorClassName, $errorClassDestinationElement->getAttribute('class')));
-								}
+                // there's an error with the element's name in the request? good. let's give the baby a class!
+                if($vr->getAuthoritativeArgumentSeverity($argument) > Validator::SILENT) {
+                    // a collection of all elements that need an error class
+                    $errorClassElements = array();
+                    // the element itself of course
+                    $errorClassElements[] = $element;
+                    // all implicit labels
+                    foreach($this->xpath->query(sprintf('ancestor::%1$slabel[not(@for)]', $this->xmlnsPrefix), $element) as $label) {
+                        $errorClassElements[] = $label;
+                    }
+                    // and all explicit labels
+                    if(($id = $element->getAttribute('id')) != '') {
+                        // we use // and not descendant: because it doesn't have to be a child of the form element
+                        foreach($this->xpath->query(sprintf('//%1$slabel[@for="%2$s"]', $this->xmlnsPrefix, $id), $form) as $label) {
+                            $errorClassElements[] = $label;
+                        }
+                    }
+
+                    // now loop over all those elements and assign the class
+                    foreach($errorClassElements as $errorClassElement) {
+                        // go over all the elements in the error class map
+                        foreach($cfg['error_class_map'] as $xpathExpression => $errorClassName) {
+                            // evaluate each xpath expression
+                            $errorClassResults = $this->xpath->query(Toolkit::expandVariables($xpathExpression, array('htmlnsPrefix' => $this->xmlnsPrefix)), $errorClassElement);
+                            if($errorClassResults && $errorClassResults->length) {
+                                // we have results. the xpath expressions are used to locale the actual elements we set the error class on - doesn't necessarily have to be the erroneous element or the label!
+                                foreach($errorClassResults as $errorClassDestinationElement) {
+                                    $errorClassDestinationElement->setAttribute('class', preg_replace('/\s*$/', ' ' . $errorClassName, $errorClassDestinationElement->getAttribute('class')));
+                                }
 								
-								// and break the foreach, our expression matched after all - no need to look further
-								break;
-							}
-						}
-					}
-
-					// up next: the error messages
-					$fieldIncidents = array();
-					$multiFieldIncidents = array();
-					// grab all incidents for this field
-					foreach($vr->byArgument($argument)->getIncidents() as $incident) {
-						if(($incidentKey = array_search($incident, $allIncidents, true)) !== false) {
-							// does this one have more than one field?
-							// and is it really more than one parameter or file, not a cookie or header?
-							$incidentArgumentCount = 0;
-							$incidentArguments = $incident->getArguments();
-							foreach($incidentArguments as $incidentArgument) {
-								if(in_array($incidentArgument->getSource(), array(WebRequestDataHolder::SOURCE_FILES, RequestDataHolder::SOURCE_PARAMETERS))) {
-									$incidentArgumentCount++;
-								}
-							}
-							if($incidentArgumentCount > 1) {
-								$multiFieldIncidents[] = $incident;
-							} else {
-								$fieldIncidents[] = $incident;
-							}
-							// remove it from the list of all incidents
-							unset($allIncidents[$incidentKey]);
-						}
-					}
-					// 1) insert error messages that are specific to this field
-					if(!$this->insertErrorMessages($element, $fieldErrorMessageRules, $fieldIncidents)) {
-						$allIncidents = array_merge($allIncidents, $fieldIncidents);
-					}
-					// 2) insert error messages that belong to multiple fields (including this one), if that message was not inserted before
-					if(!$this->insertErrorMessages($element, $multiFieldErrorMessageRules, $multiFieldIncidents)) {
-						$allIncidents = array_merge($allIncidents, $multiFieldIncidents);
-					}
-				}
-
-				// FPF only handles "normal" values, as file inputs cannot be re-populated, so getParameter() with no source-specific stuff is fine here
-				$value = $p->getParameter($pname);
-
-				if(is_array($value) && !($element->nodeName == 'select' || $checkValue)) {
-					// name didn't match exactly. skip.
-					continue;
-				}
-
-				if(is_bool($value)) {
-					$value = (string)(int)$value;
-				} elseif(!$utf8) {
-					$value = $this->toUtf8($value, $encoding);
-				} else {
-					if(is_array($value)) {
-						$value = array_map('strval', $value);
-					} else {
-						$value = (string) $value;
-					}
-				}
-
-				if($element->nodeName == 'input') {
-					$inputType = $element->getAttribute('type');
-
-					if($inputType == 'checkbox' || $inputType == 'radio') {
-
-						// checkboxes and radios
-						$element->removeAttribute('checked');
-
-						if($checkValue && is_array($value)) {
-							$eValue = $element->getAttribute('value');
-							if(!$utf8) {
-								$eValue = $this->fromUtf8($eValue, $encoding);
-							}
-							if(!in_array($eValue, $value)) {
-								continue;
-							} else {
-								$element->setAttribute('checked', 'checked');
-							}
-						} elseif($p->hasParameter($pname) && (($element->hasAttribute('value') && $element->getAttribute('value') == $value) || (!$element->hasAttribute('value') && $p->getParameter($pname)))) {
-							$element->setAttribute('checked', 'checked');
-						}
-
-					} elseif($inputType != 'button' && $inputType != 'submit') {
+                                // and break the foreach, our expression matched after all - no need to look further
+                                break;
+                            }
+                        }
+                    }
+
+                    // up next: the error messages
+                    $fieldIncidents = array();
+                    $multiFieldIncidents = array();
+                    // grab all incidents for this field
+                    foreach($vr->byArgument($argument)->getIncidents() as $incident) {
+                        if(($incidentKey = array_search($incident, $allIncidents, true)) !== false) {
+                            // does this one have more than one field?
+                            // and is it really more than one parameter or file, not a cookie or header?
+                            $incidentArgumentCount = 0;
+                            $incidentArguments = $incident->getArguments();
+                            foreach($incidentArguments as $incidentArgument) {
+                                if(in_array($incidentArgument->getSource(), array(WebRequestDataHolder::SOURCE_FILES, RequestDataHolder::SOURCE_PARAMETERS))) {
+                                    $incidentArgumentCount++;
+                                }
+                            }
+                            if($incidentArgumentCount > 1) {
+                                $multiFieldIncidents[] = $incident;
+                            } else {
+                                $fieldIncidents[] = $incident;
+                            }
+                            // remove it from the list of all incidents
+                            unset($allIncidents[$incidentKey]);
+                        }
+                    }
+                    // 1) insert error messages that are specific to this field
+                    if(!$this->insertErrorMessages($element, $fieldErrorMessageRules, $fieldIncidents)) {
+                        $allIncidents = array_merge($allIncidents, $fieldIncidents);
+                    }
+                    // 2) insert error messages that belong to multiple fields (including this one), if that message was not inserted before
+                    if(!$this->insertErrorMessages($element, $multiFieldErrorMessageRules, $multiFieldIncidents)) {
+                        $allIncidents = array_merge($allIncidents, $multiFieldIncidents);
+                    }
+                }
+
+                // FPF only handles "normal" values, as file inputs cannot be re-populated, so getParameter() with no source-specific stuff is fine here
+                $value = $p->getParameter($pname);
+
+                if(is_array($value) && !($element->nodeName == 'select' || $checkValue)) {
+                    // name didn't match exactly. skip.
+                    continue;
+                }
+
+                if(is_bool($value)) {
+                    $value = (string)(int)$value;
+                } elseif(!$utf8) {
+                    $value = $this->toUtf8($value, $encoding);
+                } else {
+                    if(is_array($value)) {
+                        $value = array_map('strval', $value);
+                    } else {
+                        $value = (string) $value;
+                    }
+                }
+
+                if($element->nodeName == 'input') {
+                    $inputType = $element->getAttribute('type');
+
+                    if($inputType == 'checkbox' || $inputType == 'radio') {
+
+                        // checkboxes and radios
+                        $element->removeAttribute('checked');
+
+                        if($checkValue && is_array($value)) {
+                            $eValue = $element->getAttribute('value');
+                            if(!$utf8) {
+                                $eValue = $this->fromUtf8($eValue, $encoding);
+                            }
+                            if(!in_array($eValue, $value)) {
+                                continue;
+                            } else {
+                                $element->setAttribute('checked', 'checked');
+                            }
+                        } elseif($p->hasParameter($pname) && (($element->hasAttribute('value') && $element->getAttribute('value') == $value) || (!$element->hasAttribute('value') && $p->getParameter($pname)))) {
+                            $element->setAttribute('checked', 'checked');
+                        }
+
+                    } elseif($inputType != 'button' && $inputType != 'submit') {
 						
-						// everything else
+                        // everything else
 						
-						// unless "include_hidden_inputs" is false and it's a hidden input...
-						if($cfg['include_hidden_inputs'] || $inputType != 'hidden') {
-							// remove original value
-							$element->removeAttribute('value');
+                        // unless "include_hidden_inputs" is false and it's a hidden input...
+                        if($cfg['include_hidden_inputs'] || $inputType != 'hidden') {
+                            // remove original value
+                            $element->removeAttribute('value');
 							
-							// and set a new one if it's there and unless it's a password field (or we actually want to refill those)
-							if($p->hasParameter($pname) && ($cfg['include_password_inputs'] || $inputType != 'password')) {
-								$element->setAttribute('value', $value);
-							}
-						}
-					}
-
-				} elseif($element->nodeName == 'select') {
-					// select elements
-					// yes, we still use XPath because there could be OPTGROUPs
-					foreach($this->xpath->query(sprintf('descendant::%1$soption', $this->xmlnsPrefix), $element) as $option) {
-						$option->removeAttribute('selected');
-						if($p->hasParameter($pname) && ($option->getAttribute('value') === $value || ($multiple && is_array($value) && in_array($option->getAttribute('value'), $value)))) {
-							$option->setAttribute('selected', 'selected');
-						}
-					}
-
-				} elseif($element->nodeName == 'textarea') {
-
-					// textareas
-					foreach($element->childNodes as $cn) {
-						// remove all child nodes (= text nodes)
-						$element->removeChild($cn);
-					}
-					// append a new text node
-					if($xhtml && $properXhtml) {
-						$element->appendChild($this->doc->createCDATASection($value));
-					} else {
-						$element->appendChild($this->doc->createTextNode($value));
-					}
-				}
-
-			}
-
-			// now output the remaining incidents
-			// might include errors for cookies, headers and whatnot, but that is okay
-			if($this->insertErrorMessages($form, $errorMessageRules, $allIncidents)) {
-				$allIncidents = array();
-			}
-		}
-
-		$rq->setAttribute('orphaned_errors', $allIncidents, 'org.agavi.filter.FormPopulationFilter');
-
-		if($xhtml) {
-			$firstError = null;
-
-			if(!$cfg['parse_xhtml_as_xml']) {
-				// workaround for a bug in dom or something that results in two xmlns attributes being generated for the <html> element
-				// attributes must be removed and created again
-				// and don't change the DOMNodeList in the foreach!
-				$remove = array();
-				$reset = array();
-				foreach($this->doc->documentElement->attributes as $attribute) {
-					// remember to remove the node
-					$remove[] = $attribute;
-					// not for the xmlns attribute itself
-					if($attribute->nodeName != 'xmlns') {
-						// can't do $attribute->prefix. we're in HTML parsing mode, remember? even if there is a prefix, the attribute node will not have a namespace
-						$attributeNameParts = explode(':', $attribute->nodeName);
-						if(isset($attributeNameParts[1])) {
-							// it's a namespaced node
-							$attributeNamespaceUri = $attribute->parentNode->lookupNamespaceURI($attributeNameParts[0]);
-							if($attributeNamespaceUri) {
-								// it is an attribute, for which the namespace is known internally (even though we're in HTML mode), typically xml: or xmlns:.
-								// so we need to create a new node, in the right namespace
-								$attributeCopy = $this->doc->createAttributeNS($attributeNamespaceUri, $attribute->nodeName);
-							} else {
-								// it's a foo:bar node - just copy it over
-								$attributeCopy = $attribute;
-							}
-						} else {
-							// no namespace on this node, copy it
-							$attributeCopy = $attribute;
-						}
-						// don't forget the attribute value
-						$attributeCopy->nodeValue = $attribute->nodeValue;
-						// and remember to set this attribute later
-						$reset[] = $attributeCopy;
-					}
-				}
+                            // and set a new one if it's there and unless it's a password field (or we actually want to refill those)
+                            if($p->hasParameter($pname) && ($cfg['include_password_inputs'] || $inputType != 'password')) {
+                                $element->setAttribute('value', $value);
+                            }
+                        }
+                    }
+
+                } elseif($element->nodeName == 'select') {
+                    // select elements
+                    // yes, we still use XPath because there could be OPTGROUPs
+                    foreach($this->xpath->query(sprintf('descendant::%1$soption', $this->xmlnsPrefix), $element) as $option) {
+                        $option->removeAttribute('selected');
+                        if($p->hasParameter($pname) && ($option->getAttribute('value') === $value || ($multiple && is_array($value) && in_array($option->getAttribute('value'), $value)))) {
+                            $option->setAttribute('selected', 'selected');
+                        }
+                    }
+
+                } elseif($element->nodeName == 'textarea') {
+
+                    // textareas
+                    foreach($element->childNodes as $cn) {
+                        // remove all child nodes (= text nodes)
+                        $element->removeChild($cn);
+                    }
+                    // append a new text node
+                    if($xhtml && $properXhtml) {
+                        $element->appendChild($this->doc->createCDATASection($value));
+                    } else {
+                        $element->appendChild($this->doc->createTextNode($value));
+                    }
+                }
+
+            }
+
+            // now output the remaining incidents
+            // might include errors for cookies, headers and whatnot, but that is okay
+            if($this->insertErrorMessages($form, $errorMessageRules, $allIncidents)) {
+                $allIncidents = array();
+            }
+        }
+
+        $rq->setAttribute('orphaned_errors', $allIncidents, 'org.agavi.filter.FormPopulationFilter');
+
+        if($xhtml) {
+            $firstError = null;
+
+            if(!$cfg['parse_xhtml_as_xml']) {
+                // workaround for a bug in dom or something that results in two xmlns attributes being generated for the <html> element
+                // attributes must be removed and created again
+                // and don't change the DOMNodeList in the foreach!
+                $remove = array();
+                $reset = array();
+                foreach($this->doc->documentElement->attributes as $attribute) {
+                    // remember to remove the node
+                    $remove[] = $attribute;
+                    // not for the xmlns attribute itself
+                    if($attribute->nodeName != 'xmlns') {
+                        // can't do $attribute->prefix. we're in HTML parsing mode, remember? even if there is a prefix, the attribute node will not have a namespace
+                        $attributeNameParts = explode(':', $attribute->nodeName);
+                        if(isset($attributeNameParts[1])) {
+                            // it's a namespaced node
+                            $attributeNamespaceUri = $attribute->parentNode->lookupNamespaceURI($attributeNameParts[0]);
+                            if($attributeNamespaceUri) {
+                                // it is an attribute, for which the namespace is known internally (even though we're in HTML mode), typically xml: or xmlns:.
+                                // so we need to create a new node, in the right namespace
+                                $attributeCopy = $this->doc->createAttributeNS($attributeNamespaceUri, $attribute->nodeName);
+                            } else {
+                                // it's a foo:bar node - just copy it over
+                                $attributeCopy = $attribute;
+                            }
+                        } else {
+                            // no namespace on this node, copy it
+                            $attributeCopy = $attribute;
+                        }
+                        // don't forget the attribute value
+                        $attributeCopy->nodeValue = $attribute->nodeValue;
+                        // and remember to set this attribute later
+                        $reset[] = $attributeCopy;
+                    }
+                }
 				
-				foreach($remove as $attribute) {
-					$this->doc->documentElement->removeAttributeNode($attribute);
-				}
-				foreach($reset as $attribute) {
-					$this->doc->documentElement->setAttributeNode($attribute);
-				}
-			}
-			$out = $this->doc->saveXML(null, $cfg['savexml_options']);
-			if((!$cfg['parse_xhtml_as_xml'] || !$properXhtml) && $cfg['cdata_fix']) {
-				// these are ugly fixes so inline style and script blocks still work. better don't use them with XHTML to avoid trouble
-				// http://www.456bereastreet.com/archive/200501/the_perils_of_using_xhtml_properly/
-				// http://www.hixie.ch/advocacy/xhtml
-				$out = preg_replace('/<style([^>]*)>\s*<!\[CDATA\[\s*?/iU' . ($utf8 ? 'u' : ''), '<style$1><!--/*--><![CDATA[/*><!--*/' . "\n", $out);
-				if(!$firstError) {
-					$firstError = preg_last_error();
-				}
-				// we can't clean up whitespace before the closing element because a preg with a leading \s* expression would be horribly slow
-				$out = preg_replace('/\]\]>\s*<\/style>/iU' . ($utf8 ? 'u' : ''), "\n" . '/*]]>*/--></style>', $out);
-				if(!$firstError) {
-					$firstError = preg_last_error();
-				}
-				$out = preg_replace('/<script([^>]*)>\s*<!\[CDATA\[\s*?/iU' . ($utf8 ? 'u' : ''), '<script$1><!--//--><![CDATA[//><!--' . "\n", $out);
-				if(!$firstError) {
-					$firstError = preg_last_error();
-				}
-				// we can't clean up whitespace before the closing element because a preg with a leading \s* expression would be horribly slow
-				$out = preg_replace('/\]\]>\s*<\/script>/iU' . ($utf8 ? 'u' : ''), "\n" . '//--><!]]></script>', $out);
-				if(!$firstError) {
-					$firstError = preg_last_error();
-				}
-			}
-			if($cfg['remove_auto_xml_prolog'] && !$hasXmlProlog) {
-				// there was no xml prolog in the document before, so we remove the one generated by DOM now
-				$out = preg_replace('/<\?xml.*?\?>\s+/iU' . ($utf8 ? 'u' : ''), '', $out);
-				if(!$firstError) {
-					$firstError = preg_last_error();
-				}
-			} elseif(!$cfg['parse_xhtml_as_xml']) {
-				// yes, DOM sucks and inserts another XML prolog _after_ the DOCTYPE... and it has two question marks at the end, not one, don't ask me why
-				$out = preg_replace('/<\?xml.*?\?\?>\s+/iU' . ($utf8 ? 'u' : ''), '', $out);
-				if(!$firstError) {
-					$firstError = preg_last_error();
-				}
-			}
+                foreach($remove as $attribute) {
+                    $this->doc->documentElement->removeAttributeNode($attribute);
+                }
+                foreach($reset as $attribute) {
+                    $this->doc->documentElement->setAttributeNode($attribute);
+                }
+            }
+            $out = $this->doc->saveXML(null, $cfg['savexml_options']);
+            if((!$cfg['parse_xhtml_as_xml'] || !$properXhtml) && $cfg['cdata_fix']) {
+                // these are ugly fixes so inline style and script blocks still work. better don't use them with XHTML to avoid trouble
+                // http://www.456bereastreet.com/archive/200501/the_perils_of_using_xhtml_properly/
+                // http://www.hixie.ch/advocacy/xhtml
+                $out = preg_replace('/<style([^>]*)>\s*<!\[CDATA\[\s*?/iU' . ($utf8 ? 'u' : ''), '<style$1><!--/*--><![CDATA[/*><!--*/' . "\n", $out);
+                if(!$firstError) {
+                    $firstError = preg_last_error();
+                }
+                // we can't clean up whitespace before the closing element because a preg with a leading \s* expression would be horribly slow
+                $out = preg_replace('/\]\]>\s*<\/style>/iU' . ($utf8 ? 'u' : ''), "\n" . '/*]]>*/--></style>', $out);
+                if(!$firstError) {
+                    $firstError = preg_last_error();
+                }
+                $out = preg_replace('/<script([^>]*)>\s*<!\[CDATA\[\s*?/iU' . ($utf8 ? 'u' : ''), '<script$1><!--//--><![CDATA[//><!--' . "\n", $out);
+                if(!$firstError) {
+                    $firstError = preg_last_error();
+                }
+                // we can't clean up whitespace before the closing element because a preg with a leading \s* expression would be horribly slow
+                $out = preg_replace('/\]\]>\s*<\/script>/iU' . ($utf8 ? 'u' : ''), "\n" . '//--><!]]></script>', $out);
+                if(!$firstError) {
+                    $firstError = preg_last_error();
+                }
+            }
+            if($cfg['remove_auto_xml_prolog'] && !$hasXmlProlog) {
+                // there was no xml prolog in the document before, so we remove the one generated by DOM now
+                $out = preg_replace('/<\?xml.*?\?>\s+/iU' . ($utf8 ? 'u' : ''), '', $out);
+                if(!$firstError) {
+                    $firstError = preg_last_error();
+                }
+            } elseif(!$cfg['parse_xhtml_as_xml']) {
+                // yes, DOM sucks and inserts another XML prolog _after_ the DOCTYPE... and it has two question marks at the end, not one, don't ask me why
+                $out = preg_replace('/<\?xml.*?\?\?>\s+/iU' . ($utf8 ? 'u' : ''), '', $out);
+                if(!$firstError) {
+                    $firstError = preg_last_error();
+                }
+            }
 			
-			if($firstError) {
-				$error = "Form Population Filter encountered an error while performing final regular expression replaces on the output.\n";
-				// the preg_replaces failed and produced an empty string. let's find out why
-				$error .= "The error reported by preg_last_error() indicates that ";
-				switch($firstError) {
-					case PREG_BAD_UTF8_ERROR:
-						$error .= "the input contained malformed UTF-8 data.";
-						break;
-					case PREG_RECURSION_LIMIT_ERROR:
-						$error .= "the recursion limit (defined by \"pcre.recursion_limit\") was hit. This shouldn't happen unless you changed that limit yourself in php.ini or using ini_set(). If the problem is not on your end, please file a bug report with a reproduce case on the Agavi issue tracker or drop by on the IRC support channel.";
-						break;
-					case PREG_BACKTRACK_LIMIT_ERROR:
-						$error .= "the backtrack limit (defined by \"pcre.backtrack_limit\") was hit. This shouldn't happen unless you changed that limit yourself in php.ini or using ini_set(). If the problem is not on your end, please file a bug report with a reproduce case on the Agavi issue tracker or drop by on the IRC support channel.";
-						break;
-					case PREG_INTERNAL_ERROR:
-					default:
-						$error .= "an internal PCRE error occurred. As a quick countermeasure, try to upgrade PHP (and the bundled PCRE) as well as libxml (yes!) to the latest versions to see if the problem goes away. If the issue persists, file a bug report with a reproduce case on the Agavi issue tracker or drop by on the IRC support channel.";
-				}
-				throw new AgaviException($error);
-			}
-
-			$response->setContent($out);
-		} else {
-			$response->setContent($this->doc->saveHTML());
-		}
-		unset($this->xpath);
-		unset($this->doc);
-	}
-
-	/**
-	 * Insert the error messages from the given incidents into the given element
-	 * using the given rules.
-	 *
-	 * @param      \DOMElement          $element The element to work on.
-	 * @param      array                $rules An array of insertion rules
-	 * @param      ValidationIncident[] $incidents An array of ValidationIncidents.
-	 *
-	 * @return     bool Whether or not the inserts were successful.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	protected function insertErrorMessages(\DOMElement $element, array $rules, array $incidents)
-	{
-		$errors = array();
-		foreach($incidents as $incident) {
-			if($incident->getSeverity() <= Validator::SILENT) {
-				continue;
-			}
-			foreach($incident->getErrors() as $error) {
-				if(strlen($error->getMessage())) {
-					$errors[] = $error;
-				}
-			}
-		}
+            if($firstError) {
+                $error = "Form Population Filter encountered an error while performing final regular expression replaces on the output.\n";
+                // the preg_replaces failed and produced an empty string. let's find out why
+                $error .= "The error reported by preg_last_error() indicates that ";
+                switch($firstError) {
+                    case PREG_BAD_UTF8_ERROR:
+                        $error .= "the input contained malformed UTF-8 data.";
+                        break;
+                    case PREG_RECURSION_LIMIT_ERROR:
+                        $error .= "the recursion limit (defined by \"pcre.recursion_limit\") was hit. This shouldn't happen unless you changed that limit yourself in php.ini or using ini_set(). If the problem is not on your end, please file a bug report with a reproduce case on the Agavi issue tracker or drop by on the IRC support channel.";
+                        break;
+                    case PREG_BACKTRACK_LIMIT_ERROR:
+                        $error .= "the backtrack limit (defined by \"pcre.backtrack_limit\") was hit. This shouldn't happen unless you changed that limit yourself in php.ini or using ini_set(). If the problem is not on your end, please file a bug report with a reproduce case on the Agavi issue tracker or drop by on the IRC support channel.";
+                        break;
+                    case PREG_INTERNAL_ERROR:
+                    default:
+                        $error .= "an internal PCRE error occurred. As a quick countermeasure, try to upgrade PHP (and the bundled PCRE) as well as libxml (yes!) to the latest versions to see if the problem goes away. If the issue persists, file a bug report with a reproduce case on the Agavi issue tracker or drop by on the IRC support channel.";
+                }
+                throw new AgaviException($error);
+            }
+
+            $response->setContent($out);
+        } else {
+            $response->setContent($this->doc->saveHTML());
+        }
+        unset($this->xpath);
+        unset($this->doc);
+    }
+
+    /**
+     * Insert the error messages from the given incidents into the given element
+     * using the given rules.
+     *
+     * @param      \DOMElement          $element The element to work on.
+     * @param      array                $rules An array of insertion rules
+     * @param      ValidationIncident[] $incidents An array of ValidationIncidents.
+     *
+     * @return     bool Whether or not the inserts were successful.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    protected function insertErrorMessages(\DOMElement $element, array $rules, array $incidents)
+    {
+        $errors = array();
+        foreach($incidents as $incident) {
+            if($incident->getSeverity() <= Validator::SILENT) {
+                continue;
+            }
+            foreach($incident->getErrors() as $error) {
+                if(strlen($error->getMessage())) {
+                    $errors[] = $error;
+                }
+            }
+        }
 		
-		if(!$errors) {
-			// nothing to do here
-			return true;
-		}
-
-		$luie = libxml_use_internal_errors(true);
-		libxml_clear_errors();
-
-		$insertSuccessful = false;
-		foreach($rules as $xpathExpression => $errorMessageInfo) {
-			$targets = $this->xpath->query(Toolkit::expandVariables($xpathExpression, array('htmlnsPrefix' => $this->xmlnsPrefix)), $element);
-
-			if(!$targets || !$targets->length) {
-				continue;
-			}
-
-			if(!is_array($errorMessageInfo)) {
-				$errorMessageInfo = array('markup' => $errorMessageInfo);
-			}
-			if(isset($errorMessageInfo['markup'])) {
-				$errorMarkup = $errorMessageInfo['markup'];
-			} else {
-				$errorMarkup = null;
-			}
-			if(isset($errorMessageInfo['location'])) {
-				$errorLocation = $errorMessageInfo['location'];
-			} else {
-				$errorLocation = 'after';
-			}
-			if(isset($errorMessageInfo['container'])) {
-				$errorContainer = $errorMessageInfo['container'];
-			} else {
-				$errorContainer = null;
-			}
+        if(!$errors) {
+            // nothing to do here
+            return true;
+        }
+
+        $luie = libxml_use_internal_errors(true);
+        libxml_clear_errors();
+
+        $insertSuccessful = false;
+        foreach($rules as $xpathExpression => $errorMessageInfo) {
+            $targets = $this->xpath->query(Toolkit::expandVariables($xpathExpression, array('htmlnsPrefix' => $this->xmlnsPrefix)), $element);
+
+            if(!$targets || !$targets->length) {
+                continue;
+            }
+
+            if(!is_array($errorMessageInfo)) {
+                $errorMessageInfo = array('markup' => $errorMessageInfo);
+            }
+            if(isset($errorMessageInfo['markup'])) {
+                $errorMarkup = $errorMessageInfo['markup'];
+            } else {
+                $errorMarkup = null;
+            }
+            if(isset($errorMessageInfo['location'])) {
+                $errorLocation = $errorMessageInfo['location'];
+            } else {
+                $errorLocation = 'after';
+            }
+            if(isset($errorMessageInfo['container'])) {
+                $errorContainer = $errorMessageInfo['container'];
+            } else {
+                $errorContainer = null;
+            }
 			
-			if(!$errorMarkup && !$errorContainer) {
-				throw new AgaviExceptionn('Form Population Filter was unable to insert error messages into the document using the XPath expression "' . $xpathExpression . '" because the element information did not contain either a "markup" or "container" entry to use.');
-			}
+            if(!$errorMarkup && !$errorContainer) {
+                throw new AgaviExceptionn('Form Population Filter was unable to insert error messages into the document using the XPath expression "' . $xpathExpression . '" because the element information did not contain either a "markup" or "container" entry to use.');
+            }
 			
-			$errorElements = array();
+            $errorElements = array();
 			
-			if($errorMarkup) {
-				foreach($errors as $error) {
-					if(is_callable($errorMarkup)) {
-						// it's a callback we can use to get a DOMElement or an XML/HTML string (for convenience
-						// and because it is impossible to provide multiple sibling elements via a DOMElement)
-						// we give it the element as the first, the error message as the second (for BC reasons)
-						// and the error object as the third argument
-						$errorElement = call_user_func($errorMarkup, $element, $error->getMessage(), $error);
-						if(is_string($errorElement)) {
-							$errorElementHtml = $errorElement;
-							$errorElement = $this->doc->createDocumentFragment();
-							$errorElement->appendXML($errorElementHtml);
-						} else {
-							$this->doc->importNode($errorElement, true);
-						}
-					} elseif(is_string($errorMarkup)) {
-						// it's a string with the HTML to insert
-						// %s is the placeholder in the HTML for the error message
-						$errorElement = $this->doc->createDocumentFragment();
-						$errorElement->appendXML(
-							Toolkit::expandVariables(
-								$errorMarkup,
-								array(
-									'elementId'    => htmlspecialchars($element->getAttribute('id'), ENT_QUOTES, 'UTF-8'),
-									'elementName'  => htmlspecialchars($element->getAttribute('name'), ENT_QUOTES, 'UTF-8'),
-									'errorMessage' => htmlspecialchars($error->getMessage(), ENT_QUOTES, 'UTF-8'),
-								)
-							)
-						);
-					} else {
-						throw new AgaviException('Form Population Filter was unable to insert an error message into the document using the XPath expression "' . $xpathExpression . '" because the element information could not be evaluated as an XML/HTML fragment or as a PHP callback.');
-					}
+            if($errorMarkup) {
+                foreach($errors as $error) {
+                    if(is_callable($errorMarkup)) {
+                        // it's a callback we can use to get a DOMElement or an XML/HTML string (for convenience
+                        // and because it is impossible to provide multiple sibling elements via a DOMElement)
+                        // we give it the element as the first, the error message as the second (for BC reasons)
+                        // and the error object as the third argument
+                        $errorElement = call_user_func($errorMarkup, $element, $error->getMessage(), $error);
+                        if(is_string($errorElement)) {
+                            $errorElementHtml = $errorElement;
+                            $errorElement = $this->doc->createDocumentFragment();
+                            $errorElement->appendXML($errorElementHtml);
+                        } else {
+                            $this->doc->importNode($errorElement, true);
+                        }
+                    } elseif(is_string($errorMarkup)) {
+                        // it's a string with the HTML to insert
+                        // %s is the placeholder in the HTML for the error message
+                        $errorElement = $this->doc->createDocumentFragment();
+                        $errorElement->appendXML(
+                            Toolkit::expandVariables(
+                                $errorMarkup,
+                                array(
+                                    'elementId'    => htmlspecialchars($element->getAttribute('id'), ENT_QUOTES, 'UTF-8'),
+                                    'elementName'  => htmlspecialchars($element->getAttribute('name'), ENT_QUOTES, 'UTF-8'),
+                                    'errorMessage' => htmlspecialchars($error->getMessage(), ENT_QUOTES, 'UTF-8'),
+                                )
+                            )
+                        );
+                    } else {
+                        throw new AgaviException('Form Population Filter was unable to insert an error message into the document using the XPath expression "' . $xpathExpression . '" because the element information could not be evaluated as an XML/HTML fragment or as a PHP callback.');
+                    }
 					
-					$errorElements[] = $errorElement;
-				}
-			}
-
-			if($errorContainer) {
-				// we have an error container.
-				// that means that instead of inserting each message element, we add the messages into the container
-				// then, the container is the only element scheduled for insertion
-				$errorStrings = array();
-				if($errorElements) {
-					// add all error XML strings to an array
-					foreach($errorElements as $errorElement) {
-						$errorStrings[] = $errorElement->ownerDocument->saveXML($errorElement);
-					}
-				} else {
-					// if no error markup was given, just provide the error messages
-					foreach($errors as $error) {
-						$errorStrings[] = $error->getMessage();
-					}
-				}
-
-				// create the container element and replace the errors placeholder in the container
-				if(is_callable($errorContainer)) {
-					// it's a callback we can use to get a DOMElement or an XML/HTML string (for convenience
-					// and because it is impossible to provide multiple sibling elements via a DOMElement)
-					// we give it the element as the first, the error messages array(!) as the second (for BC reasons)
-					// and the array of all error objects as the third argument
-					$containerElement = call_user_func($errorContainer, $element, $errorStrings, $errors);
-					if(is_string($containerElement)) {
-						$containerElementHtml = $containerElement;
-						$containerElement = $this->doc->createDocumentFragment();
-						$containerElement->appendXML($containerElementHtml);
-					} else {
-						$this->doc->importNode($containerElement, true);
-					}
-				} elseif(is_string($errorContainer)) {
-					// it's a string with the HTML to insert
-					// %s is the placeholder in the HTML for the error message
-					$containerElement = $this->doc->createDocumentFragment();
-					$containerElement->appendXML(
-						Toolkit::expandVariables(
-							$errorContainer,
-							array(
-								'elementId'     => htmlspecialchars($element->getAttribute('id'), ENT_QUOTES, 'UTF-8'),
-								'elementName'   => htmlspecialchars($element->getAttribute('name'), ENT_QUOTES, 'UTF-8'),
-								'errorMessages' => implode("\n", $errorStrings),
-							)
-						)
-					);
-				} else {
-					throw new AgaviException('Form Population Filter was unable to insert an error message container into the document using the XPath expression "' . $xpathExpression . '" because the element information could not be evaluated as an XML/HTML fragment or as a PHP callback.');
-				}
-
-				// and now the trick: set the error container element as the only one in the errorElements variable
-				// that way, it's going to get inserted for us as if it were a normal error message element, using the location specified
-				$errorElements = array($containerElement);
-			}
-
-			if(libxml_get_last_error() !== false) {
-				$errors = array();
-				foreach(libxml_get_errors() as $error) {
-					$errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
-				}
-				libxml_clear_errors();
-				libxml_use_internal_errors($luie);
-				$emsg = sprintf(
-					'Form Population Filter was unable to insert an error message into the document using the XPath expression "%s" due to the following error%s: ' . "\n\n%s",
-					$xpathExpression,
-					count($errors) > 1 ? 's' : '',
-					implode("\n", $errors)
-				);
-				throw new ParseException($emsg);
-			}
-
-			foreach($errorElements as $errorElement) {
-				foreach($targets as $target) {
-					// in case the target yielded more than one location, we need to clone the element
-					// because the document fragment node will be corrupted after an insert
-					$clonedErrorElement = $errorElement->cloneNode(true);
+                    $errorElements[] = $errorElement;
+                }
+            }
+
+            if($errorContainer) {
+                // we have an error container.
+                // that means that instead of inserting each message element, we add the messages into the container
+                // then, the container is the only element scheduled for insertion
+                $errorStrings = array();
+                if($errorElements) {
+                    // add all error XML strings to an array
+                    foreach($errorElements as $errorElement) {
+                        $errorStrings[] = $errorElement->ownerDocument->saveXML($errorElement);
+                    }
+                } else {
+                    // if no error markup was given, just provide the error messages
+                    foreach($errors as $error) {
+                        $errorStrings[] = $error->getMessage();
+                    }
+                }
+
+                // create the container element and replace the errors placeholder in the container
+                if(is_callable($errorContainer)) {
+                    // it's a callback we can use to get a DOMElement or an XML/HTML string (for convenience
+                    // and because it is impossible to provide multiple sibling elements via a DOMElement)
+                    // we give it the element as the first, the error messages array(!) as the second (for BC reasons)
+                    // and the array of all error objects as the third argument
+                    $containerElement = call_user_func($errorContainer, $element, $errorStrings, $errors);
+                    if(is_string($containerElement)) {
+                        $containerElementHtml = $containerElement;
+                        $containerElement = $this->doc->createDocumentFragment();
+                        $containerElement->appendXML($containerElementHtml);
+                    } else {
+                        $this->doc->importNode($containerElement, true);
+                    }
+                } elseif(is_string($errorContainer)) {
+                    // it's a string with the HTML to insert
+                    // %s is the placeholder in the HTML for the error message
+                    $containerElement = $this->doc->createDocumentFragment();
+                    $containerElement->appendXML(
+                        Toolkit::expandVariables(
+                            $errorContainer,
+                            array(
+                                'elementId'     => htmlspecialchars($element->getAttribute('id'), ENT_QUOTES, 'UTF-8'),
+                                'elementName'   => htmlspecialchars($element->getAttribute('name'), ENT_QUOTES, 'UTF-8'),
+                                'errorMessages' => implode("\n", $errorStrings),
+                            )
+                        )
+                    );
+                } else {
+                    throw new AgaviException('Form Population Filter was unable to insert an error message container into the document using the XPath expression "' . $xpathExpression . '" because the element information could not be evaluated as an XML/HTML fragment or as a PHP callback.');
+                }
+
+                // and now the trick: set the error container element as the only one in the errorElements variable
+                // that way, it's going to get inserted for us as if it were a normal error message element, using the location specified
+                $errorElements = array($containerElement);
+            }
+
+            if(libxml_get_last_error() !== false) {
+                $errors = array();
+                foreach(libxml_get_errors() as $error) {
+                    $errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
+                }
+                libxml_clear_errors();
+                libxml_use_internal_errors($luie);
+                $emsg = sprintf(
+                    'Form Population Filter was unable to insert an error message into the document using the XPath expression "%s" due to the following error%s: ' . "\n\n%s",
+                    $xpathExpression,
+                    count($errors) > 1 ? 's' : '',
+                    implode("\n", $errors)
+                );
+                throw new ParseException($emsg);
+            }
+
+            foreach($errorElements as $errorElement) {
+                foreach($targets as $target) {
+                    // in case the target yielded more than one location, we need to clone the element
+                    // because the document fragment node will be corrupted after an insert
+                    $clonedErrorElement = $errorElement->cloneNode(true);
 					
-					if($errorLocation == 'before') {
-						$target->parentNode->insertBefore($clonedErrorElement, $target);
-					} elseif($errorLocation == 'after') {
-						// check if there is a following sibling, then insert before that one
-						// if not, append to parent
-						if($target->nextSibling) {
-							$target->parentNode->insertBefore($clonedErrorElement, $target->nextSibling);
-						} else {
-							$target->parentNode->appendChild($clonedErrorElement);
-						}
-					} elseif($errorLocation == 'replace') {
-						$target->parentNode->replaceChild($clonedErrorElement, $target);
-					} else {
-						$target->appendChild($clonedErrorElement);
-					}
-				}
-			}
-
-			// and break the foreach, our expression matched after all - no need to look further
-			$insertSuccessful = true;
-			break;
-		}
-
-		libxml_clear_errors();
-		libxml_use_internal_errors($luie);
-
-		return $insertSuccessful;
-	}
-
-	/**
-	 * Encode given value to UTF-8
-	 *
-	 * @param      mixed  $value The value to convert (can be an array).
-	 * @param      string $encoding The encoding of the value.
-	 *
-	 * @return     mixed  The converted value.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	protected function toUtf8($value, $encoding = self::ENCODING_ISO_8859_1)
-	{
-		if($encoding == self::ENCODING_ISO_8859_1) {
-			if(is_array($value)) {
-				foreach($value as &$val) {
-					$val = $this->toUtf8($val, $encoding);
-				}
-			} else {
-				$value = utf8_encode($value);
-			}
-		} else {
-			if(is_array($value)) {
-				foreach($value as &$val) {
-					$val = $this->toUtf8($val, $encoding);
-				}
-			} else {
-				$value = iconv($encoding, self::ENCODING_UTF_8, $value);
-			}
-		}
-
-		return $value;
-	}
-
-	/**
-	 * Decode given value from UTF-8
-	 *
-	 * @param      mixed  $value The value to convert (can be an array).
-	 * @param      string $encoding The encoding of the value.
-	 *
-	 * @return     mixed  The converted value.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	protected function fromUtf8($value, $encoding = self::ENCODING_ISO_8859_1)
-	{
-		if($encoding == self::ENCODING_ISO_8859_1) {
-			if(is_array($value)) {
-				foreach($value as &$val) {
-					$val = $this->fromUtf8($val, $encoding);
-				}
-			} else {
-				$value = utf8_decode($value);
-			}
-		} else {
-			if(is_array($value)) {
-				foreach($value as &$val) {
-					$val = $this->fromUtf8($val, $encoding);
-				}
-			} else {
-				$value = iconv(self::ENCODING_UTF_8, $encoding, $value);
-			}
-		}
-
-		return $value;
-	}
-
-	/**
-	 * Initialize this filter.
-	 *
-	 * @param      Context $context The current application context.
-	 * @param      array   $parameters An associative array of initialization parameters.
-	 *
-	 * @throws     <b>AgaviFilterException</b> If an error occurs during
-	 *                                         initialization
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function initialize(Context $context, array $parameters = array())
-	{
-		// set defaults
-		$this->setParameters(array(
-			'methods'                    => array(),
-			'output_types'               => null,
-
-			'forms_xpath'                => '//${htmlnsPrefix}form[@action]',
-			'populate'                   => null,
-			'skip'                       => null,
-			'include_hidden_inputs'      => true,
-			'include_password_inputs'    => false,
-
-			'force_output_mode'          => false,
-			'force_encoding'             => false,
-			'force_request_uri'          => false,
-			'force_request_url'          => false,
-			'cdata_fix'                  => true,
-			'parse_xhtml_as_xml'         => true,
-			'remove_auto_xml_prolog'     => true,
-			'dom_substitute_entities'    => false,
-			'dom_resolve_externals'      => false,
-			'dom_validate_on_parse'      => false,
-			'dom_preserve_white_space'   => true,
-			'dom_format_output'          => false,
-			'savexml_options'            => array(),
-
-			'error_class'                => 'error',
-			'error_class_map'            => array(),
-			'error_messages'             => array(),
-			'field_error_messages'       => array(),
-			'multi_field_error_messages' => array(),
-
-			'ignore_parse_errors'        => LIBXML_ERR_ERROR,
-			'log_parse_errors'           => LIBXML_ERR_WARNING,
-			'logging_logger'             => null,
-		));
-
-		// initialize parent
-		parent::initialize($context, $parameters);
-
-		// and "clean up" some of the params just in case the user messed up
-
-		$errorClassMap = (array) $this->getParameter('error_class_map');
-		// append a match-all expression to the map, which assigns the default error class
-		$errorClassMap['self::${htmlnsPrefix}*'] = $this->getParameter('error_class');
-		$this->setParameter('error_class_map', $errorClassMap);
-
-		$this->setParameter('methods', (array) $this->getParameter('methods'));
-
-		if($ot = $this->getParameter('output_types')) {
-			$this->setParameter('output_types', (array) $ot);
-		}
+                    if($errorLocation == 'before') {
+                        $target->parentNode->insertBefore($clonedErrorElement, $target);
+                    } elseif($errorLocation == 'after') {
+                        // check if there is a following sibling, then insert before that one
+                        // if not, append to parent
+                        if($target->nextSibling) {
+                            $target->parentNode->insertBefore($clonedErrorElement, $target->nextSibling);
+                        } else {
+                            $target->parentNode->appendChild($clonedErrorElement);
+                        }
+                    } elseif($errorLocation == 'replace') {
+                        $target->parentNode->replaceChild($clonedErrorElement, $target);
+                    } else {
+                        $target->appendChild($clonedErrorElement);
+                    }
+                }
+            }
+
+            // and break the foreach, our expression matched after all - no need to look further
+            $insertSuccessful = true;
+            break;
+        }
+
+        libxml_clear_errors();
+        libxml_use_internal_errors($luie);
+
+        return $insertSuccessful;
+    }
+
+    /**
+     * Encode given value to UTF-8
+     *
+     * @param      mixed  $value The value to convert (can be an array).
+     * @param      string $encoding The encoding of the value.
+     *
+     * @return     mixed  The converted value.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    protected function toUtf8($value, $encoding = self::ENCODING_ISO_8859_1)
+    {
+        if($encoding == self::ENCODING_ISO_8859_1) {
+            if(is_array($value)) {
+                foreach($value as &$val) {
+                    $val = $this->toUtf8($val, $encoding);
+                }
+            } else {
+                $value = utf8_encode($value);
+            }
+        } else {
+            if(is_array($value)) {
+                foreach($value as &$val) {
+                    $val = $this->toUtf8($val, $encoding);
+                }
+            } else {
+                $value = iconv($encoding, self::ENCODING_UTF_8, $value);
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * Decode given value from UTF-8
+     *
+     * @param      mixed  $value The value to convert (can be an array).
+     * @param      string $encoding The encoding of the value.
+     *
+     * @return     mixed  The converted value.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    protected function fromUtf8($value, $encoding = self::ENCODING_ISO_8859_1)
+    {
+        if($encoding == self::ENCODING_ISO_8859_1) {
+            if(is_array($value)) {
+                foreach($value as &$val) {
+                    $val = $this->fromUtf8($val, $encoding);
+                }
+            } else {
+                $value = utf8_decode($value);
+            }
+        } else {
+            if(is_array($value)) {
+                foreach($value as &$val) {
+                    $val = $this->fromUtf8($val, $encoding);
+                }
+            } else {
+                $value = iconv(self::ENCODING_UTF_8, $encoding, $value);
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * Initialize this filter.
+     *
+     * @param      Context $context The current application context.
+     * @param      array   $parameters An associative array of initialization parameters.
+     *
+     * @throws     <b>AgaviFilterException</b> If an error occurs during
+     *                                         initialization
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function initialize(Context $context, array $parameters = array())
+    {
+        // set defaults
+        $this->setParameters(array(
+            'methods'                    => array(),
+            'output_types'               => null,
+
+            'forms_xpath'                => '//${htmlnsPrefix}form[@action]',
+            'populate'                   => null,
+            'skip'                       => null,
+            'include_hidden_inputs'      => true,
+            'include_password_inputs'    => false,
+
+            'force_output_mode'          => false,
+            'force_encoding'             => false,
+            'force_request_uri'          => false,
+            'force_request_url'          => false,
+            'cdata_fix'                  => true,
+            'parse_xhtml_as_xml'         => true,
+            'remove_auto_xml_prolog'     => true,
+            'dom_substitute_entities'    => false,
+            'dom_resolve_externals'      => false,
+            'dom_validate_on_parse'      => false,
+            'dom_preserve_white_space'   => true,
+            'dom_format_output'          => false,
+            'savexml_options'            => array(),
+
+            'error_class'                => 'error',
+            'error_class_map'            => array(),
+            'error_messages'             => array(),
+            'field_error_messages'       => array(),
+            'multi_field_error_messages' => array(),
+
+            'ignore_parse_errors'        => LIBXML_ERR_ERROR,
+            'log_parse_errors'           => LIBXML_ERR_WARNING,
+            'logging_logger'             => null,
+        ));
+
+        // initialize parent
+        parent::initialize($context, $parameters);
+
+        // and "clean up" some of the params just in case the user messed up
+
+        $errorClassMap = (array) $this->getParameter('error_class_map');
+        // append a match-all expression to the map, which assigns the default error class
+        $errorClassMap['self::${htmlnsPrefix}*'] = $this->getParameter('error_class');
+        $this->setParameter('error_class_map', $errorClassMap);
+
+        $this->setParameter('methods', (array) $this->getParameter('methods'));
+
+        if($ot = $this->getParameter('output_types')) {
+            $this->setParameter('output_types', (array) $ot);
+        }
 		
-		$savexmlOptions = 0;
-		foreach((array)$this->getParameter('savexml_options', array()) as $option) {
-			if(is_numeric($option)) {
-				$savexmlOptions |= (int)$option;
-			} elseif(defined($option)) {
-				$savexmlOptions |= constant($option);
-			}
-		}
-		$this->setParameter('savexml_options', $savexmlOptions);
-
-		$ignoreParseErrors =& $this->getParameter('ignore_parse_errors');
-		if(is_string($ignoreParseErrors) && defined($ignoreParseErrors)) {
-			$ignoreParseErrors = constant($ignoreParseErrors);
-		}
-		// BC
-		if($ignoreParseErrors === true) {
-			$ignoreParseErrors = LIBXML_ERR_FATAL;
-		} elseif($ignoreParseErrors === false) {
-			$ignoreParseErrors = LIBXML_ERR_NONE;
-		}
+        $savexmlOptions = 0;
+        foreach((array)$this->getParameter('savexml_options', array()) as $option) {
+            if(is_numeric($option)) {
+                $savexmlOptions |= (int)$option;
+            } elseif(defined($option)) {
+                $savexmlOptions |= constant($option);
+            }
+        }
+        $this->setParameter('savexml_options', $savexmlOptions);
+
+        $ignoreParseErrors =& $this->getParameter('ignore_parse_errors');
+        if(is_string($ignoreParseErrors) && defined($ignoreParseErrors)) {
+            $ignoreParseErrors = constant($ignoreParseErrors);
+        }
+        // BC
+        if($ignoreParseErrors === true) {
+            $ignoreParseErrors = LIBXML_ERR_FATAL;
+        } elseif($ignoreParseErrors === false) {
+            $ignoreParseErrors = LIBXML_ERR_NONE;
+        }
 		
-		$logParseErrors =& $this->getParameter('log_parse_errors');
-		if(is_string($logParseErrors) && defined($logParseErrors)) {
-			$logParseErrors = constant($logParseErrors);
-		}
-		// BC
-		if($logParseErrors === true) {
-			$logParseErrors = LIBXML_ERR_WARNING;
-		}
-
-		// and now copy all that to the request namespace so it can all be modified at runtime, not just overwritten
-		$this->context->getRequest()->setAttributes($this->getParameters(), 'org.agavi.filter.FormPopulationFilter');
-	}
+        $logParseErrors =& $this->getParameter('log_parse_errors');
+        if(is_string($logParseErrors) && defined($logParseErrors)) {
+            $logParseErrors = constant($logParseErrors);
+        }
+        // BC
+        if($logParseErrors === true) {
+            $logParseErrors = LIBXML_ERR_WARNING;
+        }
+
+        // and now copy all that to the request namespace so it can all be modified at runtime, not just overwritten
+        $this->context->getRequest()->setAttributes($this->getParameters(), 'org.agavi.filter.FormPopulationFilter');
+    }
 }
 
 ?>

src/controller/Controller.class.php

Indentation +263 added lines, -263 removed lines

@@ -38,293 +38,293 @@
  */
 abstract class Controller
 {
-	/**
-	 * @var        ExecutionContainer This controller's execution container.
-	 */
-	protected $container = null;
+    /**
+     * @var        ExecutionContainer This controller's execution container.
+     */
+    protected $container = null;
 
-	/**
-	 * @var        Context A Context instance.
-	 */
-	protected $context = null;
+    /**
+     * @var        Context A Context instance.
+     */
+    protected $context = null;
 
-	/**
-	 * Retrieve the current application context.
-	 *
-	 * @return     Context The current Context instance.
-	 *
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @since      0.9.0
-	 */
-	public final function getContext()
-	{
-		return $this->context;
-	}
+    /**
+     * Retrieve the current application context.
+     *
+     * @return     Context The current Context instance.
+     *
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @since      0.9.0
+     */
+    public final function getContext()
+    {
+        return $this->context;
+    }
 
-	/**
-	 * Retrieve the execution container for this controller.
-	 *
-	 * @return     ExecutionContainer This controller's execution container.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public final function getContainer()
-	{
-		return $this->container;
-	}
+    /**
+     * Retrieve the execution container for this controller.
+     *
+     * @return     ExecutionContainer This controller's execution container.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public final function getContainer()
+    {
+        return $this->container;
+    }
 
-	/**
-	 * Retrieve the credential required to access this controller.
-	 *
-	 * @return     mixed Data that indicates the level of security for this
-	 *                   controller.
-	 *
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.9.0
-	 */
-	public function getCredentials()
-	{
-		return null;
-	}
+    /**
+     * Retrieve the credential required to access this controller.
+     *
+     * @return     mixed Data that indicates the level of security for this
+     *                   controller.
+     *
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.9.0
+     */
+    public function getCredentials()
+    {
+        return null;
+    }
 
-	/**
-	 * Execute any post-validation error application logic.
-	 *
-	 * @param      RequestDataHolder $rd The controller's request data holder.
-	 *
-	 * @return     mixed A string containing the view name associated with this
-	 *                   controller.
-	 *                   Or an array with the following indices:
-	 *                   - The parent module of the view that will be executed.
-	 *                   - The view that will be executed.
-	 *
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.9.0
-	 */
-	public function handleError(RequestDataHolder $rd)
-	{
-		return 'Error';
-	}
+    /**
+     * Execute any post-validation error application logic.
+     *
+     * @param      RequestDataHolder $rd The controller's request data holder.
+     *
+     * @return     mixed A string containing the view name associated with this
+     *                   controller.
+     *                   Or an array with the following indices:
+     *                   - The parent module of the view that will be executed.
+     *                   - The view that will be executed.
+     *
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.9.0
+     */
+    public function handleError(RequestDataHolder $rd)
+    {
+        return 'Error';
+    }
 
-	/**
-	 * Initialize this controller.
-	 *
-	 * @param      ExecutionContainer $container This Controller's execution container.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.9.0
-	 */
-	public function initialize(ExecutionContainer $container)
-	{
-		$this->container = $container;
+    /**
+     * Initialize this controller.
+     *
+     * @param      ExecutionContainer $container This Controller's execution container.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.9.0
+     */
+    public function initialize(ExecutionContainer $container)
+    {
+        $this->container = $container;
 
-		$this->context = $container->getContext();
-	}
+        $this->context = $container->getContext();
+    }
 
-	/**
-	 * Indicates that this controller requires security.
-	 *
-	 * @return     bool true, if this controller requires security, otherwise false.
-	 *
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @since      0.9.0
-	 */
-	public function isSecure()
-	{
-		return false;
-	}
+    /**
+     * Indicates that this controller requires security.
+     *
+     * @return     bool true, if this controller requires security, otherwise false.
+     *
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @since      0.9.0
+     */
+    public function isSecure()
+    {
+        return false;
+    }
 
-	/**
-	 * Whether or not this controller is "simple", i.e. does not use validation etc.
-	 *
-	 * @return     bool true, if this controller should act in simple mode, or false.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function isSimple()
-	{
-		return false;
-	}
+    /**
+     * Whether or not this controller is "simple", i.e. does not use validation etc.
+     *
+     * @return     bool true, if this controller should act in simple mode, or false.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function isSimple()
+    {
+        return false;
+    }
 
-	/**
-	 * Manually register validators for this controller.
-	 *
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @since      0.9.0
-	 */
-	public function registerValidators()
-	{
-	}
+    /**
+     * Manually register validators for this controller.
+     *
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @since      0.9.0
+     */
+    public function registerValidators()
+    {
+    }
 
-	/**
-	 * Manually validate files and parameters.
-	 *
-	 * @param      RequestDataHolder $rd The controller's request data holder.
-	 *
-	 * @return     bool true, if validation completed successfully, otherwise
-	 *                  false.
-	 *
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.9.0
-	 */
-	public function validate(RequestDataHolder $rd)
-	{
-		return true;
-	}
+    /**
+     * Manually validate files and parameters.
+     *
+     * @param      RequestDataHolder $rd The controller's request data holder.
+     *
+     * @return     bool true, if validation completed successfully, otherwise
+     *                  false.
+     *
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.9.0
+     */
+    public function validate(RequestDataHolder $rd)
+    {
+        return true;
+    }
 
-	/**
-	 * Get the default View name if this Controller doesn't serve the Request method.
-	 *
-	 * @return     mixed A string containing the view name associated with this
-	 *                   controller.
-	 *                   Or an array with the following indices:
-	 *                   - The parent module of the view that will be executed.
-	 *                   - The view that will be executed.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getDefaultViewName()
-	{
-		return 'Input';
-	}
+    /**
+     * Get the default View name if this Controller doesn't serve the Request method.
+     *
+     * @return     mixed A string containing the view name associated with this
+     *                   controller.
+     *                   Or an array with the following indices:
+     *                   - The parent module of the view that will be executed.
+     *                   - The view that will be executed.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getDefaultViewName()
+    {
+        return 'Input';
+    }
 
-	/**
-	 * @see        AttributeHolder::clearAttributes()
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.9.0
-	 */
-	public function clearAttributes()
-	{
-		$this->container->clearAttributes();
-	}
+    /**
+     * @see        AttributeHolder::clearAttributes()
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.9.0
+     */
+    public function clearAttributes()
+    {
+        $this->container->clearAttributes();
+    }
 
-	/**
-	 * @see        AttributeHolder::getAttribute()
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.9.0
-	 */
-	public function &getAttribute($name, $default = null)
-	{
-		return $this->container->getAttribute($name, null, $default);
-	}
+    /**
+     * @see        AttributeHolder::getAttribute()
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.9.0
+     */
+    public function &getAttribute($name, $default = null)
+    {
+        return $this->container->getAttribute($name, null, $default);
+    }
 
-	/**
-	 * @see        AttributeHolder::getAttributeNames()
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.9.0
-	 */
-	public function getAttributeNames()
-	{
-		return $this->container->getAttributeNames();
-	}
+    /**
+     * @see        AttributeHolder::getAttributeNames()
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.9.0
+     */
+    public function getAttributeNames()
+    {
+        return $this->container->getAttributeNames();
+    }
 
-	/**
-	 * @see        AttributeHolder::getAttributes()
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function &getAttributes()
-	{
-		return $this->container->getAttributes();
-	}
+    /**
+     * @see        AttributeHolder::getAttributes()
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function &getAttributes()
+    {
+        return $this->container->getAttributes();
+    }
 
-	/**
-	 * @see        AttributeHolder::hasAttribute()
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.9.0
-	 */
-	public function hasAttribute($name)
-	{
-		return $this->container->hasAttribute($name);
-	}
+    /**
+     * @see        AttributeHolder::hasAttribute()
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.9.0
+     */
+    public function hasAttribute($name)
+    {
+        return $this->container->hasAttribute($name);
+    }
 
-	/**
-	 * @see        AttributeHolder::removeAttribute()
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.9.0
-	 */
-	public function &removeAttribute($name)
-	{
-		return $this->container->removeAttribute($name);
-	}
+    /**
+     * @see        AttributeHolder::removeAttribute()
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.9.0
+     */
+    public function &removeAttribute($name)
+    {
+        return $this->container->removeAttribute($name);
+    }
 
-	/**
-	 * @see        AttributeHolder::setAttribute()
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.9.0
-	 */
-	public function setAttribute($name, $value)
-	{
-		$this->container->setAttribute($name, $value);
-	}
+    /**
+     * @see        AttributeHolder::setAttribute()
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.9.0
+     */
+    public function setAttribute($name, $value)
+    {
+        $this->container->setAttribute($name, $value);
+    }
 
-	/**
-	 * @see        AttributeHolder::appendAttribute()
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.10.0
-	 */
-	public function appendAttribute($name, $value)
-	{
-		$this->container->appendAttribute($name, $value);
-	}
+    /**
+     * @see        AttributeHolder::appendAttribute()
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.10.0
+     */
+    public function appendAttribute($name, $value)
+    {
+        $this->container->appendAttribute($name, $value);
+    }
 
-	/**
-	 * @see        AttributeHolder::setAttributeByRef()
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.9.0
-	 */
-	public function setAttributeByRef($name, &$value)
-	{
-		$this->container->setAttributeByRef($name, $value);
-	}
+    /**
+     * @see        AttributeHolder::setAttributeByRef()
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.9.0
+     */
+    public function setAttributeByRef($name, &$value)
+    {
+        $this->container->setAttributeByRef($name, $value);
+    }
 
-	/**
-	 * @see        AttributeHolder::appendAttributeByRef()
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.10.0
-	 */
-	public function appendAttributeByRef($name, &$value)
-	{
-		$this->container->appendAttributeByRef($name, $value);
-	}
+    /**
+     * @see        AttributeHolder::appendAttributeByRef()
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.10.0
+     */
+    public function appendAttributeByRef($name, &$value)
+    {
+        $this->container->appendAttributeByRef($name, $value);
+    }
 
-	/**
-	 * @see        AttributeHolder::setAttributes()
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.9.0
-	 */
-	public function setAttributes(array $attributes)
-	{
-		$this->container->setAttributes($attributes);
-	}
+    /**
+     * @see        AttributeHolder::setAttributes()
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.9.0
+     */
+    public function setAttributes(array $attributes)
+    {
+        $this->container->setAttributes($attributes);
+    }
 
-	/**
-	 * @see        AttributeHolder::setAttributesByRef()
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.9.0
-	 */
-	public function setAttributesByRef(array &$attributes)
-	{
-		$this->container->setAttributesByRef($attributes);
-	}
+    /**
+     * @see        AttributeHolder::setAttributesByRef()
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.9.0
+     */
+    public function setAttributesByRef(array &$attributes)
+    {
+        $this->container->setAttributesByRef($attributes);
+    }
 }
 
 ?>
\ No newline at end of file

src/response/SoapResponse.class.php

Indentation +267 added lines, -267 removed lines

@@ -30,294 +30,294 @@
  */
 class SoapResponse extends Response
 {
-	/**
-	 * @var        mixed The content to send back with this response.
-	 */
-	protected $content = null;
+    /**
+     * @var        mixed The content to send back with this response.
+     */
+    protected $content = null;
 	
-	/**
-	 * @var        array An array of SOAP headers to send with the response.
-	 */
-	protected $soapHeaders = array();
+    /**
+     * @var        array An array of SOAP headers to send with the response.
+     */
+    protected $soapHeaders = array();
 	
-	/**
-	 * Import response metadata (SOAP headers) from another response.
-	 *
-	 * @param      Response $otherResponse The other response to import information from.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function merge(Response $otherResponse)
-	{
-		parent::merge($otherResponse);
+    /**
+     * Import response metadata (SOAP headers) from another response.
+     *
+     * @param      Response $otherResponse The other response to import information from.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function merge(Response $otherResponse)
+    {
+        parent::merge($otherResponse);
 		
-		if($otherResponse instanceof SoapResponse) {
-			foreach($otherResponse->getSoapHeaders() as $soapHeader) {
-				if(!$this->hasSoapHeader($soapHeader->namespace, $soapHeader->name)) {
-					$this->addSoapHeader($soapHeader);
-				}
-			}
-		}
-	}
+        if($otherResponse instanceof SoapResponse) {
+            foreach($otherResponse->getSoapHeaders() as $soapHeader) {
+                if(!$this->hasSoapHeader($soapHeader->namespace, $soapHeader->name)) {
+                    $this->addSoapHeader($soapHeader);
+                }
+            }
+        }
+    }
 	
-	/**
-	 * Redirect externally. Not implemented here.
-	 *
-	 * @param      mixed $to Where to redirect.
-	 *
-	 * @throws     \BadMethodCallException
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function setRedirect($to)
-	{
-		throw new \BadMethodCallException('Redirects are not implemented for SOAP.');
-	}
+    /**
+     * Redirect externally. Not implemented here.
+     *
+     * @param      mixed $to Where to redirect.
+     *
+     * @throws     \BadMethodCallException
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function setRedirect($to)
+    {
+        throw new \BadMethodCallException('Redirects are not implemented for SOAP.');
+    }
 	
-	/**
-	 * Get info about the set redirect. Not implemented here.
-	 *
-	 * @return     array An assoc array of redirect info, or null if none set.
-	 *
-	 * @throws     \BadMethodCallException
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getRedirect()
-	{
-		throw new \BadMethodCallException('Redirects are not implemented for SOAP.');
-	}
+    /**
+     * Get info about the set redirect. Not implemented here.
+     *
+     * @return     array An assoc array of redirect info, or null if none set.
+     *
+     * @throws     \BadMethodCallException
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getRedirect()
+    {
+        throw new \BadMethodCallException('Redirects are not implemented for SOAP.');
+    }
 
-	/**
-	 * Check if a redirect is set. Not implemented here.
-	 *
-	 * @return     bool true, if a redirect is set, otherwise false
-	 *
-	 * @throws     \BadMethodCallException
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function hasRedirect()
-	{
-		throw new \BadMethodCallException('Redirects are not implemented for SOAP.');
-	}
+    /**
+     * Check if a redirect is set. Not implemented here.
+     *
+     * @return     bool true, if a redirect is set, otherwise false
+     *
+     * @throws     \BadMethodCallException
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function hasRedirect()
+    {
+        throw new \BadMethodCallException('Redirects are not implemented for SOAP.');
+    }
 
-	/**
-	 * Clear any set redirect information. Not implemented here.
-	 *
-	 * @throws     \BadMethodCallException
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function clearRedirect()
-	{
-		throw new \BadMethodCallException('Redirects are not implemented for SOAP.');
-	}
+    /**
+     * Clear any set redirect information. Not implemented here.
+     *
+     * @throws     \BadMethodCallException
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function clearRedirect()
+    {
+        throw new \BadMethodCallException('Redirects are not implemented for SOAP.');
+    }
 	
-	/**
-	 * @see        Response::isMutable()
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function isContentMutable()
-	{
-		return false;
-	}
+    /**
+     * @see        Response::isMutable()
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function isContentMutable()
+    {
+        return false;
+    }
 	
-	/**
-	 * Clear the content for this Response
-	 *
-	 * @return     bool Whether or not the operation was successful.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function clearContent()
-	{
-		$this->content = null;
-		return true;
-	}
+    /**
+     * Clear the content for this Response
+     *
+     * @return     bool Whether or not the operation was successful.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function clearContent()
+    {
+        $this->content = null;
+        return true;
+    }
 	
-	/**
-	 * Send all response data to the client.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function send(OutputType $outputType = null)
-	{
-		$this->sendSoapHeaders();
-		// don't send content, that's done by returning it from Dispatcher::dispatch(), so SoapServer::handle() deals with the rest
-		// $this->sendContent();
-	}
+    /**
+     * Send all response data to the client.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function send(OutputType $outputType = null)
+    {
+        $this->sendSoapHeaders();
+        // don't send content, that's done by returning it from Dispatcher::dispatch(), so SoapServer::handle() deals with the rest
+        // $this->sendContent();
+    }
 	
-	/**
-	 * Clear all response data.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function clear()
-	{
-		$this->clearContent();
-		$this->clearSoapHeaders();
-	}
+    /**
+     * Clear all response data.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function clear()
+    {
+        $this->clearContent();
+        $this->clearSoapHeaders();
+    }
 	
-	/**
-	 * Clear all SOAP headers from the response.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function clearSoapHeaders()
-	{
-		$this->soapHeaders = array();
-	}
+    /**
+     * Clear all SOAP headers from the response.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function clearSoapHeaders()
+    {
+        $this->soapHeaders = array();
+    }
 	
-	/**
-	 * Send SOAP Headers.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function sendSoapHeaders()
-	{
-		$server = $this->context->getDispatcher()->getSoapServer();
+    /**
+     * Send SOAP Headers.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function sendSoapHeaders()
+    {
+        $server = $this->context->getDispatcher()->getSoapServer();
 		
-		foreach($this->soapHeaders as $soapHeader) {
-			$server->addSoapHeader($soapHeader);
-		}
-	}
+        foreach($this->soapHeaders as $soapHeader) {
+            $server->addSoapHeader($soapHeader);
+        }
+    }
 	
-	/**
-	 * Get an array of all SOAP headers set on this response.
-	 *
-	 * @return     array An array of SoapHeader objects.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getSoapHeaders()
-	{
-		return $this->soapHeaders;
-	}
+    /**
+     * Get an array of all SOAP headers set on this response.
+     *
+     * @return     array An array of SoapHeader objects.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getSoapHeaders()
+    {
+        return $this->soapHeaders;
+    }
 	
-	/**
-	 * Get a SOAP Header from this response based on its namespace and name.
-	 *
-	 * @param      string $namespace The namespace of the SOAP header element.
-	 * @param      string $name The name of the SOAP header element.
-	 *
-	 * @return     \SoapHeader A SoapHeader, if found, otherwise null.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getSoapHeader($namespace, $name)
-	{
-		if(($key = $this->searchSoapHeader($namespace, $name)) !== false) {
-			return $this->soapHeaders[$key];
-		}
-	}
+    /**
+     * Get a SOAP Header from this response based on its namespace and name.
+     *
+     * @param      string $namespace The namespace of the SOAP header element.
+     * @param      string $name The name of the SOAP header element.
+     *
+     * @return     \SoapHeader A SoapHeader, if found, otherwise null.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getSoapHeader($namespace, $name)
+    {
+        if(($key = $this->searchSoapHeader($namespace, $name)) !== false) {
+            return $this->soapHeaders[$key];
+        }
+    }
 	
-	/**
-	 * Add a SOAP Header to this response.
-	 *
-	 * @param      \SoapHeader $soapHeader The SOAP header to set.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function addSoapHeader(\SoapHeader $soapHeader)
-	{
-		$this->removeSoapHeader($soapHeader->namespace, $soapHeader->name);
-		$this->soapHeaders[] = $soapHeader;
-	}
+    /**
+     * Add a SOAP Header to this response.
+     *
+     * @param      \SoapHeader $soapHeader The SOAP header to set.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function addSoapHeader(\SoapHeader $soapHeader)
+    {
+        $this->removeSoapHeader($soapHeader->namespace, $soapHeader->name);
+        $this->soapHeaders[] = $soapHeader;
+    }
 	
-	/**
-	 * Set a SOAP header into this response.
-	 *
-	 * This method has the same signature as PHP's SoapHeader->__construct().
-	 *
-	 * @param      string $namespace The namespace of the SOAP header element.
-	 * @param      string $name The name of the SOAP header element.
-	 * @param      mixed  $data A SOAP header's content. It can be a PHP value or a
-	 *                    SoapVar object.
-	 * @param      bool   $mustUnderstand Value of the mustUnderstand attribute of the SOAP header
-	 *                    element.
-	 * @param      mixed  $actor Value of the actor attribute of the SOAP header element.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function setSoapHeader($namespace, $name, $data = null, $mustUnderstand = false, $actor = null)
-	{
-		if($actor === null) {
-			$h = new \SoapHeader($namespace, $name, $data, $mustUnderstand);
-		} else {
-			$h = new \SoapHeader($namespace, $name, $data, $mustUnderstand, $actor);
-		}
-		$this->addSoapHeader($h);
-	}
+    /**
+     * Set a SOAP header into this response.
+     *
+     * This method has the same signature as PHP's SoapHeader->__construct().
+     *
+     * @param      string $namespace The namespace of the SOAP header element.
+     * @param      string $name The name of the SOAP header element.
+     * @param      mixed  $data A SOAP header's content. It can be a PHP value or a
+     *                    SoapVar object.
+     * @param      bool   $mustUnderstand Value of the mustUnderstand attribute of the SOAP header
+     *                    element.
+     * @param      mixed  $actor Value of the actor attribute of the SOAP header element.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function setSoapHeader($namespace, $name, $data = null, $mustUnderstand = false, $actor = null)
+    {
+        if($actor === null) {
+            $h = new \SoapHeader($namespace, $name, $data, $mustUnderstand);
+        } else {
+            $h = new \SoapHeader($namespace, $name, $data, $mustUnderstand, $actor);
+        }
+        $this->addSoapHeader($h);
+    }
 	
-	/**
-	 * Remove a SOAP Header from this response based on its namespace and name.
-	 *
-	 * @param      string $namespace The namespace of the SOAP header element.
-	 * @param      string $name The name of the SOAP header element.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function removeSoapHeader($namespace, $name)
-	{
-		if(($key = $this->searchSoapHeader($namespace, $name)) !== false) {
-			unset($this->soapHeaders[$key]);
-		}
-	}
+    /**
+     * Remove a SOAP Header from this response based on its namespace and name.
+     *
+     * @param      string $namespace The namespace of the SOAP header element.
+     * @param      string $name The name of the SOAP header element.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function removeSoapHeader($namespace, $name)
+    {
+        if(($key = $this->searchSoapHeader($namespace, $name)) !== false) {
+            unset($this->soapHeaders[$key]);
+        }
+    }
 	
-	/**
-	 * Check if a SOAP Header has been set based on its namespace and name.
-	 *
-	 * @param      string $namespace The namespace of the SOAP header element.
-	 * @param      string $name The name of the SOAP header element.
-	 *
-	 * @return     bool true, if this SOAP header has been set, false otherwise.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function hasSoapHeader($namespace, $name)
-	{
-		return $this->searchSoapHeader($namespace, $name) !== false;
-	}
+    /**
+     * Check if a SOAP Header has been set based on its namespace and name.
+     *
+     * @param      string $namespace The namespace of the SOAP header element.
+     * @param      string $name The name of the SOAP header element.
+     *
+     * @return     bool true, if this SOAP header has been set, false otherwise.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function hasSoapHeader($namespace, $name)
+    {
+        return $this->searchSoapHeader($namespace, $name) !== false;
+    }
 	
-	/**
-	 * Find the key of a SOAP Header based on its namespace and name.
-	 *
-	 * @param      string $namespace The namespace of the SOAP header element.
-	 * @param      string $name The name of the SOAP header element.
-	 *
-	 * @return     int The key of the SOAP header in the array, otherwise false.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	protected function searchSoapHeader($namespace, $name)
-	{
-		foreach($this->soapHeaders as $key => $soapHeader) {
-			if($soapHeader->namespace == $namespace && $soapHeader->name == $name) {
-				return $key;
-			}
-		}
-		return false;
-	}
+    /**
+     * Find the key of a SOAP Header based on its namespace and name.
+     *
+     * @param      string $namespace The namespace of the SOAP header element.
+     * @param      string $name The name of the SOAP header element.
+     *
+     * @return     int The key of the SOAP header in the array, otherwise false.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    protected function searchSoapHeader($namespace, $name)
+    {
+        foreach($this->soapHeaders as $key => $soapHeader) {
+            if($soapHeader->namespace == $namespace && $soapHeader->name == $name) {
+                return $key;
+            }
+        }
+        return false;
+    }
 }
 
 ?>
\ No newline at end of file

src/response/Response.class.php

Indentation +314 added lines, -314 removed lines

@@ -34,351 +34,351 @@
  */
 abstract class Response extends AttributeHolder
 {
-	/**
-	 * @var        Context An Context instance.
-	 */
-	protected $context = null;
+    /**
+     * @var        Context An Context instance.
+     */
+    protected $context = null;
 	
-	/**
-	 * @var        mixed The content to send back to the client.
-	 */
-	protected $content = null;
+    /**
+     * @var        mixed The content to send back to the client.
+     */
+    protected $content = null;
 	
-	/**
-	 * @var        OutputType The output type of this response.
-	 */
-	protected $outputType = null;
+    /**
+     * @var        OutputType The output type of this response.
+     */
+    protected $outputType = null;
 	
-	/**
-	 * Pre-serialization callback.
-	 *
-	 * Will set the name of the context and exclude the instance from serializing.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function __sleep()
-	{
-		$vars = get_object_vars($this);
-		$also = array();
+    /**
+     * Pre-serialization callback.
+     *
+     * Will set the name of the context and exclude the instance from serializing.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function __sleep()
+    {
+        $vars = get_object_vars($this);
+        $also = array();
 		
-		$this->contextName = $this->context->getName();
-		unset($vars['context']);
-		$also[] = 'contextName';
+        $this->contextName = $this->context->getName();
+        unset($vars['context']);
+        $also[] = 'contextName';
 		
-		if($this->outputType) {
-			$this->outputTypeName = $this->outputType->getName();
-			unset($vars['outputType']);
-			$also[] = 'outputTypeName';
-		}
+        if($this->outputType) {
+            $this->outputTypeName = $this->outputType->getName();
+            unset($vars['outputType']);
+            $also[] = 'outputTypeName';
+        }
 		
-		if(is_resource($this->content)) {
-			$this->contentStreamMeta = stream_get_meta_data($this->content);
-			unset($vars['content']);
-			$also[] = 'contentStreamMeta';
-		}
+        if(is_resource($this->content)) {
+            $this->contentStreamMeta = stream_get_meta_data($this->content);
+            unset($vars['content']);
+            $also[] = 'contentStreamMeta';
+        }
 		
-		return array_merge(array_keys($vars), $also);
-	}
+        return array_merge(array_keys($vars), $also);
+    }
 	
-	/**
-	 * Post-unserialization callback.
-	 *
-	 * Will restore the context based on the names set by __sleep.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function __wakeup()
-	{
-		$this->context = Context::getInstance($this->contextName);
-		unset($this->contextName);
+    /**
+     * Post-unserialization callback.
+     *
+     * Will restore the context based on the names set by __sleep.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function __wakeup()
+    {
+        $this->context = Context::getInstance($this->contextName);
+        unset($this->contextName);
 		
-		if(isset($this->outputTypeName)) {
-			$this->outputType = $this->context->getDispatcher()->getOutputType($this->outputTypeName);
-			unset($this->outputTypeName);
-		}
+        if(isset($this->outputTypeName)) {
+            $this->outputType = $this->context->getDispatcher()->getOutputType($this->outputTypeName);
+            unset($this->outputTypeName);
+        }
 		
-		if(isset($this->contentStreamMeta)) {
-			// contrary to what the documentation says, stream_get_meta_data() will not return a list of filters attached to the stream, so we cannot restore these, unfortunately.
-			$this->content = fopen($this->contentStreamMeta['uri'], $this->contentStreamMeta['mode']);
-			unset($this->contentStreamMeta);
-		}
-	}
+        if(isset($this->contentStreamMeta)) {
+            // contrary to what the documentation says, stream_get_meta_data() will not return a list of filters attached to the stream, so we cannot restore these, unfortunately.
+            $this->content = fopen($this->contentStreamMeta['uri'], $this->contentStreamMeta['mode']);
+            unset($this->contentStreamMeta);
+        }
+    }
 	
-	/**
-	 * Retrieve the Context instance this Response object belongs to.
-	 *
-	 * @return     Context An Context instance.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public final function getContext()
-	{
-		return $this->context;
-	}
+    /**
+     * Retrieve the Context instance this Response object belongs to.
+     *
+     * @return     Context An Context instance.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public final function getContext()
+    {
+        return $this->context;
+    }
 	
-	/**
-	 * Initialize this Response.
-	 *
-	 * @param      Context $context    An Context instance.
-	 * @param      array   $parameters An array of initialization parameters.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function initialize(Context $context, array $parameters = array())
-	{
-		$this->context = $context;
-		$this->setParameters($parameters);
-	}
+    /**
+     * Initialize this Response.
+     *
+     * @param      Context $context    An Context instance.
+     * @param      array   $parameters An array of initialization parameters.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function initialize(Context $context, array $parameters = array())
+    {
+        $this->context = $context;
+        $this->setParameters($parameters);
+    }
 	
-	/**
-	 * Get the Output Type to use with this response.
-	 *
-	 * @return     OutputType The Output Type instance associated with.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.1
-	 */
-	public function getOutputType()
-	{
-		return $this->outputType;
-	}
+    /**
+     * Get the Output Type to use with this response.
+     *
+     * @return     OutputType The Output Type instance associated with.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.1
+     */
+    public function getOutputType()
+    {
+        return $this->outputType;
+    }
 	
-	/**
-	 * Set the Output Type to use with this response.
-	 *
-	 * @param      OutputType $outputType The Output Type instance to associate with.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.1
-	 */
-	public function setOutputType(OutputType $outputType)
-	{
-		$this->outputType = $outputType;
-	}
+    /**
+     * Set the Output Type to use with this response.
+     *
+     * @param      OutputType $outputType The Output Type instance to associate with.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.1
+     */
+    public function setOutputType(OutputType $outputType)
+    {
+        $this->outputType = $outputType;
+    }
 	
-	/**
-	 * Clear the Output Type to use with this response.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.1
-	 */
-	public function clearOutputType()
-	{
-		$this->outputType = null;
-	}
+    /**
+     * Clear the Output Type to use with this response.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.1
+     */
+    public function clearOutputType()
+    {
+        $this->outputType = null;
+    }
 	
-	/**
-	 * Retrieve the content set for this Response.
-	 *
-	 * @return     mixed The content set in this Response.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getContent()
-	{
-		return $this->content;
-	}
+    /**
+     * Retrieve the content set for this Response.
+     *
+     * @return     mixed The content set in this Response.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getContent()
+    {
+        return $this->content;
+    }
 	
-	/**
-	 * Check whether or not some content is set.
-	 *
-	 * @return     bool If any content is set, false otherwise.
-	 *
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      0.11.6
-	 */
-	public function hasContent()
-	{
-		return $this->content !== null;
-	}
+    /**
+     * Check whether or not some content is set.
+     *
+     * @return     bool If any content is set, false otherwise.
+     *
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      0.11.6
+     */
+    public function hasContent()
+    {
+        return $this->content !== null;
+    }
 	
-	/**
-	 * Retrieve the size (in bytes) of the content set for this Response.
-	 *
-	 * @return     int The content size in bytes.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getContentSize()
-	{
-		if(is_resource($this->content)) {
-			if(($stat = fstat($this->content)) !== false) {
-				return $stat['size'];
-			} else {
-				return false;
-			}
-		} else {
-			return strlen($this->content);
-		}
-	}
+    /**
+     * Retrieve the size (in bytes) of the content set for this Response.
+     *
+     * @return     int The content size in bytes.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getContentSize()
+    {
+        if(is_resource($this->content)) {
+            if(($stat = fstat($this->content)) !== false) {
+                return $stat['size'];
+            } else {
+                return false;
+            }
+        } else {
+            return strlen($this->content);
+        }
+    }
 	
-	/**
-	 * Set the content for this Response.
-	 *
-	 * @param      mixed $content The content to be sent in this Response.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function setContent($content)
-	{
-		$this->content = $content;
-	}
+    /**
+     * Set the content for this Response.
+     *
+     * @param      mixed $content The content to be sent in this Response.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function setContent($content)
+    {
+        $this->content = $content;
+    }
 	
-	/**
-	 * Prepend content to the existing content for this Response.
-	 *
-	 * @param      mixed $content The content to be prepended to this Response.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function prependContent($content)
-	{
-		$this->setContent($content . $this->getContent());
-	}
+    /**
+     * Prepend content to the existing content for this Response.
+     *
+     * @param      mixed $content The content to be prepended to this Response.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function prependContent($content)
+    {
+        $this->setContent($content . $this->getContent());
+    }
 	
-	/**
-	 * Append content to the existing content for this Response.
-	 *
-	 * @param      mixed $content The content to be appended to this Response.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function appendContent($content)
-	{
-		$this->setContent($this->getContent() . $content);
-	}
+    /**
+     * Append content to the existing content for this Response.
+     *
+     * @param      mixed $content The content to be appended to this Response.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function appendContent($content)
+    {
+        $this->setContent($this->getContent() . $content);
+    }
 	
-	/**
-	 * Clear the content for this Response
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function clearContent()
-	{
-		$this->content = null;
-	}
+    /**
+     * Clear the content for this Response
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function clearContent()
+    {
+        $this->content = null;
+    }
 	
-	/**
-	 * Redirect externally.
-	 *
-	 * @param      mixed $to Where to redirect.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	abstract public function setRedirect($to);
+    /**
+     * Redirect externally.
+     *
+     * @param      mixed $to Where to redirect.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    abstract public function setRedirect($to);
 
-	/**
-	 * Get info about the set redirect.
-	 *
-	 * @return     array An assoc array of redirect info, or null if none set.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	abstract public function getRedirect();
+    /**
+     * Get info about the set redirect.
+     *
+     * @return     array An assoc array of redirect info, or null if none set.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    abstract public function getRedirect();
 
-	/**
-	 * Check if a redirect is set.
-	 *
-	 * @return     bool true, if a redirect is set, otherwise false
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	abstract public function hasRedirect();
+    /**
+     * Check if a redirect is set.
+     *
+     * @return     bool true, if a redirect is set, otherwise false
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    abstract public function hasRedirect();
 
-	/**
-	 * Clear any set redirect information.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	abstract public function clearRedirect();
+    /**
+     * Clear any set redirect information.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    abstract public function clearRedirect();
 
-	/**
-	 * Import response metadata from another response.
-	 *
-	 * @param      Response $otherResponse The other response to import information from.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function merge(Response $otherResponse)
-	{
-		foreach($otherResponse->getAttributeNamespaces() as $namespace) {
-			foreach($otherResponse->getAttributes($namespace) as $name => $value) {
-				if(!$this->hasAttribute($name, $namespace)) {
-					$this->setAttribute($name, $value, $namespace);
-				} elseif(is_array($value)) {
-					$thisAttribute =& $this->getAttribute($name, $namespace);
-					if(is_array($thisAttribute)) {
-						$thisAttribute = array_merge($value, $thisAttribute);
-					}
-				}
-			}
-		}
-	}
+    /**
+     * Import response metadata from another response.
+     *
+     * @param      Response $otherResponse The other response to import information from.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function merge(Response $otherResponse)
+    {
+        foreach($otherResponse->getAttributeNamespaces() as $namespace) {
+            foreach($otherResponse->getAttributes($namespace) as $name => $value) {
+                if(!$this->hasAttribute($name, $namespace)) {
+                    $this->setAttribute($name, $value, $namespace);
+                } elseif(is_array($value)) {
+                    $thisAttribute =& $this->getAttribute($name, $namespace);
+                    if(is_array($thisAttribute)) {
+                        $thisAttribute = array_merge($value, $thisAttribute);
+                    }
+                }
+            }
+        }
+    }
 	
-	/**
-	 * Clear all data for this Response.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	abstract public function clear();
+    /**
+     * Clear all data for this Response.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    abstract public function clear();
 	
-	/**
-	 * Send all response data to the client.
-	 *
-	 * @param      OutputType $outputType An optional Output Type object with information
-	 *                                    the response can use to send additional data.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	abstract public function send(OutputType $outputType = null);
+    /**
+     * Send all response data to the client.
+     *
+     * @param      OutputType $outputType An optional Output Type object with information
+     *                                    the response can use to send additional data.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    abstract public function send(OutputType $outputType = null);
 	
-	/**
-	 * Determine whether the content in the response may be modified by appending
-	 * or prepending data using string operations. Typically false for streams, 
-	 * and for responses like XMLRPC where the content is an array.
-	 *
-	 * @return     bool If the content can be treated as / changed like a string.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function isContentMutable()
-	{
-		return !$this->hasRedirect() && !is_resource($this->content);
-	}
+    /**
+     * Determine whether the content in the response may be modified by appending
+     * or prepending data using string operations. Typically false for streams, 
+     * and for responses like XMLRPC where the content is an array.
+     *
+     * @return     bool If the content can be treated as / changed like a string.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function isContentMutable()
+    {
+        return !$this->hasRedirect() && !is_resource($this->content);
+    }
 	
-	/**
-	 * Send the content for this response
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	protected function sendContent()
-	{
-		if(is_resource($this->content)) {
-			fpassthru($this->content);
-			fclose($this->content);
-		} else {
-			echo $this->content;
-		}
-	}
+    /**
+     * Send the content for this response
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    protected function sendContent()
+    {
+        if(is_resource($this->content)) {
+            fpassthru($this->content);
+            fclose($this->content);
+        } else {
+            echo $this->content;
+        }
+    }
 }
 
 ?>
\ No newline at end of file

src/routing/WebRouting.class.php

Indentation +398 added lines, -398 removed lines

@@ -34,412 +34,412 @@
  */
 class WebRouting extends Routing
 {
-	/**
-	 * @var        string The path to the application's root with trailing slash.
-	 */
-	protected $basePath = '';
-
-	/**
-	 * @var        string The URL to the application's root with trailing slash.
-	 */
-	protected $baseHref = '';
-
-	/**
-	 * @var        array The GET parameters that were passed in the URL.
-	 */
-	protected $inputParameters = array();
-
-	/**
-	 * @var        array arg_separator.input as defined in php.ini, exploded
-	 */
-	protected $argSeparatorInput = array('&');
-
-	/**
-	 * @var        string arg_separator.output as defined in php.ini
-	 */
-	protected $argSeparatorOutput = '&';
-
-	/**
-	 * Constructor.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		$this->defaultGenOptions = array_merge($this->defaultGenOptions, array(
-			// separator, typically &amp; for HTML, & otherwise
-			'separator' => '&amp;',
-			// whether or not to append the SID if necessary
-			'use_trans_sid' => false,
-			// scheme, or true to include, or false to block
-			'scheme' => null,
-			// authority, or true to include, or false to block
-			'authority' => null,
-			// host, or true to include, or false to block
-			'host' => null,
-			// port, or true to include, or false to block
-			'port' => null,
-			// fragment identifier (#foo)
-			'fragment' => null,
-		));
+    /**
+     * @var        string The path to the application's root with trailing slash.
+     */
+    protected $basePath = '';
+
+    /**
+     * @var        string The URL to the application's root with trailing slash.
+     */
+    protected $baseHref = '';
+
+    /**
+     * @var        array The GET parameters that were passed in the URL.
+     */
+    protected $inputParameters = array();
+
+    /**
+     * @var        array arg_separator.input as defined in php.ini, exploded
+     */
+    protected $argSeparatorInput = array('&');
+
+    /**
+     * @var        string arg_separator.output as defined in php.ini
+     */
+    protected $argSeparatorOutput = '&amp;';
+
+    /**
+     * Constructor.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->defaultGenOptions = array_merge($this->defaultGenOptions, array(
+            // separator, typically &amp; for HTML, & otherwise
+            'separator' => '&amp;',
+            // whether or not to append the SID if necessary
+            'use_trans_sid' => false,
+            // scheme, or true to include, or false to block
+            'scheme' => null,
+            // authority, or true to include, or false to block
+            'authority' => null,
+            // host, or true to include, or false to block
+            'host' => null,
+            // port, or true to include, or false to block
+            'port' => null,
+            // fragment identifier (#foo)
+            'fragment' => null,
+        ));
 		
-		$this->argSeparatorInput = str_split(ini_get('arg_separator.input'));
-		$this->argSeparatorOutput = ini_get('arg_separator.output');
-	}
-
-	/**
-	 * Initialize the routing instance.
-	 *
-	 * @param      Context $context The Context.
-	 * @param      array   $parameters An array of initialization parameters.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @author     Veikko Mäkinen <veikko@veikkomakinen.com>
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function initialize(Context $context, array $parameters = array())
-	{
-		parent::initialize($context, $parameters);
-
-		/** @var WebRequest $rq */
-		$rq = $this->context->getRequest();
-
-		/** @var RequestDataHolder $rd */
-		$rd = $rq->getRequestData();
-
-		// 'scheme://authority' is necessary so parse_url doesn't stumble over '://' in the request URI
-		$ru = array_merge(array('path' => '', 'query' => ''), parse_url('scheme://authority' . $rq->getRequestUri()));
-
-		if(isset($_SERVER['QUERY_STRING'])) {
-			$qs = $_SERVER['QUERY_STRING'];
-		} else {
-			$qs = '';
-		}
-
-		// when rewriting, apache strips one (not all) trailing ampersand from the end of QUERY_STRING... normalize:
-		$rewritten = (preg_replace('/&+$/D', '', $qs) !== preg_replace('/&+$/D', '', $ru['query']));
-
-		if($this->isEnabled() && $rewritten) {
-			// strip the one trailing ampersand, see above
-			$queryWasEmptied = false;
-			if($ru['query'] !== '' && isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false) {
-				$ru['query'] = preg_replace('/&$/D', '', $ru['query']);
-				if($ru['query'] == '') {
-					$queryWasEmptied = true;
-				}
-			}
-
-			$stripFromQuery = '&' . $ru['query'];
-			if($ru['query'] == '' && !$queryWasEmptied && isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false) {
-				// if the query is empty, simply give apache2 nothing instead of an "&", since that could kill a real trailing ampersand in the path, as Apache strips those from the query string (which has the rewritten path), but not the request uri
-				$stripFromQuery = '';
-			}
-			$this->input = preg_replace('/' . preg_quote($stripFromQuery, '/') . '$/D', '', $qs);
-
-			if(isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Apache/2') !== false) {
-				$sru = $_SERVER['REQUEST_URI'];
+        $this->argSeparatorInput = str_split(ini_get('arg_separator.input'));
+        $this->argSeparatorOutput = ini_get('arg_separator.output');
+    }
+
+    /**
+     * Initialize the routing instance.
+     *
+     * @param      Context $context The Context.
+     * @param      array   $parameters An array of initialization parameters.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @author     Veikko Mäkinen <veikko@veikkomakinen.com>
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function initialize(Context $context, array $parameters = array())
+    {
+        parent::initialize($context, $parameters);
+
+        /** @var WebRequest $rq */
+        $rq = $this->context->getRequest();
+
+        /** @var RequestDataHolder $rd */
+        $rd = $rq->getRequestData();
+
+        // 'scheme://authority' is necessary so parse_url doesn't stumble over '://' in the request URI
+        $ru = array_merge(array('path' => '', 'query' => ''), parse_url('scheme://authority' . $rq->getRequestUri()));
+
+        if(isset($_SERVER['QUERY_STRING'])) {
+            $qs = $_SERVER['QUERY_STRING'];
+        } else {
+            $qs = '';
+        }
+
+        // when rewriting, apache strips one (not all) trailing ampersand from the end of QUERY_STRING... normalize:
+        $rewritten = (preg_replace('/&+$/D', '', $qs) !== preg_replace('/&+$/D', '', $ru['query']));
+
+        if($this->isEnabled() && $rewritten) {
+            // strip the one trailing ampersand, see above
+            $queryWasEmptied = false;
+            if($ru['query'] !== '' && isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false) {
+                $ru['query'] = preg_replace('/&$/D', '', $ru['query']);
+                if($ru['query'] == '') {
+                    $queryWasEmptied = true;
+                }
+            }
+
+            $stripFromQuery = '&' . $ru['query'];
+            if($ru['query'] == '' && !$queryWasEmptied && isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false) {
+                // if the query is empty, simply give apache2 nothing instead of an "&", since that could kill a real trailing ampersand in the path, as Apache strips those from the query string (which has the rewritten path), but not the request uri
+                $stripFromQuery = '';
+            }
+            $this->input = preg_replace('/' . preg_quote($stripFromQuery, '/') . '$/D', '', $qs);
+
+            if(isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Apache/2') !== false) {
+                $sru = $_SERVER['REQUEST_URI'];
 				
-				if(($fqmp = strpos($sru, '?')) !== false && ($fqmp == strlen($sru)-1)) {
-					// strip a trailing question mark, but only if it really is the query string separator (i.e. the only question mark in the URI)
-					$sru = substr($sru, 0, -1);
-				} elseif($ru['query'] !== '' || $queryWasEmptied) {
-					// if there is a trailing ampersand (in query string or path, whatever ends the URL), strip it (but just one)
-					$sru = preg_replace('/&$/D', '', $sru);
-				}
+                if(($fqmp = strpos($sru, '?')) !== false && ($fqmp == strlen($sru)-1)) {
+                    // strip a trailing question mark, but only if it really is the query string separator (i.e. the only question mark in the URI)
+                    $sru = substr($sru, 0, -1);
+                } elseif($ru['query'] !== '' || $queryWasEmptied) {
+                    // if there is a trailing ampersand (in query string or path, whatever ends the URL), strip it (but just one)
+                    $sru = preg_replace('/&$/D', '', $sru);
+                }
 				
-				// multiple consecutive slashes got lost in our input thanks to an apache bug
-				// let's fix that
-				$cqs = preg_replace('#/{2,}#', '/', rawurldecode($ru['query']));
-				$cru = preg_replace('#/{2,}#', '/', rawurldecode($sru));
-				$tmp = preg_replace('/' . preg_quote($this->input . (($cqs != '' || $queryWasEmptied) ? '?' . $cqs : ''), '/') . '$/D', '', $cru);
-				$input = preg_replace('/^' . preg_quote($tmp, '/') . '/', '', $sru);
-				if($ru['query'] !== '' || $queryWasEmptied) {
-					$input = preg_replace('/' . preg_quote('?' . $ru['query'], '/') . '$/D', '', $input);
-				}
-				$this->input = $input;
-			}
-
-			if(!(isset($_SERVER['SERVER_SOFTWARE']) && (strpos($_SERVER['SERVER_SOFTWARE'], 'Apache/1') !== false || (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false && isset($_SERVER['UNENCODED_URL']))))) {
-				// don't do that for Apache 1 or IIS 7 with URL Rewrite Module, it's already rawurldecode()d there
-				$this->input = rawurldecode($this->input);
-			}
-
-			$this->basePath = $this->prefix = preg_replace('/' . preg_quote($this->input, '/') . '$/D', '', rawurldecode($ru['path']));
-
-			// that was easy. now clean up $_GET and the Request
-			$parsedRuQuery = $parsedInput = '';
-			parse_str($ru['query'], $parsedRuQuery);
-			parse_str($this->input, $parsedInput);
-			if(get_magic_quotes_gpc()) {
-				$parsedRuQuery = WebRequest::clearMagicQuotes($parsedRuQuery);
-				$parsedInput = WebRequest::clearMagicQuotes($parsedInput, false /* start on the first level */);
-			}
-			foreach(array_diff(array_keys($parsedInput), array_keys($parsedRuQuery)) as $unset) {
-				// our element is in $_GET
-				unset($_GET[$unset]);
-				unset($GLOBALS['HTTP_GET_VARS'][$unset]);
-				// if it is not also in $_POST, then we need to remove it from the request params
-				if(!isset($_POST[$unset])) {
-					$rd->removeParameter($unset);
-					// and from $_REQUEST, too!
-					unset($_REQUEST[$unset]);
-				}
-			}
-		} else {
-			$sn = $_SERVER['SCRIPT_NAME'];
-			$path = rawurldecode($ru['path']);
-
-			$appendFrom = 0;
-			$this->prefix = Toolkit::stringBase($sn, $path, $appendFrom);
-			$this->prefix .= substr($sn, $appendFrom);
-
-			$this->input = substr($path, $appendFrom);
-			if(!isset($_SERVER['SERVER_SOFTWARE']) || strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') === false || isset($_SERVER['HTTP_X_REWRITE_URL']) || !isset($_SERVER['GATEWAY_INTERFACE']) || strpos($_SERVER['GATEWAY_INTERFACE'], 'CGI') === false) {
-				// don't do that for IIS-CGI, it's already rawurldecode()d there
-				$this->input = rawurldecode($this->input);
-			}
-
-			$this->basePath = str_replace('\\', '/', dirname($this->prefix));
-		}
-
-		$this->inputParameters = $_GET;
-
-		if(!$this->input) {
-			$this->input = "/";
-		}
-
-		if(substr($this->basePath, -1, 1) != '/') {
-			$this->basePath .= '/';
-		}
-
-		$this->baseHref = $rq->getUrlScheme() . '://' . $rq->getUrlAuthority() . $this->basePath;
-	}
-
-	/**
-	 * Retrieve the base path where the application's root sits
-	 *
-	 * @return     string A path string, including a trailing slash.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getBasePath()
-	{
-		return $this->basePath;
-	}
-
-	/**
-	 * Retrieve the full URL to the application's root.
-	 *
-	 * @return     string A URL string, including the protocol, the server port
-	  *                   (if necessary) and the path including a trailing slash.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getBaseHref()
-	{
-		return $this->baseHref;
-	}
+                // multiple consecutive slashes got lost in our input thanks to an apache bug
+                // let's fix that
+                $cqs = preg_replace('#/{2,}#', '/', rawurldecode($ru['query']));
+                $cru = preg_replace('#/{2,}#', '/', rawurldecode($sru));
+                $tmp = preg_replace('/' . preg_quote($this->input . (($cqs != '' || $queryWasEmptied) ? '?' . $cqs : ''), '/') . '$/D', '', $cru);
+                $input = preg_replace('/^' . preg_quote($tmp, '/') . '/', '', $sru);
+                if($ru['query'] !== '' || $queryWasEmptied) {
+                    $input = preg_replace('/' . preg_quote('?' . $ru['query'], '/') . '$/D', '', $input);
+                }
+                $this->input = $input;
+            }
+
+            if(!(isset($_SERVER['SERVER_SOFTWARE']) && (strpos($_SERVER['SERVER_SOFTWARE'], 'Apache/1') !== false || (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false && isset($_SERVER['UNENCODED_URL']))))) {
+                // don't do that for Apache 1 or IIS 7 with URL Rewrite Module, it's already rawurldecode()d there
+                $this->input = rawurldecode($this->input);
+            }
+
+            $this->basePath = $this->prefix = preg_replace('/' . preg_quote($this->input, '/') . '$/D', '', rawurldecode($ru['path']));
+
+            // that was easy. now clean up $_GET and the Request
+            $parsedRuQuery = $parsedInput = '';
+            parse_str($ru['query'], $parsedRuQuery);
+            parse_str($this->input, $parsedInput);
+            if(get_magic_quotes_gpc()) {
+                $parsedRuQuery = WebRequest::clearMagicQuotes($parsedRuQuery);
+                $parsedInput = WebRequest::clearMagicQuotes($parsedInput, false /* start on the first level */);
+            }
+            foreach(array_diff(array_keys($parsedInput), array_keys($parsedRuQuery)) as $unset) {
+                // our element is in $_GET
+                unset($_GET[$unset]);
+                unset($GLOBALS['HTTP_GET_VARS'][$unset]);
+                // if it is not also in $_POST, then we need to remove it from the request params
+                if(!isset($_POST[$unset])) {
+                    $rd->removeParameter($unset);
+                    // and from $_REQUEST, too!
+                    unset($_REQUEST[$unset]);
+                }
+            }
+        } else {
+            $sn = $_SERVER['SCRIPT_NAME'];
+            $path = rawurldecode($ru['path']);
+
+            $appendFrom = 0;
+            $this->prefix = Toolkit::stringBase($sn, $path, $appendFrom);
+            $this->prefix .= substr($sn, $appendFrom);
+
+            $this->input = substr($path, $appendFrom);
+            if(!isset($_SERVER['SERVER_SOFTWARE']) || strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') === false || isset($_SERVER['HTTP_X_REWRITE_URL']) || !isset($_SERVER['GATEWAY_INTERFACE']) || strpos($_SERVER['GATEWAY_INTERFACE'], 'CGI') === false) {
+                // don't do that for IIS-CGI, it's already rawurldecode()d there
+                $this->input = rawurldecode($this->input);
+            }
+
+            $this->basePath = str_replace('\\', '/', dirname($this->prefix));
+        }
+
+        $this->inputParameters = $_GET;
+
+        if(!$this->input) {
+            $this->input = "/";
+        }
+
+        if(substr($this->basePath, -1, 1) != '/') {
+            $this->basePath .= '/';
+        }
+
+        $this->baseHref = $rq->getUrlScheme() . '://' . $rq->getUrlAuthority() . $this->basePath;
+    }
+
+    /**
+     * Retrieve the base path where the application's root sits
+     *
+     * @return     string A path string, including a trailing slash.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getBasePath()
+    {
+        return $this->basePath;
+    }
+
+    /**
+     * Retrieve the full URL to the application's root.
+     *
+     * @return     string A URL string, including the protocol, the server port
+     *                   (if necessary) and the path including a trailing slash.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getBaseHref()
+    {
+        return $this->baseHref;
+    }
 	
-	/**
-	 * Generate a formatted Agavi URL.
-	 *
-	 * @param      string $route A route name.
-	 * @param      array  $params An associative array of parameters.
-	 * @param      mixed  $options An array of options, or the name of an options preset.
-	 *
-	 * @return     string The generated URL.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function gen($route, array $params = array(), $options = array())
-	{
-		/** @var WebRequest $req */
-		$req = $this->context->getRequest();
-
-		if(substr($route, -1) == '*') {
-			$options['refill_all_parameters'] = true;
-			$route = substr($route, 0, -1);
-		}
-
-		$options = $this->resolveGenOptions($options);
-
-		$aso = $this->argSeparatorOutput;
-		if($options['separator'] != $aso) {
-			$aso = $options['separator'];
-		}
-
-		if($options['use_trans_sid'] === true && defined('SID') && SID !== '') {
-			$params = array_merge($params, array(session_name() => session_id()));
-		}
-
-		if($route === null && empty($params)) {
-			$retval = $req->getRequestUri();
-			$retval = str_replace(array('[', ']', '\''), array('%5B', '%5D', '%27'), $retval);
-			// much quicker than str_replace($this->argSeparatorInput, array_fill(0, count($this->argSeparatorInput), $aso), $retval)
-			foreach($this->argSeparatorInput as $char) {
-				$retval = str_replace($char, $aso, $retval);
-			}
-		} else {
-			if($this->isEnabled()) {
-				// the route exists and routing is enabled, the parent method handles it
-
-				$append = '';
-
-				list($path, $usedParams, $options, $extraParams, $isNullRoute) = parent::gen($route, $params, $options);
+    /**
+     * Generate a formatted Agavi URL.
+     *
+     * @param      string $route A route name.
+     * @param      array  $params An associative array of parameters.
+     * @param      mixed  $options An array of options, or the name of an options preset.
+     *
+     * @return     string The generated URL.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function gen($route, array $params = array(), $options = array())
+    {
+        /** @var WebRequest $req */
+        $req = $this->context->getRequest();
+
+        if(substr($route, -1) == '*') {
+            $options['refill_all_parameters'] = true;
+            $route = substr($route, 0, -1);
+        }
+
+        $options = $this->resolveGenOptions($options);
+
+        $aso = $this->argSeparatorOutput;
+        if($options['separator'] != $aso) {
+            $aso = $options['separator'];
+        }
+
+        if($options['use_trans_sid'] === true && defined('SID') && SID !== '') {
+            $params = array_merge($params, array(session_name() => session_id()));
+        }
+
+        if($route === null && empty($params)) {
+            $retval = $req->getRequestUri();
+            $retval = str_replace(array('[', ']', '\''), array('%5B', '%5D', '%27'), $retval);
+            // much quicker than str_replace($this->argSeparatorInput, array_fill(0, count($this->argSeparatorInput), $aso), $retval)
+            foreach($this->argSeparatorInput as $char) {
+                $retval = str_replace($char, $aso, $retval);
+            }
+        } else {
+            if($this->isEnabled()) {
+                // the route exists and routing is enabled, the parent method handles it
+
+                $append = '';
+
+                list($path, $usedParams, $options, $extraParams, $isNullRoute) = parent::gen($route, $params, $options);
 				
-				if($isNullRoute) {
-					// add the incoming parameters from the request uri for gen(null) and friends
-					$extraParams = array_merge($this->inputParameters, $extraParams);
-				}
-				if(count($extraParams) > 0) {
-					$append = http_build_query($extraParams, '', $aso);
-					if($append !== '') {
-					  $append = '?' . $append;
-					}
-				}
-			} else {
-				// the route exists, but we must create a normal index.php?foo=bar URL.
-
-				$isNullRoute = false;
-				$routes = $this->getAffectedRoutes($route, $isNullRoute);
-				if($isNullRoute) {
-					$params = array_merge($this->inputParameters, $params);
-				}
-				if(count($routes) == 0) {
-					$path = $route;
-				}
-
-				// we collect the default parameters from the route and make sure
-				// new parameters don't overwrite already defined parameters
-				$defaults = array();
-
-				$ma = $req->getParameter('module_accessor');
-				$aa = $req->getParameter('controller_accessor');
-
-				foreach($routes as $route) {
-					if(isset($this->routes[$route])) {
-						$r = $this->routes[$route];
-						$myDefaults = array();
-
-						foreach($r['opt']['defaults'] as $key => $default) {
-							$myDefaults[$key] = $default->getValue();
-						}
-						if($r['opt']['module']) {
-							$myDefaults[$ma] = $r['opt']['module'];
-						}
-						if($r['opt']['controller']) {
-							$myDefaults[$aa] = $r['opt']['controller'];
-						}
-
-						$defaults = array_merge($myDefaults, $defaults);
-					}
-				}
-
-				$params = array_merge($defaults, $params);
-			}
+                if($isNullRoute) {
+                    // add the incoming parameters from the request uri for gen(null) and friends
+                    $extraParams = array_merge($this->inputParameters, $extraParams);
+                }
+                if(count($extraParams) > 0) {
+                    $append = http_build_query($extraParams, '', $aso);
+                    if($append !== '') {
+                        $append = '?' . $append;
+                    }
+                }
+            } else {
+                // the route exists, but we must create a normal index.php?foo=bar URL.
+
+                $isNullRoute = false;
+                $routes = $this->getAffectedRoutes($route, $isNullRoute);
+                if($isNullRoute) {
+                    $params = array_merge($this->inputParameters, $params);
+                }
+                if(count($routes) == 0) {
+                    $path = $route;
+                }
+
+                // we collect the default parameters from the route and make sure
+                // new parameters don't overwrite already defined parameters
+                $defaults = array();
+
+                $ma = $req->getParameter('module_accessor');
+                $aa = $req->getParameter('controller_accessor');
+
+                foreach($routes as $route) {
+                    if(isset($this->routes[$route])) {
+                        $r = $this->routes[$route];
+                        $myDefaults = array();
+
+                        foreach($r['opt']['defaults'] as $key => $default) {
+                            $myDefaults[$key] = $default->getValue();
+                        }
+                        if($r['opt']['module']) {
+                            $myDefaults[$ma] = $r['opt']['module'];
+                        }
+                        if($r['opt']['controller']) {
+                            $myDefaults[$aa] = $r['opt']['controller'];
+                        }
+
+                        $defaults = array_merge($myDefaults, $defaults);
+                    }
+                }
+
+                $params = array_merge($defaults, $params);
+            }
 			
-			if(!isset($path)) {
-				// the route does not exist. we generate a normal index.php?foo=bar URL.
-				$path = $_SERVER['SCRIPT_NAME'];
-			}
+            if(!isset($path)) {
+                // the route does not exist. we generate a normal index.php?foo=bar URL.
+                $path = $_SERVER['SCRIPT_NAME'];
+            }
 			
-			if(!isset($path)) {
-				// routing was off; the name of the route is the input
-			}
-			if(!isset($append)) {
-				$append = '?' . http_build_query($params, '', $aso);
-			}
-
-			$retval = $path . $append;
-		}
-
-		if(
-			!$options['relative'] ||
-			($options['relative'] && (
-				$options['scheme'] !== null ||
-				$options['authority'] !== null ||
-				$options['host'] !== null ||
-				$options['port'] !== null
-			))
-		) {
-			$scheme = false;
-			if($options['scheme'] !== false) {
-				$scheme = ($options['scheme'] === null ? $req->getUrlScheme() : $options['scheme']);
-			}
-
-			$authority = '';
-
-			if($options['authority'] === null) {
-				if($options['host'] !== null && $options['host'] !== false) {
-					$authority = $options['host'];
-				} elseif($options['host'] === false) {
-					$authority = '';
-				} else {
-					$authority = $req->getUrlHost();
-				}
-				$port = null;
-				if($options['port'] !== null && $options['port'] !== false) {
-					if(Toolkit::isPortNecessary($options['scheme'] !== null && $options['scheme'] !== false ? $options['scheme'] : $req->getUrlScheme(), $options['port'])) {
-						$port = $options['port'];
-					} else {
-						$port = null;
-					}
-				} elseif($options['port'] === false) {
-					$port = null;
-				} elseif($options['scheme'] === null) {
-					if(!Toolkit::isPortNecessary($req->getUrlScheme(), $port = $req->getUrlPort())) {
-						$port = null;
-					}
-				}
-				if($port !== null) {
-					$authority .= ':' . $port;
-				}
-			} elseif($options['authority'] !== false) {
-				$authority = $options['authority'];
-			}
-
-			if($scheme === false) {
-				// nothing at all, e.g. when displaying a URL without the "http://" prefix
-				$scheme = '';
-			} elseif(trim($scheme) === '') {
-				// a protocol-relative URL (see #1224)
-				$scheme = '//';
-			} else {
-				// given scheme plus "://"
-				$scheme = $scheme . '://';
-			}
+            if(!isset($path)) {
+                // routing was off; the name of the route is the input
+            }
+            if(!isset($append)) {
+                $append = '?' . http_build_query($params, '', $aso);
+            }
+
+            $retval = $path . $append;
+        }
+
+        if(
+            !$options['relative'] ||
+            ($options['relative'] && (
+                $options['scheme'] !== null ||
+                $options['authority'] !== null ||
+                $options['host'] !== null ||
+                $options['port'] !== null
+            ))
+        ) {
+            $scheme = false;
+            if($options['scheme'] !== false) {
+                $scheme = ($options['scheme'] === null ? $req->getUrlScheme() : $options['scheme']);
+            }
+
+            $authority = '';
+
+            if($options['authority'] === null) {
+                if($options['host'] !== null && $options['host'] !== false) {
+                    $authority = $options['host'];
+                } elseif($options['host'] === false) {
+                    $authority = '';
+                } else {
+                    $authority = $req->getUrlHost();
+                }
+                $port = null;
+                if($options['port'] !== null && $options['port'] !== false) {
+                    if(Toolkit::isPortNecessary($options['scheme'] !== null && $options['scheme'] !== false ? $options['scheme'] : $req->getUrlScheme(), $options['port'])) {
+                        $port = $options['port'];
+                    } else {
+                        $port = null;
+                    }
+                } elseif($options['port'] === false) {
+                    $port = null;
+                } elseif($options['scheme'] === null) {
+                    if(!Toolkit::isPortNecessary($req->getUrlScheme(), $port = $req->getUrlPort())) {
+                        $port = null;
+                    }
+                }
+                if($port !== null) {
+                    $authority .= ':' . $port;
+                }
+            } elseif($options['authority'] !== false) {
+                $authority = $options['authority'];
+            }
+
+            if($scheme === false) {
+                // nothing at all, e.g. when displaying a URL without the "http://" prefix
+                $scheme = '';
+            } elseif(trim($scheme) === '') {
+                // a protocol-relative URL (see #1224)
+                $scheme = '//';
+            } else {
+                // given scheme plus "://"
+                $scheme = $scheme . '://';
+            }
 			
-			$retval = $scheme . $authority . $retval;
-		}
-
-		if($options['fragment'] !== null) {
-			$retval .= '#' . $options['fragment'];
-		}
-
-		return $retval;
-	}
-
-	/**
-	 * Escapes an argument to be used in an generated route.
-	 *
-	 * @param      string $string The argument to be escaped.
-	 *
-	 * @return     string The escaped argument.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function escapeOutputParameter($string)
-	{
-		return rawurlencode($string);
-	}
+            $retval = $scheme . $authority . $retval;
+        }
+
+        if($options['fragment'] !== null) {
+            $retval .= '#' . $options['fragment'];
+        }
+
+        return $retval;
+    }
+
+    /**
+     * Escapes an argument to be used in an generated route.
+     *
+     * @param      string $string The argument to be escaped.
+     *
+     * @return     string The escaped argument.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function escapeOutputParameter($string)
+    {
+        return rawurlencode($string);
+    }
 
 }
 

Spacing +50 added lines, -50 removed lines

@@ -114,7 +114,7 @@ 
 		// 'scheme://authority' is necessary so parse_url doesn't stumble over '://' in the request URI
 		$ru = array_merge(array('path' => '', 'query' => ''), parse_url('scheme://authority' . $rq->getRequestUri()));
 
-		if(isset($_SERVER['QUERY_STRING'])) {
+		if (isset($_SERVER['QUERY_STRING'])) {
 			$qs = $_SERVER['QUERY_STRING'];
 		} else {
 			$qs = '';
@@ -123,30 +123,30 @@ 
 		// when rewriting, apache strips one (not all) trailing ampersand from the end of QUERY_STRING... normalize:
 		$rewritten = (preg_replace('/&+$/D', '', $qs) !== preg_replace('/&+$/D', '', $ru['query']));
 
-		if($this->isEnabled() && $rewritten) {
+		if ($this->isEnabled() && $rewritten) {
 			// strip the one trailing ampersand, see above
 			$queryWasEmptied = false;
-			if($ru['query'] !== '' && isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false) {
+			if ($ru['query'] !== '' && isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false) {
 				$ru['query'] = preg_replace('/&$/D', '', $ru['query']);
-				if($ru['query'] == '') {
+				if ($ru['query'] == '') {
 					$queryWasEmptied = true;
 				}
 			}
 
 			$stripFromQuery = '&' . $ru['query'];
-			if($ru['query'] == '' && !$queryWasEmptied && isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false) {
+			if ($ru['query'] == '' && !$queryWasEmptied && isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false) {
 				// if the query is empty, simply give apache2 nothing instead of an "&", since that could kill a real trailing ampersand in the path, as Apache strips those from the query string (which has the rewritten path), but not the request uri
 				$stripFromQuery = '';
 			}
 			$this->input = preg_replace('/' . preg_quote($stripFromQuery, '/') . '$/D', '', $qs);
 
-			if(isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Apache/2') !== false) {
+			if (isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Apache/2') !== false) {
 				$sru = $_SERVER['REQUEST_URI'];
 				
-				if(($fqmp = strpos($sru, '?')) !== false && ($fqmp == strlen($sru)-1)) {
+				if (($fqmp = strpos($sru, '?')) !== false && ($fqmp == strlen($sru) - 1)) {
 					// strip a trailing question mark, but only if it really is the query string separator (i.e. the only question mark in the URI)
 					$sru = substr($sru, 0, -1);
-				} elseif($ru['query'] !== '' || $queryWasEmptied) {
+				} elseif ($ru['query'] !== '' || $queryWasEmptied) {
 					// if there is a trailing ampersand (in query string or path, whatever ends the URL), strip it (but just one)
 					$sru = preg_replace('/&$/D', '', $sru);
 				}
@@ -157,13 +157,13 @@ 
 				$cru = preg_replace('#/{2,}#', '/', rawurldecode($sru));
 				$tmp = preg_replace('/' . preg_quote($this->input . (($cqs != '' || $queryWasEmptied) ? '?' . $cqs : ''), '/') . '$/D', '', $cru);
 				$input = preg_replace('/^' . preg_quote($tmp, '/') . '/', '', $sru);
-				if($ru['query'] !== '' || $queryWasEmptied) {
+				if ($ru['query'] !== '' || $queryWasEmptied) {
 					$input = preg_replace('/' . preg_quote('?' . $ru['query'], '/') . '$/D', '', $input);
 				}
 				$this->input = $input;
 			}
 
-			if(!(isset($_SERVER['SERVER_SOFTWARE']) && (strpos($_SERVER['SERVER_SOFTWARE'], 'Apache/1') !== false || (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false && isset($_SERVER['UNENCODED_URL']))))) {
+			if (!(isset($_SERVER['SERVER_SOFTWARE']) && (strpos($_SERVER['SERVER_SOFTWARE'], 'Apache/1') !== false || (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false && isset($_SERVER['UNENCODED_URL']))))) {
 				// don't do that for Apache 1 or IIS 7 with URL Rewrite Module, it's already rawurldecode()d there
 				$this->input = rawurldecode($this->input);
 			}
@@ -174,16 +174,16 @@ 
 			$parsedRuQuery = $parsedInput = '';
 			parse_str($ru['query'], $parsedRuQuery);
 			parse_str($this->input, $parsedInput);
-			if(get_magic_quotes_gpc()) {
+			if (get_magic_quotes_gpc()) {
 				$parsedRuQuery = WebRequest::clearMagicQuotes($parsedRuQuery);
 				$parsedInput = WebRequest::clearMagicQuotes($parsedInput, false /* start on the first level */);
 			}
-			foreach(array_diff(array_keys($parsedInput), array_keys($parsedRuQuery)) as $unset) {
+			foreach (array_diff(array_keys($parsedInput), array_keys($parsedRuQuery)) as $unset) {
 				// our element is in $_GET
 				unset($_GET[$unset]);
 				unset($GLOBALS['HTTP_GET_VARS'][$unset]);
 				// if it is not also in $_POST, then we need to remove it from the request params
-				if(!isset($_POST[$unset])) {
+				if (!isset($_POST[$unset])) {
 					$rd->removeParameter($unset);
 					// and from $_REQUEST, too!
 					unset($_REQUEST[$unset]);
@@ -198,7 +198,7 @@ 
 			$this->prefix .= substr($sn, $appendFrom);
 
 			$this->input = substr($path, $appendFrom);
-			if(!isset($_SERVER['SERVER_SOFTWARE']) || strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') === false || isset($_SERVER['HTTP_X_REWRITE_URL']) || !isset($_SERVER['GATEWAY_INTERFACE']) || strpos($_SERVER['GATEWAY_INTERFACE'], 'CGI') === false) {
+			if (!isset($_SERVER['SERVER_SOFTWARE']) || strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') === false || isset($_SERVER['HTTP_X_REWRITE_URL']) || !isset($_SERVER['GATEWAY_INTERFACE']) || strpos($_SERVER['GATEWAY_INTERFACE'], 'CGI') === false) {
 				// don't do that for IIS-CGI, it's already rawurldecode()d there
 				$this->input = rawurldecode($this->input);
 			}
@@ -208,11 +208,11 @@ 
 
 		$this->inputParameters = $_GET;
 
-		if(!$this->input) {
+		if (!$this->input) {
 			$this->input = "/";
 		}
 
-		if(substr($this->basePath, -1, 1) != '/') {
+		if (substr($this->basePath, -1, 1) != '/') {
 			$this->basePath .= '/';
 		}
 
@@ -263,7 +263,7 @@ 
 		/** @var WebRequest $req */
 		$req = $this->context->getRequest();
 
-		if(substr($route, -1) == '*') {
+		if (substr($route, -1) == '*') {
 			$options['refill_all_parameters'] = true;
 			$route = substr($route, 0, -1);
 		}
@@ -271,36 +271,36 @@ 
 		$options = $this->resolveGenOptions($options);
 
 		$aso = $this->argSeparatorOutput;
-		if($options['separator'] != $aso) {
+		if ($options['separator'] != $aso) {
 			$aso = $options['separator'];
 		}
 
-		if($options['use_trans_sid'] === true && defined('SID') && SID !== '') {
+		if ($options['use_trans_sid'] === true && defined('SID') && SID !== '') {
 			$params = array_merge($params, array(session_name() => session_id()));
 		}
 
-		if($route === null && empty($params)) {
+		if ($route === null && empty($params)) {
 			$retval = $req->getRequestUri();
 			$retval = str_replace(array('[', ']', '\''), array('%5B', '%5D', '%27'), $retval);
 			// much quicker than str_replace($this->argSeparatorInput, array_fill(0, count($this->argSeparatorInput), $aso), $retval)
-			foreach($this->argSeparatorInput as $char) {
+			foreach ($this->argSeparatorInput as $char) {
 				$retval = str_replace($char, $aso, $retval);
 			}
 		} else {
-			if($this->isEnabled()) {
+			if ($this->isEnabled()) {
 				// the route exists and routing is enabled, the parent method handles it
 
 				$append = '';
 
 				list($path, $usedParams, $options, $extraParams, $isNullRoute) = parent::gen($route, $params, $options);
 				
-				if($isNullRoute) {
+				if ($isNullRoute) {
 					// add the incoming parameters from the request uri for gen(null) and friends
 					$extraParams = array_merge($this->inputParameters, $extraParams);
 				}
-				if(count($extraParams) > 0) {
+				if (count($extraParams) > 0) {
 					$append = http_build_query($extraParams, '', $aso);
-					if($append !== '') {
+					if ($append !== '') {
 					  $append = '?' . $append;
 					}
 				}
@@ -309,10 +309,10 @@ 
 
 				$isNullRoute = false;
 				$routes = $this->getAffectedRoutes($route, $isNullRoute);
-				if($isNullRoute) {
+				if ($isNullRoute) {
 					$params = array_merge($this->inputParameters, $params);
 				}
-				if(count($routes) == 0) {
+				if (count($routes) == 0) {
 					$path = $route;
 				}
 
@@ -323,18 +323,18 @@ 
 				$ma = $req->getParameter('module_accessor');
 				$aa = $req->getParameter('controller_accessor');
 
-				foreach($routes as $route) {
-					if(isset($this->routes[$route])) {
+				foreach ($routes as $route) {
+					if (isset($this->routes[$route])) {
 						$r = $this->routes[$route];
 						$myDefaults = array();
 
-						foreach($r['opt']['defaults'] as $key => $default) {
+						foreach ($r['opt']['defaults'] as $key => $default) {
 							$myDefaults[$key] = $default->getValue();
 						}
-						if($r['opt']['module']) {
+						if ($r['opt']['module']) {
 							$myDefaults[$ma] = $r['opt']['module'];
 						}
-						if($r['opt']['controller']) {
+						if ($r['opt']['controller']) {
 							$myDefaults[$aa] = $r['opt']['controller'];
 						}
 
@@ -345,22 +345,22 @@ 
 				$params = array_merge($defaults, $params);
 			}
 			
-			if(!isset($path)) {
+			if (!isset($path)) {
 				// the route does not exist. we generate a normal index.php?foo=bar URL.
 				$path = $_SERVER['SCRIPT_NAME'];
 			}
 			
-			if(!isset($path)) {
+			if (!isset($path)) {
 				// routing was off; the name of the route is the input
 			}
-			if(!isset($append)) {
+			if (!isset($append)) {
 				$append = '?' . http_build_query($params, '', $aso);
 			}
 
 			$retval = $path . $append;
 		}
 
-		if(
+		if (
 			!$options['relative'] ||
 			($options['relative'] && (
 				$options['scheme'] !== null ||
@@ -370,45 +370,45 @@ 
 			))
 		) {
 			$scheme = false;
-			if($options['scheme'] !== false) {
+			if ($options['scheme'] !== false) {
 				$scheme = ($options['scheme'] === null ? $req->getUrlScheme() : $options['scheme']);
 			}
 
 			$authority = '';
 
-			if($options['authority'] === null) {
-				if($options['host'] !== null && $options['host'] !== false) {
+			if ($options['authority'] === null) {
+				if ($options['host'] !== null && $options['host'] !== false) {
 					$authority = $options['host'];
-				} elseif($options['host'] === false) {
+				} elseif ($options['host'] === false) {
 					$authority = '';
 				} else {
 					$authority = $req->getUrlHost();
 				}
 				$port = null;
-				if($options['port'] !== null && $options['port'] !== false) {
-					if(Toolkit::isPortNecessary($options['scheme'] !== null && $options['scheme'] !== false ? $options['scheme'] : $req->getUrlScheme(), $options['port'])) {
+				if ($options['port'] !== null && $options['port'] !== false) {
+					if (Toolkit::isPortNecessary($options['scheme'] !== null && $options['scheme'] !== false ? $options['scheme'] : $req->getUrlScheme(), $options['port'])) {
 						$port = $options['port'];
 					} else {
 						$port = null;
 					}
-				} elseif($options['port'] === false) {
+				} elseif ($options['port'] === false) {
 					$port = null;
-				} elseif($options['scheme'] === null) {
-					if(!Toolkit::isPortNecessary($req->getUrlScheme(), $port = $req->getUrlPort())) {
+				} elseif ($options['scheme'] === null) {
+					if (!Toolkit::isPortNecessary($req->getUrlScheme(), $port = $req->getUrlPort())) {
 						$port = null;
 					}
 				}
-				if($port !== null) {
+				if ($port !== null) {
 					$authority .= ':' . $port;
 				}
-			} elseif($options['authority'] !== false) {
+			} elseif ($options['authority'] !== false) {
 				$authority = $options['authority'];
 			}
 
-			if($scheme === false) {
+			if ($scheme === false) {
 				// nothing at all, e.g. when displaying a URL without the "http://" prefix
 				$scheme = '';
-			} elseif(trim($scheme) === '') {
+			} elseif (trim($scheme) === '') {
 				// a protocol-relative URL (see #1224)
 				$scheme = '//';
 			} else {
@@ -419,7 +419,7 @@ 
 			$retval = $scheme . $authority . $retval;
 		}
 
-		if($options['fragment'] !== null) {
+		if ($options['fragment'] !== null) {
 			$retval .= '#' . $options['fragment'];
 		}
 

src/routing/Routing.class.php

Indentation +1651 added lines, -1651 removed lines

@@ -42,1194 +42,1194 @@ 
  */
 abstract class Routing extends ParameterHolder
 {
-	const ANCHOR_NONE = 0;
-	const ANCHOR_START = 1;
-	const ANCHOR_END = 2;
-
-	/**
-	 * @var        array An array of route information
-	 */
-	protected $routes = array();
-
-	/**
-	 * @var        Context A Context instance.
-	 */
-	protected $context = null;
-
-	/**
-	 * @var        string Route input.
-	 */
-	protected $input = null;
-
-	/**
-	 * @var        RoutingArraySource[] An array of RoutingArraySource.
-	 */
-	protected $sources = array();
-
-	/**
-	 * @var        string Route prefix to use with gen()
-	 */
-	protected $prefix = '';
-
-	/**
-	 * @var        array An array of default options for gen()
-	 */
-	protected $defaultGenOptions = array();
-
-	/**
-	 * @var        array An array of default options presets for gen()
-	 */
-	protected $genOptionsPresets = array();
-
-	/**
-	 * Constructor.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function __construct()
-	{
-		// for now, we still use this setting as default.
-		// will be removed in 1.1
-		$this->setParameter('enabled', Config::get('core.use_routing', true));
+    const ANCHOR_NONE = 0;
+    const ANCHOR_START = 1;
+    const ANCHOR_END = 2;
+
+    /**
+     * @var        array An array of route information
+     */
+    protected $routes = array();
+
+    /**
+     * @var        Context A Context instance.
+     */
+    protected $context = null;
+
+    /**
+     * @var        string Route input.
+     */
+    protected $input = null;
+
+    /**
+     * @var        RoutingArraySource[] An array of RoutingArraySource.
+     */
+    protected $sources = array();
+
+    /**
+     * @var        string Route prefix to use with gen()
+     */
+    protected $prefix = '';
+
+    /**
+     * @var        array An array of default options for gen()
+     */
+    protected $defaultGenOptions = array();
+
+    /**
+     * @var        array An array of default options presets for gen()
+     */
+    protected $genOptionsPresets = array();
+
+    /**
+     * Constructor.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function __construct()
+    {
+        // for now, we still use this setting as default.
+        // will be removed in 1.1
+        $this->setParameter('enabled', Config::get('core.use_routing', true));
 		
-		$this->defaultGenOptions = array_merge($this->defaultGenOptions, array(
-			'relative' => true,
-			'refill_all_parameters' => false,
-			'omit_defaults' => false,
-		));
-	}
+        $this->defaultGenOptions = array_merge($this->defaultGenOptions, array(
+            'relative' => true,
+            'refill_all_parameters' => false,
+            'omit_defaults' => false,
+        ));
+    }
 	
-	/**
-	 * Initialize the routing instance.
-	 *
-	 * @param      Context $context    The Context.
-	 * @param      array   $parameters An array of initialization parameters.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function initialize(Context $context, array $parameters = array())
-	{
-		$this->context = $context;
-
-		$this->setParameters($parameters);
-
-		$this->defaultGenOptions = array_merge(
-			$this->defaultGenOptions,
-			$this->getParameter('default_gen_options', array())
-		);
-
-		$this->genOptionsPresets = array_merge(
-			$this->genOptionsPresets,
-			$this->getParameter('gen_options_presets', array())
-		);
+    /**
+     * Initialize the routing instance.
+     *
+     * @param      Context $context    The Context.
+     * @param      array   $parameters An array of initialization parameters.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function initialize(Context $context, array $parameters = array())
+    {
+        $this->context = $context;
+
+        $this->setParameters($parameters);
+
+        $this->defaultGenOptions = array_merge(
+            $this->defaultGenOptions,
+            $this->getParameter('default_gen_options', array())
+        );
+
+        $this->genOptionsPresets = array_merge(
+            $this->genOptionsPresets,
+            $this->getParameter('gen_options_presets', array())
+        );
 		
-		// and load the config.
-		$this->loadConfig();
-	}
-
-	/**
-	 * Load the routing.xml configuration file.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	protected function loadConfig()
-	{
-		$cfg = Config::get('core.config_dir') . '/routing.xml';
-		// allow missing routing.xml when routing is not enabled
-		if($this->isEnabled() || is_readable($cfg)) {
-			$this->importRoutes(unserialize(file_get_contents(ConfigCache::checkConfig($cfg, $this->context->getName()))));
-		}
-	}
-
-	/**
-	 * Do any necessary startup work after initialization.
-	 *
-	 * This method is not called directly after initialize().
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function startup()
-	{
-		$this->sources['_ENV'] = new RoutingArraySource($_ENV);
-
-		$this->sources['_SERVER'] = new RoutingArraySource($_SERVER);
-
-		if(Config::get('core.use_security')) {
-			$this->sources['user'] = new RoutingUserSource($this->context->getUser());
-		}
-	}
-
-	/**
-	 * Execute the shutdown procedure.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function shutdown()
-	{
-	}
-
-	/**
-	 * Check if this routing instance is enabled.
-	 *
-	 * @return     bool Whether or not routing is enabled.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      1.0.0
-	 */
-	public function isEnabled()
-	{
-		return $this->getParameter('enabled') === true;
-	}
-
-	/**
-	 * Retrieve the current application context.
-	 *
-	 * @return     Context A Context instance.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public final function getContext()
-	{
-		return $this->context;
-	}
-
-	/**
-	 * Retrieve the info about a named route for this routing instance.
-	 *
-	 * @return     mixed The route info or null if the route doesn't exist.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public final function getRoute($name)
-	{
-		if(!isset($this->routes[$name])) {
-			return null;
-		}
-		return $this->routes[$name];
-	}
-
-	/**
-	 * Retrieve the input for this routing instance.
-	 *
-	 * @return     string The input.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public final function getInput()
-	{
-		return $this->input;
-	}
-
-	/**
-	 * Retrieve the prefix for this routing instance.
-	 *
-	 * @return     string The prefix.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public final function getPrefix()
-	{
-		return $this->prefix;
-	}
-
-	/**
-	 * Adds a route to this routing instance.
-	 *
-	 * @param      string $route   A string with embedded regexp.
-	 * @param      array  $options An array with options. The array can contain following
-	 *                   items:
-	 *                   <ul>
-	 *                    <li>name</li>
-	 *                    <li>stop</li>
-	 *                    <li>output_type</li>
-	 *                    <li>module</li>
-	 *                    <li>controller</li>
-	 *                    <li>parameters</li>
-	 *                    <li>ignores</li>
-	 *                    <li>defaults</li>
-	 *                    <li>childs</li>
-	 *                    <li>callbacks</li>
-	 *                    <li>imply</li>
-	 *                    <li>cut</li>
-	 *                    <li>source</li>
-	 *                   </ul>
-	 * @param      string $parent   The name of the parent route (if any).
-	 *
-	 * @return     string The name of the route.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function addRoute($route, array $options = array(), $parent = null)
-	{
-		// catch the old options from the route which has to be overwritten
-		if(isset($options['name']) && isset($this->routes[$options['name']])) {
-			$defaultOpts = $this->routes[$options['name']]['opt'];
-
-			// when the parent is set and differs from the parent of the route to be overwritten bail out
-			if($parent !== null && $defaultOpts['parent'] != $parent) {
-				throw new AgaviException('You are trying to overwrite a route but are not staying in the same hierarchy');
-			}
-
-			if($parent === null) {
-				$parent = $defaultOpts['parent'];
-			} else {
-				$defaultOpts['parent'] = $parent;
-			}
-		} else {
-			$defaultOpts = array('name' => Toolkit::uniqid(), 'stop' => true, 'output_type' => null, 'module' => null, 'controller' => null, 'parameters' => array(), 'ignores' => array(), 'defaults' => array(), 'childs' => array(), 'callbacks' => array(), 'imply' => false, 'cut' => null, 'source' => null, 'method' => null, 'constraint' => array(), 'locale' => null, 'pattern_parameters' => array(), 'optional_parameters' => array(), 'parent' => $parent, 'reverseStr' => '', 'nostops' => array(), 'anchor' => self::ANCHOR_NONE);
-		}
-		// retain backwards compatibility to 0.11
-		if(isset($options['callback'])) {
-			$options['callbacks'] = array(array('class' => $options['callback'], 'parameters' => array()));
-			unset($options['callback']);
-		}
-
-		if(isset($options['defaults'])) {
-			foreach($options['defaults'] as $name => &$value) {
-				$val = $pre = $post = null;
-				if(preg_match('#(.*)\{(.*)\}(.*)#', $value, $match)) {
-					$pre = $match[1];
-					$val = $match[2];
-					$post = $match[3];
-				} else {
-					$val = $value;
-				}
-
-				$value = $this->createValue($val)->setPrefix($pre)->setPostfix($post);
-			}
-		}
-
-		// set the default options + user opts
-		$options = array_merge($defaultOpts, $options);
-		list($regexp, $options['reverseStr'], $routeParams, $options['anchor']) = $this->parseRouteString($route);
-
-		$params = array();
-
-		// transfer the parameters and fill available automatic defaults
-		foreach($routeParams as $name => $param) {
-			$params[] = $name;
-
-			if($param['is_optional']) {
-				$options['optional_parameters'][$name] = true;
-			}
-
-			if(!isset($options['defaults'][$name]) && ($param['pre'] || $param['val'] || $param['post'])) {
-				unset($param['is_optional']);
-				$options['defaults'][$name] = $this->createValue($param['val'])->setPrefix($param['pre'])->setPostfix($param['post']);
-			}
-		}
-
-		$options['pattern_parameters'] = $params;
-
-		// remove all ignore from the parameters in the route
-		foreach($options['ignores'] as $ignore) {
-			if(($key = array_search($ignore, $params)) !== false) {
-				unset($params[$key]);
-			}
-		}
-
-		$routeName = $options['name'];
-
-		// parse all the setting values for dynamic variables
-		// check if 2 nodes with the same name in the same execution tree exist
-		foreach($this->routes as $name => $route) {
-			// if a route with this route as parent exist check if its really a child of our route
-			if($route['opt']['parent'] == $routeName && !in_array($name, $options['childs'])) {
-				throw new AgaviException('The route ' . $routeName . ' specifies a child route with the same name');
-			}
-		}
-
-		// direct childs/parents with the same name aren't caught by the above check
-		if($routeName == $parent) {
-			throw new AgaviException('The route ' . $routeName . ' specifies a child route with the same name');
-		}
-
-		// if we are a child route, we need add this route as a child to the parent
-		if($parent !== null) {
-			foreach($this->routes[$parent]['opt']['childs'] as $name) {
-				if($name == $routeName) {
-					// we're overwriting a route, so unlike when first adding the route, there are more routes after this that might also be non-stopping, but we obviously don't want those, so we need to bail out at this point
-					break;
-				}
-				$route = $this->routes[$name];
-				if(!$route['opt']['stop']) {
-					$options['nostops'][] = $name;
-				}
-			}
-			$this->routes[$parent]['opt']['childs'][] = $routeName;
-		} else {
-			foreach($this->routes as $name => $route) {
-				if($name == $routeName) {
-					// we're overwriting a route, so unlike when first adding the route, there are more routes after this that might also be non-stopping, but we obviously don't want those, so we need to bail out at this point
-					break;
-				}
-				if(!$route['opt']['stop'] && !$route['opt']['parent']) {
-					$options['nostops'][] = $name;
-				}
-			}
-		}
+        // and load the config.
+        $this->loadConfig();
+    }
+
+    /**
+     * Load the routing.xml configuration file.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    protected function loadConfig()
+    {
+        $cfg = Config::get('core.config_dir') . '/routing.xml';
+        // allow missing routing.xml when routing is not enabled
+        if($this->isEnabled() || is_readable($cfg)) {
+            $this->importRoutes(unserialize(file_get_contents(ConfigCache::checkConfig($cfg, $this->context->getName()))));
+        }
+    }
+
+    /**
+     * Do any necessary startup work after initialization.
+     *
+     * This method is not called directly after initialize().
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function startup()
+    {
+        $this->sources['_ENV'] = new RoutingArraySource($_ENV);
+
+        $this->sources['_SERVER'] = new RoutingArraySource($_SERVER);
+
+        if(Config::get('core.use_security')) {
+            $this->sources['user'] = new RoutingUserSource($this->context->getUser());
+        }
+    }
+
+    /**
+     * Execute the shutdown procedure.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function shutdown()
+    {
+    }
+
+    /**
+     * Check if this routing instance is enabled.
+     *
+     * @return     bool Whether or not routing is enabled.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      1.0.0
+     */
+    public function isEnabled()
+    {
+        return $this->getParameter('enabled') === true;
+    }
+
+    /**
+     * Retrieve the current application context.
+     *
+     * @return     Context A Context instance.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public final function getContext()
+    {
+        return $this->context;
+    }
+
+    /**
+     * Retrieve the info about a named route for this routing instance.
+     *
+     * @return     mixed The route info or null if the route doesn't exist.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public final function getRoute($name)
+    {
+        if(!isset($this->routes[$name])) {
+            return null;
+        }
+        return $this->routes[$name];
+    }
+
+    /**
+     * Retrieve the input for this routing instance.
+     *
+     * @return     string The input.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public final function getInput()
+    {
+        return $this->input;
+    }
+
+    /**
+     * Retrieve the prefix for this routing instance.
+     *
+     * @return     string The prefix.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public final function getPrefix()
+    {
+        return $this->prefix;
+    }
+
+    /**
+     * Adds a route to this routing instance.
+     *
+     * @param      string $route   A string with embedded regexp.
+     * @param      array  $options An array with options. The array can contain following
+     *                   items:
+     *                   <ul>
+     *                    <li>name</li>
+     *                    <li>stop</li>
+     *                    <li>output_type</li>
+     *                    <li>module</li>
+     *                    <li>controller</li>
+     *                    <li>parameters</li>
+     *                    <li>ignores</li>
+     *                    <li>defaults</li>
+     *                    <li>childs</li>
+     *                    <li>callbacks</li>
+     *                    <li>imply</li>
+     *                    <li>cut</li>
+     *                    <li>source</li>
+     *                   </ul>
+     * @param      string $parent   The name of the parent route (if any).
+     *
+     * @return     string The name of the route.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function addRoute($route, array $options = array(), $parent = null)
+    {
+        // catch the old options from the route which has to be overwritten
+        if(isset($options['name']) && isset($this->routes[$options['name']])) {
+            $defaultOpts = $this->routes[$options['name']]['opt'];
+
+            // when the parent is set and differs from the parent of the route to be overwritten bail out
+            if($parent !== null && $defaultOpts['parent'] != $parent) {
+                throw new AgaviException('You are trying to overwrite a route but are not staying in the same hierarchy');
+            }
+
+            if($parent === null) {
+                $parent = $defaultOpts['parent'];
+            } else {
+                $defaultOpts['parent'] = $parent;
+            }
+        } else {
+            $defaultOpts = array('name' => Toolkit::uniqid(), 'stop' => true, 'output_type' => null, 'module' => null, 'controller' => null, 'parameters' => array(), 'ignores' => array(), 'defaults' => array(), 'childs' => array(), 'callbacks' => array(), 'imply' => false, 'cut' => null, 'source' => null, 'method' => null, 'constraint' => array(), 'locale' => null, 'pattern_parameters' => array(), 'optional_parameters' => array(), 'parent' => $parent, 'reverseStr' => '', 'nostops' => array(), 'anchor' => self::ANCHOR_NONE);
+        }
+        // retain backwards compatibility to 0.11
+        if(isset($options['callback'])) {
+            $options['callbacks'] = array(array('class' => $options['callback'], 'parameters' => array()));
+            unset($options['callback']);
+        }
+
+        if(isset($options['defaults'])) {
+            foreach($options['defaults'] as $name => &$value) {
+                $val = $pre = $post = null;
+                if(preg_match('#(.*)\{(.*)\}(.*)#', $value, $match)) {
+                    $pre = $match[1];
+                    $val = $match[2];
+                    $post = $match[3];
+                } else {
+                    $val = $value;
+                }
+
+                $value = $this->createValue($val)->setPrefix($pre)->setPostfix($post);
+            }
+        }
+
+        // set the default options + user opts
+        $options = array_merge($defaultOpts, $options);
+        list($regexp, $options['reverseStr'], $routeParams, $options['anchor']) = $this->parseRouteString($route);
+
+        $params = array();
+
+        // transfer the parameters and fill available automatic defaults
+        foreach($routeParams as $name => $param) {
+            $params[] = $name;
+
+            if($param['is_optional']) {
+                $options['optional_parameters'][$name] = true;
+            }
+
+            if(!isset($options['defaults'][$name]) && ($param['pre'] || $param['val'] || $param['post'])) {
+                unset($param['is_optional']);
+                $options['defaults'][$name] = $this->createValue($param['val'])->setPrefix($param['pre'])->setPostfix($param['post']);
+            }
+        }
+
+        $options['pattern_parameters'] = $params;
+
+        // remove all ignore from the parameters in the route
+        foreach($options['ignores'] as $ignore) {
+            if(($key = array_search($ignore, $params)) !== false) {
+                unset($params[$key]);
+            }
+        }
+
+        $routeName = $options['name'];
+
+        // parse all the setting values for dynamic variables
+        // check if 2 nodes with the same name in the same execution tree exist
+        foreach($this->routes as $name => $route) {
+            // if a route with this route as parent exist check if its really a child of our route
+            if($route['opt']['parent'] == $routeName && !in_array($name, $options['childs'])) {
+                throw new AgaviException('The route ' . $routeName . ' specifies a child route with the same name');
+            }
+        }
+
+        // direct childs/parents with the same name aren't caught by the above check
+        if($routeName == $parent) {
+            throw new AgaviException('The route ' . $routeName . ' specifies a child route with the same name');
+        }
+
+        // if we are a child route, we need add this route as a child to the parent
+        if($parent !== null) {
+            foreach($this->routes[$parent]['opt']['childs'] as $name) {
+                if($name == $routeName) {
+                    // we're overwriting a route, so unlike when first adding the route, there are more routes after this that might also be non-stopping, but we obviously don't want those, so we need to bail out at this point
+                    break;
+                }
+                $route = $this->routes[$name];
+                if(!$route['opt']['stop']) {
+                    $options['nostops'][] = $name;
+                }
+            }
+            $this->routes[$parent]['opt']['childs'][] = $routeName;
+        } else {
+            foreach($this->routes as $name => $route) {
+                if($name == $routeName) {
+                    // we're overwriting a route, so unlike when first adding the route, there are more routes after this that might also be non-stopping, but we obviously don't want those, so we need to bail out at this point
+                    break;
+                }
+                if(!$route['opt']['stop'] && !$route['opt']['parent']) {
+                    $options['nostops'][] = $name;
+                }
+            }
+        }
 		
-		// make sure we have no duplicates in the nostops (can happen when a route is overwritten)
-		$options['nostops'] = array_unique($options['nostops']);
-
-		$route = array('rxp' => $regexp, 'par' => $params, 'opt' => $options, 'matches' => array());
-		$this->routes[$routeName] = $route;
-
-		return $routeName;
-	}
-
-	/**
-	 * Retrieve the internal representation of the route info.
-	 *
-	 * @return     array The info about all routes.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function exportRoutes()
-	{
-		return $this->routes;
-	}
-
-	/**
-	 * Sets the internal representation of the route info.
-	 *
-	 * @param      array $route The info about all routes.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function importRoutes(array $routes)
-	{
-		$this->routes = $routes;
-	}
-
-	/**
-	 * Retrieves the routes which need to be taken into account when generating
-	 * the reverse string of a routing to be generated.
-	 *
-	 * @param      string $route       The route name(s, delimited by +) to calculate.
-	 * @param      bool   $isNullRoute Set to true if the requested route was 'null' or
-	 *                                 'null' + 'xxx'
-	 *
-	 * @return     array A list of names of affected routes.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getAffectedRoutes($route, &$isNullRoute = false)
-	{
-		$includedRoutes = array();
-		$excludedRoutes = array();
+        // make sure we have no duplicates in the nostops (can happen when a route is overwritten)
+        $options['nostops'] = array_unique($options['nostops']);
+
+        $route = array('rxp' => $regexp, 'par' => $params, 'opt' => $options, 'matches' => array());
+        $this->routes[$routeName] = $route;
+
+        return $routeName;
+    }
+
+    /**
+     * Retrieve the internal representation of the route info.
+     *
+     * @return     array The info about all routes.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function exportRoutes()
+    {
+        return $this->routes;
+    }
+
+    /**
+     * Sets the internal representation of the route info.
+     *
+     * @param      array $route The info about all routes.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function importRoutes(array $routes)
+    {
+        $this->routes = $routes;
+    }
+
+    /**
+     * Retrieves the routes which need to be taken into account when generating
+     * the reverse string of a routing to be generated.
+     *
+     * @param      string $route       The route name(s, delimited by +) to calculate.
+     * @param      bool   $isNullRoute Set to true if the requested route was 'null' or
+     *                                 'null' + 'xxx'
+     *
+     * @return     array A list of names of affected routes.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getAffectedRoutes($route, &$isNullRoute = false)
+    {
+        $includedRoutes = array();
+        $excludedRoutes = array();
 		
-		if($route === null) {
-			$includedRoutes = array_reverse($this->getContext()->getRequest()->getAttribute('matched_routes', 'org.agavi.routing', array()));
-			$isNullRoute = true;
-		} elseif(strlen($route) > 0) {
-			if($route[0] == '-' || $route[0] == '+') {
-				$includedRoutes = array_reverse($this->getContext()->getRequest()->getAttribute('matched_routes', 'org.agavi.routing', array()));
-				$isNullRoute = true;
-			}
+        if($route === null) {
+            $includedRoutes = array_reverse($this->getContext()->getRequest()->getAttribute('matched_routes', 'org.agavi.routing', array()));
+            $isNullRoute = true;
+        } elseif(strlen($route) > 0) {
+            if($route[0] == '-' || $route[0] == '+') {
+                $includedRoutes = array_reverse($this->getContext()->getRequest()->getAttribute('matched_routes', 'org.agavi.routing', array()));
+                $isNullRoute = true;
+            }
 			
-			$routeParts = preg_split('#(-|\+)#', $route, -1, PREG_SPLIT_DELIM_CAPTURE);
-			$prevDelimiter = '+';
-			foreach($routeParts as $part) {
-				if($part == '+' || $part == '-') {
-					$prevDelimiter = $part;
-				}
+            $routeParts = preg_split('#(-|\+)#', $route, -1, PREG_SPLIT_DELIM_CAPTURE);
+            $prevDelimiter = '+';
+            foreach($routeParts as $part) {
+                if($part == '+' || $part == '-') {
+                    $prevDelimiter = $part;
+                }
 				
-				if($prevDelimiter == '+') {
-					$includedRoutes[] = $part;
-				} else { // $prevDelimiter == '-'
-					$excludedRoutes[] = $part;
-				}
-			}
-		}
+                if($prevDelimiter == '+') {
+                    $includedRoutes[] = $part;
+                } else { // $prevDelimiter == '-'
+                    $excludedRoutes[] = $part;
+                }
+            }
+        }
 		
-		$excludedRoutes = array_flip($excludedRoutes);
+        $excludedRoutes = array_flip($excludedRoutes);
 
-		if($includedRoutes) {
-			$route = $includedRoutes[0];
-			// TODO: useful comment here
-			unset($includedRoutes[0]);
-		}
+        if($includedRoutes) {
+            $route = $includedRoutes[0];
+            // TODO: useful comment here
+            unset($includedRoutes[0]);
+        }
 		
-		$myRoutes = array();
-		foreach($includedRoutes as $r) {
-			$myRoutes[$r] = true;
-		}
-
-		$affectedRoutes = array();
-
-		if(isset($this->routes[$route])) {
-			$parent = $route;
-			do {
-				if(!isset($excludedRoutes[$parent])) {
-					$affectedRoutes[] = $parent;
-				}
-				$r = $this->routes[$parent];
-
-				foreach(array_reverse($r['opt']['nostops']) as $noStop) {
-					$myR = $this->routes[$noStop];
-					if(isset($myRoutes[$noStop])) {
-						unset($myRoutes[$noStop]);
-					} elseif(!$myR['opt']['imply']) {
-						continue;
-					}
-
-					if(!isset($excludedRoutes[$noStop])) {
-						$affectedRoutes[] = $noStop;
-					}
-				}
-
-				$parent = $r['opt']['parent'];
-
-			} while($parent);
-		} else {
-			// TODO: error handling - route with the given name does not exist
-		}
-
-		if(count($myRoutes)) {
-			// TODO: error handling - we couldn't find some of the nonstopping rules
-		}
-
-		return $affectedRoutes;
-	}
+        $myRoutes = array();
+        foreach($includedRoutes as $r) {
+            $myRoutes[$r] = true;
+        }
+
+        $affectedRoutes = array();
+
+        if(isset($this->routes[$route])) {
+            $parent = $route;
+            do {
+                if(!isset($excludedRoutes[$parent])) {
+                    $affectedRoutes[] = $parent;
+                }
+                $r = $this->routes[$parent];
+
+                foreach(array_reverse($r['opt']['nostops']) as $noStop) {
+                    $myR = $this->routes[$noStop];
+                    if(isset($myRoutes[$noStop])) {
+                        unset($myRoutes[$noStop]);
+                    } elseif(!$myR['opt']['imply']) {
+                        continue;
+                    }
+
+                    if(!isset($excludedRoutes[$noStop])) {
+                        $affectedRoutes[] = $noStop;
+                    }
+                }
+
+                $parent = $r['opt']['parent'];
+
+            } while($parent);
+        } else {
+            // TODO: error handling - route with the given name does not exist
+        }
+
+        if(count($myRoutes)) {
+            // TODO: error handling - we couldn't find some of the nonstopping rules
+        }
+
+        return $affectedRoutes;
+    }
 	
-	/**
-	 * Get a list of all parameter matches which where matched in execute()
-	 * in the given routes. 
-	 *
-	 * @param      array $routeNames An array of route names.
-	 *
-	 * @return     array The matched parameters as name => value.
-	 *
-	 * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function getMatchedParameters(array $routeNames)
-	{
-		$params = array();
-		foreach($routeNames as $name) {
-			if(isset($this->routes[$name])) {
-				$route = $this->routes[$name];
-				$params = array_merge($params, $route['matches']);
-			}
-		}
-		return $params;
-	}
+    /**
+     * Get a list of all parameter matches which where matched in execute()
+     * in the given routes. 
+     *
+     * @param      array $routeNames An array of route names.
+     *
+     * @return     array The matched parameters as name => value.
+     *
+     * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
+     * @since      1.0.0
+     */
+    public function getMatchedParameters(array $routeNames)
+    {
+        $params = array();
+        foreach($routeNames as $name) {
+            if(isset($this->routes[$name])) {
+                $route = $this->routes[$name];
+                $params = array_merge($params, $route['matches']);
+            }
+        }
+        return $params;
+    }
 	
-	/**
-	 * Get a complete list of gen() options based on the given, probably
-	 * incomplete, options array, and/or options preset name(s).
-	 *
-	 * @param      mixed $input An array of gen options and names of options presets
-	 *                   or just the name of a single option preset.
-	 *
-	 * @return     array A complete array of options.
-	 *
-	 * @throws     \Exception If the given preset name doesn't exist.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	protected function resolveGenOptions($input = array())
-	{
-		if(is_string($input)) {
-			// A single option preset was given
-			if(isset($this->genOptionsPresets[$input])) {
-				return array_merge($this->defaultGenOptions, $this->genOptionsPresets[$input]);
-			}
-		} elseif(is_array($input)) {
-			$genOptions = $this->defaultGenOptions;
-			foreach($input as $key => $value) {
-				if(is_numeric($key)) {
-					// Numeric key – it's an option preset
-					if(isset($this->genOptionsPresets[$value])) {
-						$genOptions = array_merge($genOptions, $this->genOptionsPresets[$value]);
-					} else {
-						throw new AgaviException('Undefined Routing gen() options preset "' . $value . '"');
-					}
-				} else {
-					// String key – it's an option
-					$genOptions[$key] = $value;
-				}
-			}
-			return $genOptions;
-		}
-		throw new AgaviException('Unexpected type "' . gettype($input) . '" used as Routing gen() option preset identifier');
-	}
+    /**
+     * Get a complete list of gen() options based on the given, probably
+     * incomplete, options array, and/or options preset name(s).
+     *
+     * @param      mixed $input An array of gen options and names of options presets
+     *                   or just the name of a single option preset.
+     *
+     * @return     array A complete array of options.
+     *
+     * @throws     \Exception If the given preset name doesn't exist.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    protected function resolveGenOptions($input = array())
+    {
+        if(is_string($input)) {
+            // A single option preset was given
+            if(isset($this->genOptionsPresets[$input])) {
+                return array_merge($this->defaultGenOptions, $this->genOptionsPresets[$input]);
+            }
+        } elseif(is_array($input)) {
+            $genOptions = $this->defaultGenOptions;
+            foreach($input as $key => $value) {
+                if(is_numeric($key)) {
+                    // Numeric key – it's an option preset
+                    if(isset($this->genOptionsPresets[$value])) {
+                        $genOptions = array_merge($genOptions, $this->genOptionsPresets[$value]);
+                    } else {
+                        throw new AgaviException('Undefined Routing gen() options preset "' . $value . '"');
+                    }
+                } else {
+                    // String key – it's an option
+                    $genOptions[$key] = $value;
+                }
+            }
+            return $genOptions;
+        }
+        throw new AgaviException('Unexpected type "' . gettype($input) . '" used as Routing gen() option preset identifier');
+    }
 	
-	/**
-	 * Adds the matched parameters from the 'null' routes to the given parameters
-	 * (without overwriting existing ones)
-	 * 
-	 * @param      array $routeNames The route names
-	 * @param      array $params     The parameters
-	 * 
-	 * @return     array The new parameters
-	 * 
-	 * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function fillGenNullParameters(array $routeNames, array $params)
-	{
-		return array_merge($this->getMatchedParameters($routeNames), $params);
-	}
+    /**
+     * Adds the matched parameters from the 'null' routes to the given parameters
+     * (without overwriting existing ones)
+     * 
+     * @param      array $routeNames The route names
+     * @param      array $params     The parameters
+     * 
+     * @return     array The new parameters
+     * 
+     * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
+     * @since      1.0.0
+     */
+    public function fillGenNullParameters(array $routeNames, array $params)
+    {
+        return array_merge($this->getMatchedParameters($routeNames), $params);
+    }
 	
-	/**
-	 * Builds the routing information (result string, all kinds of parameters)
-	 * for the given routes.
-	 * 
-	 * @param      array $options    The options
-	 * @param      array $routeNames The names of the routes to generate
-	 * @param      array $params     The parameters supplied by the user
-	 * 
-	 * @return     array
-	 * 
-	 * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
-	 * @since      1.0.0
-	 */
-	protected function assembleRoutes(array $options, array $routeNames, array $params)
-	{
-		$uri = '';
-		$defaultParams = array();
-		$availableParams = array();
-		$matchedParams = array(); // the merged incoming matched params of implied routes
-		$optionalParams = array();
-		$firstRoute = true;
+    /**
+     * Builds the routing information (result string, all kinds of parameters)
+     * for the given routes.
+     * 
+     * @param      array $options    The options
+     * @param      array $routeNames The names of the routes to generate
+     * @param      array $params     The parameters supplied by the user
+     * 
+     * @return     array
+     * 
+     * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
+     * @since      1.0.0
+     */
+    protected function assembleRoutes(array $options, array $routeNames, array $params)
+    {
+        $uri = '';
+        $defaultParams = array();
+        $availableParams = array();
+        $matchedParams = array(); // the merged incoming matched params of implied routes
+        $optionalParams = array();
+        $firstRoute = true;
 		
-		foreach($routeNames as $routeName) {
-			$r = $this->routes[$routeName];
-
-			$myDefaults = $r['opt']['defaults'];
-
-			if(count($r['opt']['callbacks']) > 0) {
-				if(!isset($r['callback_instances'])) {
-					foreach($r['opt']['callbacks'] as $key => $callback) {
-						/** @var RoutingCallback $instance */
-						$instance = new $callback['class']();
-						$instance->setParameters($callback['parameters']);
-						$instance->initialize($this->context, $r);
-						$r['callback_instances'][$key] = $instance;
-					}
-				}
-				foreach($r['callback_instances'] as $callbackInstance) {
-					$paramsCopy = $params;
-					$isLegacyCallback = false;
-					if($callbackInstance instanceof LegacyRoutingCallbackInterface) {
-						$isLegacyCallback = true;
-						// convert all routing values to strings so legacy callbacks don't break
-						$defaultsCopy = $myDefaults;
-						foreach($paramsCopy as &$param) {
-							if($param instanceof RoutingValueInterface) {
-								$param = $param->getValue();
-							}
-						}
-						foreach($defaultsCopy as &$default) {
-							if($default instanceof RoutingValueInterface) {
-								$default = array(
-									'pre' => $default->getPrefix(),
-									'val' => $default->getValue(),
-									'post' => $default->getPostfix(),
-								);
-							}
-						}
-						$changedParamsCopy = $paramsCopy;
-						if(!$callbackInstance->onGenerate($defaultsCopy, $paramsCopy, $options)) {
-							continue 2;
-						}
-						// find all params changed in the callback, but ignore unset() parameters since they will be filled in at a later stage (and doing something the them would prevent default values being inserted after unset()tting of a parameter)
-						$diff = array();
-						foreach($paramsCopy as $key => $value) {
-							if(!array_key_exists($key, $changedParamsCopy) || $changedParamsCopy[$key] !== $value) {
-								$diff[$key] = $value;
-							}
-						}
-						// do *not* use this instead, it will segfault in PHP < 5.2.6:
-						// $diff = array_udiff_assoc($paramsCopy, $changedParamsCopy, array($this, 'onGenerateParamDiffCallback'));
-						// likely caused by http://bugs.php.net/bug.php?id=42838 / http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.51&r2=1.308.2.21.2.52
-					} else {
-						if(!$callbackInstance->onGenerate($myDefaults, $params, $options)) {
-							continue 2;
-						}
-						// find all params changed in the callback, but ignore unset() parameters since they will be filled in at a later stage (and doing something the them would prevent default values being inserted after unset()tting of a parameter)
-						$diff = array();
-						foreach($params as $key => $value) {
-							if(!array_key_exists($key, $paramsCopy) || $paramsCopy[$key] !== $value) {
-								$diff[$key] = $value;
-							}
-						}
-						// do *not* use this instead, it will segfault in PHP < 5.2.6:
-						// $diff = array_udiff_assoc($params, $paramsCopy, array($this, 'onGenerateParamDiffCallback'));
-						// likely caused by http://bugs.php.net/bug.php?id=42838 / http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.51&r2=1.308.2.21.2.52
-					}
+        foreach($routeNames as $routeName) {
+            $r = $this->routes[$routeName];
+
+            $myDefaults = $r['opt']['defaults'];
+
+            if(count($r['opt']['callbacks']) > 0) {
+                if(!isset($r['callback_instances'])) {
+                    foreach($r['opt']['callbacks'] as $key => $callback) {
+                        /** @var RoutingCallback $instance */
+                        $instance = new $callback['class']();
+                        $instance->setParameters($callback['parameters']);
+                        $instance->initialize($this->context, $r);
+                        $r['callback_instances'][$key] = $instance;
+                    }
+                }
+                foreach($r['callback_instances'] as $callbackInstance) {
+                    $paramsCopy = $params;
+                    $isLegacyCallback = false;
+                    if($callbackInstance instanceof LegacyRoutingCallbackInterface) {
+                        $isLegacyCallback = true;
+                        // convert all routing values to strings so legacy callbacks don't break
+                        $defaultsCopy = $myDefaults;
+                        foreach($paramsCopy as &$param) {
+                            if($param instanceof RoutingValueInterface) {
+                                $param = $param->getValue();
+                            }
+                        }
+                        foreach($defaultsCopy as &$default) {
+                            if($default instanceof RoutingValueInterface) {
+                                $default = array(
+                                    'pre' => $default->getPrefix(),
+                                    'val' => $default->getValue(),
+                                    'post' => $default->getPostfix(),
+                                );
+                            }
+                        }
+                        $changedParamsCopy = $paramsCopy;
+                        if(!$callbackInstance->onGenerate($defaultsCopy, $paramsCopy, $options)) {
+                            continue 2;
+                        }
+                        // find all params changed in the callback, but ignore unset() parameters since they will be filled in at a later stage (and doing something the them would prevent default values being inserted after unset()tting of a parameter)
+                        $diff = array();
+                        foreach($paramsCopy as $key => $value) {
+                            if(!array_key_exists($key, $changedParamsCopy) || $changedParamsCopy[$key] !== $value) {
+                                $diff[$key] = $value;
+                            }
+                        }
+                        // do *not* use this instead, it will segfault in PHP < 5.2.6:
+                        // $diff = array_udiff_assoc($paramsCopy, $changedParamsCopy, array($this, 'onGenerateParamDiffCallback'));
+                        // likely caused by http://bugs.php.net/bug.php?id=42838 / http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.51&r2=1.308.2.21.2.52
+                    } else {
+                        if(!$callbackInstance->onGenerate($myDefaults, $params, $options)) {
+                            continue 2;
+                        }
+                        // find all params changed in the callback, but ignore unset() parameters since they will be filled in at a later stage (and doing something the them would prevent default values being inserted after unset()tting of a parameter)
+                        $diff = array();
+                        foreach($params as $key => $value) {
+                            if(!array_key_exists($key, $paramsCopy) || $paramsCopy[$key] !== $value) {
+                                $diff[$key] = $value;
+                            }
+                        }
+                        // do *not* use this instead, it will segfault in PHP < 5.2.6:
+                        // $diff = array_udiff_assoc($params, $paramsCopy, array($this, 'onGenerateParamDiffCallback'));
+                        // likely caused by http://bugs.php.net/bug.php?id=42838 / http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.51&r2=1.308.2.21.2.52
+                    }
 					
-					if(count($diff)) {
-						$diffKeys = array_keys($diff);
-						foreach($diffKeys as $key) {
-							// NEVER assign this value as a reference, as PHP will go completely bonkers if we use a reference here (it marks the entry in the array as a reference, so modifying the value in $params in a callback means it gets modified in $paramsCopy as well)
-							// if the callback was a legacy callback, the array to read the values from is different (since everything was cast to strings before running the callback)
-							$value = $isLegacyCallback ? $paramsCopy[$key] : $params[$key];
-							if($value !== null && !($value instanceof RoutingValueInterface)) {
-								$routingValue = $this->createValue($value, false);
-								if(isset($myDefaults[$key])) {
-									if($myDefaults[$key] instanceof RoutingValueInterface) {
-										// clone the default value so pre and postfix are preserved
-										/** @var RoutingValue $routingValue */
-										$routingValue = clone $myDefaults[$key];
-										// BC: When setting a value in a callback it was supposed to be already encoded
-										$routingValue->setValue($value)->setValueNeedsEncoding(false);
-									} else {
-										// $myDefaults[$key] can only be an array at this stage
-										$routingValue->setPrefix($myDefaults[$key]['pre'])->setPrefixNeedsEncoding(false);
-										$routingValue->setPostfix($myDefaults[$key]['post'])->setPostfixNeedsEncoding(false);
-									}
-								}
-								$value = $routingValue;
-							}
-							// for writing no legacy check mustn't be done, since that would mean the changed value would get lost
-							$params[$key] = $value;
-						}
-					}
-				}
-			}
-
-			// if the route has a source we shouldn't put its stuff in the generated string
-			if($r['opt']['source']) {
-				continue;
-			}
-
-			$matchedParams = array_merge($matchedParams, $r['matches']);
-			$optionalParams = array_merge($optionalParams, $r['opt']['optional_parameters']);
-
-			$availableParams = array_merge($availableParams, array_reverse($r['opt']['pattern_parameters']));
-
-			if($firstRoute || $r['opt']['cut'] || (count($r['opt']['childs']) && $r['opt']['cut'] === null)) {
-				if($r['opt']['anchor'] & self::ANCHOR_START || $r['opt']['anchor'] == self::ANCHOR_NONE) {
-					$uri = $r['opt']['reverseStr'] . $uri;
-				} else {
-					$uri = $uri . $r['opt']['reverseStr'];
-				}
-			}
-
-			$defaultParams = array_merge($defaultParams, $myDefaults);
-			$firstRoute = false;
-		}
+                    if(count($diff)) {
+                        $diffKeys = array_keys($diff);
+                        foreach($diffKeys as $key) {
+                            // NEVER assign this value as a reference, as PHP will go completely bonkers if we use a reference here (it marks the entry in the array as a reference, so modifying the value in $params in a callback means it gets modified in $paramsCopy as well)
+                            // if the callback was a legacy callback, the array to read the values from is different (since everything was cast to strings before running the callback)
+                            $value = $isLegacyCallback ? $paramsCopy[$key] : $params[$key];
+                            if($value !== null && !($value instanceof RoutingValueInterface)) {
+                                $routingValue = $this->createValue($value, false);
+                                if(isset($myDefaults[$key])) {
+                                    if($myDefaults[$key] instanceof RoutingValueInterface) {
+                                        // clone the default value so pre and postfix are preserved
+                                        /** @var RoutingValue $routingValue */
+                                        $routingValue = clone $myDefaults[$key];
+                                        // BC: When setting a value in a callback it was supposed to be already encoded
+                                        $routingValue->setValue($value)->setValueNeedsEncoding(false);
+                                    } else {
+                                        // $myDefaults[$key] can only be an array at this stage
+                                        $routingValue->setPrefix($myDefaults[$key]['pre'])->setPrefixNeedsEncoding(false);
+                                        $routingValue->setPostfix($myDefaults[$key]['post'])->setPostfixNeedsEncoding(false);
+                                    }
+                                }
+                                $value = $routingValue;
+                            }
+                            // for writing no legacy check mustn't be done, since that would mean the changed value would get lost
+                            $params[$key] = $value;
+                        }
+                    }
+                }
+            }
+
+            // if the route has a source we shouldn't put its stuff in the generated string
+            if($r['opt']['source']) {
+                continue;
+            }
+
+            $matchedParams = array_merge($matchedParams, $r['matches']);
+            $optionalParams = array_merge($optionalParams, $r['opt']['optional_parameters']);
+
+            $availableParams = array_merge($availableParams, array_reverse($r['opt']['pattern_parameters']));
+
+            if($firstRoute || $r['opt']['cut'] || (count($r['opt']['childs']) && $r['opt']['cut'] === null)) {
+                if($r['opt']['anchor'] & self::ANCHOR_START || $r['opt']['anchor'] == self::ANCHOR_NONE) {
+                    $uri = $r['opt']['reverseStr'] . $uri;
+                } else {
+                    $uri = $uri . $r['opt']['reverseStr'];
+                }
+            }
+
+            $defaultParams = array_merge($defaultParams, $myDefaults);
+            $firstRoute = false;
+        }
 		
-		$availableParams = array_reverse($availableParams);
+        $availableParams = array_reverse($availableParams);
 		
-		return array(
-			'uri' => $uri,
-			'options' => $options,
-			'user_parameters' => $params,
-			'available_parameters' => $availableParams,
-			'matched_parameters' => $matchedParams,
-			'optional_parameters' => $optionalParams,
-			'default_parameters' => $defaultParams,
-		);
-	}
+        return array(
+            'uri' => $uri,
+            'options' => $options,
+            'user_parameters' => $params,
+            'available_parameters' => $availableParams,
+            'matched_parameters' => $matchedParams,
+            'optional_parameters' => $optionalParams,
+            'default_parameters' => $defaultParams,
+        );
+    }
 	
-	/**
-	 * Adds all matched parameters to the supplied parameters. Will not overwrite
-	 * already existing parameters.
-	 * 
-	 * @param      array $options       The options
-	 * @param      array $params        The parameters supplied by the user
-	 * @param      array $matchedParams The parameters which matched in execute()
-	 * 
-	 * @return     array The $params with the added matched parameters
-	 * 
-	 * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
-	 * @since      1.0.0
-	 */
-	protected function refillAllMatchedParameters(array $options, array $params, array $matchedParams)
-	{
-		if(!empty($options['refill_all_parameters'])) {
-			foreach($matchedParams as $name => $value) {
-				if(!(isset($params[$name]) || array_key_exists($name, $params))) {
-					$params[$name] = $this->createValue($value, true);
-				}
-			}
-		}
+    /**
+     * Adds all matched parameters to the supplied parameters. Will not overwrite
+     * already existing parameters.
+     * 
+     * @param      array $options       The options
+     * @param      array $params        The parameters supplied by the user
+     * @param      array $matchedParams The parameters which matched in execute()
+     * 
+     * @return     array The $params with the added matched parameters
+     * 
+     * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
+     * @since      1.0.0
+     */
+    protected function refillAllMatchedParameters(array $options, array $params, array $matchedParams)
+    {
+        if(!empty($options['refill_all_parameters'])) {
+            foreach($matchedParams as $name => $value) {
+                if(!(isset($params[$name]) || array_key_exists($name, $params))) {
+                    $params[$name] = $this->createValue($value, true);
+                }
+            }
+        }
 		
-		return $params;
-	}
+        return $params;
+    }
 	
-	/**
-	 * Adds all parameters which were matched in the incoming routes to the 
-	 * generated route up the first user supplied parameter (from left to right)
-	 * Also adds the default value for all non optional parameters the user 
-	 * didn't supply.
-	 * 
-	 * @param      array $options The options
-	 * @param      array $originalUserParams The parameters originally passed to gen()
-	 * @param      array $params The parameters
-	 * @param      array $availableParams A list of parameter names available for the route
-	 * @param      array $matchedParams The matched parameters from execute() for the route
-	 * @param      array $optionalParams the optional parameters for the route
-	 * @param      array $defaultParams the default parameters for the route
-	 * 
-	 * @return     array The 'final' parameters
-	 * 
-	 * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
-	 * @since      1.0.0
-	 */
-	protected function refillMatchedAndDefaultParameters(array $options, array $originalUserParams, array $params, array $availableParams, array $matchedParams, array $optionalParams, array $defaultParams)
-	{
-		$refillValue = true;
-		$finalParams = array();
-		foreach($availableParams as $name) {
-			// loop all params and fill all with the matched parameters
-			// until a user (not callback) supplied parameter is encountered.
-			// After that only check defaults. Parameters supplied from the user
-			// or via callback always have precedence
-
-			// keep track if a user supplied parameter has already been encountered
-			if($refillValue && (isset($originalUserParams[$name]) || array_key_exists($name, $originalUserParams))) {
-				$refillValue = false;
-			}
-
-			// these 'aliases' are just for readability of the lower block
-			$isOptional = isset($optionalParams[$name]);
-			$hasMatched = isset($matchedParams[$name]);
-			$hasDefault = isset($defaultParams[$name]);
-			$hasUserCallbackParam = (isset($params[$name]) || array_key_exists($name, $params));
-
-			if($hasUserCallbackParam) {
-				// anything a user or callback supplied has precedence
-				// and since the user params are handled afterwards, skip them here
-			} elseif($refillValue && $hasMatched) {
-				// Use the matched input
-				$finalParams[$name] = $this->createValue($matchedParams[$name], true);
-			} elseif($hasDefault) {
-				// now we just need to check if there are defaults for this available param and fill them in if applicable
-				$default = $defaultParams[$name];
-				if(!$isOptional || strlen($default->getValue()) > 0) {
-					$finalParams[$name] = clone $default;
-				} elseif($isOptional) {
-					// there is no default or incoming match for this optional param, so remove it
-					$finalParams[$name] = null;
-				}
-			}
-		}
-
-		return $finalParams;
-	}
+    /**
+     * Adds all parameters which were matched in the incoming routes to the 
+     * generated route up the first user supplied parameter (from left to right)
+     * Also adds the default value for all non optional parameters the user 
+     * didn't supply.
+     * 
+     * @param      array $options The options
+     * @param      array $originalUserParams The parameters originally passed to gen()
+     * @param      array $params The parameters
+     * @param      array $availableParams A list of parameter names available for the route
+     * @param      array $matchedParams The matched parameters from execute() for the route
+     * @param      array $optionalParams the optional parameters for the route
+     * @param      array $defaultParams the default parameters for the route
+     * 
+     * @return     array The 'final' parameters
+     * 
+     * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
+     * @since      1.0.0
+     */
+    protected function refillMatchedAndDefaultParameters(array $options, array $originalUserParams, array $params, array $availableParams, array $matchedParams, array $optionalParams, array $defaultParams)
+    {
+        $refillValue = true;
+        $finalParams = array();
+        foreach($availableParams as $name) {
+            // loop all params and fill all with the matched parameters
+            // until a user (not callback) supplied parameter is encountered.
+            // After that only check defaults. Parameters supplied from the user
+            // or via callback always have precedence
+
+            // keep track if a user supplied parameter has already been encountered
+            if($refillValue && (isset($originalUserParams[$name]) || array_key_exists($name, $originalUserParams))) {
+                $refillValue = false;
+            }
+
+            // these 'aliases' are just for readability of the lower block
+            $isOptional = isset($optionalParams[$name]);
+            $hasMatched = isset($matchedParams[$name]);
+            $hasDefault = isset($defaultParams[$name]);
+            $hasUserCallbackParam = (isset($params[$name]) || array_key_exists($name, $params));
+
+            if($hasUserCallbackParam) {
+                // anything a user or callback supplied has precedence
+                // and since the user params are handled afterwards, skip them here
+            } elseif($refillValue && $hasMatched) {
+                // Use the matched input
+                $finalParams[$name] = $this->createValue($matchedParams[$name], true);
+            } elseif($hasDefault) {
+                // now we just need to check if there are defaults for this available param and fill them in if applicable
+                $default = $defaultParams[$name];
+                if(!$isOptional || strlen($default->getValue()) > 0) {
+                    $finalParams[$name] = clone $default;
+                } elseif($isOptional) {
+                    // there is no default or incoming match for this optional param, so remove it
+                    $finalParams[$name] = null;
+                }
+            }
+        }
+
+        return $finalParams;
+    }
 	
-	/**
-	 * Adds the user supplied parameters to the 'final' parameters for the route.
-	 * 
-	 * @param      array $options The options
-	 * @param      array $params The user parameters
-	 * @param      array $finalParams The 'final' parameters
-	 * @param      array $availableParams A list of parameter names available for the route
-	 * @param      array $optionalParams the optional parameters for the route
-	 * @param      array $defaultParams the default parameters for the route
-	 * 
-	 * @return     array The 'final' parameters
-	 * 
-	 * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
-	 * @since      1.0.0
-	 */
-	protected function fillUserParameters(array $options, array $params, array $finalParams, array $availableParams, array $optionalParams, array $defaultParams)
-	{
-		$availableParamsAsKeys = array_flip($availableParams);
-
-		foreach($params as $name => $param) {
-			if(!(isset($finalParams[$name]) || array_key_exists($name, $finalParams))) {
-				if($param === null && isset($optionalParams[$name])) {
-					// null was set for an optional parameter
-					$finalParams[$name] = $param;
-				} else {
-					if(isset($defaultParams[$name])) {
-						if($param === null || ($param instanceof RoutingValue && $param->getValue() === null)) {
-							// the user set the parameter to null, to signal that the default value should be used
-							$param = clone $defaultParams[$name];
-						}
-						$finalParams[$name] = $param;
-					} elseif(isset($availableParamsAsKeys[$name])) {
-						// when the parameter was available in one of the routes
-						$finalParams[$name] = $param;
-					}
-				}
-			}
-		}
-
-		return $finalParams;
-	}
-
-	/**
-	 * Adds the user supplied parameters to the 'final' parameters for the route.
-	 * 
-	 * @param      array $options The options
-	 * @param      array $finalParams The 'final' parameters
-	 * @param      array $availableParams A list of parameter names available for the route
-	 * @param      array $optionalParams the optional parameters for the route
-	 * @param      array $defaultParams the default parameters for the route
-	 * 
-	 * @return     array The 'final' parameters
-	 * 
-	 * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
-	 * @since      1.0.0
-	 */
-	protected function removeMatchingDefaults(array $options, array $finalParams, array $availableParams, array $optionalParams, array $defaultParams)
-	{
-		// if omit_defaults is set, we should not put optional values into the result string in case they are equal to their default value - even if they were given as a param
-		if(!empty($options['omit_defaults'])) {
-			// remove the optional parameters from the pattern beginning from right to the left, in case they are equal to their default
-			foreach(array_reverse($availableParams) as $name) {
-				if(isset($optionalParams[$name])) {
-					// the isset() could be replaced by
-					// "!array_key_exists($name, $finalParams) || $finalParams[$name] === null"
-					// to clarify that null is explicitly allowed here
-					if(!isset($finalParams[$name]) ||
-							(
-								isset($defaultParams[$name]) && 
-								$finalParams[$name]->getValue() == $defaultParams[$name]->getValue() &&
-								(!$finalParams[$name]->hasPrefix() || $finalParams[$name]->getPrefix() == $defaultParams[$name]->getPrefix()) && 
-								(!$finalParams[$name]->hasPostfix() || $finalParams[$name]->getPostfix() == $defaultParams[$name]->getPostfix())
-							)
-					) {
-						$finalParams[$name] = null;
-					} else {
-						break;
-					}
-				} else {
-					break;
-				}
-			}
-		}
+    /**
+     * Adds the user supplied parameters to the 'final' parameters for the route.
+     * 
+     * @param      array $options The options
+     * @param      array $params The user parameters
+     * @param      array $finalParams The 'final' parameters
+     * @param      array $availableParams A list of parameter names available for the route
+     * @param      array $optionalParams the optional parameters for the route
+     * @param      array $defaultParams the default parameters for the route
+     * 
+     * @return     array The 'final' parameters
+     * 
+     * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
+     * @since      1.0.0
+     */
+    protected function fillUserParameters(array $options, array $params, array $finalParams, array $availableParams, array $optionalParams, array $defaultParams)
+    {
+        $availableParamsAsKeys = array_flip($availableParams);
+
+        foreach($params as $name => $param) {
+            if(!(isset($finalParams[$name]) || array_key_exists($name, $finalParams))) {
+                if($param === null && isset($optionalParams[$name])) {
+                    // null was set for an optional parameter
+                    $finalParams[$name] = $param;
+                } else {
+                    if(isset($defaultParams[$name])) {
+                        if($param === null || ($param instanceof RoutingValue && $param->getValue() === null)) {
+                            // the user set the parameter to null, to signal that the default value should be used
+                            $param = clone $defaultParams[$name];
+                        }
+                        $finalParams[$name] = $param;
+                    } elseif(isset($availableParamsAsKeys[$name])) {
+                        // when the parameter was available in one of the routes
+                        $finalParams[$name] = $param;
+                    }
+                }
+            }
+        }
+
+        return $finalParams;
+    }
+
+    /**
+     * Adds the user supplied parameters to the 'final' parameters for the route.
+     * 
+     * @param      array $options The options
+     * @param      array $finalParams The 'final' parameters
+     * @param      array $availableParams A list of parameter names available for the route
+     * @param      array $optionalParams the optional parameters for the route
+     * @param      array $defaultParams the default parameters for the route
+     * 
+     * @return     array The 'final' parameters
+     * 
+     * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
+     * @since      1.0.0
+     */
+    protected function removeMatchingDefaults(array $options, array $finalParams, array $availableParams, array $optionalParams, array $defaultParams)
+    {
+        // if omit_defaults is set, we should not put optional values into the result string in case they are equal to their default value - even if they were given as a param
+        if(!empty($options['omit_defaults'])) {
+            // remove the optional parameters from the pattern beginning from right to the left, in case they are equal to their default
+            foreach(array_reverse($availableParams) as $name) {
+                if(isset($optionalParams[$name])) {
+                    // the isset() could be replaced by
+                    // "!array_key_exists($name, $finalParams) || $finalParams[$name] === null"
+                    // to clarify that null is explicitly allowed here
+                    if(!isset($finalParams[$name]) ||
+                            (
+                                isset($defaultParams[$name]) && 
+                                $finalParams[$name]->getValue() == $defaultParams[$name]->getValue() &&
+                                (!$finalParams[$name]->hasPrefix() || $finalParams[$name]->getPrefix() == $defaultParams[$name]->getPrefix()) && 
+                                (!$finalParams[$name]->hasPostfix() || $finalParams[$name]->getPostfix() == $defaultParams[$name]->getPostfix())
+                            )
+                    ) {
+                        $finalParams[$name] = null;
+                    } else {
+                        break;
+                    }
+                } else {
+                    break;
+                }
+            }
+        }
 		
-		return $finalParams;
-	}
+        return $finalParams;
+    }
 	
-	/**
-	 * Updates the pre and postfixes in the final params from the default
-	 * pre and postfix if available and if it hasn't been set yet by the user.
-	 * 
-	 * @param      array $finalParams The 'final' parameters
-	 * @param      array $defaultParams the default parameters for the route
-	 * 
-	 * @return     array The 'final' parameters
-	 * 
-	 * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
-	 * @since      1.0.0
-	 */
-	protected function updatePrefixAndPostfix(array $finalParams, array $defaultParams)
-	{
-		foreach($finalParams as $name => $param) {
-			if($param === null) {
-				continue;
-			}
+    /**
+     * Updates the pre and postfixes in the final params from the default
+     * pre and postfix if available and if it hasn't been set yet by the user.
+     * 
+     * @param      array $finalParams The 'final' parameters
+     * @param      array $defaultParams the default parameters for the route
+     * 
+     * @return     array The 'final' parameters
+     * 
+     * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
+     * @since      1.0.0
+     */
+    protected function updatePrefixAndPostfix(array $finalParams, array $defaultParams)
+    {
+        foreach($finalParams as $name => $param) {
+            if($param === null) {
+                continue;
+            }
 			
-			if(isset($defaultParams[$name])) {
-				// update the pre- and postfix from the default if they are not set in the routing value
-				$default = $defaultParams[$name];
-				if(!$param->hasPrefix() && $default->hasPrefix()) {
-					$param->setPrefix($default->getPrefix());
-				}
-				if(!$param->hasPostfix() && $default->hasPostfix()) {
-					$param->setPostfix($default->getPostfix());
-				}
-			}
-		}
-		return $finalParams;
-	}
+            if(isset($defaultParams[$name])) {
+                // update the pre- and postfix from the default if they are not set in the routing value
+                $default = $defaultParams[$name];
+                if(!$param->hasPrefix() && $default->hasPrefix()) {
+                    $param->setPrefix($default->getPrefix());
+                }
+                if(!$param->hasPostfix() && $default->hasPostfix()) {
+                    $param->setPostfix($default->getPostfix());
+                }
+            }
+        }
+        return $finalParams;
+    }
 	
-	/**
-	 * Encodes all 'final' parameters.
-	 * 
-	 * @param      array $options The 'final' parameters
-	 * @param      array $params The default parameters for the route
-	 * 
-	 * @return     array The 'final' parameters
-	 * 
-	 * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
-	 * @since      1.0.0
-	 */
-	protected function encodeParameters(array $options, array $params)
-	{
-		foreach($params as &$param) {
-			$param = $this->encodeParameter($param);
-		}
-		return $params;
-	}
+    /**
+     * Encodes all 'final' parameters.
+     * 
+     * @param      array $options The 'final' parameters
+     * @param      array $params The default parameters for the route
+     * 
+     * @return     array The 'final' parameters
+     * 
+     * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
+     * @since      1.0.0
+     */
+    protected function encodeParameters(array $options, array $params)
+    {
+        foreach($params as &$param) {
+            $param = $this->encodeParameter($param);
+        }
+        return $params;
+    }
 	
-	/**
-	 * Encodes a single parameter.
-	 * 
-	 * @param      mixed $parameter A RoutingValue object or a string
-	 * 
-	 * @return     string The encoded parameter
-	 * 
-	 * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
-	 * @since      1.0.0
-	 */
-	protected function encodeParameter($parameter)
-	{
-		if($parameter instanceof RoutingValue) {
-			return sprintf('%s%s%s', 
-				$parameter->getPrefixNeedsEncoding()  ? $this->escapeOutputParameter($parameter->getPrefix())  : $parameter->getPrefix(),
-				$parameter->getValueNeedsEncoding()   ? $this->escapeOutputParameter($parameter->getValue())   : $parameter->getValue(),
-				$parameter->getPostfixNeedsEncoding() ? $this->escapeOutputParameter($parameter->getPostfix()) : $parameter->getPostfix()
-			);
-		} else {
-			return $this->escapeOutputParameter($parameter);
-		}
-	}
+    /**
+     * Encodes a single parameter.
+     * 
+     * @param      mixed $parameter A RoutingValue object or a string
+     * 
+     * @return     string The encoded parameter
+     * 
+     * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
+     * @since      1.0.0
+     */
+    protected function encodeParameter($parameter)
+    {
+        if($parameter instanceof RoutingValue) {
+            return sprintf('%s%s%s', 
+                $parameter->getPrefixNeedsEncoding()  ? $this->escapeOutputParameter($parameter->getPrefix())  : $parameter->getPrefix(),
+                $parameter->getValueNeedsEncoding()   ? $this->escapeOutputParameter($parameter->getValue())   : $parameter->getValue(),
+                $parameter->getPostfixNeedsEncoding() ? $this->escapeOutputParameter($parameter->getPostfix()) : $parameter->getPostfix()
+            );
+        } else {
+            return $this->escapeOutputParameter($parameter);
+        }
+    }
 	
-	/**
-	 * Converts all members of an array to AgaviIRoutingValues.
-	 * 
-	 * @param      array $parameters The parameters
-	 * 
-	 * @return     array An array containing all parameters as RoutingValues
-	 * 
-	 * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
-	 * @since      1.0.0
-	 */
-	protected function convertParametersToRoutingValues(array $parameters)
-	{
-		if(count($parameters)) {
-			// make sure everything in $parameters is a routing value
-			foreach($parameters as &$param) {
-				if(!$param instanceof RoutingValue) {
-					if($param !== null) {
-						$param = $this->createValue($param);
-					}
-				} else {
-					// make sure the routing value the user passed to gen() is not modified
-					$param = clone $param;
-				}
-			}
-			return $parameters;
-		} else {
-			return array();
-		}
-	}
-
-	/**
-	 * Generate a formatted Agavi URL.
-	 *
-	 * @param      string $route   A route name.
-	 * @param      array  $params  An associative array of parameters.
-	 * @param      mixed  $options An array of options, or the name of an options preset.
-	 *
-	 * @return     array An array containing the generated route path, the
-	 *                   (possibly modified) parameters, and the (possibly
-	 *                   modified) options.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function gen($route, array $params = array(), $options = array())
-	{
-		if(array_key_exists('prefix', $options)) {
-			$prefix = (string) $options['prefix'];
-		} else {
-			$prefix = $this->getPrefix();
-		}
+    /**
+     * Converts all members of an array to AgaviIRoutingValues.
+     * 
+     * @param      array $parameters The parameters
+     * 
+     * @return     array An array containing all parameters as RoutingValues
+     * 
+     * @author     Dominik del Bondio <dominik.del.bondio@bitextender.com>
+     * @since      1.0.0
+     */
+    protected function convertParametersToRoutingValues(array $parameters)
+    {
+        if(count($parameters)) {
+            // make sure everything in $parameters is a routing value
+            foreach($parameters as &$param) {
+                if(!$param instanceof RoutingValue) {
+                    if($param !== null) {
+                        $param = $this->createValue($param);
+                    }
+                } else {
+                    // make sure the routing value the user passed to gen() is not modified
+                    $param = clone $param;
+                }
+            }
+            return $parameters;
+        } else {
+            return array();
+        }
+    }
+
+    /**
+     * Generate a formatted Agavi URL.
+     *
+     * @param      string $route   A route name.
+     * @param      array  $params  An associative array of parameters.
+     * @param      mixed  $options An array of options, or the name of an options preset.
+     *
+     * @return     array An array containing the generated route path, the
+     *                   (possibly modified) parameters, and the (possibly
+     *                   modified) options.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function gen($route, array $params = array(), $options = array())
+    {
+        if(array_key_exists('prefix', $options)) {
+            $prefix = (string) $options['prefix'];
+        } else {
+            $prefix = $this->getPrefix();
+        }
 		
-		$isNullRoute = false;
-		$routes = $this->getAffectedRoutes($route, $isNullRoute);
+        $isNullRoute = false;
+        $routes = $this->getAffectedRoutes($route, $isNullRoute);
 		
-		if(count($routes) == 0) {
-			return array($route, array(), $options, $params, $isNullRoute);
-		}
+        if(count($routes) == 0) {
+            return array($route, array(), $options, $params, $isNullRoute);
+        }
 		
-		if($isNullRoute) {
-			// for gen(null) and friends all matched parameters are inserted before the 
-			// supplied params are backuped
-			$params = $this->fillGenNullParameters($routes, $params);
-		}
+        if($isNullRoute) {
+            // for gen(null) and friends all matched parameters are inserted before the 
+            // supplied params are backuped
+            $params = $this->fillGenNullParameters($routes, $params);
+        }
 		
-		$params = $this->convertParametersToRoutingValues($params);
-		// we need to store the original params since we will be trying to fill the
-		// parameters up to the first user supplied parameter
-		$originalParams = $params;
+        $params = $this->convertParametersToRoutingValues($params);
+        // we need to store the original params since we will be trying to fill the
+        // parameters up to the first user supplied parameter
+        $originalParams = $params;
 		
-		$assembledInformation = $this->assembleRoutes($options, $routes, $params);
+        $assembledInformation = $this->assembleRoutes($options, $routes, $params);
 		
-		$options = $assembledInformation['options'];
+        $options = $assembledInformation['options'];
 		
-		$params = $assembledInformation['user_parameters'];
+        $params = $assembledInformation['user_parameters'];
 		
-		$params = $this->refillAllMatchedParameters($options, $params, $assembledInformation['matched_parameters']);
-		$finalParams = $this->refillMatchedAndDefaultParameters($options, $originalParams, $params, $assembledInformation['available_parameters'], $assembledInformation['matched_parameters'], $assembledInformation['optional_parameters'], $assembledInformation['default_parameters']);
-		$finalParams = $this->fillUserParameters($options, $params, $finalParams, $assembledInformation['available_parameters'], $assembledInformation['optional_parameters'], $assembledInformation['default_parameters']);
-		$finalParams = $this->removeMatchingDefaults($options, $finalParams, $assembledInformation['available_parameters'], $assembledInformation['optional_parameters'], $assembledInformation['default_parameters']);
-		$finalParams = $this->updatePrefixAndPostfix($finalParams, $assembledInformation['default_parameters']);
-
-		// remember the params that are not in any pattern (could be extra query params, for example, set by a callback), use the parameter state after the callbacks have been run and defaults have been inserted. We also need to take originalParams into account for the case that a value was unset in a callback (which requires us to restore the old value). The array_merge is safe for this task since everything changed, etc appears in $params and overwrites the values from $originalParams
-		$extras = array_diff_key(array_merge($originalParams, $params), $finalParams);
-		// but since the values are expected as plain values and not routing values, convert the routing values back to 
-		// 'plain' values
-		foreach($extras as &$extra) {
-			$extra = ($extra instanceof RoutingValue) ? $extra->getValue() : $extra;
-		}
-
-		$params = $finalParams;
-
-		$params = $this->encodeParameters($options, $params);
-
-		$from = array();
-		$to = array();
+        $params = $this->refillAllMatchedParameters($options, $params, $assembledInformation['matched_parameters']);
+        $finalParams = $this->refillMatchedAndDefaultParameters($options, $originalParams, $params, $assembledInformation['available_parameters'], $assembledInformation['matched_parameters'], $assembledInformation['optional_parameters'], $assembledInformation['default_parameters']);
+        $finalParams = $this->fillUserParameters($options, $params, $finalParams, $assembledInformation['available_parameters'], $assembledInformation['optional_parameters'], $assembledInformation['default_parameters']);
+        $finalParams = $this->removeMatchingDefaults($options, $finalParams, $assembledInformation['available_parameters'], $assembledInformation['optional_parameters'], $assembledInformation['default_parameters']);
+        $finalParams = $this->updatePrefixAndPostfix($finalParams, $assembledInformation['default_parameters']);
+
+        // remember the params that are not in any pattern (could be extra query params, for example, set by a callback), use the parameter state after the callbacks have been run and defaults have been inserted. We also need to take originalParams into account for the case that a value was unset in a callback (which requires us to restore the old value). The array_merge is safe for this task since everything changed, etc appears in $params and overwrites the values from $originalParams
+        $extras = array_diff_key(array_merge($originalParams, $params), $finalParams);
+        // but since the values are expected as plain values and not routing values, convert the routing values back to 
+        // 'plain' values
+        foreach($extras as &$extra) {
+            $extra = ($extra instanceof RoutingValue) ? $extra->getValue() : $extra;
+        }
+
+        $params = $finalParams;
+
+        $params = $this->encodeParameters($options, $params);
+
+        $from = array();
+        $to = array();
 		
 
-		// remove not specified available parameters
-		foreach(array_unique($assembledInformation['available_parameters']) as $name) {
-			if(!isset($params[$name])) {
-				$from[] = '(:' . $name . ':)';
-				$to[] = '';
-			}
-		}
-
-		foreach($params as $n => $p) {
-			$from[] = '(:' . $n . ':)';
-			$to[] = $p;
-		}
-
-		$uri = str_replace($from, $to, $assembledInformation['uri']);
-		return array($prefix . $uri, $params, $options, $extras, $isNullRoute);
-	}
+        // remove not specified available parameters
+        foreach(array_unique($assembledInformation['available_parameters']) as $name) {
+            if(!isset($params[$name])) {
+                $from[] = '(:' . $name . ':)';
+                $to[] = '';
+            }
+        }
+
+        foreach($params as $n => $p) {
+            $from[] = '(:' . $n . ':)';
+            $to[] = $p;
+        }
+
+        $uri = str_replace($from, $to, $assembledInformation['uri']);
+        return array($prefix . $uri, $params, $options, $extras, $isNullRoute);
+    }
 	
 	
-	/**
-	 * Escapes an argument to be used in an generated route.
-	 *
-	 * @param      string $string The argument to be escaped.
-	 *
-	 * @return     string The escaped argument.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function escapeOutputParameter($string)
-	{
-		return (string)$string;
-	}
-
-	/**
-	 * Matches the input against the routing info and sets the info as request
-	 * parameter.
-	 *
-	 * @return     mixed An ExecutionContainer as a result of this execution,
-	 *                   or an AgaviResponse if a callback returned one.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function execute()
-	{
-		$rq = $this->context->getRequest();
-
-		$rd = $rq->getRequestData();
-
-		$tm = $this->context->getTranslationManager();
+    /**
+     * Escapes an argument to be used in an generated route.
+     *
+     * @param      string $string The argument to be escaped.
+     *
+     * @return     string The escaped argument.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function escapeOutputParameter($string)
+    {
+        return (string)$string;
+    }
+
+    /**
+     * Matches the input against the routing info and sets the info as request
+     * parameter.
+     *
+     * @return     mixed An ExecutionContainer as a result of this execution,
+     *                   or an AgaviResponse if a callback returned one.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function execute()
+    {
+        $rq = $this->context->getRequest();
+
+        $rd = $rq->getRequestData();
+
+        $tm = $this->context->getTranslationManager();
 		
-		$container = $this->context->getDispatcher()->createExecutionContainer();
+        $container = $this->context->getDispatcher()->createExecutionContainer();
 
-		if(!$this->isEnabled()) {
-			// routing disabled, just bail out here
-			return $container;
-		}
+        if(!$this->isEnabled()) {
+            // routing disabled, just bail out here
+            return $container;
+        }
 
-		$matchedRoutes = array();
+        $matchedRoutes = array();
 
-		$input = $this->input;
+        $input = $this->input;
 
-		$vars = array();
-		$ot = null;
-		$locale = null;
-		$method = null;
+        $vars = array();
+        $ot = null;
+        $locale = null;
+        $method = null;
 		
-		$umap = $rq->getParameter('use_module_controller_parameters');
-		$ma = $rq->getParameter('module_accessor');
-		$aa = $rq->getParameter('controller_accessor');
+        $umap = $rq->getParameter('use_module_controller_parameters');
+        $ma = $rq->getParameter('module_accessor');
+        $aa = $rq->getParameter('controller_accessor');
 		
-		$requestMethod = $rq->getMethod();
-
-		$routes = array();
-		// get all top level routes
-		foreach($this->routes as $name => $route) {
-			if(!$route['opt']['parent']) {
-				$routes[] = $name;
-			}
-		}
-
-		// prepare the working stack with the root routes
-		$routeStack = array($routes);
-
-		do {
-			$routes = array_pop($routeStack);
-			foreach($routes as $key) {
-				$route =& $this->routes[$key];
-				$opts =& $route['opt'];
-				if(count($opts['constraint']) == 0 || in_array($requestMethod, $opts['constraint'])) {
-					if(count($opts['callbacks']) > 0 && !isset($route['callback_instances'])) {
-						foreach($opts['callbacks'] as $key => $callback) {
-							/** @var RoutingCallback $instance */
-							$instance = new $callback['class']();
-							$instance->initialize($this->context, $route);
-							$instance->setParameters($callback['parameters']);
-							$route['callback_instances'][$key] = $instance;
-						}
-					}
-
-					$match = array();
-					if($this->parseInput($route, $input, $match)) {
-						$varsBackup = $vars;
+        $requestMethod = $rq->getMethod();
+
+        $routes = array();
+        // get all top level routes
+        foreach($this->routes as $name => $route) {
+            if(!$route['opt']['parent']) {
+                $routes[] = $name;
+            }
+        }
+
+        // prepare the working stack with the root routes
+        $routeStack = array($routes);
+
+        do {
+            $routes = array_pop($routeStack);
+            foreach($routes as $key) {
+                $route =& $this->routes[$key];
+                $opts =& $route['opt'];
+                if(count($opts['constraint']) == 0 || in_array($requestMethod, $opts['constraint'])) {
+                    if(count($opts['callbacks']) > 0 && !isset($route['callback_instances'])) {
+                        foreach($opts['callbacks'] as $key => $callback) {
+                            /** @var RoutingCallback $instance */
+                            $instance = new $callback['class']();
+                            $instance->initialize($this->context, $route);
+                            $instance->setParameters($callback['parameters']);
+                            $route['callback_instances'][$key] = $instance;
+                        }
+                    }
+
+                    $match = array();
+                    if($this->parseInput($route, $input, $match)) {
+                        $varsBackup = $vars;
 						
-						// backup the container, must be done here already
-						if(count($opts['callbacks']) > 0) {
-							$containerBackup = $container;
-							$container = clone $container;
-						}
+                        // backup the container, must be done here already
+                        if(count($opts['callbacks']) > 0) {
+                            $containerBackup = $container;
+                            $container = clone $container;
+                        }
 						
-						$ign = array();
-						if(count($opts['ignores']) > 0) {
-							$ign = array_flip($opts['ignores']);
-						}
-
-						/**
-						 * @var $value RoutingValue;
-						 */
-						foreach($opts['defaults'] as $key => $value) {
-							if(!isset($ign[$key]) && $value->getValue() !== null) {
-								$vars[$key] = $value->getValue();
-							}
-						}
-
-						foreach($route['par'] as $param) {
-							if(isset($match[$param]) && $match[$param][1] != -1) {
-								$vars[$param] = $match[$param][0];
-							}
-						}
-
-						foreach($match as $name => $m) {
-							if(is_string($name) && $m[1] != -1) {
-								$route['matches'][$name] = $m[0];
-							}
-						}
-
-						// /* ! Only use the parameters from this route for expandVariables !
-						// matches are arrays with value and offset due to PREG_OFFSET_CAPTURE, and we want index 0, the value, which reset() will give us. Long story short, this removes the offset from the individual match
-						$matchvals = array_map('reset', $match);
-						// */
-						/* ! Use the parameters from ALL routes for expandVariables !
+                        $ign = array();
+                        if(count($opts['ignores']) > 0) {
+                            $ign = array_flip($opts['ignores']);
+                        }
+
+                        /**
+                         * @var $value RoutingValue;
+                         */
+                        foreach($opts['defaults'] as $key => $value) {
+                            if(!isset($ign[$key]) && $value->getValue() !== null) {
+                                $vars[$key] = $value->getValue();
+                            }
+                        }
+
+                        foreach($route['par'] as $param) {
+                            if(isset($match[$param]) && $match[$param][1] != -1) {
+                                $vars[$param] = $match[$param][0];
+                            }
+                        }
+
+                        foreach($match as $name => $m) {
+                            if(is_string($name) && $m[1] != -1) {
+                                $route['matches'][$name] = $m[0];
+                            }
+                        }
+
+                        // /* ! Only use the parameters from this route for expandVariables !
+                        // matches are arrays with value and offset due to PREG_OFFSET_CAPTURE, and we want index 0, the value, which reset() will give us. Long story short, this removes the offset from the individual match
+                        $matchvals = array_map('reset', $match);
+                        // */
+                        /* ! Use the parameters from ALL routes for expandVariables !
 						$matchvals = $vars;
 						// ignores need of the current route need to be added
 						$foreach($opts['ignores'] as $ignore) {
@@ -1239,532 +1239,532 @@ 
 						}
 						// */
 
-						if($opts['module']) {
-							$module = Toolkit::expandVariables($opts['module'], $matchvals);
-							$container->setModuleName($module);
-							if($umap) {
-								$vars[$ma] = $module;
-							}
-						}
-
-						if($opts['controller']) {
-							$controller = Toolkit::expandVariables($opts['controller'], $matchvals);
-							$container->setControllerName($controller);
-							if($umap) {
-								$vars[$aa] = $controller;
-							}
-						}
-
-						if($opts['output_type']) {
-							// set the output type if necessary
-							// here no explicit check is done, since in 0.11 this is compared against null
-							// which can never be the result of expandVariables
-							$ot = Toolkit::expandVariables($opts['output_type'], $matchvals);
+                        if($opts['module']) {
+                            $module = Toolkit::expandVariables($opts['module'], $matchvals);
+                            $container->setModuleName($module);
+                            if($umap) {
+                                $vars[$ma] = $module;
+                            }
+                        }
+
+                        if($opts['controller']) {
+                            $controller = Toolkit::expandVariables($opts['controller'], $matchvals);
+                            $container->setControllerName($controller);
+                            if($umap) {
+                                $vars[$aa] = $controller;
+                            }
+                        }
+
+                        if($opts['output_type']) {
+                            // set the output type if necessary
+                            // here no explicit check is done, since in 0.11 this is compared against null
+                            // which can never be the result of expandVariables
+                            $ot = Toolkit::expandVariables($opts['output_type'], $matchvals);
 							
-							// we need to wrap in try/catch here (but not further down after the callbacks have run) for BC
-							// and because it makes sense - maybe a callback checks or changes the output type name
-							try {
-								$container->setOutputType($this->context->getDispatcher()->getOutputType($ot));
-							} catch(AgaviException $e) {
-							}
-						}
-
-						if($opts['locale']) {
-							$localeBackup = $tm->getCurrentLocaleIdentifier();
+                            // we need to wrap in try/catch here (but not further down after the callbacks have run) for BC
+                            // and because it makes sense - maybe a callback checks or changes the output type name
+                            try {
+                                $container->setOutputType($this->context->getDispatcher()->getOutputType($ot));
+                            } catch(AgaviException $e) {
+                            }
+                        }
+
+                        if($opts['locale']) {
+                            $localeBackup = $tm->getCurrentLocaleIdentifier();
 							
-							// set the locale if necessary
-							if($locale = Toolkit::expandVariables($opts['locale'], $matchvals)) {
-								// the if is here for bc reasons, since if $opts['locale'] only contains variable parts
-								// expandVariables could possibly return an empty string in which case the pre 1.0 routing
-								// didn't set the variable
+                            // set the locale if necessary
+                            if($locale = Toolkit::expandVariables($opts['locale'], $matchvals)) {
+                                // the if is here for bc reasons, since if $opts['locale'] only contains variable parts
+                                // expandVariables could possibly return an empty string in which case the pre 1.0 routing
+                                // didn't set the variable
 								
-								// we need to wrap in try/catch here (but not further down after the callbacks have run) for BC
-								// and because it makes sense - maybe a callback checks or changes the locale name
-								try {
-									$tm->setLocale($locale);
-								} catch(AgaviException $e) {
-								}
-							}
-						} else {
-							// unset it explicitly, so that further down, the isset() check doesn't set back a value from a previous iteration!
-							$localeBackup = null;
-						}
-
-						if($opts['method']) {
-							// set the request method if necessary
-							if($method = Toolkit::expandVariables($opts['method'], $matchvals)) {
-								// the if is here for bc reasons, since if $opts['method'] only contains variable parts
-								// expandVariables could possibly return an empty string in which case the pre 1.0 routing
-								// didn't set the variable
-								$rq->setMethod($method);
-								// and on the already created container, too!
-								$container->setRequestMethod($method);
-							}
-						}
-
-						if(count($opts['callbacks']) > 0) {
-							if(count($opts['ignores']) > 0) {
-								// add ignored variables to the callback vars
-								foreach($vars as $name => &$var) {
-									$vars[$name] =& $var;
-								}
-								foreach($opts['ignores'] as $ignore) {
-									if(isset($match[$ignore]) && $match[$ignore][1] != -1) {
-										$vars[$ignore] = $match[$ignore][0];
-									}
-								}
-							}
-							$callbackSuccess = true;
-							/** @var RoutingCallback $callbackInstance */
-							foreach($route['callback_instances'] as $callbackInstance) {
-								// call onMatched on all callbacks until one of them returns false
-								// then restore state and call onNotMatched on that same callback
-								// after that, call onNotMatched for all remaining callbacks of that route
-								if($callbackSuccess) {
-									// backup stuff which could be changed in the callback so we are 
-									// able to determine which values were changed in the callback
-									$oldModule = $container->getModuleName();
-									$oldController = $container->getControllerName();
-									$oldOutputTypeName = $container->getOutputType() ? $container->getOutputType()->getName() : null;
-									if(null === $tm) {
-										$oldLocale = null;
-									} else {
-										$oldLocale = $tm->getCurrentLocaleIdentifier();
-									}
-									$oldRequestMethod = $rq->getMethod();
-									$oldContainerMethod = $container->getRequestMethod();
-
-									$onMatched = $callbackInstance->onMatched($vars, $container);
-									if($onMatched instanceof Response) {
-										return $onMatched;
-									}
-									if(!$onMatched) {
-										$callbackSuccess = false;
+                                // we need to wrap in try/catch here (but not further down after the callbacks have run) for BC
+                                // and because it makes sense - maybe a callback checks or changes the locale name
+                                try {
+                                    $tm->setLocale($locale);
+                                } catch(AgaviException $e) {
+                                }
+                            }
+                        } else {
+                            // unset it explicitly, so that further down, the isset() check doesn't set back a value from a previous iteration!
+                            $localeBackup = null;
+                        }
+
+                        if($opts['method']) {
+                            // set the request method if necessary
+                            if($method = Toolkit::expandVariables($opts['method'], $matchvals)) {
+                                // the if is here for bc reasons, since if $opts['method'] only contains variable parts
+                                // expandVariables could possibly return an empty string in which case the pre 1.0 routing
+                                // didn't set the variable
+                                $rq->setMethod($method);
+                                // and on the already created container, too!
+                                $container->setRequestMethod($method);
+                            }
+                        }
+
+                        if(count($opts['callbacks']) > 0) {
+                            if(count($opts['ignores']) > 0) {
+                                // add ignored variables to the callback vars
+                                foreach($vars as $name => &$var) {
+                                    $vars[$name] =& $var;
+                                }
+                                foreach($opts['ignores'] as $ignore) {
+                                    if(isset($match[$ignore]) && $match[$ignore][1] != -1) {
+                                        $vars[$ignore] = $match[$ignore][0];
+                                    }
+                                }
+                            }
+                            $callbackSuccess = true;
+                            /** @var RoutingCallback $callbackInstance */
+                            foreach($route['callback_instances'] as $callbackInstance) {
+                                // call onMatched on all callbacks until one of them returns false
+                                // then restore state and call onNotMatched on that same callback
+                                // after that, call onNotMatched for all remaining callbacks of that route
+                                if($callbackSuccess) {
+                                    // backup stuff which could be changed in the callback so we are 
+                                    // able to determine which values were changed in the callback
+                                    $oldModule = $container->getModuleName();
+                                    $oldController = $container->getControllerName();
+                                    $oldOutputTypeName = $container->getOutputType() ? $container->getOutputType()->getName() : null;
+                                    if(null === $tm) {
+                                        $oldLocale = null;
+                                    } else {
+                                        $oldLocale = $tm->getCurrentLocaleIdentifier();
+                                    }
+                                    $oldRequestMethod = $rq->getMethod();
+                                    $oldContainerMethod = $container->getRequestMethod();
+
+                                    $onMatched = $callbackInstance->onMatched($vars, $container);
+                                    if($onMatched instanceof Response) {
+                                        return $onMatched;
+                                    }
+                                    if(!$onMatched) {
+                                        $callbackSuccess = false;
 										
-										// reset the matches array. it must be populated by the time onMatched() is called so matches can be modified in a callback
-										$route['matches'] = array();
-										// restore the variables from the variables which were set before this route matched
-										$vars = $varsBackup;
-										// reset all relevant container data we already set in the container for this (now non matching) route
-										$container = $containerBackup;
-										// restore locale
-										if(isset($localeBackup)) {
-											$tm->setLocale($localeBackup);
-										}
-										// restore request method
-										$rq->setMethod($container->getRequestMethod());
-									}
-								}
+                                        // reset the matches array. it must be populated by the time onMatched() is called so matches can be modified in a callback
+                                        $route['matches'] = array();
+                                        // restore the variables from the variables which were set before this route matched
+                                        $vars = $varsBackup;
+                                        // reset all relevant container data we already set in the container for this (now non matching) route
+                                        $container = $containerBackup;
+                                        // restore locale
+                                        if(isset($localeBackup)) {
+                                            $tm->setLocale($localeBackup);
+                                        }
+                                        // restore request method
+                                        $rq->setMethod($container->getRequestMethod());
+                                    }
+                                }
 								
-								// always call onNotMatched if $callbackSuccess == false, even if we just called onMatched() on the same instance. this is expected behavior
-								if(!$callbackSuccess) {
-									$onNotMatched = $callbackInstance->onNotMatched($container);
-									if($onNotMatched instanceof Response) {
-										return $onNotMatched;
-									}
+                                // always call onNotMatched if $callbackSuccess == false, even if we just called onMatched() on the same instance. this is expected behavior
+                                if(!$callbackSuccess) {
+                                    $onNotMatched = $callbackInstance->onNotMatched($container);
+                                    if($onNotMatched instanceof Response) {
+                                        return $onNotMatched;
+                                    }
 									
-									// continue with the next callback
-									continue;
-								}
+                                    // continue with the next callback
+                                    continue;
+                                }
 								
-								// /* ! Only use the parameters from this route for expandVariables !
-								$expandVars = $vars;
-								$routeParamsAsKey = array_flip($route['par']);
-								// only use parameters which are defined in this route or are new
-								foreach($expandVars as $name => $value) {
-									if(!isset($routeParamsAsKey[$name]) && array_key_exists($name, $varsBackup)) {
-										unset($expandVars[$name]);
-									}
-								} 
-								// */
-								/* ! Use the parameters from ALL routes for expandVariables !
+                                // /* ! Only use the parameters from this route for expandVariables !
+                                $expandVars = $vars;
+                                $routeParamsAsKey = array_flip($route['par']);
+                                // only use parameters which are defined in this route or are new
+                                foreach($expandVars as $name => $value) {
+                                    if(!isset($routeParamsAsKey[$name]) && array_key_exists($name, $varsBackup)) {
+                                        unset($expandVars[$name]);
+                                    }
+                                } 
+                                // */
+                                /* ! Use the parameters from ALL routes for expandVariables !
 								$expandVars = $vars;
 								// */
 								
 								
-								// if the callback didn't change the value, execute expandVariables again since 
-								// the callback could have changed one of the values which expandVariables uses
-								// to evaluate the contents of the attribute in question (e.g. module="${zomg}")
-								if($opts['module'] && $oldModule == $container->getModuleName() && (!$umap || !array_key_exists($ma, $vars) || $oldModule == $vars[$ma])) {
-									$module = Toolkit::expandVariables($opts['module'], $expandVars);
-									$container->setModuleName($module);
-									if($umap) {
-										$vars[$ma] = $module;
-									}
-								}
-								if($opts['controller'] && $oldController == $container->getControllerName() && (!$umap || !array_key_exists($aa, $vars) || $oldController == $vars[$aa])) {
-									$controller = Toolkit::expandVariables($opts['controller'], $expandVars);
-									$container->setControllerName($controller);
-									if($umap) {
-										$vars[$aa] = $controller;
-									}
-								}
-								if($opts['output_type'] && $oldOutputTypeName == ($container->getOutputType() ? $container->getOutputType()->getName() : null)) {
-									$ot = Toolkit::expandVariables($opts['output_type'], $expandVars);
-									$container->setOutputType($this->context->getDispatcher()->getOutputType($ot));
-								}
-								if($opts['locale'] && $oldLocale == $tm->getCurrentLocaleIdentifier()) {
-									if($locale = Toolkit::expandVariables($opts['locale'], $expandVars)) {
-										// see above for the reason of the if
-										$tm->setLocale($locale);
-									}
-								}
-								if($opts['method']) {
-									if($oldRequestMethod == $rq->getMethod() && $oldContainerMethod == $container->getRequestMethod()) {
-										if($method = Toolkit::expandVariables($opts['method'], $expandVars)) {
-											// see above for the reason of the if
-											$rq->setMethod($method);
-											$container->setRequestMethod($method);
-										}
-									} elseif($oldContainerMethod != $container->getRequestMethod()) {
-										// copy the request method to the request (a method set on the container 
-										// in a callback always has precedence over request methods set on the request)
-										$rq->setMethod($container->getRequestMethod());
-									} elseif($oldRequestMethod != $rq->getMethod()) {
-										// copy the request method to the container
-										$container->setRequestMethod($rq->getMethod());
-									}
-								}
+                                // if the callback didn't change the value, execute expandVariables again since 
+                                // the callback could have changed one of the values which expandVariables uses
+                                // to evaluate the contents of the attribute in question (e.g. module="${zomg}")
+                                if($opts['module'] && $oldModule == $container->getModuleName() && (!$umap || !array_key_exists($ma, $vars) || $oldModule == $vars[$ma])) {
+                                    $module = Toolkit::expandVariables($opts['module'], $expandVars);
+                                    $container->setModuleName($module);
+                                    if($umap) {
+                                        $vars[$ma] = $module;
+                                    }
+                                }
+                                if($opts['controller'] && $oldController == $container->getControllerName() && (!$umap || !array_key_exists($aa, $vars) || $oldController == $vars[$aa])) {
+                                    $controller = Toolkit::expandVariables($opts['controller'], $expandVars);
+                                    $container->setControllerName($controller);
+                                    if($umap) {
+                                        $vars[$aa] = $controller;
+                                    }
+                                }
+                                if($opts['output_type'] && $oldOutputTypeName == ($container->getOutputType() ? $container->getOutputType()->getName() : null)) {
+                                    $ot = Toolkit::expandVariables($opts['output_type'], $expandVars);
+                                    $container->setOutputType($this->context->getDispatcher()->getOutputType($ot));
+                                }
+                                if($opts['locale'] && $oldLocale == $tm->getCurrentLocaleIdentifier()) {
+                                    if($locale = Toolkit::expandVariables($opts['locale'], $expandVars)) {
+                                        // see above for the reason of the if
+                                        $tm->setLocale($locale);
+                                    }
+                                }
+                                if($opts['method']) {
+                                    if($oldRequestMethod == $rq->getMethod() && $oldContainerMethod == $container->getRequestMethod()) {
+                                        if($method = Toolkit::expandVariables($opts['method'], $expandVars)) {
+                                            // see above for the reason of the if
+                                            $rq->setMethod($method);
+                                            $container->setRequestMethod($method);
+                                        }
+                                    } elseif($oldContainerMethod != $container->getRequestMethod()) {
+                                        // copy the request method to the request (a method set on the container 
+                                        // in a callback always has precedence over request methods set on the request)
+                                        $rq->setMethod($container->getRequestMethod());
+                                    } elseif($oldRequestMethod != $rq->getMethod()) {
+                                        // copy the request method to the container
+                                        $container->setRequestMethod($rq->getMethod());
+                                    }
+                                }
 								
-								// one last thing we need to do: see if one of the callbacks modified the 'controller' or 'module' vars inside $vars if $umap is on
-								// we then need to write those back to the container, unless they changed THERE, too, in which case the container values take precedence
-								if($umap && $oldModule == $container->getModuleName() && array_key_exists($ma, $vars) && $vars[$ma] != $oldModule) {
-									$container->setModuleName($vars[$ma]);
-								}
-								if($umap && $oldController == $container->getControllerName() && array_key_exists($aa, $vars) && $vars[$aa] != $oldController) {
-									$container->setControllerName($vars[$aa]);
-								}
-							}
-							if(!$callbackSuccess) {
-								// jump straight to the next route
-								continue;
-							} else {
-								// We added the ignores to the route variables so the callback receives them, so restore them from vars backup.
-								// Restoring them from the backup is necessary since otherwise a value which has been set before this route
-								// and which was ignored in this route would take the ignored value instead of keeping the old one.
-								// And variables which have not been set in an earlier routes need to be removed again
-								foreach($opts['ignores'] as $ignore) {
-									if(array_key_exists($ignore, $varsBackup)) {
-										$vars[$ignore] = $varsBackup[$ignore];
-									} else {
-										unset($vars[$ignore]);
-									}
-								}
-							}
-						}
-
-						$matchedRoutes[] = $opts['name'];
-
-						if($opts['cut'] || (count($opts['childs']) && $opts['cut'] === null)) {
-							if($route['opt']['source'] !== null) {
-								$s =& $this->sources[$route['opt']['source']];
-							} else {
-								$s =& $input;
-							}
-
-							$ni = '';
-							// if the route didn't match from the start of the input preserve the 'prefix'
-							if($match[0][1] > 0) {
-								$ni = substr($s, 0, $match[0][1]);
-							}
-							$ni .= substr($s, $match[0][1] + strlen($match[0][0]));
-							$s = $ni;
-						}
-
-						if(count($opts['childs'])) {
-							// our childs need to be processed next and stop processing 'afterwards'
-							$routeStack[] = $opts['childs'];
-							break;
-						}
-
-						if($opts['stop']) {
-							break;
-						}
-
-					} else {
-						if(count($opts['callbacks']) > 0) {
-							/** @var RoutingCallback $callbackInstance */
-							foreach($route['callback_instances'] as $callbackInstance) {
-								$onNotMatched = $callbackInstance->onNotMatched($container);
-								if($onNotMatched instanceof Response) {
-									return $onNotMatched;
-								}
-							}
-						}
-					}
-				}
-			}
-		} while(count($routeStack) > 0);
-
-		// put the vars into the request
-		$rd->setParameters($vars);
-
-		if($container->getModuleName() === null || $container->getControllerName() === null) {
-			// no route which supplied the required parameters matched, use 404 controller
-			$container->setModuleName(Config::get('controllers.error_404_module'));
-			$container->setControllerName(Config::get('controllers.error_404_controller'));
+                                // one last thing we need to do: see if one of the callbacks modified the 'controller' or 'module' vars inside $vars if $umap is on
+                                // we then need to write those back to the container, unless they changed THERE, too, in which case the container values take precedence
+                                if($umap && $oldModule == $container->getModuleName() && array_key_exists($ma, $vars) && $vars[$ma] != $oldModule) {
+                                    $container->setModuleName($vars[$ma]);
+                                }
+                                if($umap && $oldController == $container->getControllerName() && array_key_exists($aa, $vars) && $vars[$aa] != $oldController) {
+                                    $container->setControllerName($vars[$aa]);
+                                }
+                            }
+                            if(!$callbackSuccess) {
+                                // jump straight to the next route
+                                continue;
+                            } else {
+                                // We added the ignores to the route variables so the callback receives them, so restore them from vars backup.
+                                // Restoring them from the backup is necessary since otherwise a value which has been set before this route
+                                // and which was ignored in this route would take the ignored value instead of keeping the old one.
+                                // And variables which have not been set in an earlier routes need to be removed again
+                                foreach($opts['ignores'] as $ignore) {
+                                    if(array_key_exists($ignore, $varsBackup)) {
+                                        $vars[$ignore] = $varsBackup[$ignore];
+                                    } else {
+                                        unset($vars[$ignore]);
+                                    }
+                                }
+                            }
+                        }
+
+                        $matchedRoutes[] = $opts['name'];
+
+                        if($opts['cut'] || (count($opts['childs']) && $opts['cut'] === null)) {
+                            if($route['opt']['source'] !== null) {
+                                $s =& $this->sources[$route['opt']['source']];
+                            } else {
+                                $s =& $input;
+                            }
+
+                            $ni = '';
+                            // if the route didn't match from the start of the input preserve the 'prefix'
+                            if($match[0][1] > 0) {
+                                $ni = substr($s, 0, $match[0][1]);
+                            }
+                            $ni .= substr($s, $match[0][1] + strlen($match[0][0]));
+                            $s = $ni;
+                        }
+
+                        if(count($opts['childs'])) {
+                            // our childs need to be processed next and stop processing 'afterwards'
+                            $routeStack[] = $opts['childs'];
+                            break;
+                        }
+
+                        if($opts['stop']) {
+                            break;
+                        }
+
+                    } else {
+                        if(count($opts['callbacks']) > 0) {
+                            /** @var RoutingCallback $callbackInstance */
+                            foreach($route['callback_instances'] as $callbackInstance) {
+                                $onNotMatched = $callbackInstance->onNotMatched($container);
+                                if($onNotMatched instanceof Response) {
+                                    return $onNotMatched;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        } while(count($routeStack) > 0);
+
+        // put the vars into the request
+        $rd->setParameters($vars);
+
+        if($container->getModuleName() === null || $container->getControllerName() === null) {
+            // no route which supplied the required parameters matched, use 404 controller
+            $container->setModuleName(Config::get('controllers.error_404_module'));
+            $container->setControllerName(Config::get('controllers.error_404_controller'));
 			
-			if($umap) {
-				$rd->setParameters(array(
-					$ma => $container->getModuleName(),
-					$aa => $container->getControllerName(),
-				));
-			}
-		}
-
-		// set the list of matched route names as a request attribute
-		$rq->setAttribute('matched_routes', $matchedRoutes, 'org.agavi.routing');
-
-		// return a list of matched route names
-		return $container;
-	}
-
-	/**
-	 * Performs as match of the route against the input
-	 *
-	 * @param      array  $route   The route info array.
-	 * @param      string $input   The input.
-	 * @param      array  $matches The array where the matches will be stored to.
-	 *
-	 * @return     bool Whether the regexp matched.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	protected function parseInput(array $route, $input, &$matches)
-	{
-		if($route['opt']['source'] !== null) {
-			$parts = ArrayPathDefinition::getPartsFromPath($route['opt']['source']);
-			$partArray = $parts['parts'];
-			$count = count($partArray);
-			if($count > 0 && isset($this->sources[$partArray[0]])) {
-				$input = $this->sources[$partArray[0]];
-				if($count > 1) {
-					array_shift($partArray);
-					if(is_array($input)) {
-						$input = ArrayPathDefinition::getValue($partArray, $input);
-					} elseif($input instanceof RoutingSourceInterface) {
-						$input = $input->getSource($partArray);
-					}
-				}
-			}
-		}
-		return preg_match($route['rxp'], $input, $matches, PREG_OFFSET_CAPTURE);
-	}
-
-	/**
-	 * Parses a route pattern string.
-	 *
-	 * @param      string $str The route pattern.
-	 *
-	 * @return     array The info for this route pattern.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	protected function parseRouteString($str)
-	{
-		$vars = array();
-		$rxStr = '';
-		$reverseStr = '';
-
-		$anchor = 0;
-		$anchor |= (substr($str, 0, 1) == '^') ? self::ANCHOR_START : 0;
-		$anchor |= (substr($str, -1) == '$') ? self::ANCHOR_END : 0;
-
-		$str = substr($str, (int)$anchor & self::ANCHOR_START, $anchor & self::ANCHOR_END ? -1 : strlen($str));
-
-		$rxChars = implode('', array('.', '\\', '+', '*', '?', '[', '^', ']', '$', '(', ')', '{', '}', '=', '!', '<', '>', '|', ':'));
-
-		$len = strlen($str);
-		$state = 'start';
-		$tmpStr = '';
-		$inEscape = false;
-
-		$rxName = null;
-		$rxInner = null;
-		$rxPrefix = null;
-		$rxPostfix = null;
-		$parenthesisCount = 0;
-		$bracketCount = 0;
-		$hasBrackets = false;
-
-		for($i = 0; $i < $len; ++$i) {
-			$atEnd = $i + 1 == $len;
-
-			$c = $str[$i];
-
-			if(!$atEnd && !$inEscape && $c == '\\') {
-				$cNext = $str[$i + 1];
-
-				if(
-					($cNext == '\\') ||
-					($state == 'start' && $cNext == '(') ||
-					($state == 'rxStart' && in_array($cNext, array('(',')','{','}')))
-				) {
-					$inEscape = true;
-					continue;
-				}
-				if($state == 'afterRx' && $cNext == '?') {
-					$inEscape = false;
-					$state = 'start';
-					continue;
-				}
-			} elseif($inEscape) {
-				$tmpStr .= $c;
-				$inEscape = false;
-				continue;
-			}
-
-			if($state == 'start') {
-				// start of regular expression block
-				if($c == '(') {
-					$rxStr .= preg_quote($tmpStr, '#');
-					$reverseStr .= $tmpStr;
-
-					$tmpStr = '';
-					$state = 'rxStart';
-					$rxName = $rxInner = $rxPrefix = $rxPostfix = null;
-					$parenthesisCount = 1;
-					$bracketCount = 0;
-					$hasBrackets = false;
-				} else {
-					$tmpStr .= $c;
-				}
-
-				if($atEnd) {
-					$rxStr .= preg_quote($tmpStr, '#');
-					$reverseStr .= $tmpStr;
-				}
-			} elseif($state == 'rxStart') {
-				if($c == '{') {
-					++$bracketCount;
-					if($bracketCount == 1) {
-						$hasBrackets = true;
-						$rxPrefix = $tmpStr;
-						$tmpStr = '';
-					} else {
-						$tmpStr .= $c;
-					}
-				} elseif($c == '}') {
-					--$bracketCount;
-					if($bracketCount == 0) {
-						list($rxName, $rxInner) = $this->parseParameterDefinition($tmpStr);
-						$tmpStr = '';
-					} else {
-						$tmpStr .= $c;
-					}
-				} elseif($c == '(') {
-					++$parenthesisCount;
-					$tmpStr .= $c;
-				} elseif($c == ')') {
-					--$parenthesisCount;
-					if($parenthesisCount > 0) {
-						$tmpStr .= $c;
-					} else {
-						if($parenthesisCount < 0) {
-							throw new AgaviException('The pattern ' . $str . ' contains an unbalanced set of parentheses!');
-						}
-
-						if(!$hasBrackets) {
-							list($rxName, $rxInner) = $this->parseParameterDefinition($tmpStr);
-						} else {
-							if($bracketCount != 0) {
-								throw new AgaviException('The pattern ' . $str . ' contains an unbalanced set of brackets!');
-							}
-							$rxPostfix = $tmpStr;
-						}
-
-						if(!$rxName) {
-							$myRx = $rxPrefix . $rxInner . $rxPostfix;
-							// if the entire regular expression doesn't contain any regular expression character we can safely append it to the reverseStr
-							//if(strlen($myRx) == strcspn($myRx, $rxChars)) {
-							if(strpbrk($myRx, $rxChars) === false) {
-								$reverseStr .= $myRx;
-							}
-							$rxStr .= str_replace('#', '\#', sprintf('(%s)', $myRx));
-						} else {
-							$rxStr .= str_replace('#', '\#', sprintf('(%s(?P<%s>%s)%s)', $rxPrefix, $rxName, $rxInner, $rxPostfix));
-							$reverseStr .= sprintf('(:%s:)', $rxName);
-
-							if(!isset($vars[$rxName])) {
-								if(strpbrk($rxPrefix, $rxChars) !== false) {
-									$rxPrefix = null;
-								}
-								if(strpbrk($rxInner, $rxChars) !== false) {
-									$rxInner = null;
-								}
-								if(strpbrk($rxPostfix, $rxChars) !== false) {
-									$rxPostfix = null;
-								}
-
-								$vars[$rxName] = array('pre' => $rxPrefix, 'val' => $rxInner, 'post' => $rxPostfix, 'is_optional' => false);
-							}
-						}
-
-						$tmpStr = '';
-						$state = 'afterRx';
-					}
-				} else {
-					$tmpStr .= $c;
-				}
-
-				if($atEnd && $parenthesisCount != 0) {
-					throw new AgaviException('The pattern ' . $str . ' contains an unbalanced set of parentheses!');
-				}
-			} elseif($state == 'afterRx') {
-				if($c == '?') {
-					// only record the optional state when the pattern had a name
-					if(isset($vars[$rxName])) {
-						$vars[$rxName]['is_optional'] = true;
-					}
-					$rxStr .= $c;
-				} else {
-					// let the start state parse the char
-					--$i;
-				}
-
-				$state = 'start';
-			}
-		}
-
-		$rxStr = sprintf('#%s%s%s#', $anchor & self::ANCHOR_START ? '^' : '', $rxStr, $anchor & self::ANCHOR_END ? '$' : '');
-		return array($rxStr, $reverseStr, $vars, $anchor);
-	}
-
-	/**
-	 * Parses an embedded regular expression in the route pattern string.
-	 *
-	 * @param      string $def The definition.
-	 *
-	 * @return     array The name and the regexp.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	protected function parseParameterDefinition($def)
-	{
-		preg_match('#(?:([a-z0-9_-]+):)?(.*)#i', $def, $match);
-		return array($match[1] !== '' ? $match[1] : null, $match[2]);
-	}
+            if($umap) {
+                $rd->setParameters(array(
+                    $ma => $container->getModuleName(),
+                    $aa => $container->getControllerName(),
+                ));
+            }
+        }
+
+        // set the list of matched route names as a request attribute
+        $rq->setAttribute('matched_routes', $matchedRoutes, 'org.agavi.routing');
+
+        // return a list of matched route names
+        return $container;
+    }
+
+    /**
+     * Performs as match of the route against the input
+     *
+     * @param      array  $route   The route info array.
+     * @param      string $input   The input.
+     * @param      array  $matches The array where the matches will be stored to.
+     *
+     * @return     bool Whether the regexp matched.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    protected function parseInput(array $route, $input, &$matches)
+    {
+        if($route['opt']['source'] !== null) {
+            $parts = ArrayPathDefinition::getPartsFromPath($route['opt']['source']);
+            $partArray = $parts['parts'];
+            $count = count($partArray);
+            if($count > 0 && isset($this->sources[$partArray[0]])) {
+                $input = $this->sources[$partArray[0]];
+                if($count > 1) {
+                    array_shift($partArray);
+                    if(is_array($input)) {
+                        $input = ArrayPathDefinition::getValue($partArray, $input);
+                    } elseif($input instanceof RoutingSourceInterface) {
+                        $input = $input->getSource($partArray);
+                    }
+                }
+            }
+        }
+        return preg_match($route['rxp'], $input, $matches, PREG_OFFSET_CAPTURE);
+    }
+
+    /**
+     * Parses a route pattern string.
+     *
+     * @param      string $str The route pattern.
+     *
+     * @return     array The info for this route pattern.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    protected function parseRouteString($str)
+    {
+        $vars = array();
+        $rxStr = '';
+        $reverseStr = '';
+
+        $anchor = 0;
+        $anchor |= (substr($str, 0, 1) == '^') ? self::ANCHOR_START : 0;
+        $anchor |= (substr($str, -1) == '$') ? self::ANCHOR_END : 0;
+
+        $str = substr($str, (int)$anchor & self::ANCHOR_START, $anchor & self::ANCHOR_END ? -1 : strlen($str));
+
+        $rxChars = implode('', array('.', '\\', '+', '*', '?', '[', '^', ']', '$', '(', ')', '{', '}', '=', '!', '<', '>', '|', ':'));
+
+        $len = strlen($str);
+        $state = 'start';
+        $tmpStr = '';
+        $inEscape = false;
+
+        $rxName = null;
+        $rxInner = null;
+        $rxPrefix = null;
+        $rxPostfix = null;
+        $parenthesisCount = 0;
+        $bracketCount = 0;
+        $hasBrackets = false;
+
+        for($i = 0; $i < $len; ++$i) {
+            $atEnd = $i + 1 == $len;
+
+            $c = $str[$i];
+
+            if(!$atEnd && !$inEscape && $c == '\\') {
+                $cNext = $str[$i + 1];
+
+                if(
+                    ($cNext == '\\') ||
+                    ($state == 'start' && $cNext == '(') ||
+                    ($state == 'rxStart' && in_array($cNext, array('(',')','{','}')))
+                ) {
+                    $inEscape = true;
+                    continue;
+                }
+                if($state == 'afterRx' && $cNext == '?') {
+                    $inEscape = false;
+                    $state = 'start';
+                    continue;
+                }
+            } elseif($inEscape) {
+                $tmpStr .= $c;
+                $inEscape = false;
+                continue;
+            }
+
+            if($state == 'start') {
+                // start of regular expression block
+                if($c == '(') {
+                    $rxStr .= preg_quote($tmpStr, '#');
+                    $reverseStr .= $tmpStr;
+
+                    $tmpStr = '';
+                    $state = 'rxStart';
+                    $rxName = $rxInner = $rxPrefix = $rxPostfix = null;
+                    $parenthesisCount = 1;
+                    $bracketCount = 0;
+                    $hasBrackets = false;
+                } else {
+                    $tmpStr .= $c;
+                }
+
+                if($atEnd) {
+                    $rxStr .= preg_quote($tmpStr, '#');
+                    $reverseStr .= $tmpStr;
+                }
+            } elseif($state == 'rxStart') {
+                if($c == '{') {
+                    ++$bracketCount;
+                    if($bracketCount == 1) {
+                        $hasBrackets = true;
+                        $rxPrefix = $tmpStr;
+                        $tmpStr = '';
+                    } else {
+                        $tmpStr .= $c;
+                    }
+                } elseif($c == '}') {
+                    --$bracketCount;
+                    if($bracketCount == 0) {
+                        list($rxName, $rxInner) = $this->parseParameterDefinition($tmpStr);
+                        $tmpStr = '';
+                    } else {
+                        $tmpStr .= $c;
+                    }
+                } elseif($c == '(') {
+                    ++$parenthesisCount;
+                    $tmpStr .= $c;
+                } elseif($c == ')') {
+                    --$parenthesisCount;
+                    if($parenthesisCount > 0) {
+                        $tmpStr .= $c;
+                    } else {
+                        if($parenthesisCount < 0) {
+                            throw new AgaviException('The pattern ' . $str . ' contains an unbalanced set of parentheses!');
+                        }
+
+                        if(!$hasBrackets) {
+                            list($rxName, $rxInner) = $this->parseParameterDefinition($tmpStr);
+                        } else {
+                            if($bracketCount != 0) {
+                                throw new AgaviException('The pattern ' . $str . ' contains an unbalanced set of brackets!');
+                            }
+                            $rxPostfix = $tmpStr;
+                        }
+
+                        if(!$rxName) {
+                            $myRx = $rxPrefix . $rxInner . $rxPostfix;
+                            // if the entire regular expression doesn't contain any regular expression character we can safely append it to the reverseStr
+                            //if(strlen($myRx) == strcspn($myRx, $rxChars)) {
+                            if(strpbrk($myRx, $rxChars) === false) {
+                                $reverseStr .= $myRx;
+                            }
+                            $rxStr .= str_replace('#', '\#', sprintf('(%s)', $myRx));
+                        } else {
+                            $rxStr .= str_replace('#', '\#', sprintf('(%s(?P<%s>%s)%s)', $rxPrefix, $rxName, $rxInner, $rxPostfix));
+                            $reverseStr .= sprintf('(:%s:)', $rxName);
+
+                            if(!isset($vars[$rxName])) {
+                                if(strpbrk($rxPrefix, $rxChars) !== false) {
+                                    $rxPrefix = null;
+                                }
+                                if(strpbrk($rxInner, $rxChars) !== false) {
+                                    $rxInner = null;
+                                }
+                                if(strpbrk($rxPostfix, $rxChars) !== false) {
+                                    $rxPostfix = null;
+                                }
+
+                                $vars[$rxName] = array('pre' => $rxPrefix, 'val' => $rxInner, 'post' => $rxPostfix, 'is_optional' => false);
+                            }
+                        }
+
+                        $tmpStr = '';
+                        $state = 'afterRx';
+                    }
+                } else {
+                    $tmpStr .= $c;
+                }
+
+                if($atEnd && $parenthesisCount != 0) {
+                    throw new AgaviException('The pattern ' . $str . ' contains an unbalanced set of parentheses!');
+                }
+            } elseif($state == 'afterRx') {
+                if($c == '?') {
+                    // only record the optional state when the pattern had a name
+                    if(isset($vars[$rxName])) {
+                        $vars[$rxName]['is_optional'] = true;
+                    }
+                    $rxStr .= $c;
+                } else {
+                    // let the start state parse the char
+                    --$i;
+                }
+
+                $state = 'start';
+            }
+        }
+
+        $rxStr = sprintf('#%s%s%s#', $anchor & self::ANCHOR_START ? '^' : '', $rxStr, $anchor & self::ANCHOR_END ? '$' : '');
+        return array($rxStr, $reverseStr, $vars, $anchor);
+    }
+
+    /**
+     * Parses an embedded regular expression in the route pattern string.
+     *
+     * @param      string $def The definition.
+     *
+     * @return     array The name and the regexp.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    protected function parseParameterDefinition($def)
+    {
+        preg_match('#(?:([a-z0-9_-]+):)?(.*)#i', $def, $match);
+        return array($match[1] !== '' ? $match[1] : null, $match[2]);
+    }
 	
-	/**
-	 * Creates and initializes a new RoutingValue.
-	 * 
-	 * @param      mixed $value              The value of the returned routing value.
-	 * @param      bool  $valueNeedsEncoding Whether the $value needs to be encoded.
-	 * 
-	 * @return     RoutingValue
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      1.0.0
-	 */
-	public function createValue($value, $valueNeedsEncoding = true)
-	{
-		$value = new RoutingValue($value, $valueNeedsEncoding);
-		$value->initialize($this->context);
-		return $value;
-	}
+    /**
+     * Creates and initializes a new RoutingValue.
+     * 
+     * @param      mixed $value              The value of the returned routing value.
+     * @param      bool  $valueNeedsEncoding Whether the $value needs to be encoded.
+     * 
+     * @return     RoutingValue
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      1.0.0
+     */
+    public function createValue($value, $valueNeedsEncoding = true)
+    {
+        $value = new RoutingValue($value, $valueNeedsEncoding);
+        $value->initialize($this->context);
+        return $value;
+    }
 	
 }
 

Spacing +224 added lines, -224 removed lines

@@ -140,7 +140,7 @@ 
 	{
 		$cfg = Config::get('core.config_dir') . '/routing.xml';
 		// allow missing routing.xml when routing is not enabled
-		if($this->isEnabled() || is_readable($cfg)) {
+		if ($this->isEnabled() || is_readable($cfg)) {
 			$this->importRoutes(unserialize(file_get_contents(ConfigCache::checkConfig($cfg, $this->context->getName()))));
 		}
 	}
@@ -159,7 +159,7 @@ 
 
 		$this->sources['_SERVER'] = new RoutingArraySource($_SERVER);
 
-		if(Config::get('core.use_security')) {
+		if (Config::get('core.use_security')) {
 			$this->sources['user'] = new RoutingUserSource($this->context->getUser());
 		}
 	}
@@ -210,7 +210,7 @@ 
 	 */
 	public final function getRoute($name)
 	{
-		if(!isset($this->routes[$name])) {
+		if (!isset($this->routes[$name])) {
 			return null;
 		}
 		return $this->routes[$name];
@@ -273,15 +273,15 @@ 
 	public function addRoute($route, array $options = array(), $parent = null)
 	{
 		// catch the old options from the route which has to be overwritten
-		if(isset($options['name']) && isset($this->routes[$options['name']])) {
+		if (isset($options['name']) && isset($this->routes[$options['name']])) {
 			$defaultOpts = $this->routes[$options['name']]['opt'];
 
 			// when the parent is set and differs from the parent of the route to be overwritten bail out
-			if($parent !== null && $defaultOpts['parent'] != $parent) {
+			if ($parent !== null && $defaultOpts['parent'] != $parent) {
 				throw new AgaviException('You are trying to overwrite a route but are not staying in the same hierarchy');
 			}
 
-			if($parent === null) {
+			if ($parent === null) {
 				$parent = $defaultOpts['parent'];
 			} else {
 				$defaultOpts['parent'] = $parent;
@@ -290,15 +290,15 @@ 
 			$defaultOpts = array('name' => Toolkit::uniqid(), 'stop' => true, 'output_type' => null, 'module' => null, 'controller' => null, 'parameters' => array(), 'ignores' => array(), 'defaults' => array(), 'childs' => array(), 'callbacks' => array(), 'imply' => false, 'cut' => null, 'source' => null, 'method' => null, 'constraint' => array(), 'locale' => null, 'pattern_parameters' => array(), 'optional_parameters' => array(), 'parent' => $parent, 'reverseStr' => '', 'nostops' => array(), 'anchor' => self::ANCHOR_NONE);
 		}
 		// retain backwards compatibility to 0.11
-		if(isset($options['callback'])) {
+		if (isset($options['callback'])) {
 			$options['callbacks'] = array(array('class' => $options['callback'], 'parameters' => array()));
 			unset($options['callback']);
 		}
 
-		if(isset($options['defaults'])) {
-			foreach($options['defaults'] as $name => &$value) {
+		if (isset($options['defaults'])) {
+			foreach ($options['defaults'] as $name => &$value) {
 				$val = $pre = $post = null;
-				if(preg_match('#(.*)\{(.*)\}(.*)#', $value, $match)) {
+				if (preg_match('#(.*)\{(.*)\}(.*)#', $value, $match)) {
 					$pre = $match[1];
 					$val = $match[2];
 					$post = $match[3];
@@ -317,14 +317,14 @@ 
 		$params = array();
 
 		// transfer the parameters and fill available automatic defaults
-		foreach($routeParams as $name => $param) {
+		foreach ($routeParams as $name => $param) {
 			$params[] = $name;
 
-			if($param['is_optional']) {
+			if ($param['is_optional']) {
 				$options['optional_parameters'][$name] = true;
 			}
 
-			if(!isset($options['defaults'][$name]) && ($param['pre'] || $param['val'] || $param['post'])) {
+			if (!isset($options['defaults'][$name]) && ($param['pre'] || $param['val'] || $param['post'])) {
 				unset($param['is_optional']);
 				$options['defaults'][$name] = $this->createValue($param['val'])->setPrefix($param['pre'])->setPostfix($param['post']);
 			}
@@ -333,8 +333,8 @@ 
 		$options['pattern_parameters'] = $params;
 
 		// remove all ignore from the parameters in the route
-		foreach($options['ignores'] as $ignore) {
-			if(($key = array_search($ignore, $params)) !== false) {
+		foreach ($options['ignores'] as $ignore) {
+			if (($key = array_search($ignore, $params)) !== false) {
 				unset($params[$key]);
 			}
 		}
@@ -343,38 +343,38 @@ 
 
 		// parse all the setting values for dynamic variables
 		// check if 2 nodes with the same name in the same execution tree exist
-		foreach($this->routes as $name => $route) {
+		foreach ($this->routes as $name => $route) {
 			// if a route with this route as parent exist check if its really a child of our route
-			if($route['opt']['parent'] == $routeName && !in_array($name, $options['childs'])) {
+			if ($route['opt']['parent'] == $routeName && !in_array($name, $options['childs'])) {
 				throw new AgaviException('The route ' . $routeName . ' specifies a child route with the same name');
 			}
 		}
 
 		// direct childs/parents with the same name aren't caught by the above check
-		if($routeName == $parent) {
+		if ($routeName == $parent) {
 			throw new AgaviException('The route ' . $routeName . ' specifies a child route with the same name');
 		}
 
 		// if we are a child route, we need add this route as a child to the parent
-		if($parent !== null) {
-			foreach($this->routes[$parent]['opt']['childs'] as $name) {
-				if($name == $routeName) {
+		if ($parent !== null) {
+			foreach ($this->routes[$parent]['opt']['childs'] as $name) {
+				if ($name == $routeName) {
 					// we're overwriting a route, so unlike when first adding the route, there are more routes after this that might also be non-stopping, but we obviously don't want those, so we need to bail out at this point
 					break;
 				}
 				$route = $this->routes[$name];
-				if(!$route['opt']['stop']) {
+				if (!$route['opt']['stop']) {
 					$options['nostops'][] = $name;
 				}
 			}
 			$this->routes[$parent]['opt']['childs'][] = $routeName;
 		} else {
-			foreach($this->routes as $name => $route) {
-				if($name == $routeName) {
+			foreach ($this->routes as $name => $route) {
+				if ($name == $routeName) {
 					// we're overwriting a route, so unlike when first adding the route, there are more routes after this that might also be non-stopping, but we obviously don't want those, so we need to bail out at this point
 					break;
 				}
-				if(!$route['opt']['stop'] && !$route['opt']['parent']) {
+				if (!$route['opt']['stop'] && !$route['opt']['parent']) {
 					$options['nostops'][] = $name;
 				}
 			}
@@ -433,23 +433,23 @@ 
 		$includedRoutes = array();
 		$excludedRoutes = array();
 		
-		if($route === null) {
+		if ($route === null) {
 			$includedRoutes = array_reverse($this->getContext()->getRequest()->getAttribute('matched_routes', 'org.agavi.routing', array()));
 			$isNullRoute = true;
-		} elseif(strlen($route) > 0) {
-			if($route[0] == '-' || $route[0] == '+') {
+		} elseif (strlen($route) > 0) {
+			if ($route[0] == '-' || $route[0] == '+') {
 				$includedRoutes = array_reverse($this->getContext()->getRequest()->getAttribute('matched_routes', 'org.agavi.routing', array()));
 				$isNullRoute = true;
 			}
 			
 			$routeParts = preg_split('#(-|\+)#', $route, -1, PREG_SPLIT_DELIM_CAPTURE);
 			$prevDelimiter = '+';
-			foreach($routeParts as $part) {
-				if($part == '+' || $part == '-') {
+			foreach ($routeParts as $part) {
+				if ($part == '+' || $part == '-') {
 					$prevDelimiter = $part;
 				}
 				
-				if($prevDelimiter == '+') {
+				if ($prevDelimiter == '+') {
 					$includedRoutes[] = $part;
 				} else { // $prevDelimiter == '-'
 					$excludedRoutes[] = $part;
@@ -459,48 +459,48 @@ 
 		
 		$excludedRoutes = array_flip($excludedRoutes);
 
-		if($includedRoutes) {
+		if ($includedRoutes) {
 			$route = $includedRoutes[0];
 			// TODO: useful comment here
 			unset($includedRoutes[0]);
 		}
 		
 		$myRoutes = array();
-		foreach($includedRoutes as $r) {
+		foreach ($includedRoutes as $r) {
 			$myRoutes[$r] = true;
 		}
 
 		$affectedRoutes = array();
 
-		if(isset($this->routes[$route])) {
+		if (isset($this->routes[$route])) {
 			$parent = $route;
 			do {
-				if(!isset($excludedRoutes[$parent])) {
+				if (!isset($excludedRoutes[$parent])) {
 					$affectedRoutes[] = $parent;
 				}
 				$r = $this->routes[$parent];
 
-				foreach(array_reverse($r['opt']['nostops']) as $noStop) {
+				foreach (array_reverse($r['opt']['nostops']) as $noStop) {
 					$myR = $this->routes[$noStop];
-					if(isset($myRoutes[$noStop])) {
+					if (isset($myRoutes[$noStop])) {
 						unset($myRoutes[$noStop]);
-					} elseif(!$myR['opt']['imply']) {
+					} elseif (!$myR['opt']['imply']) {
 						continue;
 					}
 
-					if(!isset($excludedRoutes[$noStop])) {
+					if (!isset($excludedRoutes[$noStop])) {
 						$affectedRoutes[] = $noStop;
 					}
 				}
 
 				$parent = $r['opt']['parent'];
 
-			} while($parent);
+			} while ($parent);
 		} else {
 			// TODO: error handling - route with the given name does not exist
 		}
 
-		if(count($myRoutes)) {
+		if (count($myRoutes)) {
 			// TODO: error handling - we couldn't find some of the nonstopping rules
 		}
 
@@ -521,8 +521,8 @@ 
 	public function getMatchedParameters(array $routeNames)
 	{
 		$params = array();
-		foreach($routeNames as $name) {
-			if(isset($this->routes[$name])) {
+		foreach ($routeNames as $name) {
+			if (isset($this->routes[$name])) {
 				$route = $this->routes[$name];
 				$params = array_merge($params, $route['matches']);
 			}
@@ -546,17 +546,17 @@ 
 	 */
 	protected function resolveGenOptions($input = array())
 	{
-		if(is_string($input)) {
+		if (is_string($input)) {
 			// A single option preset was given
-			if(isset($this->genOptionsPresets[$input])) {
+			if (isset($this->genOptionsPresets[$input])) {
 				return array_merge($this->defaultGenOptions, $this->genOptionsPresets[$input]);
 			}
-		} elseif(is_array($input)) {
+		} elseif (is_array($input)) {
 			$genOptions = $this->defaultGenOptions;
-			foreach($input as $key => $value) {
-				if(is_numeric($key)) {
+			foreach ($input as $key => $value) {
+				if (is_numeric($key)) {
 					// Numeric key – it's an option preset
-					if(isset($this->genOptionsPresets[$value])) {
+					if (isset($this->genOptionsPresets[$value])) {
 						$genOptions = array_merge($genOptions, $this->genOptionsPresets[$value]);
 					} else {
 						throw new AgaviException('Undefined Routing gen() options preset "' . $value . '"');
@@ -610,14 +610,14 @@ 
 		$optionalParams = array();
 		$firstRoute = true;
 		
-		foreach($routeNames as $routeName) {
+		foreach ($routeNames as $routeName) {
 			$r = $this->routes[$routeName];
 
 			$myDefaults = $r['opt']['defaults'];
 
-			if(count($r['opt']['callbacks']) > 0) {
-				if(!isset($r['callback_instances'])) {
-					foreach($r['opt']['callbacks'] as $key => $callback) {
+			if (count($r['opt']['callbacks']) > 0) {
+				if (!isset($r['callback_instances'])) {
+					foreach ($r['opt']['callbacks'] as $key => $callback) {
 						/** @var RoutingCallback $instance */
 						$instance = new $callback['class']();
 						$instance->setParameters($callback['parameters']);
@@ -625,20 +625,20 @@ 
 						$r['callback_instances'][$key] = $instance;
 					}
 				}
-				foreach($r['callback_instances'] as $callbackInstance) {
+				foreach ($r['callback_instances'] as $callbackInstance) {
 					$paramsCopy = $params;
 					$isLegacyCallback = false;
-					if($callbackInstance instanceof LegacyRoutingCallbackInterface) {
+					if ($callbackInstance instanceof LegacyRoutingCallbackInterface) {
 						$isLegacyCallback = true;
 						// convert all routing values to strings so legacy callbacks don't break
 						$defaultsCopy = $myDefaults;
-						foreach($paramsCopy as &$param) {
-							if($param instanceof RoutingValueInterface) {
+						foreach ($paramsCopy as &$param) {
+							if ($param instanceof RoutingValueInterface) {
 								$param = $param->getValue();
 							}
 						}
-						foreach($defaultsCopy as &$default) {
-							if($default instanceof RoutingValueInterface) {
+						foreach ($defaultsCopy as &$default) {
+							if ($default instanceof RoutingValueInterface) {
 								$default = array(
 									'pre' => $default->getPrefix(),
 									'val' => $default->getValue(),
@@ -647,13 +647,13 @@ 
 							}
 						}
 						$changedParamsCopy = $paramsCopy;
-						if(!$callbackInstance->onGenerate($defaultsCopy, $paramsCopy, $options)) {
+						if (!$callbackInstance->onGenerate($defaultsCopy, $paramsCopy, $options)) {
 							continue 2;
 						}
 						// find all params changed in the callback, but ignore unset() parameters since they will be filled in at a later stage (and doing something the them would prevent default values being inserted after unset()tting of a parameter)
 						$diff = array();
-						foreach($paramsCopy as $key => $value) {
-							if(!array_key_exists($key, $changedParamsCopy) || $changedParamsCopy[$key] !== $value) {
+						foreach ($paramsCopy as $key => $value) {
+							if (!array_key_exists($key, $changedParamsCopy) || $changedParamsCopy[$key] !== $value) {
 								$diff[$key] = $value;
 							}
 						}
@@ -661,13 +661,13 @@ 
 						// $diff = array_udiff_assoc($paramsCopy, $changedParamsCopy, array($this, 'onGenerateParamDiffCallback'));
 						// likely caused by http://bugs.php.net/bug.php?id=42838 / http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.51&r2=1.308.2.21.2.52
 					} else {
-						if(!$callbackInstance->onGenerate($myDefaults, $params, $options)) {
+						if (!$callbackInstance->onGenerate($myDefaults, $params, $options)) {
 							continue 2;
 						}
 						// find all params changed in the callback, but ignore unset() parameters since they will be filled in at a later stage (and doing something the them would prevent default values being inserted after unset()tting of a parameter)
 						$diff = array();
-						foreach($params as $key => $value) {
-							if(!array_key_exists($key, $paramsCopy) || $paramsCopy[$key] !== $value) {
+						foreach ($params as $key => $value) {
+							if (!array_key_exists($key, $paramsCopy) || $paramsCopy[$key] !== $value) {
 								$diff[$key] = $value;
 							}
 						}
@@ -676,16 +676,16 @@ 
 						// likely caused by http://bugs.php.net/bug.php?id=42838 / http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.51&r2=1.308.2.21.2.52
 					}
 					
-					if(count($diff)) {
+					if (count($diff)) {
 						$diffKeys = array_keys($diff);
-						foreach($diffKeys as $key) {
+						foreach ($diffKeys as $key) {
 							// NEVER assign this value as a reference, as PHP will go completely bonkers if we use a reference here (it marks the entry in the array as a reference, so modifying the value in $params in a callback means it gets modified in $paramsCopy as well)
 							// if the callback was a legacy callback, the array to read the values from is different (since everything was cast to strings before running the callback)
 							$value = $isLegacyCallback ? $paramsCopy[$key] : $params[$key];
-							if($value !== null && !($value instanceof RoutingValueInterface)) {
+							if ($value !== null && !($value instanceof RoutingValueInterface)) {
 								$routingValue = $this->createValue($value, false);
-								if(isset($myDefaults[$key])) {
-									if($myDefaults[$key] instanceof RoutingValueInterface) {
+								if (isset($myDefaults[$key])) {
+									if ($myDefaults[$key] instanceof RoutingValueInterface) {
 										// clone the default value so pre and postfix are preserved
 										/** @var RoutingValue $routingValue */
 										$routingValue = clone $myDefaults[$key];
@@ -707,7 +707,7 @@ 
 			}
 
 			// if the route has a source we shouldn't put its stuff in the generated string
-			if($r['opt']['source']) {
+			if ($r['opt']['source']) {
 				continue;
 			}
 
@@ -716,8 +716,8 @@ 
 
 			$availableParams = array_merge($availableParams, array_reverse($r['opt']['pattern_parameters']));
 
-			if($firstRoute || $r['opt']['cut'] || (count($r['opt']['childs']) && $r['opt']['cut'] === null)) {
-				if($r['opt']['anchor'] & self::ANCHOR_START || $r['opt']['anchor'] == self::ANCHOR_NONE) {
+			if ($firstRoute || $r['opt']['cut'] || (count($r['opt']['childs']) && $r['opt']['cut'] === null)) {
+				if ($r['opt']['anchor'] & self::ANCHOR_START || $r['opt']['anchor'] == self::ANCHOR_NONE) {
 					$uri = $r['opt']['reverseStr'] . $uri;
 				} else {
 					$uri = $uri . $r['opt']['reverseStr'];
@@ -756,9 +756,9 @@ 
 	 */
 	protected function refillAllMatchedParameters(array $options, array $params, array $matchedParams)
 	{
-		if(!empty($options['refill_all_parameters'])) {
-			foreach($matchedParams as $name => $value) {
-				if(!(isset($params[$name]) || array_key_exists($name, $params))) {
+		if (!empty($options['refill_all_parameters'])) {
+			foreach ($matchedParams as $name => $value) {
+				if (!(isset($params[$name]) || array_key_exists($name, $params))) {
 					$params[$name] = $this->createValue($value, true);
 				}
 			}
@@ -790,14 +790,14 @@ 
 	{
 		$refillValue = true;
 		$finalParams = array();
-		foreach($availableParams as $name) {
+		foreach ($availableParams as $name) {
 			// loop all params and fill all with the matched parameters
 			// until a user (not callback) supplied parameter is encountered.
 			// After that only check defaults. Parameters supplied from the user
 			// or via callback always have precedence
 
 			// keep track if a user supplied parameter has already been encountered
-			if($refillValue && (isset($originalUserParams[$name]) || array_key_exists($name, $originalUserParams))) {
+			if ($refillValue && (isset($originalUserParams[$name]) || array_key_exists($name, $originalUserParams))) {
 				$refillValue = false;
 			}
 
@@ -807,18 +807,18 @@ 
 			$hasDefault = isset($defaultParams[$name]);
 			$hasUserCallbackParam = (isset($params[$name]) || array_key_exists($name, $params));
 
-			if($hasUserCallbackParam) {
+			if ($hasUserCallbackParam) {
 				// anything a user or callback supplied has precedence
 				// and since the user params are handled afterwards, skip them here
-			} elseif($refillValue && $hasMatched) {
+			} elseif ($refillValue && $hasMatched) {
 				// Use the matched input
 				$finalParams[$name] = $this->createValue($matchedParams[$name], true);
-			} elseif($hasDefault) {
+			} elseif ($hasDefault) {
 				// now we just need to check if there are defaults for this available param and fill them in if applicable
 				$default = $defaultParams[$name];
-				if(!$isOptional || strlen($default->getValue()) > 0) {
+				if (!$isOptional || strlen($default->getValue()) > 0) {
 					$finalParams[$name] = clone $default;
-				} elseif($isOptional) {
+				} elseif ($isOptional) {
 					// there is no default or incoming match for this optional param, so remove it
 					$finalParams[$name] = null;
 				}
@@ -847,19 +847,19 @@ 
 	{
 		$availableParamsAsKeys = array_flip($availableParams);
 
-		foreach($params as $name => $param) {
-			if(!(isset($finalParams[$name]) || array_key_exists($name, $finalParams))) {
-				if($param === null && isset($optionalParams[$name])) {
+		foreach ($params as $name => $param) {
+			if (!(isset($finalParams[$name]) || array_key_exists($name, $finalParams))) {
+				if ($param === null && isset($optionalParams[$name])) {
 					// null was set for an optional parameter
 					$finalParams[$name] = $param;
 				} else {
-					if(isset($defaultParams[$name])) {
-						if($param === null || ($param instanceof RoutingValue && $param->getValue() === null)) {
+					if (isset($defaultParams[$name])) {
+						if ($param === null || ($param instanceof RoutingValue && $param->getValue() === null)) {
 							// the user set the parameter to null, to signal that the default value should be used
 							$param = clone $defaultParams[$name];
 						}
 						$finalParams[$name] = $param;
-					} elseif(isset($availableParamsAsKeys[$name])) {
+					} elseif (isset($availableParamsAsKeys[$name])) {
 						// when the parameter was available in one of the routes
 						$finalParams[$name] = $param;
 					}
@@ -887,14 +887,14 @@ 
 	protected function removeMatchingDefaults(array $options, array $finalParams, array $availableParams, array $optionalParams, array $defaultParams)
 	{
 		// if omit_defaults is set, we should not put optional values into the result string in case they are equal to their default value - even if they were given as a param
-		if(!empty($options['omit_defaults'])) {
+		if (!empty($options['omit_defaults'])) {
 			// remove the optional parameters from the pattern beginning from right to the left, in case they are equal to their default
-			foreach(array_reverse($availableParams) as $name) {
-				if(isset($optionalParams[$name])) {
+			foreach (array_reverse($availableParams) as $name) {
+				if (isset($optionalParams[$name])) {
 					// the isset() could be replaced by
 					// "!array_key_exists($name, $finalParams) || $finalParams[$name] === null"
 					// to clarify that null is explicitly allowed here
-					if(!isset($finalParams[$name]) ||
+					if (!isset($finalParams[$name]) ||
 							(
 								isset($defaultParams[$name]) && 
 								$finalParams[$name]->getValue() == $defaultParams[$name]->getValue() &&
@@ -929,18 +929,18 @@ 
 	 */
 	protected function updatePrefixAndPostfix(array $finalParams, array $defaultParams)
 	{
-		foreach($finalParams as $name => $param) {
-			if($param === null) {
+		foreach ($finalParams as $name => $param) {
+			if ($param === null) {
 				continue;
 			}
 			
-			if(isset($defaultParams[$name])) {
+			if (isset($defaultParams[$name])) {
 				// update the pre- and postfix from the default if they are not set in the routing value
 				$default = $defaultParams[$name];
-				if(!$param->hasPrefix() && $default->hasPrefix()) {
+				if (!$param->hasPrefix() && $default->hasPrefix()) {
 					$param->setPrefix($default->getPrefix());
 				}
-				if(!$param->hasPostfix() && $default->hasPostfix()) {
+				if (!$param->hasPostfix() && $default->hasPostfix()) {
 					$param->setPostfix($default->getPostfix());
 				}
 			}
@@ -961,7 +961,7 @@ 
 	 */
 	protected function encodeParameters(array $options, array $params)
 	{
-		foreach($params as &$param) {
+		foreach ($params as &$param) {
 			$param = $this->encodeParameter($param);
 		}
 		return $params;
@@ -979,10 +979,10 @@ 
 	 */
 	protected function encodeParameter($parameter)
 	{
-		if($parameter instanceof RoutingValue) {
+		if ($parameter instanceof RoutingValue) {
 			return sprintf('%s%s%s', 
-				$parameter->getPrefixNeedsEncoding()  ? $this->escapeOutputParameter($parameter->getPrefix())  : $parameter->getPrefix(),
-				$parameter->getValueNeedsEncoding()   ? $this->escapeOutputParameter($parameter->getValue())   : $parameter->getValue(),
+				$parameter->getPrefixNeedsEncoding() ? $this->escapeOutputParameter($parameter->getPrefix()) : $parameter->getPrefix(),
+				$parameter->getValueNeedsEncoding() ? $this->escapeOutputParameter($parameter->getValue()) : $parameter->getValue(),
 				$parameter->getPostfixNeedsEncoding() ? $this->escapeOutputParameter($parameter->getPostfix()) : $parameter->getPostfix()
 			);
 		} else {
@@ -1002,11 +1002,11 @@ 
 	 */
 	protected function convertParametersToRoutingValues(array $parameters)
 	{
-		if(count($parameters)) {
+		if (count($parameters)) {
 			// make sure everything in $parameters is a routing value
-			foreach($parameters as &$param) {
-				if(!$param instanceof RoutingValue) {
-					if($param !== null) {
+			foreach ($parameters as &$param) {
+				if (!$param instanceof RoutingValue) {
+					if ($param !== null) {
 						$param = $this->createValue($param);
 					}
 				} else {
@@ -1037,8 +1037,8 @@ 
 	 */
 	public function gen($route, array $params = array(), $options = array())
 	{
-		if(array_key_exists('prefix', $options)) {
-			$prefix = (string) $options['prefix'];
+		if (array_key_exists('prefix', $options)) {
+			$prefix = (string)$options['prefix'];
 		} else {
 			$prefix = $this->getPrefix();
 		}
@@ -1046,11 +1046,11 @@ 
 		$isNullRoute = false;
 		$routes = $this->getAffectedRoutes($route, $isNullRoute);
 		
-		if(count($routes) == 0) {
+		if (count($routes) == 0) {
 			return array($route, array(), $options, $params, $isNullRoute);
 		}
 		
-		if($isNullRoute) {
+		if ($isNullRoute) {
 			// for gen(null) and friends all matched parameters are inserted before the 
 			// supplied params are backuped
 			$params = $this->fillGenNullParameters($routes, $params);
@@ -1077,7 +1077,7 @@ 
 		$extras = array_diff_key(array_merge($originalParams, $params), $finalParams);
 		// but since the values are expected as plain values and not routing values, convert the routing values back to 
 		// 'plain' values
-		foreach($extras as &$extra) {
+		foreach ($extras as &$extra) {
 			$extra = ($extra instanceof RoutingValue) ? $extra->getValue() : $extra;
 		}
 
@@ -1090,14 +1090,14 @@ 
 		
 
 		// remove not specified available parameters
-		foreach(array_unique($assembledInformation['available_parameters']) as $name) {
-			if(!isset($params[$name])) {
+		foreach (array_unique($assembledInformation['available_parameters']) as $name) {
+			if (!isset($params[$name])) {
 				$from[] = '(:' . $name . ':)';
 				$to[] = '';
 			}
 		}
 
-		foreach($params as $n => $p) {
+		foreach ($params as $n => $p) {
 			$from[] = '(:' . $n . ':)';
 			$to[] = $p;
 		}
@@ -1142,7 +1142,7 @@ 
 		
 		$container = $this->context->getDispatcher()->createExecutionContainer();
 
-		if(!$this->isEnabled()) {
+		if (!$this->isEnabled()) {
 			// routing disabled, just bail out here
 			return $container;
 		}
@@ -1164,8 +1164,8 @@ 
 
 		$routes = array();
 		// get all top level routes
-		foreach($this->routes as $name => $route) {
-			if(!$route['opt']['parent']) {
+		foreach ($this->routes as $name => $route) {
+			if (!$route['opt']['parent']) {
 				$routes[] = $name;
 			}
 		}
@@ -1175,12 +1175,12 @@ 
 
 		do {
 			$routes = array_pop($routeStack);
-			foreach($routes as $key) {
-				$route =& $this->routes[$key];
-				$opts =& $route['opt'];
-				if(count($opts['constraint']) == 0 || in_array($requestMethod, $opts['constraint'])) {
-					if(count($opts['callbacks']) > 0 && !isset($route['callback_instances'])) {
-						foreach($opts['callbacks'] as $key => $callback) {
+			foreach ($routes as $key) {
+				$route = & $this->routes[$key];
+				$opts = & $route['opt'];
+				if (count($opts['constraint']) == 0 || in_array($requestMethod, $opts['constraint'])) {
+					if (count($opts['callbacks']) > 0 && !isset($route['callback_instances'])) {
+						foreach ($opts['callbacks'] as $key => $callback) {
 							/** @var RoutingCallback $instance */
 							$instance = new $callback['class']();
 							$instance->initialize($this->context, $route);
@@ -1190,37 +1190,37 @@ 
 					}
 
 					$match = array();
-					if($this->parseInput($route, $input, $match)) {
+					if ($this->parseInput($route, $input, $match)) {
 						$varsBackup = $vars;
 						
 						// backup the container, must be done here already
-						if(count($opts['callbacks']) > 0) {
+						if (count($opts['callbacks']) > 0) {
 							$containerBackup = $container;
 							$container = clone $container;
 						}
 						
 						$ign = array();
-						if(count($opts['ignores']) > 0) {
+						if (count($opts['ignores']) > 0) {
 							$ign = array_flip($opts['ignores']);
 						}
 
 						/**
 						 * @var $value RoutingValue;
 						 */
-						foreach($opts['defaults'] as $key => $value) {
-							if(!isset($ign[$key]) && $value->getValue() !== null) {
+						foreach ($opts['defaults'] as $key => $value) {
+							if (!isset($ign[$key]) && $value->getValue() !== null) {
 								$vars[$key] = $value->getValue();
 							}
 						}
 
-						foreach($route['par'] as $param) {
-							if(isset($match[$param]) && $match[$param][1] != -1) {
+						foreach ($route['par'] as $param) {
+							if (isset($match[$param]) && $match[$param][1] != -1) {
 								$vars[$param] = $match[$param][0];
 							}
 						}
 
-						foreach($match as $name => $m) {
-							if(is_string($name) && $m[1] != -1) {
+						foreach ($match as $name => $m) {
+							if (is_string($name) && $m[1] != -1) {
 								$route['matches'][$name] = $m[0];
 							}
 						}
@@ -1239,23 +1239,23 @@ 
 						}
 						// */
 
-						if($opts['module']) {
+						if ($opts['module']) {
 							$module = Toolkit::expandVariables($opts['module'], $matchvals);
 							$container->setModuleName($module);
-							if($umap) {
+							if ($umap) {
 								$vars[$ma] = $module;
 							}
 						}
 
-						if($opts['controller']) {
+						if ($opts['controller']) {
 							$controller = Toolkit::expandVariables($opts['controller'], $matchvals);
 							$container->setControllerName($controller);
-							if($umap) {
+							if ($umap) {
 								$vars[$aa] = $controller;
 							}
 						}
 
-						if($opts['output_type']) {
+						if ($opts['output_type']) {
 							// set the output type if necessary
 							// here no explicit check is done, since in 0.11 this is compared against null
 							// which can never be the result of expandVariables
@@ -1265,15 +1265,15 @@ 
 							// and because it makes sense - maybe a callback checks or changes the output type name
 							try {
 								$container->setOutputType($this->context->getDispatcher()->getOutputType($ot));
-							} catch(AgaviException $e) {
+							} catch (AgaviException $e) {
 							}
 						}
 
-						if($opts['locale']) {
+						if ($opts['locale']) {
 							$localeBackup = $tm->getCurrentLocaleIdentifier();
 							
 							// set the locale if necessary
-							if($locale = Toolkit::expandVariables($opts['locale'], $matchvals)) {
+							if ($locale = Toolkit::expandVariables($opts['locale'], $matchvals)) {
 								// the if is here for bc reasons, since if $opts['locale'] only contains variable parts
 								// expandVariables could possibly return an empty string in which case the pre 1.0 routing
 								// didn't set the variable
@@ -1282,7 +1282,7 @@ 
 								// and because it makes sense - maybe a callback checks or changes the locale name
 								try {
 									$tm->setLocale($locale);
-								} catch(AgaviException $e) {
+								} catch (AgaviException $e) {
 								}
 							}
 						} else {
@@ -1290,9 +1290,9 @@ 
 							$localeBackup = null;
 						}
 
-						if($opts['method']) {
+						if ($opts['method']) {
 							// set the request method if necessary
-							if($method = Toolkit::expandVariables($opts['method'], $matchvals)) {
+							if ($method = Toolkit::expandVariables($opts['method'], $matchvals)) {
 								// the if is here for bc reasons, since if $opts['method'] only contains variable parts
 								// expandVariables could possibly return an empty string in which case the pre 1.0 routing
 								// didn't set the variable
@@ -1302,31 +1302,31 @@ 
 							}
 						}
 
-						if(count($opts['callbacks']) > 0) {
-							if(count($opts['ignores']) > 0) {
+						if (count($opts['callbacks']) > 0) {
+							if (count($opts['ignores']) > 0) {
 								// add ignored variables to the callback vars
-								foreach($vars as $name => &$var) {
-									$vars[$name] =& $var;
+								foreach ($vars as $name => &$var) {
+									$vars[$name] = & $var;
 								}
-								foreach($opts['ignores'] as $ignore) {
-									if(isset($match[$ignore]) && $match[$ignore][1] != -1) {
+								foreach ($opts['ignores'] as $ignore) {
+									if (isset($match[$ignore]) && $match[$ignore][1] != -1) {
 										$vars[$ignore] = $match[$ignore][0];
 									}
 								}
 							}
 							$callbackSuccess = true;
 							/** @var RoutingCallback $callbackInstance */
-							foreach($route['callback_instances'] as $callbackInstance) {
+							foreach ($route['callback_instances'] as $callbackInstance) {
 								// call onMatched on all callbacks until one of them returns false
 								// then restore state and call onNotMatched on that same callback
 								// after that, call onNotMatched for all remaining callbacks of that route
-								if($callbackSuccess) {
+								if ($callbackSuccess) {
 									// backup stuff which could be changed in the callback so we are 
 									// able to determine which values were changed in the callback
 									$oldModule = $container->getModuleName();
 									$oldController = $container->getControllerName();
 									$oldOutputTypeName = $container->getOutputType() ? $container->getOutputType()->getName() : null;
-									if(null === $tm) {
+									if (null === $tm) {
 										$oldLocale = null;
 									} else {
 										$oldLocale = $tm->getCurrentLocaleIdentifier();
@@ -1335,10 +1335,10 @@ 
 									$oldContainerMethod = $container->getRequestMethod();
 
 									$onMatched = $callbackInstance->onMatched($vars, $container);
-									if($onMatched instanceof Response) {
+									if ($onMatched instanceof Response) {
 										return $onMatched;
 									}
-									if(!$onMatched) {
+									if (!$onMatched) {
 										$callbackSuccess = false;
 										
 										// reset the matches array. it must be populated by the time onMatched() is called so matches can be modified in a callback
@@ -1348,7 +1348,7 @@ 
 										// reset all relevant container data we already set in the container for this (now non matching) route
 										$container = $containerBackup;
 										// restore locale
-										if(isset($localeBackup)) {
+										if (isset($localeBackup)) {
 											$tm->setLocale($localeBackup);
 										}
 										// restore request method
@@ -1357,9 +1357,9 @@ 
 								}
 								
 								// always call onNotMatched if $callbackSuccess == false, even if we just called onMatched() on the same instance. this is expected behavior
-								if(!$callbackSuccess) {
+								if (!$callbackSuccess) {
 									$onNotMatched = $callbackInstance->onNotMatched($container);
-									if($onNotMatched instanceof Response) {
+									if ($onNotMatched instanceof Response) {
 										return $onNotMatched;
 									}
 									
@@ -1371,8 +1371,8 @@ 
 								$expandVars = $vars;
 								$routeParamsAsKey = array_flip($route['par']);
 								// only use parameters which are defined in this route or are new
-								foreach($expandVars as $name => $value) {
-									if(!isset($routeParamsAsKey[$name]) && array_key_exists($name, $varsBackup)) {
+								foreach ($expandVars as $name => $value) {
+									if (!isset($routeParamsAsKey[$name]) && array_key_exists($name, $varsBackup)) {
 										unset($expandVars[$name]);
 									}
 								} 
@@ -1385,42 +1385,42 @@ 
 								// if the callback didn't change the value, execute expandVariables again since 
 								// the callback could have changed one of the values which expandVariables uses
 								// to evaluate the contents of the attribute in question (e.g. module="${zomg}")
-								if($opts['module'] && $oldModule == $container->getModuleName() && (!$umap || !array_key_exists($ma, $vars) || $oldModule == $vars[$ma])) {
+								if ($opts['module'] && $oldModule == $container->getModuleName() && (!$umap || !array_key_exists($ma, $vars) || $oldModule == $vars[$ma])) {
 									$module = Toolkit::expandVariables($opts['module'], $expandVars);
 									$container->setModuleName($module);
-									if($umap) {
+									if ($umap) {
 										$vars[$ma] = $module;
 									}
 								}
-								if($opts['controller'] && $oldController == $container->getControllerName() && (!$umap || !array_key_exists($aa, $vars) || $oldController == $vars[$aa])) {
+								if ($opts['controller'] && $oldController == $container->getControllerName() && (!$umap || !array_key_exists($aa, $vars) || $oldController == $vars[$aa])) {
 									$controller = Toolkit::expandVariables($opts['controller'], $expandVars);
 									$container->setControllerName($controller);
-									if($umap) {
+									if ($umap) {
 										$vars[$aa] = $controller;
 									}
 								}
-								if($opts['output_type'] && $oldOutputTypeName == ($container->getOutputType() ? $container->getOutputType()->getName() : null)) {
+								if ($opts['output_type'] && $oldOutputTypeName == ($container->getOutputType() ? $container->getOutputType()->getName() : null)) {
 									$ot = Toolkit::expandVariables($opts['output_type'], $expandVars);
 									$container->setOutputType($this->context->getDispatcher()->getOutputType($ot));
 								}
-								if($opts['locale'] && $oldLocale == $tm->getCurrentLocaleIdentifier()) {
-									if($locale = Toolkit::expandVariables($opts['locale'], $expandVars)) {
+								if ($opts['locale'] && $oldLocale == $tm->getCurrentLocaleIdentifier()) {
+									if ($locale = Toolkit::expandVariables($opts['locale'], $expandVars)) {
 										// see above for the reason of the if
 										$tm->setLocale($locale);
 									}
 								}
-								if($opts['method']) {
-									if($oldRequestMethod == $rq->getMethod() && $oldContainerMethod == $container->getRequestMethod()) {
-										if($method = Toolkit::expandVariables($opts['method'], $expandVars)) {
+								if ($opts['method']) {
+									if ($oldRequestMethod == $rq->getMethod() && $oldContainerMethod == $container->getRequestMethod()) {
+										if ($method = Toolkit::expandVariables($opts['method'], $expandVars)) {
 											// see above for the reason of the if
 											$rq->setMethod($method);
 											$container->setRequestMethod($method);
 										}
-									} elseif($oldContainerMethod != $container->getRequestMethod()) {
+									} elseif ($oldContainerMethod != $container->getRequestMethod()) {
 										// copy the request method to the request (a method set on the container 
 										// in a callback always has precedence over request methods set on the request)
 										$rq->setMethod($container->getRequestMethod());
-									} elseif($oldRequestMethod != $rq->getMethod()) {
+									} elseif ($oldRequestMethod != $rq->getMethod()) {
 										// copy the request method to the container
 										$container->setRequestMethod($rq->getMethod());
 									}
@@ -1428,14 +1428,14 @@ 
 								
 								// one last thing we need to do: see if one of the callbacks modified the 'controller' or 'module' vars inside $vars if $umap is on
 								// we then need to write those back to the container, unless they changed THERE, too, in which case the container values take precedence
-								if($umap && $oldModule == $container->getModuleName() && array_key_exists($ma, $vars) && $vars[$ma] != $oldModule) {
+								if ($umap && $oldModule == $container->getModuleName() && array_key_exists($ma, $vars) && $vars[$ma] != $oldModule) {
 									$container->setModuleName($vars[$ma]);
 								}
-								if($umap && $oldController == $container->getControllerName() && array_key_exists($aa, $vars) && $vars[$aa] != $oldController) {
+								if ($umap && $oldController == $container->getControllerName() && array_key_exists($aa, $vars) && $vars[$aa] != $oldController) {
 									$container->setControllerName($vars[$aa]);
 								}
 							}
-							if(!$callbackSuccess) {
+							if (!$callbackSuccess) {
 								// jump straight to the next route
 								continue;
 							} else {
@@ -1443,8 +1443,8 @@ 
 								// Restoring them from the backup is necessary since otherwise a value which has been set before this route
 								// and which was ignored in this route would take the ignored value instead of keeping the old one.
 								// And variables which have not been set in an earlier routes need to be removed again
-								foreach($opts['ignores'] as $ignore) {
-									if(array_key_exists($ignore, $varsBackup)) {
+								foreach ($opts['ignores'] as $ignore) {
+									if (array_key_exists($ignore, $varsBackup)) {
 										$vars[$ignore] = $varsBackup[$ignore];
 									} else {
 										unset($vars[$ignore]);
@@ -1455,38 +1455,38 @@ 
 
 						$matchedRoutes[] = $opts['name'];
 
-						if($opts['cut'] || (count($opts['childs']) && $opts['cut'] === null)) {
-							if($route['opt']['source'] !== null) {
-								$s =& $this->sources[$route['opt']['source']];
+						if ($opts['cut'] || (count($opts['childs']) && $opts['cut'] === null)) {
+							if ($route['opt']['source'] !== null) {
+								$s = & $this->sources[$route['opt']['source']];
 							} else {
-								$s =& $input;
+								$s = & $input;
 							}
 
 							$ni = '';
 							// if the route didn't match from the start of the input preserve the 'prefix'
-							if($match[0][1] > 0) {
+							if ($match[0][1] > 0) {
 								$ni = substr($s, 0, $match[0][1]);
 							}
 							$ni .= substr($s, $match[0][1] + strlen($match[0][0]));
 							$s = $ni;
 						}
 
-						if(count($opts['childs'])) {
+						if (count($opts['childs'])) {
 							// our childs need to be processed next and stop processing 'afterwards'
 							$routeStack[] = $opts['childs'];
 							break;
 						}
 
-						if($opts['stop']) {
+						if ($opts['stop']) {
 							break;
 						}
 
 					} else {
-						if(count($opts['callbacks']) > 0) {
+						if (count($opts['callbacks']) > 0) {
 							/** @var RoutingCallback $callbackInstance */
-							foreach($route['callback_instances'] as $callbackInstance) {
+							foreach ($route['callback_instances'] as $callbackInstance) {
 								$onNotMatched = $callbackInstance->onNotMatched($container);
-								if($onNotMatched instanceof Response) {
+								if ($onNotMatched instanceof Response) {
 									return $onNotMatched;
 								}
 							}
@@ -1494,17 +1494,17 @@ 
 					}
 				}
 			}
-		} while(count($routeStack) > 0);
+		} while (count($routeStack) > 0);
 
 		// put the vars into the request
 		$rd->setParameters($vars);
 
-		if($container->getModuleName() === null || $container->getControllerName() === null) {
+		if ($container->getModuleName() === null || $container->getControllerName() === null) {
 			// no route which supplied the required parameters matched, use 404 controller
 			$container->setModuleName(Config::get('controllers.error_404_module'));
 			$container->setControllerName(Config::get('controllers.error_404_controller'));
 			
-			if($umap) {
+			if ($umap) {
 				$rd->setParameters(array(
 					$ma => $container->getModuleName(),
 					$aa => $container->getControllerName(),
@@ -1533,17 +1533,17 @@ 
 	 */
 	protected function parseInput(array $route, $input, &$matches)
 	{
-		if($route['opt']['source'] !== null) {
+		if ($route['opt']['source'] !== null) {
 			$parts = ArrayPathDefinition::getPartsFromPath($route['opt']['source']);
 			$partArray = $parts['parts'];
 			$count = count($partArray);
-			if($count > 0 && isset($this->sources[$partArray[0]])) {
+			if ($count > 0 && isset($this->sources[$partArray[0]])) {
 				$input = $this->sources[$partArray[0]];
-				if($count > 1) {
+				if ($count > 1) {
 					array_shift($partArray);
-					if(is_array($input)) {
+					if (is_array($input)) {
 						$input = ArrayPathDefinition::getValue($partArray, $input);
-					} elseif($input instanceof RoutingSourceInterface) {
+					} elseif ($input instanceof RoutingSourceInterface) {
 						$input = $input->getSource($partArray);
 					}
 				}
@@ -1589,36 +1589,36 @@ 
 		$bracketCount = 0;
 		$hasBrackets = false;
 
-		for($i = 0; $i < $len; ++$i) {
+		for ($i = 0; $i < $len; ++$i) {
 			$atEnd = $i + 1 == $len;
 
 			$c = $str[$i];
 
-			if(!$atEnd && !$inEscape && $c == '\\') {
+			if (!$atEnd && !$inEscape && $c == '\\') {
 				$cNext = $str[$i + 1];
 
-				if(
+				if (
 					($cNext == '\\') ||
 					($state == 'start' && $cNext == '(') ||
-					($state == 'rxStart' && in_array($cNext, array('(',')','{','}')))
+					($state == 'rxStart' && in_array($cNext, array('(', ')', '{', '}')))
 				) {
 					$inEscape = true;
 					continue;
 				}
-				if($state == 'afterRx' && $cNext == '?') {
+				if ($state == 'afterRx' && $cNext == '?') {
 					$inEscape = false;
 					$state = 'start';
 					continue;
 				}
-			} elseif($inEscape) {
+			} elseif ($inEscape) {
 				$tmpStr .= $c;
 				$inEscape = false;
 				continue;
 			}
 
-			if($state == 'start') {
+			if ($state == 'start') {
 				// start of regular expression block
-				if($c == '(') {
+				if ($c == '(') {
 					$rxStr .= preg_quote($tmpStr, '#');
 					$reverseStr .= $tmpStr;
 
@@ -1632,54 +1632,54 @@ 
 					$tmpStr .= $c;
 				}
 
-				if($atEnd) {
+				if ($atEnd) {
 					$rxStr .= preg_quote($tmpStr, '#');
 					$reverseStr .= $tmpStr;
 				}
-			} elseif($state == 'rxStart') {
-				if($c == '{') {
+			} elseif ($state == 'rxStart') {
+				if ($c == '{') {
 					++$bracketCount;
-					if($bracketCount == 1) {
+					if ($bracketCount == 1) {
 						$hasBrackets = true;
 						$rxPrefix = $tmpStr;
 						$tmpStr = '';
 					} else {
 						$tmpStr .= $c;
 					}
-				} elseif($c == '}') {
+				} elseif ($c == '}') {
 					--$bracketCount;
-					if($bracketCount == 0) {
+					if ($bracketCount == 0) {
 						list($rxName, $rxInner) = $this->parseParameterDefinition($tmpStr);
 						$tmpStr = '';
 					} else {
 						$tmpStr .= $c;
 					}
-				} elseif($c == '(') {
+				} elseif ($c == '(') {
 					++$parenthesisCount;
 					$tmpStr .= $c;
-				} elseif($c == ')') {
+				} elseif ($c == ')') {
 					--$parenthesisCount;
-					if($parenthesisCount > 0) {
+					if ($parenthesisCount > 0) {
 						$tmpStr .= $c;
 					} else {
-						if($parenthesisCount < 0) {
+						if ($parenthesisCount < 0) {
 							throw new AgaviException('The pattern ' . $str . ' contains an unbalanced set of parentheses!');
 						}
 
-						if(!$hasBrackets) {
+						if (!$hasBrackets) {
 							list($rxName, $rxInner) = $this->parseParameterDefinition($tmpStr);
 						} else {
-							if($bracketCount != 0) {
+							if ($bracketCount != 0) {
 								throw new AgaviException('The pattern ' . $str . ' contains an unbalanced set of brackets!');
 							}
 							$rxPostfix = $tmpStr;
 						}
 
-						if(!$rxName) {
+						if (!$rxName) {
 							$myRx = $rxPrefix . $rxInner . $rxPostfix;
 							// if the entire regular expression doesn't contain any regular expression character we can safely append it to the reverseStr
 							//if(strlen($myRx) == strcspn($myRx, $rxChars)) {
-							if(strpbrk($myRx, $rxChars) === false) {
+							if (strpbrk($myRx, $rxChars) === false) {
 								$reverseStr .= $myRx;
 							}
 							$rxStr .= str_replace('#', '\#', sprintf('(%s)', $myRx));
@@ -1687,14 +1687,14 @@ 
 							$rxStr .= str_replace('#', '\#', sprintf('(%s(?P<%s>%s)%s)', $rxPrefix, $rxName, $rxInner, $rxPostfix));
 							$reverseStr .= sprintf('(:%s:)', $rxName);
 
-							if(!isset($vars[$rxName])) {
-								if(strpbrk($rxPrefix, $rxChars) !== false) {
+							if (!isset($vars[$rxName])) {
+								if (strpbrk($rxPrefix, $rxChars) !== false) {
 									$rxPrefix = null;
 								}
-								if(strpbrk($rxInner, $rxChars) !== false) {
+								if (strpbrk($rxInner, $rxChars) !== false) {
 									$rxInner = null;
 								}
-								if(strpbrk($rxPostfix, $rxChars) !== false) {
+								if (strpbrk($rxPostfix, $rxChars) !== false) {
 									$rxPostfix = null;
 								}
 
@@ -1709,13 +1709,13 @@ 
 					$tmpStr .= $c;
 				}
 
-				if($atEnd && $parenthesisCount != 0) {
+				if ($atEnd && $parenthesisCount != 0) {
 					throw new AgaviException('The pattern ' . $str . ' contains an unbalanced set of parentheses!');
 				}
-			} elseif($state == 'afterRx') {
-				if($c == '?') {
+			} elseif ($state == 'afterRx') {
+				if ($c == '?') {
 					// only record the optional state when the pattern had a name
-					if(isset($vars[$rxName])) {
+					if (isset($vars[$rxName])) {
 						$vars[$rxName]['is_optional'] = true;
 					}
 					$rxStr .= $c;

src/build/phing/org/agavi/build/tasks/DisplayControllersTask.php

Indentation +59 added lines, -59 removed lines

@@ -31,75 +31,75 @@
  */
 class AgaviDisplayControllersTask extends AgaviTask
 {
-	protected $path = null;
+    protected $path = null;
 	
-	/**
-	 * Sets the path to the project directory from which this task will read.
-	 *
-	 * @param      PhingFile Path to the project directory.
-	 */
-	public function setPath(PhingFile $path)
-	{
-		$this->path = $path;
-	}
+    /**
+     * Sets the path to the project directory from which this task will read.
+     *
+     * @param      PhingFile Path to the project directory.
+     */
+    public function setPath(PhingFile $path)
+    {
+        $this->path = $path;
+    }
 	
-	/**
-	 * Executes this task.
-	 */
-	public function main()
-	{
-		if($this->path === null) {
-			throw new \Agavi\Build\Exception\BuildException('The path attribute must be specified');
-		}
+    /**
+     * Executes this task.
+     */
+    public function main()
+    {
+        if($this->path === null) {
+            throw new \Agavi\Build\Exception\BuildException('The path attribute must be specified');
+        }
 		
-		$check = new \Agavi\Build\Check\ModuleFilesystemCheck();
-		$check->setConfigDirectory($this->project->getProperty('module.config.directory'));
+        $check = new \Agavi\Build\Check\ModuleFilesystemCheck();
+        $check->setConfigDirectory($this->project->getProperty('module.config.directory'));
 		
-		$check->setPath($this->path->getAbsolutePath());
-		if(!$check->check()) {
-			throw new \Agavi\Build\Exception\BuildException('The path attribute must be a valid module base directory');
-		}
+        $check->setPath($this->path->getAbsolutePath());
+        if(!$check->check()) {
+            throw new \Agavi\Build\Exception\BuildException('The path attribute must be a valid module base directory');
+        }
 		
-		/* We don't know whether the module is configured or not here, so load the
+        /* We don't know whether the module is configured or not here, so load the
 		 * values we want properly. */
-		$this->tryLoadAgavi();
-		$this->tryBootstrapAgavi();
+        $this->tryLoadAgavi();
+        $this->tryBootstrapAgavi();
 		
-		require_once(\Agavi\Config\ConfigCache::checkConfig(
-			sprintf('%s/%s/module.xml',
-				$this->path->getAbsolutePath(),
-				(string)$this->project->getProperty('module.config.directory')
-			)
-		));
+        require_once(\Agavi\Config\ConfigCache::checkConfig(
+            sprintf('%s/%s/module.xml',
+                $this->path->getAbsolutePath(),
+                (string)$this->project->getProperty('module.config.directory')
+            )
+        ));
 		
-		$controllerPath = \Agavi\Util\Toolkit::expandVariables(
-			\Agavi\Util\Toolkit::expandDirectives(\Agavi\Config\Config::get(
-				sprintf('modules.%s.agavi.controller.path', strtolower($this->path->getName())),
-				'%core.module_dir%/${moduleName}/controllers/${controllerName}Controller.class.php'
-			)),
-			array(
-				'moduleName' => $this->path->getName()
-			)
-		);
-		$pattern = '#^' . \Agavi\Util\Toolkit::expandVariables(
-			/* Blaaaaaaaaauuuuuughhhhhhh... */
-			str_replace('\\$\\{controllerName\\}', '${controllerName}', preg_quote($controllerPath, '#')),
-			array('controllerName' => '(?P<controller_name>.*?)')
-		) . '$#';
+        $controllerPath = \Agavi\Util\Toolkit::expandVariables(
+            \Agavi\Util\Toolkit::expandDirectives(\Agavi\Config\Config::get(
+                sprintf('modules.%s.agavi.controller.path', strtolower($this->path->getName())),
+                '%core.module_dir%/${moduleName}/controllers/${controllerName}Controller.class.php'
+            )),
+            array(
+                'moduleName' => $this->path->getName()
+            )
+        );
+        $pattern = '#^' . \Agavi\Util\Toolkit::expandVariables(
+            /* Blaaaaaaaaauuuuuughhhhhhh... */
+            str_replace('\\$\\{controllerName\\}', '${controllerName}', preg_quote($controllerPath, '#')),
+            array('controllerName' => '(?P<controller_name>.*?)')
+        ) . '$#';
 		
-		$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->path->getAbsolutePath()));
-		for(; $iterator->valid(); $iterator->next()) {
-			$rdi = $iterator->getInnerIterator();
-			if($rdi->isDot() || !$rdi->isFile()) {
-				continue;
-			}
+        $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->path->getAbsolutePath()));
+        for(; $iterator->valid(); $iterator->next()) {
+            $rdi = $iterator->getInnerIterator();
+            if($rdi->isDot() || !$rdi->isFile()) {
+                continue;
+            }
 			
-			$file = $rdi->getPathname();
-			if(preg_match($pattern, $file, $matches)) {
-				$this->log(str_replace(DIRECTORY_SEPARATOR, '.', $matches['controller_name']));
-			}
-		}
-	}
+            $file = $rdi->getPathname();
+            if(preg_match($pattern, $file, $matches)) {
+                $this->log(str_replace(DIRECTORY_SEPARATOR, '.', $matches['controller_name']));
+            }
+        }
+    }
 }
 
 ?>
\ No newline at end of file

src/build/phing/org/agavi/build/tasks/ListControllersTask.php

Indentation +77 added lines, -77 removed lines

@@ -31,96 +31,96 @@
  */
 class ListControllersTask extends AgaviTask
 {
-	protected $property = null;
-	protected $path = null;
+    protected $property = null;
+    protected $path = null;
 	
-	/**
-	 * Sets the property that this task will modify.
-	 *
-	 * @param      string The property to modify.
-	 */
-	public function setProperty($property)
-	{
-		$this->property = $property;
-	}
+    /**
+     * Sets the property that this task will modify.
+     *
+     * @param      string The property to modify.
+     */
+    public function setProperty($property)
+    {
+        $this->property = $property;
+    }
 	
-	/**
-	 * Sets the path to the project directory from which this task will read.
-	 *
-	 * @param      PhingFile Path to the project directory.
-	 */
-	public function setPath(PhingFile $path)
-	{
-		$this->path = $path;
-	}
+    /**
+     * Sets the path to the project directory from which this task will read.
+     *
+     * @param      PhingFile Path to the project directory.
+     */
+    public function setPath(PhingFile $path)
+    {
+        $this->path = $path;
+    }
 	
-	/**
-	 * Executes this task.
-	 */
-	public function main()
-	{
-		if($this->property === null) {
-			throw new BuildException('The property attribute must be specified');
-		}
-		if($this->path === null) {
-			throw new BuildException('The path attribute must be specified');
-		}
+    /**
+     * Executes this task.
+     */
+    public function main()
+    {
+        if($this->property === null) {
+            throw new BuildException('The property attribute must be specified');
+        }
+        if($this->path === null) {
+            throw new BuildException('The path attribute must be specified');
+        }
 		
-		$check = new \Agavi\Build\Check\ModuleFilesystemCheck();
-		$check->setConfigDirectory($this->project->getProperty('module.config.directory'));
+        $check = new \Agavi\Build\Check\ModuleFilesystemCheck();
+        $check->setConfigDirectory($this->project->getProperty('module.config.directory'));
 		
-		$check->setPath($this->path->getAbsolutePath());
-		if(!$check->check()) {
-			throw new BuildException('The path attribute must be a valid module base directory');
-		}
+        $check->setPath($this->path->getAbsolutePath());
+        if(!$check->check()) {
+            throw new BuildException('The path attribute must be a valid module base directory');
+        }
 		
-		/* We don't know whether the module is configured or not here, so load the
+        /* We don't know whether the module is configured or not here, so load the
 		 * values we want properly. */
-		$this->tryLoadAgavi();
-		$this->tryBootstrapAgavi();
+        $this->tryLoadAgavi();
+        $this->tryBootstrapAgavi();
 
-		require_once(\Agavi\Config\ConfigCache::checkConfig(
-			sprintf('%s/%s/module.xml',
-				$this->path->getAbsolutePath(),
-				(string)$this->project->getProperty('module.config.directory')
-			)
-		));
+        require_once(\Agavi\Config\ConfigCache::checkConfig(
+            sprintf('%s/%s/module.xml',
+                $this->path->getAbsolutePath(),
+                (string)$this->project->getProperty('module.config.directory')
+            )
+        ));
 		
-		$controllerPath = \Agavi\Util\Toolkit::expandVariables(
-			\Agavi\Util\Toolkit::expandDirectives(\Agavi\Config\Config::get(
-				sprintf('modules.%s.agavi.controller.path', strtolower($this->path->getName())),
-				'%core.module_dir%/${moduleName}/controllers/${controllerName}Controller.class.php'
-			)),
-			array(
-				'moduleName' => $this->path->getName()
-			)
-		);
-		$pattern = '#^' . \Agavi\Util\Toolkit::expandVariables(
-			/* Blaaaaaaaaauuuuuughhhhhhh... */
-			str_replace('\\$\\{controllerName\\}', '${controllerName}', preg_quote($controllerPath, '#')),
-			array('controllerName' => '(?P<controller_name>.*?)')
-		) . '$#';
+        $controllerPath = \Agavi\Util\Toolkit::expandVariables(
+            \Agavi\Util\Toolkit::expandDirectives(\Agavi\Config\Config::get(
+                sprintf('modules.%s.agavi.controller.path', strtolower($this->path->getName())),
+                '%core.module_dir%/${moduleName}/controllers/${controllerName}Controller.class.php'
+            )),
+            array(
+                'moduleName' => $this->path->getName()
+            )
+        );
+        $pattern = '#^' . \Agavi\Util\Toolkit::expandVariables(
+            /* Blaaaaaaaaauuuuuughhhhhhh... */
+            str_replace('\\$\\{controllerName\\}', '${controllerName}', preg_quote($controllerPath, '#')),
+            array('controllerName' => '(?P<controller_name>.*?)')
+        ) . '$#';
 		
-		$controllers = array();
-		$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->path->getAbsolutePath()));
-		for(; $iterator->valid(); $iterator->next()) {
-			$rdi = $iterator->getInnerIterator();
-			if($rdi->isDot() || !$rdi->isFile()) {
-				continue;
-			}
+        $controllers = array();
+        $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->path->getAbsolutePath()));
+        for(; $iterator->valid(); $iterator->next()) {
+            $rdi = $iterator->getInnerIterator();
+            if($rdi->isDot() || !$rdi->isFile()) {
+                continue;
+            }
 			
-			$file = $rdi->getPathname();
-			if(preg_match($pattern, $file, $matches)) {
-				$controllers[] = str_replace(DIRECTORY_SEPARATOR, '.', $matches['controller_name']);
-			}
-		}
+            $file = $rdi->getPathname();
+            if(preg_match($pattern, $file, $matches)) {
+                $controllers[] = str_replace(DIRECTORY_SEPARATOR, '.', $matches['controller_name']);
+            }
+        }
 		
-		$list = new \Agavi\Build\Transform\ArraytostringTransform();
-		$list->setInput($controllers);
-		$list->setDelimiter(' ');
+        $list = new \Agavi\Build\Transform\ArraytostringTransform();
+        $list->setInput($controllers);
+        $list->setDelimiter(' ');
 		
-		$this->project->setUserProperty($this->property, $list->transform());
-	}
+        $this->project->setUserProperty($this->property, $list->transform());
+    }
 }
 
 ?>
\ No newline at end of file