Passed
Push — main ( 6c6690...0dcad8 )
by Thierry
03:45
created
jaxon-core/src/App/View/Helper/HtmlAttrHelper.php 1 patch
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.
jaxon-core/src/App/View/Store.php 1 patch
Switch Indentation   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -9,35 +9,35 @@  discard block
 block discarded – undo
9 9
 
10 10
 class Store implements JsonSerializable, Stringable
11 11
 {
12
-    /**
12
+/**
13 13
      * The view renderer
14 14
      *
15 15
      * @var ViewInterface
16 16
      */
17
-    protected $xRenderer;
17
+protected $xRenderer;
18 18
 
19
-    /**
19
+/**
20 20
      * The view namespace
21 21
      *
22 22
      * @var string
23 23
      */
24
-    protected $sNamespace;
24
+protected $sNamespace;
25 25
 
26
-    /**
26
+/**
27 27
      * The view name
28 28
      *
29 29
      * @var string
30 30
      */
31
-    protected $sViewName;
31
+protected $sViewName;
32 32
 
33
-    /**
33
+/**
34 34
      * The view data
35 35
      *
36 36
      * @var array
37 37
      */
38
-    protected $aViewData = [];
38
+protected $aViewData = [];
39 39
 
40
-    /**
40
+/**
41 41
      * Make a piece of data available for the rendered view
42 42
      *
43 43
      * @param string $sName    The data name
@@ -45,26 +45,26 @@  discard block
 block discarded – undo
45 45
      *
46 46
      * @return Store
47 47
      */
48
-    public function with(string $sName, $xValue): Store
49
-    {
50
-        $this->aViewData[$sName] = $xValue;
51
-        return $this;
52
-    }
48
+public function with(string $sName, $xValue): Store
49
+{
50
+$this->aViewData[$sName] = $xValue;
51
+return $this;
52
+}
53 53
 
54
-    /**
54
+/**
55 55
      * Set the data to be rendered
56 56
      *
57 57
      * @param array $aViewData    The view data
58 58
      *
59 59
      * @return Store
60 60
      */
61
-    public function setData(array $aViewData): Store
62
-    {
63
-        $this->aViewData = array_merge($this->aViewData, $aViewData);
64
-        return $this;
65
-    }
61
+public function setData(array $aViewData): Store
62
+{
63
+$this->aViewData = array_merge($this->aViewData, $aViewData);
64
+return $this;
65
+}
66 66
 
67
-    /**
67
+/**
68 68
      * Set the view to be rendered, with optional data
69 69
      *
70 70
      * @param ViewInterface $xRenderer    The view renderer
@@ -74,65 +74,65 @@  discard block
 block discarded – undo
74 74
      *
75 75
      * @return Store
76 76
      */
77
-    public function setView(ViewInterface $xRenderer,
78
-        string $sNamespace, string $sViewName, array $aViewData = []): Store
79
-    {
80
-        $this->xRenderer = $xRenderer;
81
-        $this->sNamespace = trim($sNamespace);
82
-        $this->sViewName = trim($sViewName);
83
-        $this->aViewData = array_merge($this->aViewData, $aViewData);
84
-        return $this;
85
-    }
77
+public function setView(ViewInterface $xRenderer,
78
+string $sNamespace, string $sViewName, array $aViewData = []): Store
79
+{
80
+$this->xRenderer = $xRenderer;
81
+$this->sNamespace = trim($sNamespace);
82
+$this->sViewName = trim($sViewName);
83
+$this->aViewData = array_merge($this->aViewData, $aViewData);
84
+return $this;
85
+}
86 86
 
87
-    /**
87
+/**
88 88
      * Get the view namespace
89 89
      *
90 90
      * @return string        The view namespace
91 91
      */
92
-    public function getNamespace(): string
93
-    {
94
-        return $this->sNamespace;
95
-    }
92
+public function getNamespace(): string
93
+{
94
+return $this->sNamespace;
95
+}
96 96
 
97
-    /**
97
+/**
98 98
      * Get the view name
99 99
      *
100 100
      * @return string        The view name
101 101
      */
102
-    public function getViewName(): string
103
-    {
104
-        return $this->sViewName;
105
-    }
102
+public function getViewName(): string
103
+{
104
+return $this->sViewName;
105
+}
106 106
 
107
-    /**
107
+/**
108 108
      * Get the view data
109 109
      *
110 110
      * @return array         The view data
111 111
      */
112
-    public function getViewData(): array
113
-    {
114
-        return $this->aViewData;
115
-    }
112
+public function getViewData(): array
113
+{
114
+return $this->aViewData;
115
+}
116 116
 
117
-    /**
117
+/**
118 118
      * Render a view using third party view system
119 119
      *
120 120
      * @return string        The string representation of the view
121 121
      */
122
-    public function __toString(): string
123
-    {
124
-        return !$this->xRenderer ? '' : $this->xRenderer->render($this);
125
-    }
122
+public function __toString(): string
123
+{
124
+return !$this->xRenderer ? '' : $this->xRenderer->render($this);
125
+}
126 126
 
127
-    /**
127
+/**
128 128
      * Convert this object to string for json.
129 129
      *
130 130
      * This is a method of the JsonSerializable interface.
131 131
      *
132 132
      * @return string
133 133
      */
134
-    public function jsonSerialize(): string
135
-    {
136
-        return $this->__toString();
137
-    }
134
+public function jsonSerialize(): string
135
+{
136
+return $this->__toString();
137
+}
138 138
 }
