Completed
Push — develop ( 9659b8...659b85 )
by Mathias
13:02
created
module/Behat/src/InstallContext.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
 
32 32
     public function __construct()
33 33
     {
34
-        static::$configFile = getcwd() . '/config/autoload/install.module.php';
35
-        static::$yawikGlobalConfig = getcwd() . '/config/autoload/yawik.config.global.php';
34
+        static::$configFile = getcwd().'/config/autoload/install.module.php';
35
+        static::$yawikGlobalConfig = getcwd().'/config/autoload/yawik.config.global.php';
36 36
         static::$yawikBackupConfig = str_replace('yawik.config.global.php', 'yawik.backup', static::$yawikGlobalConfig);
37 37
     }
38 38
 
@@ -42,18 +42,18 @@  discard block
 block discarded – undo
42 42
     public function iHaveInstallModuleActivated()
43 43
     {
44 44
         $target = static::$configFile;
45
-        if(!file_exists($target)){
45
+        if (!file_exists($target)) {
46 46
             $source = __DIR__.'/../resources/install.module.php';
47
-            copy($source,$target);
48
-            chmod($target,0777);
47
+            copy($source, $target);
48
+            chmod($target, 0777);
49 49
         }
50 50
 
51 51
         // backup existing file
52 52
         $yawikBackupConfig = static::$yawikBackupConfig;
53 53
         $yawikGlobalConfig = static::$yawikGlobalConfig;
54 54
 
55
-        if(is_file($yawikGlobalConfig)){
56
-            rename($yawikGlobalConfig,$yawikBackupConfig);
55
+        if (is_file($yawikGlobalConfig)) {
56
+            rename($yawikGlobalConfig, $yawikBackupConfig);
57 57
         }
58 58
     }
59 59
 
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 
93 93
     static public function restoreConfig()
94 94
     {
95
-        if(is_file($file = static::$configFile)){
95
+        if (is_file($file = static::$configFile)) {
96 96
             unlink($file);
97 97
         }
98 98
 
@@ -100,8 +100,8 @@  discard block
 block discarded – undo
100 100
         $yawikBackupConfig = static::$yawikBackupConfig;
101 101
         $yawikGlobalConfig = static::$yawikGlobalConfig;
102 102
 
103
-        if(is_file($yawikBackupConfig)){
104
-            rename($yawikBackupConfig,$yawikGlobalConfig);
103
+        if (is_file($yawikBackupConfig)) {
104
+            rename($yawikBackupConfig, $yawikGlobalConfig);
105 105
         }
106 106
     }
107 107
 
@@ -112,6 +112,6 @@  discard block
 block discarded – undo
112 112
     {
113 113
         $config = $this->getService('config');
114 114
         $connection = $config['doctrine']['connection']['odm_default']['connectionString'];
115
-        $this->minkContext->fillField('db_conn',$connection);
115
+        $this->minkContext->fillField('db_conn', $connection);
116 116
     }
117 117
 }
Please login to merge, or discard this patch.
module/Core/src/Core/Controller/Plugin/Service/NotificationFactory.php 2 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -31,17 +31,17 @@
 block discarded – undo
31 31
      * @param array|null            $options
32 32
      * @return Notification
33 33
      */
34
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
35
-	{
36
-		$pluginManager = $container->get('ControllerPluginManager');
37
-		$flashMessenger = $pluginManager->get('FlashMessenger');
38
-		$translator = $container->get('translator');
34
+    public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
35
+    {
36
+        $pluginManager = $container->get('ControllerPluginManager');
37
+        $flashMessenger = $pluginManager->get('FlashMessenger');
38
+        $translator = $container->get('translator');
39 39
 		
40
-		$notificationListener = $container->get('Core/Listener/Notification');
41
-		$notification   = new Notification($flashMessenger);
42
-		$notification->setListener($notificationListener);
43
-		$notification->setTranslator($translator);
40
+        $notificationListener = $container->get('Core/Listener/Notification');
41
+        $notification   = new Notification($flashMessenger);
42
+        $notification->setListener($notificationListener);
43
+        $notification->setTranslator($translator);
44 44
 		
45
-		return $notification;
46
-	}
45
+        return $notification;
46
+    }
47 47
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -31,14 +31,14 @@
 block discarded – undo
31 31
      * @param array|null            $options
32 32
      * @return Notification
33 33
      */
34
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
34
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
35 35
 	{
36 36
 		$pluginManager = $container->get('ControllerPluginManager');
37 37
 		$flashMessenger = $pluginManager->get('FlashMessenger');
38 38
 		$translator = $container->get('translator');
39 39
 		
40 40
 		$notificationListener = $container->get('Core/Listener/Notification');
41
-		$notification   = new Notification($flashMessenger);
41
+		$notification = new Notification($flashMessenger);
42 42
 		$notification->setListener($notificationListener);
43 43
 		$notification->setTranslator($translator);
44 44
 		
Please login to merge, or discard this patch.
module/Core/src/Core/Controller/Plugin/ContentCollector.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
     public function trigger($event, $target = null)
75 75
     {
76 76
         if (empty($this->_template) || !is_string($this->_template)) {
77
-              throw new \InvalidArgumentException('ContentCollector must have a template-name');
77
+                throw new \InvalidArgumentException('ContentCollector must have a template-name');
78 78
         }
79 79
           
80 80
         $responseCollection = $this->getController()->getEventManager()->trigger($event, $target);
@@ -82,9 +82,9 @@  discard block
 block discarded – undo
82 82
         $viewModel->setTemplate($this->_template);
83 83
         foreach ($responseCollection as $i => $response) {
84 84
             if (is_string($response)) {
85
-                      $template = $response;
86
-                      $response = new ViewModel(array('target' => $target));
87
-                      $response->setTemplate($template);
85
+                        $template = $response;
86
+                        $response = new ViewModel(array('target' => $target));
87
+                        $response->setTemplate($template);
88 88
             }
89 89
             $viewModel->addChild($response, $this->_captureTo . $i);
90 90
         }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
                       $response = new ViewModel(array('target' => $target));
87 87
                       $response->setTemplate($template);
88 88
             }
89
-            $viewModel->addChild($response, $this->_captureTo . $i);
89
+            $viewModel->addChild($response, $this->_captureTo.$i);
90 90
         }
91 91
                 
92 92
         return $viewModel;
Please login to merge, or discard this patch.
module/Core/src/Core/Controller/Plugin/ConfigFactory.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -13,11 +13,11 @@
 block discarded – undo
13 13
  */
14 14
 class ConfigFactory implements FactoryInterface
15 15
 {
16
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
17
-	{
18
-		$config = $container->get('Config');
19
-		$plugin = new Config($config);
16
+    public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
17
+    {
18
+        $config = $container->get('Config');
19
+        $plugin = new Config($config);
20 20
 		
21
-		return $plugin;
22
-	}
21
+        return $plugin;
22
+    }
23 23
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
  */
14 14
 class ConfigFactory implements FactoryInterface
15 15
 {
16
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
16
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
17 17
 	{
18 18
 		$config = $container->get('Config');
19 19
 		$plugin = new Config($config);
Please login to merge, or discard this patch.
module/Core/src/Core/Controller/Plugin/Mailer.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -87,11 +87,11 @@
 block discarded – undo
87 87
         return $sendMail ? $this->send($mail) : $mail;
88 88
     }
89 89
 	
90
-	/**
91
-	 * @param ContainerInterface $container
92
-	 *
93
-	 * @return Mailer
94
-	 */
90
+    /**
91
+     * @param ContainerInterface $container
92
+     *
93
+     * @return Mailer
94
+     */
95 95
     public static function factory(ContainerInterface $container)
96 96
     {
97 97
         return new static($container->get('Core/MailService'));
Please login to merge, or discard this patch.
module/Core/src/Core/Entity/AbstractIdentifiableEntity.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
  *
18 18
  * @author Anthonius Munthi <[email protected]>
19 19
  * @ODM\MappedSuperclass
20
-  */
20
+ */
21 21
 abstract class AbstractIdentifiableEntity extends AbstractEntity implements IdentifiableEntityInterface
22 22
 {
23 23
     use IdentifiableEntityTrait;
Please login to merge, or discard this patch.
module/Behat/src/MailContext.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -150,6 +150,9 @@
 block discarded – undo
150 150
         );
151 151
     }
152 152
 
153
+    /**
154
+     * @param string $contents
155
+     */
153 156
     private function parseEmail($contents)
154 157
     {
155 158
         $addresses = $this->parseEmailAddress($contents);
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
         $core = $scope->getEnvironment()->getContext(CoreContext::class);
50 50
         /* @var FileTransport $transport */
51 51
         $transport = $core->getServiceManager()->get('Core/MailService')->getTransport();
52
-        $path = $transport->getOptions()->getPath() . '/*.eml';
52
+        $path = $transport->getOptions()->getPath().'/*.eml';
53 53
         foreach (glob($path) as $filename) {
54 54
             unlink($filename);
55 55
         }
@@ -105,25 +105,25 @@  discard block
 block discarded – undo
105 105
         $regex = '/.*('.preg_quote($text).').*/im';
106 106
         $matches = [];
107 107
         $multiMessages = false;
108
-        if(count($this->messages) > 1){
108
+        if (count($this->messages) > 1) {
109 109
             $multiMessages = true;
110 110
         }
111 111
         $content = "";
112
-        foreach($this->messages as $key=>$definition){
112
+        foreach ($this->messages as $key=>$definition) {
113 113
             $content = $definition['contents'];
114
-            if(preg_match($regex,$content,$match)){
114
+            if (preg_match($regex, $content, $match)) {
115 115
                 $matches[] = $match;
116 116
             }
117 117
         }
118
-        $failMessage = sprintf('Can not find text "%s" in any email sent',$text);
119
-        if(!$multiMessages){
118
+        $failMessage = sprintf('Can not find text "%s" in any email sent', $text);
119
+        if (!$multiMessages) {
120 120
             $failMessage = sprintf(
121 121
                 'Can not find text "%s" in sent email. Here\'s the email content: %s',
122 122
                 $text,
123 123
                 PHP_EOL.PHP_EOL.$content
124 124
             );
125 125
         }
126
-        Assert::true(count($matches)>0,$failMessage);
126
+        Assert::true(count($matches) > 0, $failMessage);
127 127
     }
128 128
 
129 129
     /**
@@ -136,16 +136,16 @@  discard block
 block discarded – undo
136 136
 
137 137
         $path = $transport->getOptions()->getPath().'/*.eml';
138 138
 
139
-        foreach(glob($path) as $filename){
139
+        foreach (glob($path) as $filename) {
140 140
             $id = md5($filename);
141
-            if(!isset($this->messages[$id])){
141
+            if (!isset($this->messages[$id])) {
142 142
                 $contents = file_get_contents($filename);
143
-                $this->messages[$id]  = $this->parseEmail($contents);
143
+                $this->messages[$id] = $this->parseEmail($contents);
144 144
             }
145 145
         }
146 146
 
147 147
         Assert::true(
148
-            count($this->messages)>0,
148
+            count($this->messages) > 0,
149 149
             'No email have been sent'
150 150
         );
151 151
     }
@@ -153,33 +153,33 @@  discard block
 block discarded – undo
153 153
     private function parseEmail($contents)
154 154
     {
155 155
         $addresses = $this->parseEmailAddress($contents);
156
-        $subject =$this->parseSubject($contents);
156
+        $subject = $this->parseSubject($contents);
157 157
 
158 158
         $contents = strip_tags($contents);
159 159
         $contents = preg_replace("/(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+/", "\n", $contents);
160 160
 
161
-        return array_merge($addresses,$subject,['contents' => $contents]);
161
+        return array_merge($addresses, $subject, ['contents' => $contents]);
162 162
     }
163 163
 
164 164
     private function parseEmailAddress($contents)
165 165
     {
166 166
         // pattern to get email address
167
-        $radd =  '(\b[A-Z0-9._%+-]+@(?:[A-Z0-9-]+\.)+[A-Z]{2,6}\b)';
167
+        $radd = '(\b[A-Z0-9._%+-]+@(?:[A-Z0-9-]+\.)+[A-Z]{2,6}\b)';
168 168
 
169 169
         // get email from address
170
-        $regex = sprintf('/^From\:.*%s/im',$radd);
171
-        $hasMatch = preg_match($regex,$contents,$matches);
172
-        $fromAddress = $hasMatch ? $matches[1]:null;
170
+        $regex = sprintf('/^From\:.*%s/im', $radd);
171
+        $hasMatch = preg_match($regex, $contents, $matches);
172
+        $fromAddress = $hasMatch ? $matches[1] : null;
173 173
 
174 174
         // get email to address
175
-        $regex = sprintf('/^To\:\s+%s/im',$radd);
176
-        $hasMatch = preg_match($regex,$contents,$matches);
177
-        $toAddress1 = $hasMatch ? $matches[1]:null;
175
+        $regex = sprintf('/^To\:\s+%s/im', $radd);
176
+        $hasMatch = preg_match($regex, $contents, $matches);
177
+        $toAddress1 = $hasMatch ? $matches[1] : null;
178 178
 
179 179
         // get email to address
180
-        $regex = sprintf('/^To\:.*%s/im',$radd);
181
-        $hasMatch = preg_match($regex,$contents,$matches);
182
-        $toAddress2 = $hasMatch ? $matches[1]:null;
180
+        $regex = sprintf('/^To\:.*%s/im', $radd);
181
+        $hasMatch = preg_match($regex, $contents, $matches);
182
+        $toAddress2 = $hasMatch ? $matches[1] : null;
183 183
 
184 184
         $this->fromMails[] = $fromAddress;
185 185
         $this->toMails[] = $toAddress1;
@@ -187,15 +187,15 @@  discard block
 block discarded – undo
187 187
 
188 188
         return [
189 189
             'from' => $fromAddress,
190
-            'to' => [$toAddress1,$toAddress2],
190
+            'to' => [$toAddress1, $toAddress2],
191 191
         ];
192 192
     }
193 193
 
194 194
     private function parseSubject($contents)
195 195
     {
196 196
         $pattern = '/Subject\:(.*)/i';
197
-        preg_match($pattern,$contents,$matches);
198
-        $subject = isset($matches[1]) ? $matches[1]:null;
197
+        preg_match($pattern, $contents, $matches);
198
+        $subject = isset($matches[1]) ? $matches[1] : null;
199 199
         $this->subjects[] = $subject;
200 200
         return [
201 201
             'subject' => trim($subject)
Please login to merge, or discard this patch.
module/Core/src/Core/Mail/FileTransport.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
     {
33 33
         $options  = $this->options;
34 34
         $filename = call_user_func($options->getCallback(), $this);
35
-        $file     = $options->getPath() . DIRECTORY_SEPARATOR . $filename;
35
+        $file     = $options->getPath().DIRECTORY_SEPARATOR.$filename;
36 36
 
37 37
 
38 38
         $contents = $message->toString();
Please login to merge, or discard this patch.
module/Core/src/Core/Mail/MailServiceFactory.php 3 patches
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -26,41 +26,41 @@
 block discarded – undo
26 26
  */
27 27
 class MailServiceFactory implements FactoryInterface
28 28
 {
29
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
30
-	{
31
-		$config = $container->get('Config');
32
-		$mails = isset($config['mails']) ? $config['mails'] : [];
29
+    public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
30
+    {
31
+        $config = $container->get('Config');
32
+        $mails = isset($config['mails']) ? $config['mails'] : [];
33 33
 		
34
-		/* @var \Auth\Options\ModuleOptions $authOptions */
35
-		$authOptions = $container->get('Auth/Options');
34
+        /* @var \Auth\Options\ModuleOptions $authOptions */
35
+        $authOptions = $container->get('Auth/Options');
36 36
 		
37
-		/* @var \Core\Options\MailServiceOptions $mailServiceOptions */
38
-		$mailServiceOptions = $container->get('Core/MailServiceOptions');
37
+        /* @var \Core\Options\MailServiceOptions $mailServiceOptions */
38
+        $mailServiceOptions = $container->get('Core/MailServiceOptions');
39 39
 		
40
-		$configArray = [
41
-			'from' => [
42
-				'name' => $authOptions->getFromName(),
43
-				'email' => $authOptions->getFromEmail()
44
-			],
45
-		];
40
+        $configArray = [
41
+            'from' => [
42
+                'name' => $authOptions->getFromName(),
43
+                'email' => $authOptions->getFromEmail()
44
+            ],
45
+        ];
46 46
 
47
-		$configArray['transport'] = $this->getTransport($mailServiceOptions);
48
-		$configArray = array_merge($configArray, $mails);
47
+        $configArray['transport'] = $this->getTransport($mailServiceOptions);
48
+        $configArray = array_merge($configArray, $mails);
49 49
 		
50
-		$config = new MailServiceConfig($configArray);
51
-		$service   = new MailService($container,$config->toArray());
52
-		$config->configureServiceManager($service);
53
-		foreach($config->toArray() as $name=>$value){
54
-			$method = 'set'.$name;
55
-			if(method_exists($service,$method)){
56
-				call_user_func([$service,$method],$value);
57
-			}
58
-		}
50
+        $config = new MailServiceConfig($configArray);
51
+        $service   = new MailService($container,$config->toArray());
52
+        $config->configureServiceManager($service);
53
+        foreach($config->toArray() as $name=>$value){
54
+            $method = 'set'.$name;
55
+            if(method_exists($service,$method)){
56
+                call_user_func([$service,$method],$value);
57
+            }
58
+        }
59 59
 		
60
-		return $service;
61
-	}
60
+        return $service;
61
+    }
62 62
 
63
-	public function getTransport(MailServiceOptions $mailServiceOptions)
63
+    public function getTransport(MailServiceOptions $mailServiceOptions)
64 64
     {
65 65
         $type = $mailServiceOptions->getTransportClass();
66 66
         if (MailService::TRANSPORT_SMTP == $type) {
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
  */
27 27
 class MailServiceFactory implements FactoryInterface
28 28
 {
29
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
29
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
30 30
 	{
31 31
 		$config = $container->get('Config');
32 32
 		$mails = isset($config['mails']) ? $config['mails'] : [];
@@ -48,12 +48,12 @@  discard block
 block discarded – undo
48 48
 		$configArray = array_merge($configArray, $mails);
49 49
 		
50 50
 		$config = new MailServiceConfig($configArray);
51
-		$service   = new MailService($container,$config->toArray());
51
+		$service = new MailService($container, $config->toArray());
52 52
 		$config->configureServiceManager($service);
53
-		foreach($config->toArray() as $name=>$value){
53
+		foreach ($config->toArray() as $name=>$value) {
54 54
 			$method = 'set'.$name;
55
-			if(method_exists($service,$method)){
56
-				call_user_func([$service,$method],$value);
55
+			if (method_exists($service, $method)) {
56
+				call_user_func([$service, $method], $value);
57 57
 			}
58 58
 		}
59 59
 		
@@ -65,11 +65,11 @@  discard block
 block discarded – undo
65 65
         $type = $mailServiceOptions->getTransportClass();
66 66
         if (MailService::TRANSPORT_SMTP == $type) {
67 67
             return new Smtp($mailServiceOptions);
68
-        }elseif(MailService::TRANSPORT_FILE == $type){
68
+        }elseif (MailService::TRANSPORT_FILE == $type) {
69 69
             $fileOptions = new FileOptions();
70 70
             $fileOptions->setPath($mailServiceOptions->getPath());
71 71
             return new FileTransport($fileOptions);
72
-        }elseif(MailService::TRANSPORT_SENDMAIL == $type){
72
+        }elseif (MailService::TRANSPORT_SENDMAIL == $type) {
73 73
             return new Sendmail();
74 74
         }
75 75
 
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -65,11 +65,11 @@
 block discarded – undo
65 65
         $type = $mailServiceOptions->getTransportClass();
66 66
         if (MailService::TRANSPORT_SMTP == $type) {
67 67
             return new Smtp($mailServiceOptions);
68
-        }elseif(MailService::TRANSPORT_FILE == $type){
68
+        } elseif(MailService::TRANSPORT_FILE == $type){
69 69
             $fileOptions = new FileOptions();
70 70
             $fileOptions->setPath($mailServiceOptions->getPath());
71 71
             return new FileTransport($fileOptions);
72
-        }elseif(MailService::TRANSPORT_SENDMAIL == $type){
72
+        } elseif(MailService::TRANSPORT_SENDMAIL == $type){
73 73
             return new Sendmail();
74 74
         }
75 75
 
Please login to merge, or discard this patch.