Completed
Pull Request — develop (#434)
by Carsten
06:27
created
module/Geo/src/Geo/Service/Geo.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
     {
41 41
         $result = json_decode($result, JSON_OBJECT_AS_ARRAY);
42 42
 
43
-        $r=[];
43
+        $r = [];
44 44
         foreach ($result["result"] as $val) {
45 45
             $coords = $this->queryCoords($val);
46 46
             if (false !== strpos($val, ',')) {
Please login to merge, or discard this patch.
module/Geo/src/Geo/Form/GeoSelectHydratorStrategy.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -72,10 +72,10 @@
 block discarded – undo
72 72
         if (0 === strpos($value, '{')) {
73 73
             return $value;
74 74
         }
75
-        if ($value){
75
+        if ($value) {
76 76
             $data = $this->geoClient->queryOne($value);
77 77
             return $data['id'];
78
-        }else{
78
+        } else {
79 79
             return;
80 80
         }
81 81
     }
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Controller/Plugin/InitializeJob.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -43,9 +43,9 @@  discard block
 block discarded – undo
43 43
 
44 44
     public function __construct(RepositoryService $repositoryService, AuthenticationService $auth, Acl $acl)
45 45
     {
46
-        $this->repositoryService=$repositoryService;
47
-        $this->auth=$auth;
48
-        $this->acl=$acl;
46
+        $this->repositoryService = $repositoryService;
47
+        $this->auth = $auth;
48
+        $this->acl = $acl;
49 49
     }
50 50
 
51 51
     public function __invoke()
@@ -64,12 +64,12 @@  discard block
 block discarded – undo
64 64
     public function get(Params $params, $allowDraft = false, $getSnapshot = false)
65 65
     {
66 66
         /* @var \Jobs\Repository\Job $jobRepository */
67
-        $jobRepository  = $this->repositoryService->get('Jobs/Job');
67
+        $jobRepository = $this->repositoryService->get('Jobs/Job');
68 68
         $idFromRoute   = $params('id', 0);
69 69
         $idFromQuery   = $params->fromQuery('id', 0);
70 70
         $idFromSubForm = $params->fromPost('job', 0);
71 71
 
72
-        $id = empty($idFromRoute)? (empty($idFromQuery)?$idFromSubForm:$idFromQuery) : $idFromRoute;
72
+        $id = empty($idFromRoute) ? (empty($idFromQuery) ? $idFromSubForm : $idFromQuery) : $idFromRoute;
73 73
         $snapshotId = $params->fromPost('snapshot') ?: ($params->fromQuery('snapshot') ?: null);
74 74
 
75 75
         if (empty($id) && empty($snapshotId) && $allowDraft) {
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/View/Helper/AdminEditLink.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,6 +65,6 @@
 block discarded – undo
65 65
                 'admin' => 1,
66 66
             ]],
67 67
             true
68
-        ) . '&return=' . $this->returnUrl;
68
+        ).'&return='.$this->returnUrl;
69 69
     }
70 70
 }
71 71
\ No newline at end of file
Please login to merge, or discard this patch.
module/Geo/src/Geo/Form/GeoSelectSimple.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
                 if (0 === strpos($value, '{')) {
63 63
                     return $value;
64 64
                 }