Please login to merge, or discard this patch.
jaxon-core/src/jaxon_fn.php 1 patch
Switch Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,5 +21,5 @@
 block discarded – undo
21 21
  */
22 22
 function jaxon(): Jaxon
23 23
 {
24
-    return Jaxon::getInstance();
24
+return Jaxon::getInstance();
25 25
 }
Please login to merge, or discard this patch.
jaxon-core/src/Request/TargetInterface.php 1 patch
Switch Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -4,17 +4,17 @@
 block discarded – undo
4 4
 
5 5
 interface TargetInterface
6 6
 {
7
-    /**
7
+/**
8 8
      * The target method name.
9 9
      *
10 10
      * @return string
11 11
      */
12
-    public function method(): string;
12
+public function method(): string;
13 13
 
14
-    /**
14
+/**
15 15
      * The target method args.
16 16
      *
17 17
      * @return array
18 18
      */
19
-    public function args(): array;
19
+public function args(): array;
20 20
 }
Please login to merge, or discard this patch.
jaxon-core/src/Request/Validator.php 1 patch
Switch Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -29,73 +29,73 @@
 block discarded – undo
29 29
 
30 30
 class Validator
31 31
 {
32
-    /**
32
+/**
33 33
      * The config manager
34 34
      *
35 35
      * @var ConfigManager
36 36
      */
37
-    protected $xConfigManager;
37
+protected $xConfigManager;
38 38
 
39
-    /**
39
+/**
40 40
      * The translator
41 41
      *
42 42
      * @var Translator
43 43
      */
44
-    protected $xTranslator;
44
+protected $xTranslator;
45 45
 
46
-    public function __construct(ConfigManager $xConfigManager, Translator $xTranslator)
47
-    {
48
-        // Set the config manager
49
-        $this->xConfigManager = $xConfigManager;
50
-        // Set the translator
51
-        $this->xTranslator = $xTranslator;
52
-    }
46
+public function __construct(ConfigManager $xConfigManager, Translator $xTranslator)
47
+{
48
+// Set the config manager
49
+$this->xConfigManager = $xConfigManager;
50
+// Set the translator
51
+$this->xTranslator = $xTranslator;
52
+}
53 53
 
54
-    /**
54
+/**
55 55
      * Validate a function name
56 56
      *
57 57
      * @param string $sName    The function name
58 58
      *
59 59
      * @return bool
60 60
      */
61
-    public function validateFunction(string $sName): bool
62
-    {
63
-        return preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $sName) > 0;
64
-    }
61
+public function validateFunction(string $sName): bool
62
+{
63
+return preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $sName) > 0;
64
+}
65 65
 
66
-    /**
66
+/**
67 67
      * Validate a class name
68 68
      *
69 69
      * @param string $sName    The class name
70 70
      *
71 71
      * @return bool
72 72
      */
73
-    public function validateJsObject(string $sName): bool
74
-    {
75
-        return preg_match('/^([a-zA-Z][a-zA-Z0-9_]*)(\.[a-zA-Z][a-zA-Z0-9_]*)*$/', $sName) > 0;
76
-    }
73
+public function validateJsObject(string $sName): bool
74
+{
75
+return preg_match('/^([a-zA-Z][a-zA-Z0-9_]*)(\.[a-zA-Z][a-zA-Z0-9_]*)*$/', $sName) > 0;
76
+}
77 77
 
78
-    /**
78
+/**
79 79
      * Validate a class name
80 80
      *
81 81
      * @param string $sName    The class name
82 82
      *
83 83
      * @return bool
84 84
      */
