Completed
Pull Request — develop (#462)
by ANTHONIUS
06:57
created
module/Behat/src/CoreContext.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -39,11 +39,11 @@  discard block
 block discarded – undo
39 39
 	public function gatherContexts(BeforeScenarioScope $scope)
40 40
 	{
41 41
 		$this->minkContext = $scope->getEnvironment()->getContext(MinkContext::class);
42
-		if(false === static::$jobCategoryChecked){
42
+		if (false === static::$jobCategoryChecked) {
43 43
 			/* @var Categories $catRepo */
44 44
 			$catRepo = $this->getRepositories()->get('Jobs/Category');
45 45
 			$all = $catRepo->findAll();
46
-			if(count($all) <= 1){
46
+			if (count($all) <= 1) {
47 47
 				$catRepo->createDefaultCategory('professions');
48 48
 				$catRepo->createDefaultCategory('industries');
49 49
 				$catRepo->createDefaultCategory('employmentTypes');
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 	 */
58 58
 	public function getApplication()
59 59
 	{
60
-		if(!is_object(static::$application)){
60
+		if (!is_object(static::$application)) {
61 61
 			$configFile = realpath(__DIR__.'/../../../config/config.php');
62 62
 			$config = include($configFile);
63 63
 			static::$application = Application::init($config);
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	public function iSubmitTheFormWithId($arg)
142 142
 	{
143 143
 		$node = $this->minkContext->getSession()->getPage()->find('css', $arg);
144
-		if($node) {
144
+		if ($node) {
145 145
 			$this->minkContext->getSession()->executeScript("jQuery('$arg').submit();");
146 146
 		} else {
147 147
 			throw new \Exception('Element not found');
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 	public function iSetMainWindowName()
166 166
 	{
167 167
 		$window_name = 'main_window';
168
-		$script = 'window.name = "' . $window_name . '"';
168
+		$script = 'window.name = "'.$window_name.'"';
169 169
 		$this->getSession()->executeScript($script);
170 170
 	}
171 171
 	
@@ -224,14 +224,14 @@  discard block
 block discarded – undo
224 224
 				break;
225 225
 			
226 226
 			default:
227
-				throw new \Exception(__METHOD__ . ' Couldn\'t find selector: ' . $selector . ' - Allowed selectors: #id, .className, //xpath');
227
+				throw new \Exception(__METHOD__.' Couldn\'t find selector: '.$selector.' - Allowed selectors: #id, .className, //xpath');
228 228
 				break;
229 229
 		}
230 230
 		
231 231
 		try {
232 232
 			$this->getSession()->executeScript($function);
233 233
 		} catch (\Exception $e) {
234
-			throw new \Exception(__METHOD__ . ' failed'. ' Message: for this locator:"'.$selector.'"');
234
+			throw new \Exception(__METHOD__.' failed'.' Message: for this locator:"'.$selector.'"');
235 235
 		}
236 236
 	}
237 237
 	
@@ -252,10 +252,10 @@  discard block
 block discarded – undo
252 252
 	 *
253 253
 	 * @return \Behat\Mink\Element\NodeElement|mixed|null
254 254
 	 */
255
-	public function getElement($locator,$selector='css')
255
+	public function getElement($locator, $selector = 'css')
256 256
 	{
257 257
 		$page = $this->minkContext->getSession()->getPage();
258
-		$element = $page->find('css',$locator);
258
+		$element = $page->find('css', $locator);
259 259
 		return $element;
260 260
 	}
261 261
 	
@@ -287,12 +287,12 @@  discard block
 block discarded – undo
287 287
 		$session = $this->getSession();
288 288
 		$element = $session->getPage()->find(
289 289
 			'xpath',
290
-			$session->getSelectorsHandler()->selectorToXpath('xpath', '*//*[text()="'. $text .'"]')
290
+			$session->getSelectorsHandler()->selectorToXpath('xpath', '*//*[text()="'.$text.'"]')
291 291
 		);
292
-		if(null === $element){
292
+		if (null === $element) {
293 293
 			$element = $session->getPage()->find(
294 294
 				'named',
295
-				array('id',$text)
295
+				array('id', $text)
296 296
 			);
297 297
 		}
298 298
 		if (null === $element) {
Please login to merge, or discard this patch.
public/index.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -11,23 +11,23 @@  discard block
 block discarded – undo
11 11
 
12 12
 date_default_timezone_set('Europe/Berlin');
13 13
 
14
-if(!version_compare(PHP_VERSION, '5.6.0', 'ge')){
15
-    echo sprintf('<p>Sorry, YAWIK requires at least PHP 5.6.0 to run, but this server currently provides PHP %s</p>',PHP_VERSION);
14
+if (!version_compare(PHP_VERSION, '5.6.0', 'ge')) {
15
+    echo sprintf('<p>Sorry, YAWIK requires at least PHP 5.6.0 to run, but this server currently provides PHP %s</p>', PHP_VERSION);
16 16
     echo '<p>Please ask your servers\' administrator to install the proper PHP version.</p>';
17 17
     exit;
18 18
 }
19 19
 
20 20
 if (php_sapi_name() == 'cli-server') {
21 21
     $parseUrl = parse_url(substr($_SERVER["REQUEST_URI"], 1));
22
-    $route = isset($parseUrl['path']) ? $parseUrl['path']:null;
23
-    if (is_file(__DIR__ . '/' . $route)) {
24
-        if(substr($route, -4) == ".php"){
25
-            require __DIR__ . '/' . $route;     // Include requested script files
22
+    $route = isset($parseUrl['path']) ? $parseUrl['path'] : null;
23
+    if (is_file(__DIR__.'/'.$route)) {
24
+        if (substr($route, -4) == ".php") {
25
+            require __DIR__.'/'.$route; // Include requested script files
26 26
             exit;
27 27
         }
28
-        return false;           // Serve file as is
28
+        return false; // Serve file as is
29 29
     } else {                    // Fallback to index.php
30
-        $_GET["q"] = $route;    // Try to emulate the behaviour of a .htaccess here.
30
+        $_GET["q"] = $route; // Try to emulate the behaviour of a .htaccess here.
31 31
     }
32 32
 }
33 33
 
@@ -47,8 +47,8 @@  discard block
 block discarded – undo
47 47
 } else {
48 48
     echo '<p>Could not initialize autoloading. This happens, if the dependencies are not installed yet.</p>';
49 49
     echo '<p>Please try to install the dependencies via: </p>';
50
-    echo '<code>cd '. realpath('.') .'<br>./install.sh</code>';
51
-    echo '<p>exit at ' . __FILE__ . ' in line ' . __LINE__ .'</p>';
50
+    echo '<code>cd '.realpath('.').'<br>./install.sh</code>';
51
+    echo '<p>exit at '.__FILE__.' in line '.__LINE__.'</p>';
52 52
     exit;
53 53
 }
54 54
 
Please login to merge, or discard this patch.
module/Behat/src/ApplicationContext.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,13 +35,13 @@
 block discarded – undo
35 35
 		/* @var $repo JobRepository */
36 36
 		$repo = $this->getRepository('Jobs/Job');
37 37
 		$job = $repo->findOneBy(['title' => $title]);
38
-		if(!$job instanceof Job){
38
+		if (!$job instanceof Job) {
39 39
 			throw new \Exception('There is no job titled: "'.$title.'"');
40 40
 		}
41 41
 		$job->setApplyId($job->getId());
42 42
 		$repo->store($job);
43 43
 
44
-		$url = $this->generateUrl('lang/apply',[
44
+		$url = $this->generateUrl('lang/apply', [
45 45
 		    'applyId' => $job->getApplyId()
46 46
         ]);
47 47
 		$this->visit($url);
Please login to merge, or discard this patch.
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/Behat/src/CommonContextTrait.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -51,16 +51,16 @@
 block discarded – undo
51 51
 		$this->summaryFormContext = $scope->getEnvironment()->getContext(SummaryFormContext::class);
52 52
 	}
53 53
 	
54
-	public function generateUrl($name,array $params=array(),array $options=array())
54
+	public function generateUrl($name, array $params = array(), array $options = array())
55 55
 	{
56 56
 	    $defaults = ['lang'=>'en'];
57
-	    $params = array_merge($defaults,$params);
57
+	    $params = array_merge($defaults, $params);
58 58
         /* @var Url $urlHelper */
59 59
         $urlHelper = $this
60 60
             ->getService('ViewHelperManager')
61 61
             ->get('url')
62 62
         ;
63
-        $url = $urlHelper($name,$params,$options);
63
+        $url = $urlHelper($name, $params, $options);
64 64
 
65 65
         return $this->coreContext->generateUrl($url);
66 66
 	}
Please login to merge, or discard this patch.
module/Behat/src/SettingsContext.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
 	 */
32 32
 	public function iGoToEmailTemplatePage()
33 33
 	{
34
-	    $url = $this->generateUrl('lang/settings',[
34
+	    $url = $this->generateUrl('lang/settings', [
35 35
 	        'module' => 'Applications'
36 36
         ]);
37 37
 		$this->visit($url);
Please login to merge, or discard this patch.
module/Core/src/Core/Controller/Plugin/Service/NotificationFactory.php 1 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 1 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/Mail.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -153,18 +153,18 @@  discard block
 block discarded – undo
153 153
         $replyTo = $this->stringFromMailHeader($this->getReplyTo());
154 154
         
155 155
         return str_pad($template, 30)
156
-                . 'to: ' . str_pad($to, 50)
157
-                . 'cc: ' . str_pad($cc, 50)
158
-                . 'bcc: ' . str_pad($bcc, 50)
159
-                . 'from: ' . str_pad($from, 50)
160
-                . 'replyTo: ' . str_pad($replyTo, 50)
156
+                . 'to: '.str_pad($to, 50)
157
+                . 'cc: '.str_pad($cc, 50)
158
+                . 'bcc: '.str_pad($bcc, 50)
159
+                . 'from: '.str_pad($from, 50)
160
+                . 'replyTo: '.str_pad($replyTo, 50)
161 161
                 //. str_pad(implode(',', ArrayUtils::iteratorToArray($this->getSender())),50)
162
-                . 'subject: ' . str_pad($this->getSubject(), 50);
162
+                . 'subject: '.str_pad($this->getSubject(), 50);
163 163
     }
164 164
     
165 165
     public function template($template)
166 166
     {
167
-        $controller =  get_class($this->controller);
167
+        $controller = get_class($this->controller);
168 168
         
169 169
         $event = new Event();
170 170
         $eventManager = $this->eventManager;
@@ -181,11 +181,11 @@  discard block
 block discarded – undo
181 181
         $controllerIdentifier = strtolower(substr($controller, 0, strpos($controller, '\\')));
182 182
         $viewResolver = $this->viewResolver;
183 183
                 
184
-        $templateHalf = 'mail/' . $template;
184
+        $templateHalf = 'mail/'.$template;
185 185
         $resource = $viewResolver->resolve($templateHalf);
186 186
         
187 187
         if (empty($resource)) {
188
-            $templateFull = $controllerIdentifier . '/mail/' . $template;
188
+            $templateFull = $controllerIdentifier.'/mail/'.$template;
189 189
             $resource = $viewResolver->resolve($templateFull);
190 190
         }
191 191
         
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
                     unset($__vars[$key]);
213 213
                 }
214 214
             }
215
-            unset($__vars['content'],$__vars['controllerIdentifier'],$__vars['controller'],$__vars['resource'],$__vars['template'],$__vars['viewResolver']);
215
+            unset($__vars['content'], $__vars['controllerIdentifier'], $__vars['controller'], $__vars['resource'], $__vars['template'], $__vars['viewResolver']);
216 216
             $this->config = $__vars;
217 217
         }
218 218
     }
@@ -237,20 +237,20 @@  discard block
 block discarded – undo
237 237
         if (isset($this->config['from'])) {
238 238
             $from = $this->config['from'];
239 239
         } else {
240
-            $log->err('A from email address must be provided (Variable $from) in Template: ' . $template);
241
-            throw new \InvalidArgumentException('A from email address must be provided (Variable $from) in Template: ' . $template);
240
+            $log->err('A from email address must be provided (Variable $from) in Template: '.$template);
241
+            throw new \InvalidArgumentException('A from email address must be provided (Variable $from) in Template: '.$template);
242 242
         }
243 243
         if (isset($this->config['fromName'])) {
244 244
             $fromName = $this->config['fromName'];
245 245
         } else {
246
-            $log->err('A from name must be provided (Variable $fromName) in Template: ' . $template);
247
-            throw new \InvalidArgumentException('A from name must be provided (Variable $fromName) in Template: ' . $template);
246
+            $log->err('A from name must be provided (Variable $fromName) in Template: '.$template);
247
+            throw new \InvalidArgumentException('A from name must be provided (Variable $fromName) in Template: '.$template);
248 248
         }
249 249
         if (isset($this->config['subject'])) {
250 250
             $subject = $this->config['subject'];
251 251
         } else {
252
-            $log->err('A subject must be provided (Variable $subject) in Template: ' . $template);
253
-            throw new \InvalidArgumentException('A subject must be provided (Variable $subject) in Template: ' . $template);
252
+            $log->err('A subject must be provided (Variable $subject) in Template: '.$template);
253
+            throw new \InvalidArgumentException('A subject must be provided (Variable $subject) in Template: '.$template);
254 254
         }
255 255
         $this->setFrom($from, $fromName);
256 256
         $this->setSubject($subject);
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
             $erg = true;
272 272
             $log->info($this);
273 273
         } catch (\Exception $e) {
274
-            $log->err('Mail failure ' . $e->getMessage());
274
+            $log->err('Mail failure '.$e->getMessage());
275 275
         }
276 276
         return $erg;
277 277
     }
@@ -288,6 +288,6 @@  discard block
 block discarded – undo
288 288
         $viewResolver   = $container->get('ViewResolver');
289 289
         $eventManager   = $container->get('EventManager');
290 290
         $moduleManager  = $container->get('ModuleManager');
291
-        return new static($mailLog,$viewResolver,$eventManager,$moduleManager);
291
+        return new static($mailLog, $viewResolver, $eventManager, $moduleManager);
292 292
     }
293 293
 }
Please login to merge, or discard this patch.