Completed
Pull Request — develop (#359)
by Mathias
23:51
created
module/Core/src/Core/Repository/RepositoryService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
             $name = "\\$namespace\\Entity\\$entityName";
39 39
         }
40 40
         
41
-        $repository  = $this->dm->getRepository($name);
41
+        $repository = $this->dm->getRepository($name);
42 42
         return $repository;
43 43
     }
44 44
     
Please login to merge, or discard this patch.
module/Core/src/Core/Form/View/Helper/FormWizardContainer.php 2 patches
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -90,24 +90,24 @@
 block discarded – undo
90 90
             $tabId = $containerId . '-' . strtolower($tabElement->getName());
91 91
             $tabsNav .= '<li><a data-toggle="tab" href="#' . $tabId . '">' . $translate($tabElement->getLabel()) . '</a></li>';
92 92
             $tabsContent .= '<div class="tab-pane" id="' . $tabId . '">'
93
-                          . $formContainer($tabElement, $layout, $parameter)
94
-                          . '</div>';
93
+                            . $formContainer($tabElement, $layout, $parameter)
94
+                            . '</div>';
95 95
         }
96 96
 
97 97
         $content .= '<style type="text/css">.tab-content > div > div:first-child { margin-top: 10px; }</style><div class="wizard-container" id="' . $containerId . '">'
