cross-solution / YAWIK

module/Auth/src/Auth/Controller/ManageGroupsController.php

Indentation +14 added lines, -14 removed lines

@@ -36,24 +36,24 @@
     private $filterManager;
     
     public function __construct(
-    	$formManager,
-		$repositories,
-		$filterManager
+        $formManager,
+        $repositories,
+        $filterManager
     )
     {
-    	$this->formManager = $formManager;
-    	$this->repositories = $repositories;
-    	$this->filterManager = $filterManager;
+        $this->formManager = $formManager;
+        $this->repositories = $repositories;
+        $this->filterManager = $filterManager;
     }
 	
-	static public function factory(ContainerInterface $container)
-	{
-		return new self(
-			$container->get('FormElementManager'),
-			$container->get('repositories'),
-			$container->get('FilterManager')
-		);
-	}
+    static public function factory(ContainerInterface $container)
+    {
+        return new self(
+            $container->get('FormElementManager'),
+            $container->get('repositories'),
+            $container->get('FilterManager')
+        );
+    }
     
     /**
      * Register the default events for this controller

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
          */
         $events->attach(
             MvcEvent::EVENT_DISPATCH,
-            function ($event) {
+            function($event) {
                 $routeMatch = $event->getRouteMatch();
                 $action     = $routeMatch->getParam('action');
             
@@ -95,7 +95,7 @@ 
          */
         $events->attach(
             MvcEvent::EVENT_DISPATCH,
-            function ($event) {
+            function($event) {
                 $model = $event->getResult();
                 if (!$model instanceof ViewModel || $model->terminate()) {
                     return;
@@ -223,7 +223,7 @@ 
             $users = $repository->findByQuery($query);
         
             $userFilter = $this->filterManager->get('Auth/Entity/UserToSearchResult');
-            $filterFunc = function ($user) use ($userFilter) {
+            $filterFunc = function($user) use ($userFilter) {
                 return $userFilter->filter($user);
             };
             $result     = array_values(array_map($filterFunc, $users->toArray()));

module/Auth/src/Auth/Controller/Plugin/Service/SocialProfilesFactory.php

Indentation +7 added lines, -7 removed lines

@@ -16,12 +16,12 @@
 
 class SocialProfilesFactory implements FactoryInterface
 {
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
-	{
-		$request = $container->get('request');
-		$hybridAuth = $container->get('HybridAuth');
-		$plugin     = new SocialProfiles($hybridAuth,$request);
+    public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
+    {
+        $request = $container->get('request');
+        $hybridAuth = $container->get('HybridAuth');
+        $plugin     = new SocialProfiles($hybridAuth,$request);
 		
-		return $plugin;
-	}
+        return $plugin;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -16,11 +16,11 @@
 
 class SocialProfilesFactory implements FactoryInterface
 {
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
 	{
 		$request = $container->get('request');
 		$hybridAuth = $container->get('HybridAuth');
-		$plugin     = new SocialProfiles($hybridAuth,$request);
+		$plugin     = new SocialProfiles($hybridAuth, $request);
 		
 		return $plugin;
 	}

module/Auth/src/Auth/Form/Validator/UniqueGroupNameFactory.php

Indentation +9 added lines, -9 removed lines

@@ -37,14 +37,14 @@
         $this->options['allowName'] = isset($options['allowName']) ? $options['allowName'] : null;
     }
 	
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
-	{
-		$auth      = $container->get('AuthenticationService');
-		$user      = $auth->getUser();
-		$options   = $this->options;
-		$options['user'] = $user;
-		$validator = new UniqueGroupName($options);
+    public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
+    {
+        $auth      = $container->get('AuthenticationService');
+        $user      = $auth->getUser();
+        $options   = $this->options;
+        $options['user'] = $user;
+        $validator = new UniqueGroupName($options);
 		
-		return $validator;
-	}
+        return $validator;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
         $this->options['allowName'] = isset($options['allowName']) ? $options['allowName'] : null;
     }
 	
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
 	{
 		$auth      = $container->get('AuthenticationService');
 		$user      = $auth->getUser();

module/Auth/src/Auth/Form/UserImageFactory.php

Indentation +3 added lines, -3 removed lines

@@ -55,8 +55,8 @@
     {
         /* @var $options \Applications\Options\ModuleOptions */
         $form->get($this->fileName)->setViewHelper('formImageUpload')
-           ->setMaxSize($options->getContactImageMaxSize())
-           ->setAllowedTypes($options->getContactImageMimeType())
-           ->setForm($form);
+            ->setMaxSize($options->getContactImageMaxSize())
+            ->setAllowedTypes($options->getContactImageMimeType())
+            ->setForm($form);
     }
 }

module/Auth/src/Auth/Form/UserPassword.php

Indentation +1 added lines, -1 removed lines

@@ -56,6 +56,6 @@
         $form = new static();
         $form->forms = $forms->get('FormElementManager');
         
-		return $form;
+        return $form;
     }
 }

module/Auth/src/Auth/Entity/Info.php

Spacing +10 added lines, -10 removed lines

@@ -138,7 +138,7 @@ 
      */
     public function setBirthDay($birthDay)
     {
-        $this->birthDay=$birthDay;
+        $this->birthDay = $birthDay;
         return $this;
     }
 
@@ -159,7 +159,7 @@ 
      */
     public function setBirthMonth($birthMonth)
     {
-        $this->birthMonth=$birthMonth;
+        $this->birthMonth = $birthMonth;
         return $this;
     }
 
@@ -180,7 +180,7 @@ 
      */
     public function setBirthYear($birthYear)
     {
-        $this->birthYear=$birthYear;
+        $this->birthYear = $birthYear;
         return $this;
     }
 
@@ -201,7 +201,7 @@ 
      */
     public function setEmail($email)
     {
-        $this->email = trim((String)$email);
+        $this->email = trim((String) $email);
         return $this;
     }
 
@@ -244,7 +244,7 @@ 
      */
     public function setFirstName($firstName)
     {
-        $this->firstName = trim((String)$firstName);
+        $this->firstName = trim((String) $firstName);
         return $this;
     }
 
@@ -266,7 +266,7 @@ 
      */
     public function setGender($gender)
     {
-        $this->gender = trim((String)$gender);
+        $this->gender = trim((String) $gender);
         return $this;
     }
 
@@ -287,7 +287,7 @@ 
      */
     public function setHouseNumber($houseNumber)
     {
-        $this->houseNumber=$houseNumber;
+        $this->houseNumber = $houseNumber;
         return $this;
     }
 
@@ -332,7 +332,7 @@ 
         if (!$this->lastName) {
             return $emailIfEmpty ? $this->email : '';
         }
-        return ($this->firstName ? $this->firstName . ' ' : '') . $this->lastName;
+        return ($this->firstName ? $this->firstName.' ' : '').$this->lastName;
     }
     
     /**
@@ -426,7 +426,7 @@ 
      */
     public function setStreet($street)
     {
-        $this->street=$street;
+        $this->street = $street;
         return $this;
     }
 
@@ -447,7 +447,7 @@ 
      */
     public function setCountry($country)
     {
-        $this->country=$country;
+        $this->country = $country;
         return $this;
     }
 

module/Behat/src/SummaryFormContext.php

Braces +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 		$method = 'iSave'.$type;
 		if(method_exists($this,$method)){
 			call_user_func([$this,$method]);
-		}else{
+		} else{
 			$locator = $this->elementMap[$type].'-buttons-submit';
 			$this->coreContext->scrollIntoView($locator);
 			$element = $this->minkContext->getSession()->getPage()->find('css',$locator);

Indentation +93 added lines, -93 removed lines

@@ -15,112 +15,112 @@
 
 class SummaryFormContext implements Context
 {
-	use CommonContextTrait;
+    use CommonContextTrait;
 	
-	private $elementMap = array(
-		'name' => '#sf-nameForm',
-		'location' => '#sf-locationForm',
-		'employees' => '#sf-employeesManagement',
-		'workflow' => '#sf-workflowSettings',
-		'jobTitleAndLocation' => '#general-locationForm',
-		'jobClassification' => '#sf-general-classifications',
-		'customerNote' => '#sf-general-customerNote',
-		'personalInformations' => '#sf-contact-contact',
-		'resumePersonalInformations' => '#sf-contact',
-	);
+    private $elementMap = array(
+        'name' => '#sf-nameForm',
+        'location' => '#sf-locationForm',
+        'employees' => '#sf-employeesManagement',
+        'workflow' => '#sf-workflowSettings',
+        'jobTitleAndLocation' => '#general-locationForm',
+        'jobClassification' => '#sf-general-classifications',
+        'customerNote' => '#sf-general-customerNote',
+        'personalInformations' => '#sf-contact-contact',
+        'resumePersonalInformations' => '#sf-contact',
+    );
 	
-	/**
-	 * @When I click edit on :name form
-	 * @TODO: [ZF3] move this method to CoreContext
-	 */
-	public function iClickEditOnForm($name)
-	{
-		$this->iClickForm($name);
-		$name = Inflector::camelize($name);
-		$type = $this->elementMap[$name];
-		$locator = $type.' .sf-summary .sf-controls button';
-		$element = $this->minkContext->getSession()->getPage()->find('css',$locator);
-		if(!$element){
-			throw new \Exception('No element found with this locator: "'.$locator.'"');
-		}
-		$element->click();
-	}
+    /**
+     * @When I click edit on :name form
+     * @TODO: [ZF3] move this method to CoreContext
+     */
+    public function iClickEditOnForm($name)
+    {
+        $this->iClickForm($name);
+        $name = Inflector::camelize($name);
+        $type = $this->elementMap[$name];
+        $locator = $type.' .sf-summary .sf-controls button';
+        $element = $this->minkContext->getSession()->getPage()->find('css',$locator);
+        if(!$element){
+            throw new \Exception('No element found with this locator: "'.$locator.'"');
+        }
+        $element->click();
+    }
 	
-	/**
-	 * @When I click :form form
-	 */
-	public function iClickForm($name)
-	{
-		$name = Inflector::camelize($name);
-		$type = $this->elementMap[$name];
-		$locator = $type.' .sf-summary';
-		$session = $this->minkContext->getSession();
-		$script = <<<EOC
+    /**
+     * @When I click :form form
+     */
+    public function iClickForm($name)
+    {
+        $name = Inflector::camelize($name);
+        $type = $this->elementMap[$name];
+        $locator = $type.' .sf-summary';
+        $session = $this->minkContext->getSession();
+        $script = <<<EOC
 var tElement = jQuery("$locator .sf-controls");
 tElement.css('display','block');
 tElement.css('visibility','visible');
 EOC;
-		$session->executeScript($script);
-	}
+        $session->executeScript($script);
+    }
 	
-	/**
-	 * @When I save :type form
-	 */
-	public function iSaveForm($type)
-	{
-		$type = Inflector::camelize($type);
-		$method = 'iSave'.$type;
-		if(method_exists($this,$method)){
-			call_user_func([$this,$method]);
-		}else{
-			$locator = $this->elementMap[$type].'-buttons-submit';
-			$this->coreContext->scrollIntoView($locator);
-			$element = $this->minkContext->getSession()->getPage()->find('css',$locator);
-			$element->click();
-		}
-	}
+    /**
+     * @When I save :type form
+     */
+    public function iSaveForm($type)
+    {
+        $type = Inflector::camelize($type);
+        $method = 'iSave'.$type;
+        if(method_exists($this,$method)){
+            call_user_func([$this,$method]);
+        }else{
+            $locator = $this->elementMap[$type].'-buttons-submit';
+            $this->coreContext->scrollIntoView($locator);
+            $element = $this->minkContext->getSession()->getPage()->find('css',$locator);
+            $element->click();
+        }
+    }
 	
-	public function iSaveOrganizationName()
-	{
-		$locator = '#nameForm-buttons-submit';
-		$this->coreContext->scrollIntoView($locator);
-		$element = $this->minkContext->getSession()->getPage()->find('css',$locator);
-		$element->click();
-	}
+    public function iSaveOrganizationName()
+    {
+        $locator = '#nameForm-buttons-submit';
+        $this->coreContext->scrollIntoView($locator);
+        $element = $this->minkContext->getSession()->getPage()->find('css',$locator);
+        $element->click();
+    }
 	
-	/**
-	 * Saving organization workflow
-	 */
-	public function iSaveWorkflow()
-	{
-		$locator = '#workflowSettings-buttons-submit';
-		$element = $this->minkContext->getSession()->getPage()->find('css',$locator);
-		$element->click();
-	}
+    /**
+     * Saving organization workflow
+     */
+    public function iSaveWorkflow()
+    {
+        $locator = '#workflowSettings-buttons-submit';
+        $element = $this->minkContext->getSession()->getPage()->find('css',$locator);
+        $element->click();
+    }
 	
-	public function iSaveOrganizationLocation()
-	{
-		$locator = '#locationForm-buttons-submit';
-		$this->coreContext->scrollIntoView($locator);
-		$element = $this->minkContext->getSession()->getPage()->find('css',$locator);
-		$element->click();
-	}
+    public function iSaveOrganizationLocation()
+    {
+        $locator = '#locationForm-buttons-submit';
+        $this->coreContext->scrollIntoView($locator);
+        $element = $this->minkContext->getSession()->getPage()->find('css',$locator);
+        $element->click();
+    }
 	
 	
-	public function iSaveJobClassification()
-	{
-		$locator = '#general-classifications-buttons-submit';
-		$this->coreContext->scrollIntoView($locator);
-		$element = $this->minkContext->getSession()->getPage()->find('css',$locator);
-		$element->click();
-	}
+    public function iSaveJobClassification()
+    {
+        $locator = '#general-classifications-buttons-submit';
+        $this->coreContext->scrollIntoView($locator);
+        $element = $this->minkContext->getSession()->getPage()->find('css',$locator);
+        $element->click();
+    }
 	
-	public function iSaveCustomerNote()
-	{
-		$locator = '#general-customerNote-buttons-submit';
-		$this->coreContext->scrollIntoView('#sf-general-customerNote');
-		$element = $this->minkContext->getSession()->getPage()->find('css',$locator);
-		$element->click();
-	}
+    public function iSaveCustomerNote()
+    {
+        $locator = '#general-customerNote-buttons-submit';
+        $this->coreContext->scrollIntoView('#sf-general-customerNote');
+        $element = $this->minkContext->getSession()->getPage()->find('css',$locator);
+        $element->click();
+    }
 	
 }
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -39,8 +39,8 @@ 
 		$name = Inflector::camelize($name);
 		$type = $this->elementMap[$name];
 		$locator = $type.' .sf-summary .sf-controls button';
-		$element = $this->minkContext->getSession()->getPage()->find('css',$locator);
-		if(!$element){
+		$element = $this->minkContext->getSession()->getPage()->find('css', $locator);
+		if (!$element) {
 			throw new \Exception('No element found with this locator: "'.$locator.'"');
 		}
 		$element->click();
@@ -70,12 +70,12 @@ 
 	{
 		$type = Inflector::camelize($type);
 		$method = 'iSave'.$type;
-		if(method_exists($this,$method)){
-			call_user_func([$this,$method]);
-		}else{
+		if (method_exists($this, $method)) {
+			call_user_func([$this, $method]);
+		} else {
 			$locator = $this->elementMap[$type].'-buttons-submit';
 			$this->coreContext->scrollIntoView($locator);
-			$element = $this->minkContext->getSession()->getPage()->find('css',$locator);
+			$element = $this->minkContext->getSession()->getPage()->find('css', $locator);
 			$element->click();
 		}
 	}
@@ -84,7 +84,7 @@ 
 	{
 		$locator = '#nameForm-buttons-submit';
 		$this->coreContext->scrollIntoView($locator);
-		$element = $this->minkContext->getSession()->getPage()->find('css',$locator);
+		$element = $this->minkContext->getSession()->getPage()->find('css', $locator);
 		$element->click();
 	}
 	
@@ -94,7 +94,7 @@ 
 	public function iSaveWorkflow()
 	{
 		$locator = '#workflowSettings-buttons-submit';
-		$element = $this->minkContext->getSession()->getPage()->find('css',$locator);
+		$element = $this->minkContext->getSession()->getPage()->find('css', $locator);
 		$element->click();
 	}
 	
@@ -102,7 +102,7 @@ 
 	{
 		$locator = '#locationForm-buttons-submit';
 		$this->coreContext->scrollIntoView($locator);
-		$element = $this->minkContext->getSession()->getPage()->find('css',$locator);
+		$element = $this->minkContext->getSession()->getPage()->find('css', $locator);
 		$element->click();
 	}
 	
@@ -111,7 +111,7 @@ 
 	{
 		$locator = '#general-classifications-buttons-submit';
 		$this->coreContext->scrollIntoView($locator);
-		$element = $this->minkContext->getSession()->getPage()->find('css',$locator);
+		$element = $this->minkContext->getSession()->getPage()->find('css', $locator);
 		$element->click();
 	}
 	
@@ -119,7 +119,7 @@ 
 	{
 		$locator = '#general-customerNote-buttons-submit';
 		$this->coreContext->scrollIntoView('#sf-general-customerNote');
-		$element = $this->minkContext->getSession()->getPage()->find('css',$locator);
+		$element = $this->minkContext->getSession()->getPage()->find('css', $locator);
 		$element->click();
 	}
 	

module/Behat/src/InstallContext.php

Spacing +11 added lines, -11 removed lines

@@ -31,8 +31,8 @@ 
 
     public function __construct()
     {
-        static::$configFile = getcwd() . '/config/autoload/install.module.php';
-        static::$yawikGlobalConfig = getcwd() . '/config/autoload/yawik.config.global.php';
+        static::$configFile = getcwd().'/config/autoload/install.module.php';
+        static::$yawikGlobalConfig = getcwd().'/config/autoload/yawik.config.global.php';
         static::$yawikBackupConfig = str_replace('yawik.config.global.php', 'yawik.backup', static::$yawikGlobalConfig);
     }
 
@@ -42,18 +42,18 @@ 
     public function iHaveInstallModuleActivated()
     {
         $target = static::$configFile;
-        if(!file_exists($target)){
+        if (!file_exists($target)) {
             $source = __DIR__.'/../resources/install.module.php';
-            copy($source,$target);
-            chmod($target,0777);
+            copy($source, $target);
+            chmod($target, 0777);
         }
 
         // backup existing file
         $yawikBackupConfig = static::$yawikBackupConfig;
         $yawikGlobalConfig = static::$yawikGlobalConfig;
 
-        if(is_file($yawikGlobalConfig)){
-            rename($yawikGlobalConfig,$yawikBackupConfig);
+        if (is_file($yawikGlobalConfig)) {
+            rename($yawikGlobalConfig, $yawikBackupConfig);
         }
     }
 
@@ -92,7 +92,7 @@ 
 
     static public function restoreConfig()
     {
-        if(is_file($file = static::$configFile)){
+        if (is_file($file = static::$configFile)) {
             unlink($file);
         }
 
@@ -100,8 +100,8 @@ 
         $yawikBackupConfig = static::$yawikBackupConfig;
         $yawikGlobalConfig = static::$yawikGlobalConfig;
 
-        if(is_file($yawikBackupConfig)){
-            rename($yawikBackupConfig,$yawikGlobalConfig);
+        if (is_file($yawikBackupConfig)) {
+            rename($yawikBackupConfig, $yawikGlobalConfig);
         }
     }
 
@@ -112,6 +112,6 @@ 
     {
         $config = $this->getService('config');
         $connection = $config['doctrine']['connection']['odm_default']['connectionString'];
-        $this->minkContext->fillField('db_conn',$connection);
+        $this->minkContext->fillField('db_conn', $connection);
     }
 }

module/Behat/src/MailContext.php

Doc Comments +3 added lines

@@ -150,6 +150,9 @@
         );
     }
 
+    /**
+     * @param string $contents
+     */
     private function parseEmail($contents)
     {
         $addresses = $this->parseEmailAddress($contents);

Spacing +26 added lines, -26 removed lines

@@ -49,7 +49,7 @@ 
         $core = $scope->getEnvironment()->getContext(CoreContext::class);
         /* @var FileTransport $transport */
         $transport = $core->getServiceManager()->get('Core/MailService')->getTransport();
-        $path = $transport->getOptions()->getPath() . '/*.eml';
+        $path = $transport->getOptions()->getPath().'/*.eml';
         foreach (glob($path) as $filename) {
             unlink($filename);
         }
@@ -105,25 +105,25 @@ 
         $regex = '/.*('.preg_quote($text).').*/im';
         $matches = [];
         $multiMessages = false;
-        if(count($this->messages) > 1){
+        if (count($this->messages) > 1) {
             $multiMessages = true;
         }
         $content = "";
-        foreach($this->messages as $key=>$definition){
+        foreach ($this->messages as $key=>$definition) {
             $content = $definition['contents'];
-            if(preg_match($regex,$content,$match)){
+            if (preg_match($regex, $content, $match)) {
                 $matches[] = $match;
             }
         }
-        $failMessage = sprintf('Can not find text "%s" in any email sent',$text);
-        if(!$multiMessages){
+        $failMessage = sprintf('Can not find text "%s" in any email sent', $text);
+        if (!$multiMessages) {
             $failMessage = sprintf(
                 'Can not find text "%s" in sent email. Here\'s the email content: %s',
                 $text,
                 PHP_EOL.PHP_EOL.$content
             );
         }
-        Assert::true(count($matches)>0,$failMessage);
+        Assert::true(count($matches) > 0, $failMessage);
     }
 
     /**
@@ -136,16 +136,16 @@ 
 
         $path = $transport->getOptions()->getPath().'/*.eml';
 
-        foreach(glob($path) as $filename){
+        foreach (glob($path) as $filename) {
             $id = md5($filename);
-            if(!isset($this->messages[$id])){
+            if (!isset($this->messages[$id])) {
                 $contents = file_get_contents($filename);
-                $this->messages[$id]  = $this->parseEmail($contents);
+                $this->messages[$id] = $this->parseEmail($contents);
             }
         }
 
         Assert::true(
-            count($this->messages)>0,
+            count($this->messages) > 0,
             'No email have been sent'
         );
     }
@@ -153,33 +153,33 @@ 
     private function parseEmail($contents)
     {
         $addresses = $this->parseEmailAddress($contents);
-        $subject =$this->parseSubject($contents);
+        $subject = $this->parseSubject($contents);
 
         $contents = strip_tags($contents);
         $contents = preg_replace("/(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+/", "\n", $contents);
 
-        return array_merge($addresses,$subject,['contents' => $contents]);
+        return array_merge($addresses, $subject, ['contents' => $contents]);
     }
 
     private function parseEmailAddress($contents)
     {
         // pattern to get email address
-        $radd =  '(\b[A-Z0-9._%+-]+@(?:[A-Z0-9-]+\.)+[A-Z]{2,6}\b)';
+        $radd = '(\b[A-Z0-9._%+-]+@(?:[A-Z0-9-]+\.)+[A-Z]{2,6}\b)';
 
         // get email from address
-        $regex = sprintf('/^From\:.*%s/im',$radd);
-        $hasMatch = preg_match($regex,$contents,$matches);
-        $fromAddress = $hasMatch ? $matches[1]:null;
+        $regex = sprintf('/^From\:.*%s/im', $radd);
+        $hasMatch = preg_match($regex, $contents, $matches);
+        $fromAddress = $hasMatch ? $matches[1] : null;
 
         // get email to address
-        $regex = sprintf('/^To\:\s+%s/im',$radd);
-        $hasMatch = preg_match($regex,$contents,$matches);
-        $toAddress1 = $hasMatch ? $matches[1]:null;
+        $regex = sprintf('/^To\:\s+%s/im', $radd);
+        $hasMatch = preg_match($regex, $contents, $matches);
+        $toAddress1 = $hasMatch ? $matches[1] : null;
 
         // get email to address
-        $regex = sprintf('/^To\:.*%s/im',$radd);
-        $hasMatch = preg_match($regex,$contents,$matches);
-        $toAddress2 = $hasMatch ? $matches[1]:null;
+        $regex = sprintf('/^To\:.*%s/im', $radd);
+        $hasMatch = preg_match($regex, $contents, $matches);
+        $toAddress2 = $hasMatch ? $matches[1] : null;
 
         $this->fromMails[] = $fromAddress;
         $this->toMails[] = $toAddress1;
@@ -187,15 +187,15 @@ 
 
         return [
             'from' => $fromAddress,
-            'to' => [$toAddress1,$toAddress2],
+            'to' => [$toAddress1, $toAddress2],
         ];
     }
 
     private function parseSubject($contents)
     {
         $pattern = '/Subject\:(.*)/i';
-        preg_match($pattern,$contents,$matches);
-        $subject = isset($matches[1]) ? $matches[1]:null;
+        preg_match($pattern, $contents, $matches);
+        $subject = isset($matches[1]) ? $matches[1] : null;
         $this->subjects[] = $subject;
         return [
             'subject' => trim($subject)