cross-solution / YAWIK

module/Behat/src/CommonContextTrait.php

Spacing +3 added lines, -3 removed lines

@@ -51,16 +51,16 @@
 		$this->summaryFormContext = $scope->getEnvironment()->getContext(SummaryFormContext::class);
 	}
 	
-	public function buildUrl($name, array $params=array(), array $options=array())
+	public function buildUrl($name, array $params = array(), array $options = array())
 	{
 	    $defaults = ['lang'=>'en'];
-	    $params = array_merge($defaults,$params);
+	    $params = array_merge($defaults, $params);
         /* @var Url $urlHelper */
         $urlHelper = $this
             ->getService('ViewHelperManager')
             ->get('url')
         ;
-        $url = $urlHelper($name,$params,$options);
+        $url = $urlHelper($name, $params, $options);
 
         return $this->coreContext->generateUrl($url);
 	}

module/Behat/src/CoreContext.php

Spacing +12 added lines, -12 removed lines

@@ -35,11 +35,11 @@ 
 	 */
 	public function setupContexts(BeforeScenarioScope $scope)
 	{
-		if(false === static::$jobCategoryChecked){
+		if (false === static::$jobCategoryChecked) {
 			/* @var Categories $catRepo */
 			$catRepo = $this->getRepositories()->get('Jobs/Category');
 			$all = $catRepo->findAll();
-			if(count($all) <= 1){
+			if (count($all) <= 1) {
 				$catRepo->createDefaultCategory('professions');
 				$catRepo->createDefaultCategory('industries');
 				$catRepo->createDefaultCategory('employmentTypes');
@@ -53,7 +53,7 @@ 
 	 */
 	public function getApplication()
 	{
-		if(!is_object(static::$application)){
+		if (!is_object(static::$application)) {
 			$configFile = realpath(__DIR__.'/../../../config/config.php');
 			$config = include($configFile);
 			static::$application = Application::init($config);
@@ -137,7 +137,7 @@ 
 	public function iSubmitTheFormWithId($arg)
 	{
 		$node = $this->minkContext->getSession()->getPage()->find('css', $arg);
-		if($node) {
+		if ($node) {
 			$this->minkContext->getSession()->executeScript("jQuery('$arg').submit();");
 		} else {
 			throw new \Exception('Element not found');
@@ -161,7 +161,7 @@ 
 	public function iSetMainWindowName()
 	{
 		$window_name = 'main_window';
-		$script = 'window.name = "' . $window_name . '"';
+		$script = 'window.name = "'.$window_name.'"';
 		$this->getSession()->executeScript($script);
 	}
 	
@@ -220,14 +220,14 @@ 
 				break;
 			
 			default:
-				throw new \Exception(__METHOD__ . ' Couldn\'t find selector: ' . $selector . ' - Allowed selectors: #id, .className, //xpath');
+				throw new \Exception(__METHOD__.' Couldn\'t find selector: '.$selector.' - Allowed selectors: #id, .className, //xpath');
 				break;
 		}
 		
 		try {
 			$this->getSession()->executeScript($function);
 		} catch (\Exception $e) {
-			throw new \Exception(__METHOD__ . ' failed'. ' Message: for this locator:"'.$selector.'"');
+			throw new \Exception(__METHOD__.' failed'.' Message: for this locator:"'.$selector.'"');
 		}
 	}
 	
@@ -247,10 +247,10 @@ 
 	 *
 	 * @return \Behat\Mink\Element\NodeElement|mixed|null
 	 */
-	public function getElement($locator,$selector='css')
+	public function getElement($locator, $selector = 'css')
 	{
 		$page = $this->minkContext->getSession()->getPage();
-		$element = $page->find('css',$locator);
+		$element = $page->find('css', $locator);
 		return $element;
 	}
 	
@@ -282,12 +282,12 @@ 
 		$session = $this->getSession();
 		$element = $session->getPage()->find(
 			'xpath',
-			$session->getSelectorsHandler()->selectorToXpath('xpath', '*//*[text()="'. $text .'"]')
+			$session->getSelectorsHandler()->selectorToXpath('xpath', '*//*[text()="'.$text.'"]')
 		);
-		if(null === $element){
+		if (null === $element) {
 			$element = $session->getPage()->find(
 				'named',
-				array('id',$text)
+				array('id', $text)
 			);
 		}
 		if (null === $element) {

module/Behat/src/JobContext.php

Spacing +44 added lines, -44 removed lines

@@ -57,8 +57,8 @@ 
 	{
 		$repo = static::$jobRepo;
 		$results = $repo->findBy(['user' => $user]);
-		foreach($results as $result){
-			$repo->remove($result,true);
+		foreach ($results as $result) {
+			$repo->remove($result, true);
 		}
 	}
 	
@@ -70,7 +70,7 @@ 
 	public function beforeScenario(BeforeScenarioScope $scope)
 	{
 		$this->select2Context = $scope->getEnvironment()->getContext(Select2Context::class);
-		if(is_null(static::$jobRepo)){
+		if (is_null(static::$jobRepo)) {
 			$this->gatherContexts($scope);
 			static::$jobRepo = $this->getJobRepository();
 		}
@@ -89,7 +89,7 @@ 
 	 */
 	public function iGoToCreateJob()
 	{
-	    $url = $this->buildUrl('lang/jobs/manage',['action' => 'edit']);
+	    $url = $this->buildUrl('lang/jobs/manage', ['action' => 'edit']);
 		$this->visit($url);
 	}
 	
@@ -109,11 +109,11 @@ 
 	public function iGoToEditJobWithTitle($jobTitle)
 	{
 		$job = $this->getJobRepository()->findOneBy(['title' => $jobTitle]);
-		if(!$job instanceof Job){
-			throw new \Exception(sprintf('Job with title "%s" is not found',$jobTitle));
+		if (!$job instanceof Job) {
+			throw new \Exception(sprintf('Job with title "%s" is not found', $jobTitle));
 		}
 		$this->currentJob = $job;
-		$url = $this->buildUrl('lang/jobs/manage',[
+		$url = $this->buildUrl('lang/jobs/manage', [
 		    'id' => $job->getId()
         ]);
 		$this->visit($url);
@@ -139,8 +139,8 @@ 
 
 		$jobRepository = $this->getJobRepository();
 		$results = $jobRepository->getUserJobs($user->getId());
-		foreach($results as $job){
-			$jobRepository->remove($job,true);
+		foreach ($results as $job) {
+			$jobRepository->remove($job, true);
 		}
 		$this->currentJob = null;
 	}
@@ -149,16 +149,16 @@ 
 	 * @When I fill job location search with :search and choose :choice
 	 *
 	 */
-	public function iFillJobLocationAndChoose($search,$choice)
+	public function iFillJobLocationAndChoose($search, $choice)
 	{
 		$select2 = $this->select2Context;
-		$select2->iFillInSelect2FieldWith('jobBase[geoLocation]',$search,$choice);
+		$select2->iFillInSelect2FieldWith('jobBase[geoLocation]', $search, $choice);
 	}
 	
 	/**
 	 * @When I choose :value from :field
 	 */
-	public function iJobClassificationSelect($value,$field)
+	public function iJobClassificationSelect($value, $field)
 	{
 		$field = Inflector::camelize($field);
 		
@@ -174,18 +174,18 @@ 
 			'employmentTypes'    => "select#classifications-employmentTypes",
 		];
 		
-		if(!isset($mapSelect2[$field])){
+		if (!isset($mapSelect2[$field])) {
 			throw new \Exception('Undefined field selection value "'.$field.'"');
 		}
 		
 		$multipleField = $mapMultiple[$field];
 		$page = $this->minkContext->getSession()->getPage();
-		$element = $page->find('css',$mapMultiple[$field]);
-		if(!is_null($element) && $element->getAttribute('multiple')=='multiple'){
-			$this->minkContext->selectOption($value,$multipleField);
-		}else{
+		$element = $page->find('css', $mapMultiple[$field]);
+		if (!is_null($element) && $element->getAttribute('multiple') == 'multiple') {
+			$this->minkContext->selectOption($value, $multipleField);
+		} else {
 			$locator = $mapSelect2[$field];
-			$this->select2Context->iFillInSelect2Field($locator,$value);
+			$this->select2Context->iFillInSelect2Field($locator, $value);
 		}
 	}
 	
@@ -209,62 +209,62 @@ 
 	 * @When I have a :status job with the following:
 	 * @param TableNode $fields
 	 */
-	public function iHaveAJobWithTheFollowing($status,TableNode $fields)
+	public function iHaveAJobWithTheFollowing($status, TableNode $fields)
 	{
 		$normalizedField = [
 			'template' => 'modern',
 		];
-		foreach($fields->getRowsHash() as $field => $value){
+		foreach ($fields->getRowsHash() as $field => $value) {
 			$field = Inflector::camelize($field);
-			if($field == 'professions' || $field == 'industries'){
-				$value = explode(',',$value);
+			if ($field == 'professions' || $field == 'industries') {
+				$value = explode(',', $value);
 			}
 			$normalizedField[$field] = $value;
 		}
 		$jobRepo = $this->getJobRepository();
 		$job = $jobRepo->findOneBy(['title' => $normalizedField['title']]);
-		if(!$job instanceof Job){
+		if (!$job instanceof Job) {
 			$job = new Job();
 			$job->setTitle($normalizedField['title']);
 		}
-		if(isset($normalizedField['user'])){
+		if (isset($normalizedField['user'])) {
 			/* @var $userRepo UserRepository */
 			$user = $this->getUserContext()->getCurrentUser();
 			$jobRepo->getDocumentManager()->refresh($user);
-			if($user instanceof User){
+			if ($user instanceof User) {
 				$job->setUser($user);
 				$job->setOrganization($user->getOrganization()->getOrganization());
-			}else{
+			} else {
 				throw new \Exception('There is no user with this login:"'.$normalizedField['user'.'"']);
 			}
 		}
 		
-		if($status == 'draft'){
+		if ($status == 'draft') {
 			$job->setIsDraft(true);
-		}elseif($status == 'published'){
+		}elseif ($status == 'published') {
 			$job->setIsDraft(false);
 			$job->setDatePublishStart(new \DateTime());
 		}
 		$job->setStatus(Status::ACTIVE);
 		
-		if(isset($normalizedField['location'])){
-			$this->setLocation($job,$normalizedField['location']);
+		if (isset($normalizedField['location'])) {
+			$this->setLocation($job, $normalizedField['location']);
 		}
-		if(isset($normalizedField['companyName'])){
+		if (isset($normalizedField['companyName'])) {
 			//$job->setCompany($normalizedField['companyName']);
 		}
-		if(isset($normalizedField['professions'])){
-			$this->addProfessions($job,$normalizedField['professions']);
+		if (isset($normalizedField['professions'])) {
+			$this->addProfessions($job, $normalizedField['professions']);
 		}
 		
-		if(isset($normalizedField['industries'])){
-			$this->addIndustries($job,$normalizedField['industries']);
+		if (isset($normalizedField['industries'])) {
+			$this->addIndustries($job, $normalizedField['industries']);
 		}
-		if(isset($normalizedField['employmentTypes'])){
+		if (isset($normalizedField['employmentTypes'])) {
 			$types = $this->getCategories([$normalizedField['employmentTypes']]);
 			$type = array_shift($types);
 			$values = $job->getClassifications()->getEmploymentTypes()->getValues();
-			if(!is_array($values) || !in_array($type,$values)){
+			if (!is_array($values) || !in_array($type, $values)) {
 				$job->getClassifications()->getEmploymentTypes()->getItems()->add($type);
 			}
 		}
@@ -283,18 +283,18 @@ 
 		$location->fromString($serialized);
 		
 		$locations = $job->getLocations();
-		if(count($locations)){
+		if (count($locations)) {
 			$locations->clear();
 		}
 		$job->getLocations()->add($location);
 	}
 	
-	private function addProfessions(Job &$job,$terms)
+	private function addProfessions(Job &$job, $terms)
 	{
 		$professions = $this->getCategories($terms);
-		foreach($professions as $profession){
+		foreach ($professions as $profession) {
 			$values = $job->getClassifications()->getProfessions()->getValues();
-			if(!is_array($values) || !in_array($profession,$values)){
+			if (!is_array($values) || !in_array($profession, $values)) {
 				$job->getClassifications()->getProfessions()->getItems()->add($profession);
 			}
 		}
@@ -303,9 +303,9 @@ 
 	private function addIndustries(Job &$job, $terms)
 	{
 		$industries = $this->getCategories($terms);
-		foreach($industries as $industry){
+		foreach ($industries as $industry) {
 			$values = $job->getClassifications()->getIndustries()->getValues();
-			if(!is_array($values) || !in_array($industry,$values)){
+			if (!is_array($values) || !in_array($industry, $values)) {
 				$job->getClassifications()->getIndustries()->getItems()->add($industry);
 			}
 		}
@@ -340,7 +340,7 @@ 
 		
 		$job = $repo->findDraft($user);
 		
-		if(is_null($job)){
+		if (is_null($job)) {
 			$job = new Job();
 			$job
 				->setUser($user)

module/Behat/src/SettingsContext.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	 */
 	public function iGoToEmailTemplatePage()
 	{
-	    $url = $this->buildUrl('lang/settings',[
+	    $url = $this->buildUrl('lang/settings', [
 	        'module' => 'Applications'
         ]);
 		$this->visit($url);

module/Behat/src/ApplicationContext.php

Spacing +2 added lines, -2 removed lines

@@ -35,13 +35,13 @@
 		/* @var $repo JobRepository */
 		$repo = $this->getRepository('Jobs/Job');
 		$job = $repo->findOneBy(['title' => $title]);
-		if(!$job instanceof Job){
+		if (!$job instanceof Job) {
 			throw new \Exception('There is no job titled: "'.$title.'"');
 		}
 		$job->setApplyId($job->getId());
 		$repo->store($job);
 
-		$url = $this->buildUrl('lang/apply',[
+		$url = $this->buildUrl('lang/apply', [
 		    'applyId' => $job->getApplyId()
         ]);
 		$this->visit($url);

module/Core/src/Core/Factory/Controller/LazyControllerFactory.php

Spacing +15 added lines, -15 removed lines

@@ -36,47 +36,47 @@ 
         RepositoryService::class => 'repositories',
 	];
 	
-	public function canCreate( ContainerInterface $container, $requestedName )
+	public function canCreate(ContainerInterface $container, $requestedName)
 	{
-		return strstr( $requestedName,'\Controller') !== false;
+		return strstr($requestedName, '\Controller') !== false;
 	}
 
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
 	{
         $className = $this->getClassName($requestedName);
 		$class = new \ReflectionClass($className);
 
-		if( $constructor = $class->getConstructor() )
+		if ($constructor = $class->getConstructor())
 		{
-			if( $params = $constructor->getParameters() )
+			if ($params = $constructor->getParameters())
 			{
 				$constructorArgs = [];
-				foreach( $params as $p )
+				foreach ($params as $p)
 				{
 					$serviceName = '';
-					if( $p->getClass() ) {
+					if ($p->getClass()) {
 						$serviceName = $p->getClass()->getName();
 						if (array_key_exists($serviceName, $this->aliases)) {
 							$serviceName = $this->aliases[$serviceName];
 						}
 					}
-					else{
-						if( $p->getName() == 'config' ){
+					else {
+						if ($p->getName() == 'config') {
                             $serviceName = 'config';
                         }
 					}
 
-					if(!$container->has($serviceName)){
+					if (!$container->has($serviceName)) {
 					    throw new ServiceNotCreatedException(sprintf(
 					        'Can\'t create constructor argument "%s" for service "%s"',
-                            $p->getName(),$requestedName
+                            $p->getName(), $requestedName
                         ));
                     }
                     try {
                         $constructorArgs[] = $container->get($serviceName);
                     }
                     catch (\Exception $x) {
-                        echo __CLASS__ . " couldn't create an instance of {$p->getName()} to satisfy the constructor for $requestedName.";
+                        echo __CLASS__." couldn't create an instance of {$p->getName()} to satisfy the constructor for $requestedName.";
                         exit;
                     }
 				}
@@ -95,10 +95,10 @@ 
      */
     private function getClassName($requestedName)
     {
-        $exp = explode('/',$requestedName);
+        $exp = explode('/', $requestedName);
 
-        $className = array_shift($exp).'\\Controller\\'.implode('\\',$exp).'Controller';
-        if(!class_exists($className)){
+        $className = array_shift($exp).'\\Controller\\'.implode('\\', $exp).'Controller';
+        if (!class_exists($className)) {
             throw new ServiceNotCreatedException(
                 sprintf(
                     'Can\'t find correct controller class for "%s"',

Braces +2 added lines, -4 removed lines

@@ -59,8 +59,7 @@ 
 						if (array_key_exists($serviceName, $this->aliases)) {
 							$serviceName = $this->aliases[$serviceName];
 						}
-					}
-					else{
+					} else{
 						if( $p->getName() == 'config' ){
                             $serviceName = 'config';
                         }
@@ -74,8 +73,7 @@ 
                     }
                     try {
                         $constructorArgs[] = $container->get($serviceName);
-                    }
-                    catch (\Exception $x) {
+                    } catch (\Exception $x) {
                         echo __CLASS__ . " couldn't create an instance of {$p->getName()} to satisfy the constructor for $requestedName.";
                         exit;
                     }

module/Core/config/module.config.php

Spacing +36 added lines, -36 removed lines

@@ -17,7 +17,7 @@ 
 use Core\Factory\Controller\LazyControllerFactory;
 use Zend\I18n\Translator\Resources;
 
-$doctrineConfig = include __DIR__ . '/doctrine.config.php';
+$doctrineConfig = include __DIR__.'/doctrine.config.php';
 
 
 return array(
@@ -25,7 +25,7 @@ 
     'doctrine' => $doctrineConfig,
 
     'options' => [
-        'Core/MailServiceOptions' => [ 'class' => '\Core\Options\MailServiceOptions' ],
+        'Core/MailServiceOptions' => ['class' => '\Core\Options\MailServiceOptions'],
         ],
     
     'Core' => array(
@@ -45,7 +45,7 @@ 
                      'name' => 'stream',
                     'priority' => 1000,
                     'options' => array(
-                         'stream' => __DIR__ .'/../../../log/yawik.log',
+                         'stream' => __DIR__.'/../../../log/yawik.log',
                     ),
                  ),
             ),
@@ -56,7 +56,7 @@ 
                      'name' => 'stream',
                     'priority' => 1000,
                     'options' => array(
-                         'stream' => __DIR__ .'/../../../log/mails.log',
+                         'stream' => __DIR__.'/../../../log/mails.log',
                     ),
                  ),
             ),
@@ -73,7 +73,7 @@ 
         'mode' => true, // true = production|false = development|null = autodetect|IP address(es) csv/array
         'bar' => false, // bool = enabled|Toggle nette diagnostics bar.
         'strict' => true, // bool = cause immediate death|int = matched against error severity
-        'log' => __DIR__ . '/../../../log/tracy', // path to log directory (this directory keeps error.log, snoozing mailsent file & html exception trace files)
+        'log' => __DIR__.'/../../../log/tracy', // path to log directory (this directory keeps error.log, snoozing mailsent file & html exception trace files)
         'email' => null, // in production mode notifies the recipient
         'email_snooze' => 900 // interval for sending email in seconds
     ],
@@ -218,16 +218,16 @@ 
             'Core/JsonEntityHydrator' => 'Core\Entity\Hydrator\JsonEntityHydratorFactory',
             'Core/EntityHydrator' => 'Core\Entity\Hydrator\EntityHydratorFactory',
             'Core/Options' => 'Core\Factory\ModuleOptionsFactory',
-            'Core/DoctrineMongoODM/RepositoryEvents' => [\Core\Repository\DoctrineMongoODM\Event\RepositoryEventsSubscriber::class,'factory'],
-            'DefaultListeners' => ['Core\Listener\DefaultListener','factory'],
-            'templateProviderStrategy'   => ['Core\Form\Hydrator\Strategy\TemplateProviderStrategy','factory'],
-            'Core/Listener/DeferredListenerAggregate' => [\Core\Listener\DeferredListenerAggregate::class,'factory'],
+            'Core/DoctrineMongoODM/RepositoryEvents' => [\Core\Repository\DoctrineMongoODM\Event\RepositoryEventsSubscriber::class, 'factory'],
+            'DefaultListeners' => ['Core\Listener\DefaultListener', 'factory'],
+            'templateProviderStrategy'   => ['Core\Form\Hydrator\Strategy\TemplateProviderStrategy', 'factory'],
+            'Core/Listener/DeferredListenerAggregate' => [\Core\Listener\DeferredListenerAggregate::class, 'factory'],
             'Core/Listener/CreatePaginator' => 'Core\Listener\CreatePaginatorListener::factory',
             'Core/Locale' => 'Core\I18n\LocaleFactory',
             \Core\Listener\AjaxRouteListener::class => \Core\Factory\Listener\AjaxRouteListenerFactory::class,
             \Core\Listener\DeleteImageSetListener::class => \Core\Factory\Listener\DeleteImageSetListenerFactory::class,
             'Imagine' => \Core\Factory\Service\ImagineFactory::class,
-            'Core/Listener/Notification' => [\Core\Listener\NotificationListener::class,'factory'],
+            'Core/Listener/Notification' => [\Core\Listener\NotificationListener::class, 'factory'],
         ),
         'abstract_factories' => array(
             'Core\Factory\OptionsAbstractFactory',
@@ -250,7 +250,7 @@ 
         'translation_file_patterns' => array(
             [
                 'type' => 'gettext',
-                'base_dir' => __DIR__ . '/../language',
+                'base_dir' => __DIR__.'/../language',
                 'pattern' => '%s.mo',
             ],
             [
@@ -305,9 +305,9 @@ 
             'Core/SearchForm' => 'Core\Factory\Controller\Plugin\SearchFormFactory',
             'listquery' => 'Core\Controller\Plugin\ListQuery::factory',
             'mail' => 'Core\Controller\Plugin\Mail::factory',
-            'Core/Mailer' => ['Core\Controller\Plugin\Mailer','factory'],
-            'Core/CreatePaginator' => [\Core\Controller\Plugin\CreatePaginator::class,'factory'],
-            'Core/PaginatorService' => [\Core\Controller\Plugin\CreatePaginatorService::class,'factory'],
+            'Core/Mailer' => ['Core\Controller\Plugin\Mailer', 'factory'],
+            'Core/CreatePaginator' => [\Core\Controller\Plugin\CreatePaginator::class, 'factory'],
+            'Core/PaginatorService' => [\Core\Controller\Plugin\CreatePaginatorService::class, 'factory'],
         ),
         'invokables' => array(
             'Core/FileSender' => 'Core\Controller\Plugin\FileSender',
@@ -337,32 +337,32 @@ 
         'exception_template' => 'error/index',
         // Map template to files. Speeds up the lookup through the template stack.
         'template_map' => array(
-            'noscript-notice' => __DIR__ . '/../view/layout/_noscript-notice.phtml',
-            'layout/layout' => __DIR__ . '/../view/layout/layout.phtml',
-            'error/404' => __DIR__ . '/../view/error/404.phtml',
-            'error/403' => __DIR__ . '/../view/error/403.phtml',
-            'error/index' => __DIR__ . '/../view/error/index.phtml',
-            'main-navigation' => __DIR__ . '/../view/partial/main-navigation.phtml',
-            'pagination-control' => __DIR__ . '/../view/partial/pagination-control.phtml',
-            'core/loading-popup' => __DIR__ . '/../view/partial/loading-popup.phtml',
-            'core/notifications' => __DIR__ . '/../view/partial/notifications.phtml',
-            'form/core/buttons' => __DIR__ . '/../view/form/buttons.phtml',
-            'core/social-buttons' => __DIR__ . '/../view/partial/social-buttons.phtml',
-            'form/core/privacy' => __DIR__ . '/../view/form/privacy.phtml',
-            'core/form/permissions-fieldset' => __DIR__ . '/../view/form/permissions-fieldset.phtml',
-            'core/form/permissions-collection' => __DIR__ . '/../view/form/permissions-collection.phtml',
-            'core/form/container-view' => __DIR__ . '/../view/form/container.view.phtml',
-            'core/form/tree-manage.view' => __DIR__ . '/../view/form/tree-manage.view.phtml',
-            'core/form/tree-manage.form' => __DIR__ . '/../view/form/tree-manage.form.phtml',
-            'core/form/tree-add-item' => __DIR__ . '/../view/form/tree-add-item.phtml',
-            'mail/header' =>  __DIR__ . '/../view/mail/header.phtml',
-            'mail/footer' =>  __DIR__ . '/../view/mail/footer.phtml',
-            'mail/footer.en' =>  __DIR__ . '/../view/mail/footer.en.phtml',
+            'noscript-notice' => __DIR__.'/../view/layout/_noscript-notice.phtml',
+            'layout/layout' => __DIR__.'/../view/layout/layout.phtml',
+            'error/404' => __DIR__.'/../view/error/404.phtml',
+            'error/403' => __DIR__.'/../view/error/403.phtml',
+            'error/index' => __DIR__.'/../view/error/index.phtml',
+            'main-navigation' => __DIR__.'/../view/partial/main-navigation.phtml',
+            'pagination-control' => __DIR__.'/../view/partial/pagination-control.phtml',
+            'core/loading-popup' => __DIR__.'/../view/partial/loading-popup.phtml',
+            'core/notifications' => __DIR__.'/../view/partial/notifications.phtml',
+            'form/core/buttons' => __DIR__.'/../view/form/buttons.phtml',
+            'core/social-buttons' => __DIR__.'/../view/partial/social-buttons.phtml',
+            'form/core/privacy' => __DIR__.'/../view/form/privacy.phtml',
+            'core/form/permissions-fieldset' => __DIR__.'/../view/form/permissions-fieldset.phtml',
+            'core/form/permissions-collection' => __DIR__.'/../view/form/permissions-collection.phtml',
+            'core/form/container-view' => __DIR__.'/../view/form/container.view.phtml',
+            'core/form/tree-manage.view' => __DIR__.'/../view/form/tree-manage.view.phtml',
+            'core/form/tree-manage.form' => __DIR__.'/../view/form/tree-manage.form.phtml',
+            'core/form/tree-add-item' => __DIR__.'/../view/form/tree-add-item.phtml',
+            'mail/header' =>  __DIR__.'/../view/mail/header.phtml',
+            'mail/footer' =>  __DIR__.'/../view/mail/footer.phtml',
+            'mail/footer.en' =>  __DIR__.'/../view/mail/footer.en.phtml',
             //'startpage' => __DIR__ . '/../view/layout/startpage.phtml',
         ),
         // Where to look for view templates not mapped above
         'template_path_stack' => array(
-            __DIR__ . '/../view',
+            __DIR__.'/../view',
         ),
     ),
     'view_helpers' => array(