Passed
Push — main ( 525366...99eb4f )
by Thierry
03:58
created
jaxon-core/src/App/View/Helper/EventAttr.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
      */
60 60
     public function on(string $event, JsExpr $xJsExpr): self
61 61
     {
62
-        if($this->sSelector === '')
62
+        if ($this->sSelector === '')
63 63
         {
64 64
             return $this;
65 65
         }
Please login to merge, or discard this patch.
jaxon-core/src/App/View/Helper/HtmlAttrHelper.php 2 patches
Switch Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -203,12 +203,12 @@
 block discarded – undo
203 203
         $sCode = match($sType) {
204 204
             'html' => jaxon()->package($sClass)?->getHtml() ?? '',
205 205
             'ready' => jaxon()->package($sClass)?->getReadyScript() ?? '',
206
-            default => ''
207
-        };
208
-        $sCode = trim($sCode);
206
+default => ''
207
+};
208
+$sCode = trim($sCode);
209 209
 
210
-        return $sType !== 'ready' || $sCode === '' ? $sCode :
211
-            // Call the ready code with the jaxon.dom.ready function.
212
-            "jaxon.dom.ready(() => $sCode)";
213
-    }
210
+return $sType !== 'ready' || $sCode === '' ? $sCode :
211
+// Call the ready code with the jaxon.dom.ready function.
212
+"jaxon.dom.ready(() => $sCode)";
213
+}
214 214
 }
Please login to merge, or discard this patch.
Spacing   +5 added lines, -8 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
     public function html(JxnCall $xJsCall): string