85
-    public function validateClass(string $sName): bool
86
-    {
87
-        return preg_match('/^([a-zA-Z][a-zA-Z0-9_]*)(\\\\[a-zA-Z][a-zA-Z0-9_]*)*$/', $sName) > 0;
88
-    }
85
+public function validateClass(string $sName): bool
86
+{
87
+return preg_match('/^([a-zA-Z][a-zA-Z0-9_]*)(\\\\[a-zA-Z][a-zA-Z0-9_]*)*$/', $sName) > 0;
88
+}
89 89
 
90
-    /**
90
+/**
91 91
      * Validate a method name
92 92
      *
93 93
      * @param string $sName    The function name
94 94
      *
95 95
      * @return bool
96 96
      */
97
-    public function validateMethod(string $sName): bool
98
-    {
99
-        return preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sName) > 0;
100
-    }
97
+public function validateMethod(string $sName): bool
98
+{
99
+return preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sName) > 0;
100
+}
101 101
 }
Please login to merge, or discard this patch.
jaxon-core/src/Request/Handler/Psr/PsrAjaxMiddleware.php 1 patch
Switch Indentation   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -25,54 +25,54 @@
 block discarded – undo
25 25
 
26 26
 class PsrAjaxMiddleware implements MiddlewareInterface
27 27
 {
28
-    /**
28
+/**
29 29
      * @var Container
30 30
      */
31
-    private $di;
31
+private $di;
32 32
 
33
-    /**
33
+/**
34 34
      * @var RequestHandler
35 35
      */
36
-    private $xRequestHandler;
36
+private $xRequestHandler;
37 37
 
38
-    /**
38
+/**
39 39
      * @var ResponseManager
40 40
      */
41
-    private $xResponseManager;
41
+private $xResponseManager;
42 42
 
43
-    /**
43
+/**
44 44
      * The constructor
45 45
      *
46 46
      * @param Container $di
47 47
      * @param RequestHandler $xRequestHandler
48 48
      * @param ResponseManager $xResponseManager
49 49
      */
50
-    public function __construct(Container $di, RequestHandler $xRequestHandler, ResponseManager $xResponseManager)
51
-    {
52
-        $this->di = $di;
53
-        $this->xRequestHandler = $xRequestHandler;
54
-        $this->xResponseManager = $xResponseManager;
55
-    }
50
+public function __construct(Container $di, RequestHandler $xRequestHandler, ResponseManager $xResponseManager)
51
+{
52
+$this->di = $di;
53
+$this->xRequestHandler = $xRequestHandler;
54
+$this->xResponseManager = $xResponseManager;
55
+}
56 56
 
57
-    /**
57
+/**
58 58
      * @inheritDoc
59 59
      * @throws RequestException
60 60
      */
61
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
62
-    {
63
-        // Save the request in the container. This will override the default request,
64
-        // and the other classes will get this request from there.
65
-        $this->di->val(ServerRequestInterface::class, $request);
61
+public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
62
+{
63
+// Save the request in the container. This will override the default request,
64
+// and the other classes will get this request from there.
65
+$this->di->val(ServerRequestInterface::class, $request);
66 66
 
67
-        if(!$this->xRequestHandler->canProcessRequest())
68
-        {
69
-            // Unable to find a plugin to process the request
70
-            return $handler->handle($request);
71
-        }
67
+if(!$this->xRequestHandler->canProcessRequest())
68
+{
69
+// Unable to find a plugin to process the request
70
+return $handler->handle($request);
71
+}
72 72
 
73
-        // Process the request
74
-        $this->xRequestHandler->processRequest();
75
-        // Return a Psr7 response
76
-        return $this->xResponseManager->getResponse()->toPsr();
77
-    }
73
+// Process the request
74
+$this->xRequestHandler->processRequest();
75
+// Return a Psr7 response
76
+return $this->xResponseManager->getResponse()->toPsr();
77
+}
78 78
 }
Please login to merge, or discard this patch.
jaxon-core/src/Request/Handler/Psr/PsrConfigMiddleware.php 1 patch
Switch Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -23,37 +23,37 @@
 block discarded – undo
23 23
 
24 24
 class PsrConfigMiddleware implements MiddlewareInterface
