cross-solution / YAWIK

module/Behat/src/SettingsContext.php

Spacing +1 added lines, -1 removed lines

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

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->generateUrl('lang/jobs/manage',['action' => 'edit']);
+	    $url = $this->generateUrl('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->generateUrl('lang/jobs/manage',[
+		$url = $this->generateUrl('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 */
 			$userRepo = $this->getRepository('Auth\Entity\User');
 			$user = $userRepo->findOneBy(['login' => $normalizedField['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/Core/src/Core/Controller/Plugin/Service/NotificationFactory.php

Spacing +2 added lines, -2 removed lines

@@ -31,14 +31,14 @@
      * @param array|null            $options
      * @return Notification
      */
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
 	{
 		$pluginManager = $container->get('ControllerPluginManager');
 		$flashMessenger = $pluginManager->get('FlashMessenger');
 		$translator = $container->get('translator');
 		
 		$notificationListener = $container->get('Core/Listener/Notification');
-		$notification   = new Notification($flashMessenger);
+		$notification = new Notification($flashMessenger);
 		$notification->setListener($notificationListener);
 		$notification->setTranslator($translator);
 		

module/Core/src/Core/Controller/Plugin/ContentCollector.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
                       $response = new ViewModel(array('target' => $target));
                       $response->setTemplate($template);
             }
-            $viewModel->addChild($response, $this->_captureTo . $i);
+            $viewModel->addChild($response, $this->_captureTo.$i);
         }
                 
         return $viewModel;

module/Core/src/Core/Controller/Plugin/Mail.php

Spacing +18 added lines, -18 removed lines

@@ -153,18 +153,18 @@ 
         $replyTo = $this->stringFromMailHeader($this->getReplyTo());
         
         return str_pad($template, 30)
-                . 'to: ' . str_pad($to, 50)
-                . 'cc: ' . str_pad($cc, 50)
-                . 'bcc: ' . str_pad($bcc, 50)
-                . 'from: ' . str_pad($from, 50)
-                . 'replyTo: ' . str_pad($replyTo, 50)
+                . 'to: '.str_pad($to, 50)
+                . 'cc: '.str_pad($cc, 50)
+                . 'bcc: '.str_pad($bcc, 50)
+                . 'from: '.str_pad($from, 50)
+                . 'replyTo: '.str_pad($replyTo, 50)
                 //. str_pad(implode(',', ArrayUtils::iteratorToArray($this->getSender())),50)
-                . 'subject: ' . str_pad($this->getSubject(), 50);
+                . 'subject: '.str_pad($this->getSubject(), 50);
     }
     
     public function template($template)
     {
-        $controller =  get_class($this->controller);
+        $controller = get_class($this->controller);
         
         $event = new Event();
         $eventManager = $this->eventManager;
@@ -181,11 +181,11 @@ 
         $controllerIdentifier = strtolower(substr($controller, 0, strpos($controller, '\\')));
         $viewResolver = $this->viewResolver;
                 
-        $templateHalf = 'mail/' . $template;
+        $templateHalf = 'mail/'.$template;
         $resource = $viewResolver->resolve($templateHalf);
         
         if (empty($resource)) {
-            $templateFull = $controllerIdentifier . '/mail/' . $template;
+            $templateFull = $controllerIdentifier.'/mail/'.$template;
             $resource = $viewResolver->resolve($templateFull);
         }
         
@@ -212,7 +212,7 @@ 
                     unset($__vars[$key]);
                 }
             }
-            unset($__vars['content'],$__vars['controllerIdentifier'],$__vars['controller'],$__vars['resource'],$__vars['template'],$__vars['viewResolver']);
+            unset($__vars['content'], $__vars['controllerIdentifier'], $__vars['controller'], $__vars['resource'], $__vars['template'], $__vars['viewResolver']);
             $this->config = $__vars;
         }
     }