55 55
     {
56 56
         $sClassName = $xJsCall->_class();
57
-        if(!$sClassName)
57
+        if (!$sClassName)
58 58
         {
59 59
             return '';
60 60
         }
@@ -88,8 +88,7 @@  discard block
 block discarded – undo
88 88
     public function pagination(JxnCall $xJsCall): string
89 89
     {
90 90
         // The pagination is always rendered with the same Pagination component.
91
-        $sComponent = $this->sPaginationComponent ?:
92
-            ($this->sPaginationComponent = rq(Pagination::class)->_class());
91
+        $sComponent = $this->sPaginationComponent ?: ($this->sPaginationComponent = rq(Pagination::class)->_class());
93 92
         $sItem = $xJsCall->_class();
94 93
         return "jxn-bind=\"$sComponent\" jxn-item=\"$sItem\"";
95 94
     }
@@ -154,15 +153,14 @@  discard block
 block discarded – undo
154 153
      */
155 154
     private function setEventHandler(array $aHandler, ?EventAttr $xAttr = null): EventAttr|null
156 155
     {
157
-        if(!$this->eventIsValid($aHandler))
156
+        if (!$this->eventIsValid($aHandler))
158 157
         {
159 158
             return $xAttr;
160 159
         }
161 160
         // The array content is valid.
162 161
         [$sSelector, $sEvent, $xJsExpr] = $aHandler;
163 162
         return !$xAttr ?
164
-            $this->select($sSelector)->on($sEvent, $xJsExpr) :
165
-            $xAttr->select($sSelector)->on($sEvent, $xJsExpr);
163
+            $this->select($sSelector)->on($sEvent, $xJsExpr) : $xAttr->select($sSelector)->on($sEvent, $xJsExpr);
166 164
     }
167 165
 
168 166
     /**
@@ -207,8 +205,7 @@  discard block
 block discarded – undo
207 205
         };
208 206
         $sCode = trim($sCode);
209 207
 
210
-        return $sType !== 'ready' || $sCode === '' ? $sCode :
211
-            // Call the ready code with the jaxon.dom.ready function.
208
+        return $sType !== 'ready' || $sCode === '' ? $sCode : // Call the ready code with the jaxon.dom.ready function.
212 209
             "jaxon.dom.ready(() => $sCode)";
213 210
     }
214 211
 }
Please login to merge, or discard this patch.
jaxon-core/src/App/View/ViewRenderer.php 2 patches
Switch Indentation   +151 added lines, -151 removed lines patch added patch discarded remove patch
@@ -16,58 +16,58 @@  discard block
 block discarded – undo
16 16
 
17 17
 class ViewRenderer
18 18
 {
19
-    /**
19
+/**
20 20
      * @var Container
21 21
      */
22
-    protected $di;
22
+protected $di;
23 23
 
24
-    /**
24
+/**
25 25
      * The view data store
26 26
      *
27 27
      * @var Store
28 28
      */
29
-    protected $xStore = null;
29
+protected $xStore = null;
30 30
 
31
-    /**
31
+/**
32 32
      * The view data store
33 33
      *
34 34
      * @var Store
35 35
      */
36
-    protected $xEmptyStore = null;
36
+protected $xEmptyStore = null;
37 37
 
38
-    /**
38
+/**
39 39
      * The view namespaces
40 40
      *
41 41
      * @var array
42 42
      */
43
-    protected $aNamespaces = [];
43
+protected $aNamespaces = [];
44 44
 
45
-    /**
45
+/**
46 46
      * The default namespace
47 47
      *
48 48
      * @var string
49 49
      */
50
-    protected $sDefaultNamespace = 'jaxon';
50
+protected $sDefaultNamespace = 'jaxon';
51 51
 
52
-    /**
52
+/**
53 53
      * The view global data
54 54
      *
55 55
      * @var array
56 56
      */
57
-    protected $aViewData = [];
57
+protected $aViewData = [];
58 58
 
59
-    /**
59
+/**
60 60
      * The class constructor
61 61
      *
62 62
      * @param Container $di
63 63
      */
64
-    public function __construct(Container $di)
65
-    {
66
-        $this->di = $di;
67
-        $this->xEmptyStore = new Store();
68
-    }
64
+public function __construct(Container $di)
65
+{
66
+$this->di = $di;
67
+$this->xEmptyStore = new Store();
68
+}
69 69
 
70
-    /**
70
+/**
71 71
      * Add a view namespace, and set the corresponding renderer.
72 72
      *
73 73
      * @param string $sNamespace    The namespace name
@@ -77,59 +77,59 @@  discard block
 block discarded – undo
77 77
      *
78 78
      * @return void
79 79
      */
80
-    public function addNamespace(string $sNamespace, string $sDirectory,
81
-        string $sExtension, string $sRenderer): void
82
-    {
83
-        $aNamespace = [
84
-            'directory' => $sDirectory,
85
-            'extension' => $sExtension,
86
-            'renderer' => $sRenderer,
87
-        ];
88
-        $this->aNamespaces[$sNamespace] = $aNamespace;
89
-    }
80
+public function addNamespace(string $sNamespace, string $sDirectory,
81
+string $sExtension, string $sRenderer): void
82
+{
83
+$aNamespace = [
84
+'directory' => $sDirectory,
85
+'extension' => $sExtension,
86
+'renderer' => $sRenderer,
87
+];
88
+$this->aNamespaces[$sNamespace] = $aNamespace;
89
+}
90 90
 
91
-    /**
91
+/**
92 92
      * Set the view namespaces.
93 93
      *
94 94
      * @param Config $xAppConfig    The config options provided in the library
95 95
      *
96 96
      * @return void
97 97
      */
98
-    public function addNamespaces(Config $xAppConfig): void
99
-    {
100
-        if(empty($aNamespaces = $xAppConfig->getOptionNames('views')))
101
-        {
102
-            return;
103
-        }
98
+public function addNamespaces(Config $xAppConfig): void
99
+{
100
+if(empty($aNamespaces = $xAppConfig->getOptionNames('views')))
101
+{
102
+return;
103
+}
104 104
 
105
-        $sPackage = $xAppConfig->getOption('package', '');
106
-        foreach($aNamespaces as $sNamespace => $sOption)
107
-        {
108
-            // Save the namespace
109
-            $aNamespace = $xAppConfig->getOption($sOption);
110
-            $aNamespace['package'] = $sPackage;
111
-            if(!isset($aNamespace['renderer']))
112
-            {
113
-                $aNamespace['renderer'] = 'jaxon'; // 'jaxon' is the default renderer.
114
-            }
115
-            $this->aNamespaces[$sNamespace] = $aNamespace;
116
-        }
117
-    }
105
+$sPackage = $xAppConfig->getOption('package', '');
106
+foreach($aNamespaces as $sNamespace => $sOption)
107
+{
108
+// Save the namespace
109
+$aNamespace = $xAppConfig->getOption($sOption);
110
+$aNamespace['package'] = $sPackage;
111
+if(!isset($aNamespace['renderer']))
112
+{
113
+    $aNamespace['renderer'] = 'jaxon'; // 'jaxon' is the default renderer.
114
+}
115
+$this->aNamespaces[$sNamespace] = $aNamespace;
116
+}
117
+}
118 118
 
119
-    /**
119
+/**
120 120
      * Get the view renderer
121 121
      *
122 122
      * @param string $sId    The unique identifier of the view renderer
123 123
      *
124 124
      * @return ViewInterface
125 125
      */
126
-    public function getRenderer(string $sId): ViewInterface
127
-    {
128
-        // Return the view renderer with the given id
129
-        return $this->di->g("jaxon.app.view.$sId");
130
-    }
126
+public function getRenderer(string $sId): ViewInterface
127
+{
128
+// Return the view renderer with the given id
129
+return $this->di->g("jaxon.app.view.$sId");
130
+}
131 131
 
132
-    /**
132
+/**
133 133
      * Add a view renderer with an id
134 134
      *
135 135
      * @param string $sId    The unique identifier of the view renderer
@@ -137,25 +137,25 @@  discard block
 block discarded – undo
137 137
      *
138 138
      * @return void
139 139
      */
140
-    public function addRenderer(string $sId, Closure $xClosure): void
141
-    {
142
-        // Return the initialized view renderer
143
-        $this->di->set("jaxon.app.view.$sId", function($di) use($sId, $xClosure) {
144
-            // Get the defined renderer
145
-            $xRenderer = $xClosure($di);
146
-            // Init the renderer with the template namespaces
147
-            $aNamespaces = array_filter($this->aNamespaces, function($aOptions) use($sId) {
148
-                return $aOptions['renderer'] === $sId;
149
-            });
150
-            foreach($aNamespaces as $sName => $aOptions)
151
-            {
152
-                $xRenderer->addNamespace($sName, $aOptions['directory'], $aOptions['extension']);
153
-            }
154
-            return $xRenderer;
155
-        });
156
-    }
140
+public function addRenderer(string $sId, Closure $xClosure): void
141
+{
142
+// Return the initialized view renderer
143
+$this->di->set("jaxon.app.view.$sId", function($di) use($sId, $xClosure) {
144
+// Get the defined renderer
145
+$xRenderer = $xClosure($di);
146
+// Init the renderer with the template namespaces
147
+$aNamespaces = array_filter($this->aNamespaces, function($aOptions) use($sId) {
148
+    return $aOptions['renderer'] === $sId;
149
+});
150
+foreach($aNamespaces as $sName => $aOptions)
151
+{
152
+    $xRenderer->addNamespace($sName, $aOptions['directory'], $aOptions['extension']);
153
+}
154
+return $xRenderer;
155
+});
156
+}
157 157
 
158
-    /**
158
+/**
159 159
      * Add a view renderer with an id
160 160
      *
161 161
      * @param string $sId    The unique identifier of the view renderer
@@ -164,55 +164,55 @@  discard block
 block discarded – undo
164 164
      *
165 165
      * @return void
166 166
      */
167
-    public function setDefaultRenderer(string $sId, string $sExtension, Closure $xClosure): void
168
-    {
169
-        $this->setDefaultNamespace($sId);
170
-        $this->addNamespace($sId, '', $sExtension, $sId);
171
-        $this->addRenderer($sId, $xClosure);
172
-    }
167
+public function setDefaultRenderer(string $sId, string $sExtension, Closure $xClosure): void
168
+{
169
+$this->setDefaultNamespace($sId);
170
+$this->addNamespace($sId, '', $sExtension, $sId);
171
+$this->addRenderer($sId, $xClosure);
172
+}
173 173
 
174
-    /**
174
+/**
175 175
      * Get the view renderer for a given namespace
176 176
      *
177 177
      * @param string $sNamespace    The namespace name
178 178
      *
179 179
      * @return ViewInterface|null
180 180
      */
181
-    public function getNamespaceRenderer(string $sNamespace): ?ViewInterface
182
-    {
183
-        if(!isset($this->aNamespaces[$sNamespace]))
184
-        {
185
-            return null;
186
-        }
187
-        // Return the view renderer with the configured id
188
-        return $this->getRenderer($this->aNamespaces[$sNamespace]['renderer']);
189
-    }
181
+public function getNamespaceRenderer(string $sNamespace): ?ViewInterface
182
+{
183
+if(!isset($this->aNamespaces[$sNamespace]))
184
+{
185
+return null;
186
+}
187
+// Return the view renderer with the configured id
188
+return $this->getRenderer($this->aNamespaces[$sNamespace]['renderer']);
189
+}
190 190
 
191
-    /**
191
+/**
192 192
      * Set the default namespace
193 193
      *
194 194
      * @param string $sDefaultNamespace
195 195
      */
196
-    public function setDefaultNamespace(string $sDefaultNamespace): void
197
-    {
198
-        $this->sDefaultNamespace = $sDefaultNamespace;
199
-    }
196
+public function setDefaultNamespace(string $sDefaultNamespace): void
197
+{
198
+$this->sDefaultNamespace = $sDefaultNamespace;
199
+}
200 200
 
201
-    /**
201
+/**
202 202
      * Get the current store or create a new store
203 203
      *
204 204
      * @return Store
205 205
      */
206
-    protected function store(): Store
207
-    {
208
-        if(!$this->xStore)
209
-        {
210
-            $this->xStore = new Store();
211
-        }
212
-        return $this->xStore;
213
-    }
206
+protected function store(): Store
207
+{
208
+if(!$this->xStore)
209
+{
210
+$this->xStore = new Store();
211
+}
212
+return $this->xStore;
213
+}
214 214
 
215
-    /**
215
+/**
216 216
      * Make a piece of data available for the rendered view
217 217
      *
218 218
      * @param string $sName    The data name
@@ -220,13 +220,13 @@  discard block
 block discarded – undo
220 220
      *
221 221
      * @return ViewRenderer
222 222
      */
223
-    public function set(string $sName, $xValue): ViewRenderer
224
-    {
225
-        $this->store()->with($sName, $xValue);
226
-        return $this;
227
-    }
223
+public function set(string $sName, $xValue): ViewRenderer
224
+{
225
+$this->store()->with($sName, $xValue);
226
+return $this;
227
+}
228 228
 
229
-    /**
229
+/**
230 230
      * Make a piece of data available for all views
231 231
      *
232 232
      * @param string $sName    The data name
@@ -234,29 +234,29 @@  discard block
 block discarded – undo
234 234
      *
235 235
      * @return ViewRenderer
236 236
      */
237
-    public function share(string $sName, $xValue): ViewRenderer
238
-    {
239
-        $this->aViewData[$sName] = $xValue;
240
-        return $this;
241
-    }
237
+public function share(string $sName, $xValue): ViewRenderer
238
+{
239
+$this->aViewData[$sName] = $xValue;
240
+return $this;
241
+}
242 242
 
243
-    /**
243
+/**
244 244
      * Make an array of data available for all views
245 245
      *
246 246
      * @param array $aValues    The data values
247 247
      *
248 248
      * @return ViewRenderer
249 249
      */
250
-    public function shareValues(array $aValues): ViewRenderer
251
-    {
252
-        foreach($aValues as $sName => $xValue)
253
-        {
254
-            $this->share($sName, $xValue);
255
-        }
256
-        return $this;
257
-    }
250
+public function shareValues(array $aValues): ViewRenderer
251
+{
252
+foreach($aValues as $sName => $xValue)
253
+{
254
+$this->share($sName, $xValue);
255
+}
256
+return $this;
257
+}
258 258
 
259
-    /**
259
+/**
260 260
      * Render a view using a store
261 261
      *
262 262
      * The store returned by this function will later be used with the make() method to render the view.
@@ -266,32 +266,32 @@  discard block
 block discarded – undo
266 266
      *
267 267
      * @return Store   A store populated with the view data
268 268
      */
269
-    public function render(string $sViewName, array $aViewData = []): Store
270
-    {
271
-        $xStore = $this->store();
272
-        // Get the default view namespace
273
-        $sNamespace = $this->sDefaultNamespace;
274
-        // Get the namespace from the view name
275
-        $nSeparatorPosition = strrpos($sViewName, '::');
276
-        if($nSeparatorPosition !== false)
277
-        {
278
-            $sNamespace = substr($sViewName, 0, $nSeparatorPosition);
279
-            $sViewName = substr($sViewName, $nSeparatorPosition + 2);
280
-        }
269
+public function render(string $sViewName, array $aViewData = []): Store
270
+{
271
+$xStore = $this->store();
272
+// Get the default view namespace
273
+$sNamespace = $this->sDefaultNamespace;
274
+// Get the namespace from the view name
275
+$nSeparatorPosition = strrpos($sViewName, '::');
276
+if($nSeparatorPosition !== false)
277
+{
278
+$sNamespace = substr($sViewName, 0, $nSeparatorPosition);
279
+$sViewName = substr($sViewName, $nSeparatorPosition + 2);
280
+}
281 281
 
282
-        $xRenderer = $this->getNamespaceRenderer($sNamespace);
283
-        if(!$xRenderer)
284
-        {
285
-            // Cannot render a view if there's no renderer corresponding to the namespace.
286
-            return $this->xEmptyStore;
287
-        }
282
+$xRenderer = $this->getNamespaceRenderer($sNamespace);
283
+if(!$xRenderer)
284
+{
285
+// Cannot render a view if there's no renderer corresponding to the namespace.
286
+return $this->xEmptyStore;
287
+}
288 288
 
289
-        $xStore->setData(array_merge($this->aViewData, $aViewData))
290
-            ->setView($xRenderer, $sNamespace, $sViewName);
289
+$xStore->setData(array_merge($this->aViewData, $aViewData))
290
+->setView($xRenderer, $sNamespace, $sViewName);
291 291
 
292
-        // Set the store to null so a new store will be created for the next view.
293
-        $this->xStore = null;
294
-        // Return the store
295
-        return $xStore;
296
-    }
292
+// Set the store to null so a new store will be created for the next view.
293
+$this->xStore = null;
294
+// Return the store
295
+return $xStore;
296
+}
297 297
 }
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -97,18 +97,18 @@  discard block
 block discarded – undo