25 25
 {
26
-    /**
26
+/**
27 27
      * @var Container
28 28
      */
29
-    protected $di;
29
+protected $di;
30 30
 
31
-    /**
31
+/**
32 32
      * @var string
33 33
      */
34
-    protected $sConfigFile;
34
+protected $sConfigFile;
35 35
 
36
-    /**
36
+/**
37 37
      * The constructor
38 38
      *
39 39
      * @param Container $di
40 40
      * @param string $sConfigFile
41 41
      */
42
-    public function __construct(Container $di, string $sConfigFile)
43
-    {
44
-        $this->di = $di;
45
-        $this->sConfigFile = $sConfigFile;
46
-    }
42
+public function __construct(Container $di, string $sConfigFile)
43
+{
44
+$this->di = $di;
45
+$this->sConfigFile = $sConfigFile;
46
+}
47 47
 
48
-    /**
48
+/**
49 49
      * @inheritDoc
50 50
      * @throws SetupException
51 51
      */
52
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
53
-    {
54
-        // Load the config
55
-        $this->di->getApp()->setup($this->sConfigFile);
56
-        // Next
57
-        return $handler->handle($request);
58
-    }
52
+public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
53
+{
54
+// Load the config
55
+$this->di->getApp()->setup($this->sConfigFile);
56
+// Next
57
+return $handler->handle($request);
58
+}
59 59
 }
Please login to merge, or discard this patch.
jaxon-core/src/Request/Handler/Psr/PsrRequestHandler.php 1 patch
Switch Indentation   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -25,27 +25,27 @@  discard block
 block discarded – undo
25 25
 
26 26
 class PsrRequestHandler implements RequestHandlerInterface
27 27
 {
28
-    /**
28
+/**
29 29
      * @var Container
30 30
      */
31
-    private $di;
31
+private $di;
32 32
 
33
-    /**
33
+/**
34 34
      * @var RequestHandler
35 35
      */
36
-    private $xRequestHandler;
36
+private $xRequestHandler;
37 37
 
38
-    /**
38
+/**
39 39
      * @var ResponseManager
40 40
      */
41
-    private $xResponseManager;
41
+private $xResponseManager;
42 42
 
43
-    /**
43
+/**
44 44
      * @var Translator
45 45
      */
46
-    private $xTranslator;
46
+private $xTranslator;
47 47
 
48
-    /**
48
+/**
49 49
      * The constructor
50 50
      *
51 51
      * @param Container $di
@@ -53,34 +53,34 @@  discard block
 block discarded – undo
53 53
      * @param ResponseManager $xResponseManager
54 54
      * @param Translator $xTranslator
55 55
      */
56
-    public function __construct(Container $di, RequestHandler $xRequestHandler,
57
-        ResponseManager $xResponseManager, Translator $xTranslator)
58
-    {
59
-        $this->di = $di;
60
-        $this->xRequestHandler = $xRequestHandler;
61
-        $this->xResponseManager = $xResponseManager;
62
-        $this->xTranslator = $xTranslator;
63
-    }
56
+public function __construct(Container $di, RequestHandler $xRequestHandler,
57
+ResponseManager $xResponseManager, Translator $xTranslator)
58
+{
59
+$this->di = $di;
60
+$this->xRequestHandler = $xRequestHandler;
61
+$this->xResponseManager = $xResponseManager;
62
+$this->xTranslator = $xTranslator;
63
+}
64 64
 
65
-    /**
65
+/**
66 66
      * @inheritDoc
67 67
      * @throws RequestException
68 68
      */
69
-    public function handle(ServerRequestInterface $request): ResponseInterface
70
-    {
71
-        // Save the request in the container. This will override the default request,
72
-        // and the other classes will get this request from there.
73
-        $this->di->val(ServerRequestInterface::class, $request);
69
+public function handle(ServerRequestInterface $request): ResponseInterface
70
+{
71
+// Save the request in the container. This will override the default request,
72
+// and the other classes will get this request from there.
73
+$this->di->val(ServerRequestInterface::class, $request);
74 74
 
75
-        if(!$this->xRequestHandler->canProcessRequest())
76
-        {
77
-            // Unable to find a plugin to process the request
78
-            throw new RequestException($this->xTranslator->trans('errors.request.plugin'));
79
-        }
75
+if(!$this->xRequestHandler->canProcessRequest())
76
+{
77
+// Unable to find a plugin to process the request
78
+throw new RequestException($this->xTranslator->trans('errors.request.plugin'));
79
+}
80 80
 
81
-        // Process the request
82
-        $this->xRequestHandler->processRequest();
83
-        // Return a Psr7 response
84
-        return $this->xResponseManager->getResponse()->toPsr();
85
-    }
81
+// Process the request
82
+$this->xRequestHandler->processRequest();
83
+// Return a Psr7 response
84
+return $this->xResponseManager->getResponse()->toPsr();
85
+}
86 86
 }