@@ -237,20 +237,20 @@ 
         if (isset($this->config['from'])) {
             $from = $this->config['from'];
         } else {
-            $log->err('A from email address must be provided (Variable $from) in Template: ' . $template);
-            throw new \InvalidArgumentException('A from email address must be provided (Variable $from) in Template: ' . $template);
+            $log->err('A from email address must be provided (Variable $from) in Template: '.$template);
+            throw new \InvalidArgumentException('A from email address must be provided (Variable $from) in Template: '.$template);
         }
         if (isset($this->config['fromName'])) {
             $fromName = $this->config['fromName'];
         } else {
-            $log->err('A from name must be provided (Variable $fromName) in Template: ' . $template);
-            throw new \InvalidArgumentException('A from name must be provided (Variable $fromName) in Template: ' . $template);
+            $log->err('A from name must be provided (Variable $fromName) in Template: '.$template);
+            throw new \InvalidArgumentException('A from name must be provided (Variable $fromName) in Template: '.$template);
         }
         if (isset($this->config['subject'])) {
             $subject = $this->config['subject'];
         } else {
-            $log->err('A subject must be provided (Variable $subject) in Template: ' . $template);
-            throw new \InvalidArgumentException('A subject must be provided (Variable $subject) in Template: ' . $template);
+            $log->err('A subject must be provided (Variable $subject) in Template: '.$template);
+            throw new \InvalidArgumentException('A subject must be provided (Variable $subject) in Template: '.$template);
         }
         $this->setFrom($from, $fromName);
         $this->setSubject($subject);
@@ -271,7 +271,7 @@ 
             $erg = true;
             $log->info($this);
         } catch (\Exception $e) {
-            $log->err('Mail failure ' . $e->getMessage());
+            $log->err('Mail failure '.$e->getMessage());
         }
         return $erg;
     }
@@ -288,6 +288,6 @@ 
         $viewResolver   = $container->get('ViewResolver');
         $eventManager   = $container->get('EventManager');
         $moduleManager  = $container->get('ModuleManager');
-        return new static($mailLog,$viewResolver,$eventManager,$moduleManager);
+        return new static($mailLog, $viewResolver, $eventManager, $moduleManager);
     }
 }