97 97
      */
98 98
     public function addNamespaces(Config $xAppConfig): void
99 99
     {
100
-        if(empty($aNamespaces = $xAppConfig->getOptionNames('views')))
100
+        if (empty($aNamespaces = $xAppConfig->getOptionNames('views')))
101 101
         {
102 102
             return;
103 103
         }
104 104
 
105 105
         $sPackage = $xAppConfig->getOption('package', '');
106
-        foreach($aNamespaces as $sNamespace => $sOption)
106
+        foreach ($aNamespaces as $sNamespace => $sOption)
107 107
         {
108 108
             // Save the namespace
109 109
             $aNamespace = $xAppConfig->getOption($sOption);
110 110
             $aNamespace['package'] = $sPackage;
111
-            if(!isset($aNamespace['renderer']))
111
+            if (!isset($aNamespace['renderer']))
112 112
             {
113 113
                 $aNamespace['renderer'] = 'jaxon'; // 'jaxon' is the default renderer.
114 114
             }
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
             $aNamespaces = array_filter($this->aNamespaces, function($aOptions) use($sId) {
148 148
                 return $aOptions['renderer'] === $sId;
149 149
             });
150
-            foreach($aNamespaces as $sName => $aOptions)
150
+            foreach ($aNamespaces as $sName => $aOptions)
151 151
             {
152 152
                 $xRenderer->addNamespace($sName, $aOptions['directory'], $aOptions['extension']);
153 153
             }
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
      */
181 181
     public function getNamespaceRenderer(string $sNamespace): ?ViewInterface
182 182
     {
183
-        if(!isset($this->aNamespaces[$sNamespace]))
183
+        if (!isset($this->aNamespaces[$sNamespace]))
184 184
         {
185 185
             return null;
186 186
         }
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
      */
206 206
     protected function store(): Store
207 207
     {
208
-        if(!$this->xStore)
208
+        if (!$this->xStore)
209 209
         {
210 210
             $this->xStore = new Store();
211 211
         }
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
      */
250 250
     public function shareValues(array $aValues): ViewRenderer
251 251
     {
252
-        foreach($aValues as $sName => $xValue)
252
+        foreach ($aValues as $sName => $xValue)
253 253
         {
254 254
             $this->share($sName, $xValue);
255 255
         }
@@ -273,14 +273,14 @@  discard block
 block discarded – undo
273 273
         $sNamespace = $this->sDefaultNamespace;
274 274
         // Get the namespace from the view name
275 275
         $nSeparatorPosition = strrpos($sViewName, '::');
276
-        if($nSeparatorPosition !== false)
276
+        if ($nSeparatorPosition !== false)
277 277
         {
278 278
             $sNamespace = substr($sViewName, 0, $nSeparatorPosition);
279 279
             $sViewName = substr($sViewName, $nSeparatorPosition + 2);
280 280
         }
281 281
 
282 282
         $xRenderer = $this->getNamespaceRenderer($sNamespace);
283
-        if(!$xRenderer)
283
+        if (!$xRenderer)
284 284
         {
285 285
             // Cannot render a view if there's no renderer corresponding to the namespace.
286 286
             return $this->xEmptyStore;
Please login to merge, or discard this patch.
jaxon-core/src/App/PageComponent.php 1 patch
Switch Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -6,53 +6,53 @@
 block discarded – undo
6 6
 
7 7
 abstract class PageComponent extends NodeComponent
8 8
 {
9
-    /**
9
+/**
10 10
      * The current page number.
11 11
      *
12 12
      * @var int
13 13
      */
14
-    private int $currentPage = 1;
14
+private int $currentPage = 1;
15 15
 
16
-    /**
16
+/**
17 17
      * Get the total number of items to paginate.
18 18
      *
19 19
      * @return int
20 20
      */
21
-    abstract protected function count(): int;
21
+abstract protected function count(): int;
22 22
 
23
-    /**
23
+/**
24 24
      * Get the max number of items per page.
25 25
      *
26 26
      * @return int
27 27
      */
28
-    abstract protected function limit(): int;
28
+abstract protected function limit(): int;
29 29
 
30
-    /**
30
+/**
31 31
      * Get the paginator for the component.
32 32
      *
33 33
      * @param int $pageNumber
34 34
      *
35 35
      * @return Paginator
36 36
      */
37
-    protected function paginator(int $pageNumber): Paginator
38
-    {
39
-        return $this->cl(Component\Pagination::class)
40
-            // Use the js class name as component item identifier.
41
-            ->item($this->rq()->_class())
42
-            ->paginator($pageNumber > 0 ? $pageNumber : 1, $this->limit(), $this->count())
43
-            // This callback will receive the final value of the current page number.
44
-            ->page(function(int $currentPage) {
45
-                $this->currentPage = $currentPage;
46
-            });
47
-    }
37
+protected function paginator(int $pageNumber): Paginator
38
+{
39
+return $this->cl(Component\Pagination::class)
40
+// Use the js class name as component item identifier.
41
+->item($this->rq()->_class())
42
+->paginator($pageNumber > 0 ? $pageNumber : 1, $this->limit(), $this->count())
43
+// This callback will receive the final value of the current page number.
44
+->page(function(int $currentPage) {
45
+    $this->currentPage = $currentPage;
46
+});
47
+}
48 48
 
49
-    /**
49
+/**
50 50
      * Get the current page number
51 51
      *
52 52
      * @return int
53 53
      */
54
-    protected function currentPage(): int
55
-    {
56
-        return $this->currentPage;
57
-    }
54
+protected function currentPage(): int
55
+{
56
+return $this->currentPage;
57
+}
58 58
 }
Please login to merge, or discard this patch.
jaxon-core/src/App/DataBag/DataBag.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
     public function new(string $sBag, string $sKey, $xValue): void
91 91
     {
92 92
         // Set the value only if it doesn't already exist.
93
-        if(!isset($this->aData[$sBag]) || !key_exists($sKey, $this->aData[$sBag]))
93
+        if (!isset($this->aData[$sBag]) || !key_exists($sKey, $this->aData[$sBag]))
94 94
         {
95 95
             $this->set($sBag, $sKey, $xValue);
96 96
         }
Please login to merge, or discard this patch.
jaxon-core/src/App/PageDatabagTrait.php 2 patches
Switch Indentation   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -6,81 +6,81 @@
 block discarded – undo
6 6
 
7 7
 trait PageDatabagTrait
8 8
 {
9
-    /**
9
+/**
10 10
      * The current page number.
11 11
      *
12 12
      * @var int
13 13
      */
14
-    private int $currentPage = 1;
14
+private int $currentPage = 1;
15 15
 
16
-    /**
16
+/**
17 17
      * Get the pagination databag name.
18 18
      *
19 19
      * @return string
20 20
      */
21
-    abstract protected function bagName(): string;
21
+abstract protected function bagName(): string;
22 22
 
23
-    /**
23
+/**
24 24
      * Get the pagination databag attribute.
25 25
      *
26 26
      * @return string
27 27
      */
28
-    abstract protected function bagAttr(): string;
28
+abstract protected function bagAttr(): string;
29 29
 
30
-    /**
30
+/**
31 31
      * Get the page number.
32 32
      *
33 33
      * @param int $pageNumber
34 34
      *
35 35
      * @return int
36 36
      */
37
-    private function getPageNumber(int $pageNumber): int
38
-    {
39
-        // If no page number is provided, then get the value from the databag.
40
-        return $pageNumber > 0 ? $pageNumber :
41
-            (int)$this->bag($this->bagName())->get($this->bagAttr(), 1);
42
-    }
37
+private function getPageNumber(int $pageNumber): int
38
+{
39
+// If no page number is provided, then get the value from the databag.
40
+return $pageNumber > 0 ? $pageNumber :
41
+(int)$this->bag($this->bagName())->get($this->bagAttr(), 1);
42
+}
43 43
 
44
-    /**
44
+/**
45 45
      * Set the page number.
46 46
      *
47 47
      * @param int $currentPage
48 48
      *
49 49
      * @return void
50 50
      */
51
-    private function setCurrentPage(int $currentPage): void
52
-    {
53
-        // Save the current page in the databag.
54
-        $this->bag($this->bagName())->set($this->bagAttr(), $currentPage);
55
-        $this->currentPage = $currentPage;
56
-    }
51
+private function setCurrentPage(int $currentPage): void
52
+{
53
+// Save the current page in the databag.
54
+$this->bag($this->bagName())->set($this->bagAttr(), $currentPage);
55
+$this->currentPage = $currentPage;
56
+}
57 57
 
58
-    /**
58
+/**
59 59
      * Get the paginator for the component.
60 60
      *
61 61
      * @param int $pageNumber
62 62
      *
63 63
      * @return Paginator
64 64
      */
65
-    protected function paginator(int $pageNumber): Paginator
66
-    {
67
-        return $this->cl(Component\Pagination::class)
68
-            // Use the js class name as component item identifier.
69
-            ->item($this->rq()->_class())
70
-            ->paginator($this->getPageNumber($pageNumber), $this->limit(), $this->count())
71
-            // This callback will receive the final value of the current page number.
72
-            ->page(function(int $currentPage) {
73
-                $this->setCurrentPage($currentPage);
74
-            });
75
-    }
65
+protected function paginator(int $pageNumber): Paginator
66
+{
67
+return $this->cl(Component\Pagination::class)
68
+// Use the js class name as component item identifier.
69
+->item($this->rq()->_class())
70
+->paginator($this->getPageNumber($pageNumber), $this->limit(), $this->count())
71
+// This callback will receive the final value of the current page number.
72
+->page(function(int $currentPage) {
73
+    $this->setCurrentPage($currentPage);
74
+});
75
+}
76 76
 
77
-    /**
77
+/**
78 78
      * Get the current page number
79 79
      *
80 80
      * @return int
81 81
      */
82
-    protected function currentPage(): int
83
-    {
84
-        return $this->currentPage;
85
-    }
82
+protected function currentPage(): int
83
+{
84
+return $this->currentPage;
85
+}
86 86
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,8 +37,7 @@
 block discarded – undo
37 37
     private function getPageNumber(int $pageNumber): int
38 38
     {
39 39
         // If no page number is provided, then get the value from the databag.
40
-        return $pageNumber > 0 ? $pageNumber :
41
-            (int)$this->bag($this->bagName())->get($this->bagAttr(), 1);
40
+        return $pageNumber > 0 ? $pageNumber : (int)$this->bag($this->bagName())->get($this->bagAttr(), 1);
42 41
     }
43 42
 
44 43
     /**
Please login to merge, or discard this patch.
jaxon-core/src/Request/Handler/Psr/PsrAjaxMiddleware.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@
 block discarded – undo
64 64
         // and the other classes will get this request from there.
65 65
         $this->di->val(ServerRequestInterface::class, $request);
66 66
 
67
-        if(!$this->xRequestHandler->canProcessRequest())
67
+        if (!$this->xRequestHandler->canProcessRequest())
68 68
         {
69 69
             // Unable to find a plugin to process the request
70 70
             return $handler->handle($request);
Please login to merge, or discard this patch.
jaxon-core/src/Request/Handler/Psr/PsrRequestHandler.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@
 block discarded – undo
72 72
         // and the other classes will get this request from there.
73 73
         $this->di->val(ServerRequestInterface::class, $request);
74 74
 
75
-        if(!$this->xRequestHandler->canProcessRequest())
75
+        if (!$this->xRequestHandler->canProcessRequest())
76 76
         {
77 77
             // Unable to find a plugin to process the request
78 78
             throw new RequestException($this->xTranslator->trans('errors.request.plugin'));
Please login to merge, or discard this patch.
jaxon-core/src/Request/Handler/CallbackManager.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
      */
99 99
     public function popBootCallbacks(): array
100 100
     {
101
-        if(empty($this->aBootCallbacks))
101
+        if (empty($this->aBootCallbacks))
102 102
         {
103 103
             return [];
104 104
         }
@@ -117,9 +117,9 @@  discard block
 block discarded – undo
117 117
     private function getExceptionCallbacks(Exception $xException): array
118 118
     {
119 119
         $aExceptionCallbacks = [];
120
-        foreach($this->aExceptionCallbacks as $sExClass => $aCallbacks)
120
+        foreach ($this->aExceptionCallbacks as $sExClass => $aCallbacks)
121 121
         {
122
-            if(is_a($xException, $sExClass))
122
+            if (is_a($xException, $sExClass))
123 123
             {
124 124
                 $aExceptionCallbacks = array_merge($aExceptionCallbacks, $aCallbacks);
125 125
             }
@@ -189,13 +189,13 @@  discard block
 block discarded – undo
189 189
      */
190 190
     public function error(callable $xCallable, string $sExClass = ''): CallbackManager
191 191
     {
192
-        if($sExClass === '' || $sExClass === Exception::class)
192
+        if ($sExClass === '' || $sExClass === Exception::class)
193 193
         {
194 194
             $this->aErrorCallbacks[] = $xCallable;
195 195
             return $this;
196 196
         }
197 197
         // Callback for a given exception class
198
-        if(isset($this->aExceptionCallbacks[$sExClass]))
198
+        if (isset($this->aExceptionCallbacks[$sExClass]))
199 199
         {
200 200
             $this->aExceptionCallbacks[$sExClass][] = $xCallable;
201 201
             return $this;
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
      */
237 237
     private function executeCallbacks(array $aCallbacks, array $aParameters): void
238 238
     {
239
-        foreach($aCallbacks as $xCallback)
239
+        foreach ($aCallbacks as $xCallback)
240 240
         {
241 241
             $this->executeCallback($xCallback, $aParameters);
242 242
         }
@@ -266,10 +266,10 @@  discard block
 block discarded – undo
266 266
     public function onBefore(Target $xTarget, bool &$bEndRequest): void
267 267
     {
268 268
         // Call the user defined callback
269
-        foreach($this->aBeforeCallbacks as $xCallback)
269
+        foreach ($this->aBeforeCallbacks as $xCallback)
270 270
         {
271 271
             $this->executeCallback($xCallback, [$xTarget, &$bEndRequest]);
272
-            if($bEndRequest)
272
+            if ($bEndRequest)
273 273
             {
274 274
                 return;
275 275
             }
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
     {
317 317
         $aExceptionCallbacks = $this->getExceptionCallbacks($xException);
318 318
         $this->executeCallbacks($aExceptionCallbacks, [$xException]);
319
-        if(count($aExceptionCallbacks) > 0)
319
+        if (count($aExceptionCallbacks) > 0)
320 320
         {
321 321
             // Do not throw the exception if a custom handler is defined
322 322
             return;
Please login to merge, or discard this patch.