98
-                  . '<ul>' . $tabsNav . '</ul>'
99
-                  . '<div class="tab-content">' . $tabsContent . '</div>';
98
+                    . '<ul>' . $tabsNav . '</ul>'
99
+                    . '<div class="tab-content">' . $tabsContent . '</div>';
100 100
         if ($containerParams['pager']) {
101 101
             $content .='<ul class="pager wizard">'
102
-                  . '<li class="previous"><a href="javascript:;">&larr; ' . $translate('previous') . '</a></li>'
103
-                  . '<li class="next"><a href="javascript:;">' . $translate('Next') . ' &rarr;</a></li>'
104
-                  . '<li class="finish' . ($containerParams['finish_enabled'] ? '' : ' disabled') . '">'
105
-                  . (false !== $containerParams['finish_label']
102
+                    . '<li class="previous"><a href="javascript:;">&larr; ' . $translate('previous') . '</a></li>'
103
+                    . '<li class="next"><a href="javascript:;">' . $translate('Next') . ' &rarr;</a></li>'
104
+                    . '<li class="finish' . ($containerParams['finish_enabled'] ? '' : ' disabled') . '">'
105
+                    . (false !== $containerParams['finish_label']
106 106
                      ? '<a class="pull-right" href="' . $containerParams['finish_href'] . '">'
107
-                       . $translate($containerParams['finish_label']) . ' &bull;</a>'
107
+                        . $translate($containerParams['finish_label']) . ' &bull;</a>'
108 108
                      : ''
109 109
                     )
110
-                  . '</li></ul>';
110
+                    . '</li></ul>';
111 111
         }
112 112
         $content .= '</div>';
113 113
 
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -83,28 +83,28 @@
 block discarded – undo
83 83
 
84 84
         $containerId = $container->getAttribute('id');
85 85
         if (!$containerId) {
86
-            $containerId = 'wizardcontainer-' . strtolower(str_replace('\\', '-', get_class($container)));
86
+            $containerId = 'wizardcontainer-'.strtolower(str_replace('\\', '-', get_class($container)));
87 87
         }
88 88
 
89 89
         foreach ($container as $tabElement) {
90
-            $tabId = $containerId . '-' . strtolower($tabElement->getName());
91
-            $tabsNav .= '<li><a data-toggle="tab" href="#' . $tabId . '">' . $translate($tabElement->getLabel()) . '</a></li>';
92
-            $tabsContent .= '<div class="tab-pane" id="' . $tabId . '">'
90
+            $tabId = $containerId.'-'.strtolower($tabElement->getName());
91
+            $tabsNav .= '<li><a data-toggle="tab" href="#'.$tabId.'">'.$translate($tabElement->getLabel()).'</a></li>';
92
+            $tabsContent .= '<div class="tab-pane" id="'.$tabId.'">'
93 93
                           . $formContainer($tabElement, $layout, $parameter)
94 94
                           . '</div>';
95 95
         }
96 96
 
97
-        $content .= '<style type="text/css">.tab-content > div > div:first-child { margin-top: 10px; }</style><div class="wizard-container" id="' . $containerId . '">'
98
-                  . '<ul>' . $tabsNav . '</ul>'
99
-                  . '<div class="tab-content">' . $tabsContent . '</div>';
97
+        $content .= '<style type="text/css">.tab-content > div > div:first-child { margin-top: 10px; }</style><div class="wizard-container" id="'.$containerId.'">'
98
+                  . '<ul>'.$tabsNav.'</ul>'
99
+                  . '<div class="tab-content">'.$tabsContent.'</div>';
100 100
         if ($containerParams['pager']) {
101
-            $content .='<ul class="pager wizard">'
102
-                  . '<li class="previous"><a href="javascript:;">&larr; ' . $translate('previous') . '</a></li>'
103
-                  . '<li class="next"><a href="javascript:;">' . $translate('Next') . ' &rarr;</a></li>'
104
-                  . '<li class="finish' . ($containerParams['finish_enabled'] ? '' : ' disabled') . '">'
101
+            $content .= '<ul class="pager wizard">'
102
+                  . '<li class="previous"><a href="javascript:;">&larr; '.$translate('previous').'</a></li>'
103
+                  . '<li class="next"><a href="javascript:;">'.$translate('Next').' &rarr;</a></li>'
104
+                  . '<li class="finish'.($containerParams['finish_enabled'] ? '' : ' disabled').'">'
105 105
                   . (false !== $containerParams['finish_label']
106
-                     ? '<a class="pull-right" href="' . $containerParams['finish_href'] . '">'
107
-                       . $translate($containerParams['finish_label']) . ' &bull;</a>'
106
+                     ? '<a class="pull-right" href="'.$containerParams['finish_href'].'">'
107
+                       . $translate($containerParams['finish_label']).' &bull;</a>'
108 108
                      : ''
109 109
                     )
110 110
                   . '</li></ul>';
Please login to merge, or discard this patch.
module/Core/src/Core/Form/Tree/AddItemFieldset.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -79,13 +79,13 @@
 block discarded – undo
79 79
             'name' => [
80 80
                 'required' => true,
81 81
                 'filters' => [
82
-                    [ 'name' => 'StringTrim' ],
82
+                    ['name' => 'StringTrim'],
83 83
                 ],
84 84
             ],
85 85
             'value' => [
86 86
                 'required' => false,
87 87
                 'filters' => [
88
-                    [ 'name' => 'StringTrim' ],
88
+                    ['name' => 'StringTrim'],
89 89
                 ],
90 90
             ],
91 91
         ];
Please login to merge, or discard this patch.
module/Core/src/Core/Form/Tree/ManagementForm.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
      *
36 36
      * @var array
37 37
      */
38
-    protected $scripts = [ '/js/html.sortable.min.js', 'Core/js/forms.tree-management.js' ];
38
+    protected $scripts = ['/js/html.sortable.min.js', 'Core/js/forms.tree-management.js'];
39 39
 
40 40
     /**
41 41
      * Attributes.
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Factory/Repository/DefaultCategoriesBuilderFactory.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -38,14 +38,14 @@
 block discarded – undo
38 38
 
39 39
         $globalConfigPaths = [];
40 40
         foreach ($config['config_glob_paths'] as $path) {
41
-            $globalConfigPaths[] = substr($path, 0, strrpos($path, DIRECTORY_SEPARATOR)) . DIRECTORY_SEPARATOR;
41
+            $globalConfigPaths[] = substr($path, 0, strrpos($path, DIRECTORY_SEPARATOR)).DIRECTORY_SEPARATOR;
42 42
         }
43 43
 
44 44
         $moduleConfigPath = '.';
45 45
         foreach ($config['module_paths'] as $path) {
46
-            $path = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
47
-            if (file_exists($path . 'Jobs')) {
48
-                $moduleConfigPath = $path . 'Jobs' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR;
46
+            $path = rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
47
+            if (file_exists($path.'Jobs')) {
48
+                $moduleConfigPath = $path.'Jobs'.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR;
49 49
                 break;
50 50
             }
51 51
         }
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Repository/DefaultCategoriesBuilder.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -67,13 +67,13 @@
 block discarded – undo
67 67
         $file = "jobs.categories.$type.php";
68 68
 
69 69
         foreach ($this->globalConfigPaths as $path) {
70
-            if (file_exists($path . $file)) {
71
-                return include $path . $file;
70
+            if (file_exists($path.$file)) {
71
+                return include $path.$file;
72 72
             }
73 73
         }
74 74
 
75
-        if (file_exists($this->moduleConfigPath . $file)) {
76
-            return include $this->moduleConfigPath . $file;
75
+        if (file_exists($this->moduleConfigPath.$file)) {
76
+            return include $this->moduleConfigPath.$file;
77 77
         }
78 78
 
79 79
         return false;
Please login to merge, or discard this patch.
module/Core/src/Core/Controller/Plugin/PaginationBuilder.php 2 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -110,7 +110,6 @@
 block discarded – undo
110 110
      * @see \Core\Controller\Plugin\SearchForm::get()
111 111
      *
112 112
      * @param        $elementsFieldset
113
-     * @param null   $buttonsFieldset
114 113
      * @param string $as The name of the key in the result array.
115 114
      *
116 115
      * @return self
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
         }
71 71
 
72 72
         if (!is_array($stack)) {
73
-            throw new \InvalidArgumentException('Expected argument to be of type array, but received ' . gettype($stack));
73
+            throw new \InvalidArgumentException('Expected argument to be of type array, but received '.gettype($stack));
74 74
         }
75 75
 
76 76
         $stack = array_intersect_key($stack, ['params' => true, 'form' => true, 'paginator' => true]);
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
      *
144 144
      * @return self
145 145
      */
146
-    public function params($namespace, $defaults = [ 'page' => 1 ])
146
+    public function params($namespace, $defaults = ['page' => 1])
147 147
     {
148 148
         $this->stack['params'] = [$namespace, $defaults];
149 149
         return $this;
Please login to merge, or discard this patch.
module/Core/src/Core/Form/View/Helper/SearchForm.php 3 patches
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -83,6 +83,11 @@
 block discarded – undo
83 83
         return $content;
84 84
     }
85 85
 
86
+    /**
87
+     * @param FormInterface $form
88
+     *
89
+     * @return null|FormInterface
90
+     */
86 91
     public function renderElements($form, $colMap = null, $buttonsSpan = null)
87 92
     {
88 93
         if ($form instanceOf ViewPartialProviderInterface) {
Please login to merge, or discard this patch.
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -66,8 +66,8 @@  discard block
 block discarded – undo
66 66
         $content = $this->renderElements($form, $colMap, $buttonsSpan);
67 67
 
68 68
         return $this->openTag($form)
69
-             . '<div class="row" style="padding: 0 15px;">'
70
-             . $content . '</div>' . $this->closeTag();
69
+                . '<div class="row" style="padding: 0 15px;">'
70
+                . $content . '</div>' . $this->closeTag();
71 71
 
72 72
     }
73 73
 
@@ -109,15 +109,15 @@  discard block
 block discarded – undo
109 109
 
110 110
             if ($element->getName() == $form->getButtonElement()) {
111 111
                 $content.='<div class="input-group col-md-' . $cols . '">'
112
-                              . $formElement($element)
113
-                              . '<div class="input-group-btn search-form-buttons" style="width: 1px;">'
114
-                              . $this->renderButtons($form->getButtons()) . '</div>'
115
-                              . '</div>';
112
+                                . $formElement($element)
113
+                                . '<div class="input-group-btn search-form-buttons" style="width: 1px;">'
114
+                                . $this->renderButtons($form->getButtons()) . '</div>'
115
+                                . '</div>';
116 116
                 $buttonsRendered = true;
117 117
             } else {
118 118
                 $content .= '<div class="input-group col-md-' . $cols . '">'
119
-                          . $formElement($element)
120
-                          . '</div>';
119
+                            . $formElement($element)
120
+                            . '</div>';
121 121
             }
122 122
 
123 123
             $i += 1;
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
                 $buttonsSpan = $form->getOption('buttons_span') ?: 12;
129 129
             }
130 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>';
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.
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/src/Geo/Service/AbstractClient.php 2 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -36,6 +36,9 @@  discard block
 block discarded – undo
36 36
     protected $cache;
37 37
 
38 38
 
39
+    /**
40
+     * @param string $uri
41
+     */
39 42
     public function __construct($uri, $cache = false)
40 43
     {
41 44
         $this->client = $this->setupClient($uri);
@@ -90,6 +93,9 @@  discard block
 block discarded – undo
90 93
         return isset($result[0]) ? $result[0] : false;
91 94
     }
92 95
 
96
+    /**
97
+     * @param string $result
98
+     */
93 99
     protected function processResult($result)
94 100
     {
95 101
         return $result;
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
 
70 70
         $response = $this->client->send();
71 71
         if ($response->getStatusCode() !== 200) {
72
-            throw new \RuntimeException('Query failed, because ' . $response->getReasonPhrase());
72
+            throw new \RuntimeException('Query failed, because '.$response->getReasonPhrase());
73 73
         }
74 74
 
75 75
         $result = $response->getBody();
Please login to merge, or discard this patch.