Please login to merge, or discard this patch.
jaxon-core/src/Request/Handler/Psr/PsrFactory.php 1 patch
Switch Indentation   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -22,50 +22,50 @@  discard block
 block discarded – undo
22 22
 
23 23
 class PsrFactory
24 24
 {
25
-    /**
25
+/**
26 26
      * The container
27 27
      *
28 28
      * @var Container
29 29
      */
30
-    protected $di;
30
+protected $di;
31 31
 
32
-    /**
32
+/**
33 33
      * The constructor
34 34
      *
35 35
      * @param Container $di
36 36
      */
37
-    public function __construct(Container $di)
38
-    {
39
-        $this->di = $di;
40
-    }
37
+public function __construct(Container $di)
38
+{
39
+$this->di = $di;
40
+}
41 41
 
42
-    /**
42
+/**
43 43
      * Set the logger
44 44
      *
45 45
      * @param LoggerInterface $xLogger
46 46
      *
47 47
      * @return $this
48 48
      */
49
-    public function logger(LoggerInterface $xLogger): PsrFactory
50
-    {
51
-        $this->di->setLogger($xLogger);
52
-        return $this;
53
-    }
49
+public function logger(LoggerInterface $xLogger): PsrFactory
50
+{
51
+$this->di->setLogger($xLogger);
52
+return $this;
53
+}
54 54
 
55
-    /**
55
+/**
56 56
      * Set the container
57 57
      *
58 58
      * @param ContainerInterface $xContainer
59 59
      *
60 60
      * @return $this
61 61
      */
62
-    public function container(ContainerInterface $xContainer): PsrFactory
63
-    {
64
-        $this->di->setContainer($xContainer);
65
-        return $this;
66
-    }
62
+public function container(ContainerInterface $xContainer): PsrFactory
63
+{
64
+$this->di->setContainer($xContainer);
65
+return $this;
66
+}
67 67
 
68
-    /**
68
+/**
69 69
      * Add a view renderer with an id
70 70
      *
71 71
      * @param string $sRenderer    The renderer name
@@ -74,41 +74,41 @@  discard block
 block discarded – undo
74 74
      *
75 75
      * @return $this
76 76
      */
77
-    public function view(string $sRenderer, string $sExtension, Closure $xClosure): PsrFactory
78
-    {
79
-        $this->di->getViewRenderer()->setDefaultRenderer($sRenderer, $sExtension, $xClosure);
80
-        return $this;
81
-    }
77
+public function view(string $sRenderer, string $sExtension, Closure $xClosure): PsrFactory
78
+{
79
+$this->di->getViewRenderer()->setDefaultRenderer($sRenderer, $sExtension, $xClosure);
80
+return $this;
81
+}
82 82
 
83
-    /**
83
+/**
84 84
      * Get the Jaxon ajax PSR request handler
85 85
      *
86 86
      * @return PsrRequestHandler
87 87
      */
88
-    public function handler(): PsrRequestHandler
89
-    {
90
-        return $this->di->getPsrRequestHandler();
91
-    }
88
+public function handler(): PsrRequestHandler
89
+{
90
+return $this->di->getPsrRequestHandler();
91
+}
92 92
 
93
-    /**
93
+/**
94 94
      * Get the Jaxon config PSR middleware
95 95
      *
96 96
      * @param string $sConfigFile
97 97
      *
98 98
      * @return PsrConfigMiddleware
99 99
      */
100
-    public function config(string $sConfigFile): PsrConfigMiddleware
101
-    {
102
-        return $this->di->getPsrConfigMiddleware($sConfigFile);
103
-    }
100
+public function config(string $sConfigFile): PsrConfigMiddleware
101
+{
102
+return $this->di->getPsrConfigMiddleware($sConfigFile);
103
+}
104 104
 
105
-    /**
105
+/**
106 106
      * Get the Jaxon ajax PSR middleware
107 107
      *
108 108
      * @return PsrAjaxMiddleware
109 109
      */
110
-    public function ajax(): PsrAjaxMiddleware
111
-    {
112
-        return $this->di->getPsrAjaxMiddleware();
113
-    }
110
+public function ajax(): PsrAjaxMiddleware
111
+{
112
+return $this->di->getPsrAjaxMiddleware();
113
+}
114 114
 }
Please login to merge, or discard this patch.