module/Core/src/Core/Controller/Plugin/ConfigFactory.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
  */
 class ConfigFactory implements FactoryInterface
 {
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
 	{
 		$config = $container->get('Config');
 		$plugin = new Config($config);

module/Core/Module.php

Spacing +10 added lines, -10 removed lines

@@ -41,7 +41,7 @@ 
     public function getConsoleBanner(Console $console)
     {
         $version = `git describe 2>/dev/null`;
-        $name = 'YAWIK ' . trim($version);
+        $name = 'YAWIK '.trim($version);
         $width = $console->getWidth();
         return sprintf(
             "==%1\$s==\n%2\$s%3\$s\n**%1\$s**\n",
@@ -84,7 +84,7 @@ 
 
             /* @var \Core\Options\ModuleOptions $options */
             $languageRouteListener = new LanguageRouteListener(
-                $sm->get('Core/Locale'),$sm->get('Core/Options')
+                $sm->get('Core/Locale'), $sm->get('Core/Options')
             );
             $languageRouteListener->attach($eventManager);
         
@@ -113,8 +113,8 @@ 
 
         $eventManager->attach(
             MvcEvent::EVENT_DISPATCH_ERROR,
-            function ($event) {
-            	if($event instanceof MvcEvent){
+            function($event) {
+            	if ($event instanceof MvcEvent) {
 		            $application = $event->getApplication();
 		            
 		            if ($application::ERROR_EXCEPTION == $event->getError()) {
@@ -129,7 +129,7 @@ 
         );
         $eventManager->attach(
             MvcEvent::EVENT_DISPATCH,
-            function ($event) use ($eventManager) {
+            function($event) use ($eventManager) {
                 $eventManager->trigger('postDispatch', $event);
             },
             -150
@@ -144,7 +144,7 @@ 
      */
     public function getConfig()
     {
-        $config = include __DIR__ . '/config/module.config.php';
+        $config = include __DIR__.'/config/module.config.php';
         return $config;
     }
 
@@ -157,13 +157,13 @@ 
     {
         return array(
             'Zend\Loader\ClassMapAutoloader' => [
-                __DIR__ . '/src/autoload_classmap.php'
+                __DIR__.'/src/autoload_classmap.php'
             ],
             'Zend\Loader\StandardAutoloader' => array(
                 'namespaces' => array(
-                    __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
-                    'CoreTest' => __DIR__ . '/test/' . 'CoreTest',
-                    'CoreTestUtils' => __DIR__ . '/test/CoreTestUtils',
+                    __NAMESPACE__ => __DIR__.'/src/'.__NAMESPACE__,
+                    'CoreTest' => __DIR__.'/test/'.'CoreTest',
+                    'CoreTestUtils' => __DIR__.'/test/CoreTestUtils',
                 ),
             ),
         );

module/Core/src/Core/Listener/LanguageRouteListener.php

Spacing +5 added lines, -5 removed lines

@@ -124,10 +124,10 @@ 
         }
         
         $router = $e->getRouter();
-        $basePath=$router->getBaseUrl();
+        $basePath = $router->getBaseUrl();
         $match = [];
         
-        if (preg_match('~^' . $basePath . '/([a-z]{2})(?:/|$)~', $e->getRequest()->getRequestUri(), $match)) {
+        if (preg_match('~^'.$basePath.'/([a-z]{2})(?:/|$)~', $e->getRequest()->getRequestUri(), $match)) {
             /* It seems we have already a language in the URI
              * Now there are two possibilities:
              *
@@ -161,7 +161,7 @@ 
 
         $options = $this->moduleOptions;
         // using default language if detect language is disabled
-        $lang = $options->isDetectLanguage() ? $this->detectLanguage($e):$options->getDefaultLanguage();
+        $lang = $options->isDetectLanguage() ? $this->detectLanguage($e) : $options->getDefaultLanguage();
         $langUri = rtrim("$basePath/$lang$origUri", '/');
         if ($router->match($request->setUri($langUri)) instanceof RouteMatch) {
             $e->stopPropagation(true);
@@ -212,8 +212,8 @@ 
         setlocale(
             LC_ALL,
             array(
-            $locale . ".utf8",
-            $locale . ".iso88591",
+            $locale.".utf8",
+            $locale.".iso88591",
             $locale,
             substr($locale, 0, 2),
             'de_DE.utf8',

module/Core/config/module.config.php

Spacing +39 added lines, -39 removed lines

@@ -16,7 +16,7 @@ 
 use Zend\I18n\Translator\Resources;
 use Zend\ServiceManager\Factory\InvokableFactory;
 
-$doctrineConfig = include __DIR__ . '/doctrine.config.php';
+$doctrineConfig = include __DIR__.'/doctrine.config.php';
 
 
 return array(
@@ -24,7 +24,7 @@ 
     'doctrine' => $doctrineConfig,
 
     'options' => [
-        'Core/MailServiceOptions' => [ 'class' => '\Core\Options\MailServiceOptions' ],
+        'Core/MailServiceOptions' => ['class' => '\Core\Options\MailServiceOptions'],
         ],
     
     'Core' => array(
@@ -44,7 +44,7 @@ 
                      'name' => 'stream',
                     'priority' => 1000,
                     'options' => array(
-                         'stream' => __DIR__ .'/../../../log/yawik.log',
+                         'stream' => __DIR__.'/../../../log/yawik.log',
                     ),
                  ),
             ),
@@ -55,7 +55,7 @@ 
                      'name' => 'stream',
                     'priority' => 1000,
                     'options' => array(
-                         'stream' => __DIR__ .'/../../../log/mails.log',
+                         'stream' => __DIR__.'/../../../log/mails.log',
                     ),
                  ),
             ),
@@ -72,7 +72,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
     ],
@@ -199,16 +199,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',
@@ -231,7 +231,7 @@ 
         'translation_file_patterns' => array(
             [
                 'type' => 'gettext',
-                'base_dir' => __DIR__ . '/../language',
+                'base_dir' => __DIR__.'/../language',
                 'pattern' => '%s.mo',
             ],
             [
@@ -269,9 +269,9 @@ 
         ),
 	    'factories' => [
 	    	// @TODO: improve this factory
-		    'Core\Controller\Index' => [\Core\Controller\IndexController::class,'factory'],
-		    'Core/Admin' => [\Core\Controller\AdminController::class,'factory'],
-		    'Core\Controller\File'  => [\Core\Controller\FileController::class,'factory'],
+		    'Core\Controller\Index' => [\Core\Controller\IndexController::class, 'factory'],
+		    'Core/Admin' => [\Core\Controller\AdminController::class, 'factory'],
+		    'Core\Controller\File'  => [\Core\Controller\FileController::class, 'factory'],
 	    ],
         'abstract_factories' => [
 	        \Core\Factory\Controller\LazyControllerFactory::class
@@ -286,9 +286,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',
@@ -318,32 +318,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(