Completed
Pull Request — develop (#259)
by ANTHONIUS
09:01
created
module/Auth/src/Auth/Factory/Listener/ExceptionStrategyFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
             break;
38 38
         }
39 39
         
40
-        $config   = $serviceLocator->get('Config');
40
+        $config = $serviceLocator->get('Config');
41 41
          
42 42
         if (isset($config['view_manager'])) {
43 43
             if (isset($config['view_manager']['display_exceptions'])) {
Please login to merge, or discard this patch.
module/Auth/src/Auth/Listener/DeactivatedUserListener.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
         ];
34 34
         
35 35
         // do nothing for allowed routes
36
-		if (in_array($routeName, $allowedRoutes))
36
+        if (in_array($routeName, $allowedRoutes))
37 37
         {
38 38
             return;
39 39
         }
Please login to merge, or discard this patch.
module/Auth/src/Auth/Form/UserStatusFieldset.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -62,17 +62,17 @@
 block discarded – undo
62 62
     }
63 63
 
64 64
     /**
65
-	 * @param array $statusOptions
66
-	 * @return UserStatusFieldset
67
-	 */
68
-	public function setStatusOptions(array $statusOptions)
69
-	{
70
-		$this->statusOptions = $statusOptions;
65
+     * @param array $statusOptions
66
+     * @return UserStatusFieldset
67
+     */
68
+    public function setStatusOptions(array $statusOptions)
69
+    {
70
+        $this->statusOptions = $statusOptions;
71 71
 		
72
-		return $this;
73
-	}
72
+        return $this;
73
+    }
74 74
 
75
-	public function init()
75
+    public function init()
76 76
     {
77 77
         $this->setName('status');
78 78
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@
 block discarded – undo
121 121
                 'attributes' => [
122 122
                     'data-placeholder' => /*@translate*/ 'please select',
123 123
                     'data-allowclear' => 'false',
124
-                    'data-searchbox' => -1,  // hide the search box
124
+                    'data-searchbox' => -1, // hide the search box
125 125
                     'required' => true, // mark label as required
126 126
                 ],
127 127
             )
Please login to merge, or discard this patch.
module/Auth/src/Auth/Entity/Status.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -53,10 +53,10 @@
 block discarded – undo
53 53
     public function __construct($status = self::ACTIVE)
54 54
     {
55 55
         if (!isset(static::$orderMap[$status])) {
56
-            throw new \DomainException('Unknown status: ' . $status);
56
+            throw new \DomainException('Unknown status: '.$status);
57 57
         }
58 58
         
59
-        $constant = 'self::' . strtoupper($status);
59
+        $constant = 'self::'.strtoupper($status);
60 60
         $this->name = constant($constant);
61 61
         $this->order = $this->getOrder();
62 62
     }
Please login to merge, or discard this patch.
module/Core/src/Core/EventManager/ListenerAggregateTrait.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@
 block discarded – undo
90 90
             $method = $spec[1];
91 91
             $priority = isset($spec[2]) ? $spec[2] : 0;
92 92
 
93
-            $this->listeners[] = $events->attach($event, [ $this, $method ], $priority);
93
+            $this->listeners[] = $events->attach($event, [$this, $method], $priority);
94 94
         }
95 95
 
96 96
         return $this;
Please login to merge, or discard this patch.
module/Core/src/Core/Form/View/Helper/SearchForm.php 3 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -74,6 +74,9 @@
 block discarded – undo
74 74
         return $this->renderElements($fieldset, true);
75 75
     }
76 76
 
77
+    /**
78
+     * @return null|FormInterface
79
+     */
77 80
     public function renderElements($fieldset, $buttonsFieldset, $colMap = null, $buttonsSpan = null)