65
-                if ($value){
65
+                if ($value) {
66 66
                     foreach ($this->getValueOptions() as $optValue => $opt) {
67 67
                         if (false !== strpos($value, $opt)) {
68 68
                             return $optValue;
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
             },
76 76
 
77 77
             /* hydrate */
78
-            function ($value) {
78
+            function($value) {
79 79
                 if (empty($value) || 0 !== strpos($value, '{')) {
80 80
                     return null;
81 81
                 }
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Options/BaseFieldsetOptions.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 class BaseFieldsetOptions extends FieldsetCustomizationOptions
25 25
 {
26 26
 
27
-    const TITLE =  'title';
27
+    const TITLE = 'title';
28 28
     const LOCATION = 'geoLocation';
29 29
 
30 30
     /**
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
      *
33 33
      * @var array
34 34
      */
35
-   protected $fields=[
35
+   protected $fields = [
36 36
         self::TITLE => [
37 37
             'enabled' => true,
38 38
             'options' => [
Please login to merge, or discard this patch.
module/Core/src/Core/Form/View/Helper/SearchForm.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
      * @param array $colMap
35 35
      * @return Form|string
36 36
      */
37
-    public function __invoke(FormInterface $form = null, $colMap=null)
37
+    public function __invoke(FormInterface $form = null, $colMap = null)
38 38
     {
39 39
         if (!$form) {
40 40
             return $this;
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
         return $this->render($form, $colMap);
44 44
     }
45 45
 
46
-    public function render(FormInterface $form, $colMap=null, $buttonsSpan = null)
46
+    public function render(FormInterface $form, $colMap = null, $buttonsSpan = null)
47 47
     {
48 48
         $headscript = $this->getView()->plugin('headscript');
49 49
         $basepath   = $this->getView()->plugin('basepath');
@@ -60,14 +60,14 @@  discard block
 block discarded – undo
60 60
         $form->prepare();
61 61
 
62 62
         if ($form instanceOf ViewPartialProviderInterface) {
63
-            return $this->getView()->partial($form->getViewPartial(), [ 'element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan ]);
63
+            return $this->getView()->partial($form->getViewPartial(), ['element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan]);
64 64
         }
65 65
 
66 66
         $content = $this->renderElements($form, $colMap, $buttonsSpan);
67 67
 
68 68
         return $this->openTag($form)
69 69
              . '<div class="row" style="padding: 0 15px;">'
70
-             . $content . '</div>' . $this->closeTag();
70
+             . $content.'</div>'.$this->closeTag();
71 71
 
72 72
     }
73 73
 
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 
78 78
         $content = '';
79 79
         foreach ($buttons as $button) {
80
-            $content.= $helper($button);
80
+            $content .= $helper($button);
81 81
         }
82 82
 
83 83
         return $content;
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
     public function renderElements($form, $colMap = null, $buttonsSpan = null)
87 87
     {
88 88
         if ($form instanceOf ViewPartialProviderInterface) {
89
-            return $this->getView()->partial($form->getViewPartial(), [ 'element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan ]);
89
+            return $this->getView()->partial($form->getViewPartial(), ['element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan]);
90 90
         }
91 91
 
92 92
         if (null === $colMap) {
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
         }
95 95
 
96 96
         $formElement = $this->getView()->plugin('formElement');
97
-        $content = ''; $buttonsRendered = false; $i=0;
97
+        $content = ''; $buttonsRendered = false; $i = 0;
98 98
         foreach ($form as $element) {
99 99
 
100 100
             if (isset($colMap[$element->getName()])) {
@@ -108,14 +108,14 @@  discard block
 block discarded – undo
108 108
             }
109 109
 
110 110
             if ($element->getName() == $form->getButtonElement()) {
111
-                $content.='<div class="input-group col-md-' . $cols . '">'
111
+                $content .= '<div class="input-group col-md-'.$cols.'">'
112 112
                               . $formElement($element)
113 113
                               . '<div class="input-group-btn search-form-buttons" style="width: 1px;">'
114
-                              . $this->renderButtons($form->getButtons()) . '</div>'
114
+                              . $this->renderButtons($form->getButtons()).'</div>'
115 115
                               . '</div>';
116 116
                 $buttonsRendered = true;
117 117
             } else {
118
-                $content .= '<div class="input-group col-md-' . $cols . '">'
118
+                $content .= '<div class="input-group col-md-'.$cols.'">'
119 119
                           . $formElement($element)
120 120
                           . '</div>';
121 121
             }
@@ -127,8 +127,8 @@  discard block
 block discarded – undo
127 127
             if (null === $buttonsSpan) {
128 128
                 $buttonsSpan = $form->getOption('buttons_span') ?: 12;
129 129
             }
130
-            $content .= '<div class="input-group search-form-buttons col-md-' . $buttonsSpan . ' text-right">'
131
-                      . '<div class="btn-group">' . $this->renderButtons($form->getButtons()) .'</div></div>';
130
+            $content .= '<div class="input-group search-form-buttons col-md-'.$buttonsSpan.' text-right">'
131
+                      . '<div class="btn-group">'.$this->renderButtons($form->getButtons()).'</div></div>';
132 132
         }
133 133
 
134 134
         return $content;
Please login to merge, or discard this patch.
module/Geo/Module.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
      */
26 26
     public function getConfig()
27 27
     {
28
-        return include __DIR__ . '/config/module.config.php';
28
+        return include __DIR__.'/config/module.config.php';
29 29
     }
30 30
     
31 31
     /**
@@ -37,11 +37,11 @@  discard block
 block discarded – undo
37 37
     {
38 38
         return array(
39 39
             'Zend\Loader\ClassMapAutoloader' => [
40
-                __DIR__ . '/src/autoload_classmap.php'
40
+                __DIR__.'/src/autoload_classmap.php'
41 41
             ],
42 42
             'Zend\Loader\StandardAutoloader' => array(
43 43
                 'namespaces' => array(
44
-                    __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
44
+                    __NAMESPACE__ => __DIR__.'/src/'.__NAMESPACE__,
45 45
                 ),
46 46
             ),
47 47
         );
Please login to merge, or discard this patch.
module/Install/src/autoload_classmap.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@
 block discarded – undo
1 1
 <?php
2 2
 // Generated by ZF2's ./bin/classmap_generator.php
3 3
 return array(
4
-    'Install\Controller\Index'                                    => __DIR__ . '/Controller/Index.php',
5
-    'Install\Controller\Plugin\Prerequisites'                     => __DIR__ . '/Controller/Plugin/Prerequisites.php',
6
-    'Install\Controller\Plugin\UserCreator'                       => __DIR__ . '/Controller/Plugin/UserCreator.php',
7
-    'Install\Controller\Plugin\YawikConfigCreator'                => __DIR__ . '/Controller/Plugin/YawikConfigCreator.php',
8
-    'Install\Factory\Controller\Plugin\UserCreatorFactory'        => __DIR__ . '/Factory/Controller/Plugin/UserCreatorFactory.php',
9
-    'Install\Factory\Controller\Plugin\YawikConfigCreatorFactory' => __DIR__ . '/Factory/Controller/Plugin/YawikConfigCreatorFactory.php',
10
-    'Install\Filter\DbNameExtractor'                              => __DIR__ . '/Filter/DbNameExtractor.php',
11
-    'Install\Form\Installation'                                   => __DIR__ . '/Form/Installation.php',
12
-    'Install\Listener\LanguageSetter'                             => __DIR__ . '/Listener/LanguageSetter.php',
13
-    'Install\Validator\MongoDbConnection'                         => __DIR__ . '/Validator/MongoDbConnection.php',
14
-    'Install\Validator\MongoDbConnectionString'                   => __DIR__ . '/Validator/MongoDbConnectionString.php',
4
+    'Install\Controller\Index'                                    => __DIR__.'/Controller/Index.php',
5
+    'Install\Controller\Plugin\Prerequisites'                     => __DIR__.'/Controller/Plugin/Prerequisites.php',
6
+    'Install\Controller\Plugin\UserCreator'                       => __DIR__.'/Controller/Plugin/UserCreator.php',
7
+    'Install\Controller\Plugin\YawikConfigCreator'                => __DIR__.'/Controller/Plugin/YawikConfigCreator.php',
8
+    'Install\Factory\Controller\Plugin\UserCreatorFactory'        => __DIR__.'/Factory/Controller/Plugin/UserCreatorFactory.php',
9
+    'Install\Factory\Controller\Plugin\YawikConfigCreatorFactory' => __DIR__.'/Factory/Controller/Plugin/YawikConfigCreatorFactory.php',
10
+    'Install\Filter\DbNameExtractor'                              => __DIR__.'/Filter/DbNameExtractor.php',
11
+    'Install\Form\Installation'                                   => __DIR__.'/Form/Installation.php',
12
+    'Install\Listener\LanguageSetter'                             => __DIR__.'/Listener/LanguageSetter.php',
13
+    'Install\Validator\MongoDbConnection'                         => __DIR__.'/Validator/MongoDbConnection.php',
14
+    'Install\Validator\MongoDbConnectionString'                   => __DIR__.'/Validator/MongoDbConnectionString.php',
15 15
 );
Please login to merge, or discard this patch.