78 81
     {
79 82
         if ($fieldset instanceOf ViewPartialProviderInterface) {
Please login to merge, or discard this patch.
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -64,8 +64,8 @@  discard block
 block discarded – undo
64 64
         $content = $this->renderElements($elements, $buttons, $colMap, $buttonsSpan);
65 65
 
66 66
         return $this->openTag($form)
67
-             . '<div class="row" style="padding: 0 15px;">'
68
-             . $content . '</div>' . $this->closeTag();
67
+                . '<div class="row" style="padding: 0 15px;">'
68
+                . $content . '</div>' . $this->closeTag();
69 69
 
70 70
     }
71 71
 
@@ -104,15 +104,15 @@  discard block
 block discarded – undo
104 104
 
105 105
             if ($fieldset instanceOf TextSearchFormFieldset && $element->getName() == $fieldset->getButtonElement()) {
106 106
                 $content.='<div class="input-group col-md-' . $cols . '">'
107
-                              . $formElement($element)
108
-                              . '<div class="input-group-btn search-form-buttons" style="width: 0px;">'
109
-                              . $this->renderElements($buttonsFieldset, true) . '</div>'
110
-                              . '</div>';
107
+                                . $formElement($element)
108
+                                . '<div class="input-group-btn search-form-buttons" style="width: 0px;">'
109
+                                . $this->renderElements($buttonsFieldset, true) . '</div>'
110
+                                . '</div>';
111 111
                 $buttonsRendered = true;
112 112
             } else {
113 113
                 $content .= '<div class="input-group col-md-' . $cols . '">'
114
-                          . $formElement($element)
115
-                          . '</div>';
114
+                            . $formElement($element)
115
+                            . '</div>';
116 116
             }
117 117
 
118 118
             $i += 1;
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
                 $buttonsSpan = $buttonsFieldset->getSpan();
124 124
             }
125 125
             $content .= '<div class="input-group search-form-buttons col-md-' . $buttonsSpan . ' text-right">'
126
-                      . '<div class="btn-group">' . $this->renderElements($buttonsFieldset, true) .'</div></div>';
126
+                        . '<div class="btn-group">' . $this->renderElements($buttonsFieldset, true) .'</div></div>';
127 127
         }
128 128
 
129 129
         return $content;
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
      * @param array $colMap
34 34
      * @return Form|string
35 35
      */
36
-    public function __invoke(FormInterface $form = null, $colMap=null)
36
+    public function __invoke(FormInterface $form = null, $colMap = null)
37 37
     {
38 38
         if (!$form) {
39 39
             return $this;
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
         return $this->render($form, $colMap);
43 43
     }
44 44
 
45
-    public function render(FormInterface $form, $colMap=null, $buttonsSpan = null)
45
+    public function render(FormInterface $form, $colMap = null, $buttonsSpan = null)
46 46
     {
47 47
         $headscript = $this->getView()->plugin('headscript');
48 48
         $basepath   = $this->getView()->plugin('basepath');
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
         }
56 56
 
57 57
         if ($form instanceOf ViewPartialProviderInterface) {
58
-            return $this->getView()->partial($form->getViewPartial(), [ 'element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan ]);
58
+            return $this->getView()->partial($form->getViewPartial(), ['element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan]);
59 59
         }
60 60
 
61 61
         $elements = $form->getElements();
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 
66 66
         return $this->openTag($form)
67 67
              . '<div class="row" style="padding: 0 15px;">'
68
-             . $content . '</div>' . $this->closeTag();
68
+             . $content.'</div>'.$this->closeTag();
69 69
 
70 70
     }
71 71
 
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
     public function renderElements($fieldset, $buttonsFieldset, $colMap = null, $buttonsSpan = null)
78 78
     {
79 79
         if ($fieldset instanceOf ViewPartialProviderInterface) {
80
-            return $this->getView()->partial($fieldset->getViewPartial(), [ 'element' => $fieldset, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan ]);
80
+            return $this->getView()->partial($fieldset->getViewPartial(), ['element' => $fieldset, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan]);
81 81
         }
82 82
 
83 83
         if (true !== $buttonsFieldset && null === $colMap) {
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
         }
86 86
 
87 87
         $formElement = $this->getView()->plugin('formElement');
88
-        $content = ''; $buttonsRendered = false; $i=0;
88
+        $content = ''; $buttonsRendered = false; $i = 0;
89 89
         foreach ($fieldset as $element) {
90 90
             if (true === $buttonsFieldset) {
91 91
                 $content .= $formElement($element);
@@ -103,14 +103,14 @@  discard block
 block discarded – undo
103 103
             }
104 104
 
105 105
             if ($fieldset instanceOf TextSearchFormFieldset && $element->getName() == $fieldset->getButtonElement()) {
106
-                $content.='<div class="input-group col-md-' . $cols . '">'
106
+                $content .= '<div class="input-group col-md-'.$cols.'">'
107 107
                               . $formElement($element)
108 108
                               . '<div class="input-group-btn search-form-buttons" style="width: 0px;">'
109
-                              . $this->renderElements($buttonsFieldset, true) . '</div>'
109
+                              . $this->renderElements($buttonsFieldset, true).'</div>'
110 110
                               . '</div>';
111 111
                 $buttonsRendered = true;
112 112
             } else {
113
-                $content .= '<div class="input-group col-md-' . $cols . '">'
113
+                $content .= '<div class="input-group col-md-'.$cols.'">'
114 114
                           . $formElement($element)
115 115
                           . '</div>';
116 116
             }
@@ -122,8 +122,8 @@  discard block
 block discarded – undo
122 122
             if (null === $buttonsSpan) {
123 123
                 $buttonsSpan = $buttonsFieldset->getSpan();
124 124
             }
125
-            $content .= '<div class="input-group search-form-buttons col-md-' . $buttonsSpan . ' text-right">'
126
-                      . '<div class="btn-group">' . $this->renderElements($buttonsFieldset, true) .'</div></div>';
125
+            $content .= '<div class="input-group search-form-buttons col-md-'.$buttonsSpan.' text-right">'
126
+                      . '<div class="btn-group">'.$this->renderElements($buttonsFieldset, true).'</div></div>';
127 127
         }
128 128
 
129 129
         return $content;
Please login to merge, or discard this patch.
module/Auth/src/Auth/Controller/UsersController.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -84,9 +84,9 @@
 block discarded – undo
84 84
         $imageStrategy = $infoContainer->getForm('info.image')
85 85
             ->getHydrator()
86 86
             ->getStrategy('image');
87
-		$fileEntity = $imageStrategy->getFileEntity();
88
-		$fileEntity->setUser($user);
89
-		$imageStrategy->setFileEntity($fileEntity);
87
+        $fileEntity = $imageStrategy->getFileEntity();
88
+        $fileEntity->setUser($user);
89
+        $imageStrategy->setFileEntity($fileEntity);
90 90
         
91 91
         if ($this->request->isPost()) {
92 92
             $formName = $params->fromQuery('form');
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
         return $this->pagination([
46 46
             'paginator' => ['Auth/User', 'as' => 'users'],
47 47
             'form' => [
48
-                [ 'Core/TextSearch', [
48
+                ['Core/TextSearch', [
49 49
                         'elements_options' => [
50 50
                             'text_placeholder' => /*@translate*/ 'Type name, email address, role, or login name',
51 51
                             'button_element' => 'text',
Please login to merge, or discard this patch.
module/Orders/src/Controller/ListController.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -25,9 +25,9 @@
 block discarded – undo
25 25
     public function indexAction()
26 26
     {
27 27
         return $this->pagination([
28
-                                     'form' => ['Core/TextSearch', 'as' => 'form'],
29
-                                     'paginator' => ['Orders', [ 'sort' => 'date'], 'as' => 'orders']
30
-                                 ]);
28
+                                        'form' => ['Core/TextSearch', 'as' => 'form'],
29
+                                        'paginator' => ['Orders', [ 'sort' => 'date'], 'as' => 'orders']
30
+                                    ]);
31 31
     }
32 32
 
33 33
     public function viewAction()
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
     {
27 27
         return $this->pagination([
28 28
                                      'form' => ['Core/TextSearch', 'as' => 'form'],
29
-                                     'paginator' => ['Orders', [ 'sort' => 'date'], 'as' => 'orders']
29
+                                     'paginator' => ['Orders', ['sort' => 'date'], 'as' => 'orders']
30 30
                                  ]);
31 31
     }
32 32
 
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
         $order = $repository->find($id);
45 45
 
46 46
         if (!$order) {
47
-            throw new \InvalidArgumentException('No order with id "' . $id . '" found.');
47
+            throw new \InvalidArgumentException('No order with id "'.$id.'" found.');
48 48
         }
49 49
 
50 50
         return [
Please login to merge, or discard this patch.
module/Core/src/Core/Form/TextSearchFormButtonsFieldset.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
                 'label' => $label,
67 67
             ],
68 68
             'attributes' => [
69
-                'class' => 'btn btn-' . ('submit' == $type ? 'primary' : 'default'),
69
+                'class' => 'btn btn-'.('submit' == $type ? 'primary' : 'default'),
70 70
                 'type'  => $type,
71 71
             ],
72 72
         ];
@@ -98,6 +98,6 @@  discard block
 block discarded – undo
98 98
      */
99 99
     public function getSpan()
100 100
     {
101
-        return $this->getOption('span') ? : 12;
101
+        return $this->getOption('span') ?: 12;
102 102
     }
103 103
 }
104 104
\ No newline at end of file
Please login to merge, or discard this patch.