Skip to content

Commit 6e3c59e

Browse files
nidenniden
authored
Merge pull request #95 from niden/master
5.5.0
2 parents 7e4560a + 56bf6f7 commit 6e3c59e

File tree

155 files changed

+472
-470
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+472
-470
lines changed

‎src/Acl/Adapter/AbstractAdapter.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ abstract class AbstractAdapter extends AbstractEventsAware implements \Phalcon\A
5959
*
6060
* @return string|null
6161
*/
62-
public function getActiveAccess(): ?string
62+
public function getActiveAccess(): string|null
6363
{
6464
}
6565

@@ -68,7 +68,7 @@ public function getActiveAccess(): ?string
6868
*
6969
* @return string|null
7070
*/
71-
public function getActiveComponent(): ?string
71+
public function getActiveComponent(): string|null
7272
{
7373
}
7474

@@ -78,7 +78,7 @@ public function getActiveComponent(): ?string
7878
*
7979
* @return string|null
8080
*/
81-
public function getActiveRole(): ?string
81+
public function getActiveRole(): string|null
8282
{
8383
}
8484

‎src/Acl/Adapter/AdapterInterface.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -93,23 +93,23 @@ public function dropComponentAccess(string $componentName, $accessList): void;
9393
*
9494
* @return string|null
9595
*/
96-
public function getActiveAccess(): ?string;
96+
public function getActiveAccess(): string|null;
9797

9898
/**
9999
* Returns the role which the list is checking if it's allowed to certain
100100
* component/access
101101
*
102102
* @return string|null
103103
*/
104-
public function getActiveRole(): ?string;
104+
public function getActiveRole(): string|null;
105105

106106
/**
107107
* Returns the component which the list is checking if some role can access
108108
* it
109109
*
110110
* @return string|null
111111
*/
112-
public function getActiveComponent(): ?string;
112+
public function getActiveComponent(): string|null;
113113

114114
/**
115115
* Return an array with every component registered in the list

‎src/Acl/Adapter/Memory.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ public function addRole($role, $accessInherits = null): bool
274274
*
275275
* // Allow access to any role to browse on any component
276276
* $acl->allow("", "", "browse");
277+
* ```
277278
*
278279
* @param string $roleName
279280
* @param string $componentName
@@ -328,7 +329,7 @@ public function dropComponentAccess(string $componentName, $accessList): void
328329
*
329330
* @return mixed
330331
*/
331-
public function getActiveFunction()
332+
public function getActiveFunction(): mixed
332333
{
333334
}
334335

@@ -346,7 +347,7 @@ public function getActiveFunctionCustomArgumentsCount(): int
346347
*
347348
* @return string|null
348349
*/
349-
public function getActiveKey(): ?string
350+
public function getActiveKey(): string|null
350351
{
351352
}
352353

@@ -465,7 +466,7 @@ private function allowOrDeny(string $roleName, string $componentName, $access, $
465466
* @param string $access
466467
* @return string|bool
467468
*/
468-
private function canAccess(string $roleName, string $componentName, string $access)
469+
private function canAccess(string $roleName, string $componentName, string $access): bool|string
469470
{
470471
}
471472

‎src/Annotations/Adapter/Apcu.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function __construct(array $options = [])
5050
* @param string $key
5151
* @return bool|Reflection
5252
*/
53-
public function read(string $key)
53+
public function read(string $key): Reflection|bool
5454
{
5555
}
5656

‎src/Annotations/Adapter/Memory.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class Memory extends \Phalcon\Annotations\Adapter\AbstractAdapter
2828
* @param string $key
2929
* @return bool|Reflection
3030
*/
31-
public function read(string $key)
31+
public function read(string $key): Reflection|bool
3232
{
3333
}
3434

‎src/Annotations/Adapter/Stream.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function __construct(array $options = [])
5050
* @param string $key
5151
* @return bool|int|Reflection
5252
*/
53-
public function read(string $key)
53+
public function read(string $key): Reflection|int|bool
5454
{
5555
}
5656

‎src/Annotations/Annotation.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function __construct(array $reflectionData)
5050
* @param mixed $position
5151
* @return mixed|null
5252
*/
53-
public function getArgument($position)
53+
public function getArgument($position): mixed
5454
{
5555
}
5656

@@ -78,7 +78,7 @@ public function getExprArguments(): array
7878
* @param array $expr
7979
* @return mixed
8080
*/
81-
public function getExpression(array $expr)
81+
public function getExpression(array $expr): mixed
8282
{
8383
}
8484

@@ -87,7 +87,7 @@ public function getExpression(array $expr)
8787
*
8888
* @return string|null
8989
*/
90-
public function getName(): ?string
90+
public function getName(): string|null
9191
{
9292
}
9393

@@ -97,7 +97,7 @@ public function getName(): ?string
9797
* @param string $name
9898
* @return mixed|null
9999
*/
100-
public function getNamedArgument(string $name)
100+
public function getNamedArgument(string $name): mixed
101101
{
102102
}
103103

@@ -107,7 +107,7 @@ public function getNamedArgument(string $name)
107107
* @param string $name
108108
* @return mixed
109109
*/
110-
public function getNamedParameter(string $name)
110+
public function getNamedParameter(string $name): mixed
111111
{
112112
}
113113

‎src/Annotations/AnnotationsFactory.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function __construct(array $services = [])
4040
* Factory to create an instance from a Config object
4141
* @return mixed
4242
*/
43-
public function load($config)
43+
public function load($config): mixed
4444
{
4545
}
4646

‎src/Annotations/Collection.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function count(): int
6464
*
6565
* @return mixed
6666
*/
67-
public function current()
67+
public function current(): mixed
6868
{
6969
}
7070

‎src/Annotations/Reflection.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function __construct(array $reflectionData = [])
6666
*
6767
* @return Collection|null
6868
*/
69-
public function getClassAnnotations(): ?Collection
69+
public function getClassAnnotations(): Collection|null
7070
{
7171
}
7272

‎src/Application/AbstractApplication.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function getDefaultModule(): string
6262
*
6363
* @return ManagerInterface|null
6464
*/
65-
public function getEventsManager(): ?ManagerInterface
65+
public function getEventsManager(): ManagerInterface|null
6666
{
6767
}
6868

@@ -72,7 +72,7 @@ public function getEventsManager(): ?ManagerInterface
7272
* @param string $name *
7373
* @return array|mixed
7474
*/
75-
public function getModule(string $name)
75+
public function getModule(string $name): object|array
7676
{
7777
}
7878

‎src/Assets/Asset.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public function getType(): string
194194
*
195195
* @return string|null
196196
*/
197-
public function getVersion(): ?string
197+
public function getVersion(): string|null
198198
{
199199
}
200200

‎src/Assets/AssetInterface.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function getAssetKey(): string;
2626
*
2727
* @return array|null
2828
*/
29-
public function getAttributes(): ?array;
29+
public function getAttributes(): array|null;
3030

3131
/**
3232
* Gets if the asset must be filtered or not.

‎src/Assets/Manager.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ public function has(string $name): bool
272272
* @return string|null
273273
* @throws Exception
274274
*/
275-
public function output(Collection $collection, string $type): ?string
275+
public function output(Collection $collection, string $type): string|null
276276
{
277277
}
278278

‎src/Autoload/Loader.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public function autoload(string $className): bool
155155
*
156156
* @return string|null
157157
*/
158-
public function getCheckedPath(): ?string
158+
public function getCheckedPath(): string|null
159159
{
160160
}
161161

@@ -209,7 +209,7 @@ public function getFiles(): array
209209
*
210210
* @return string|null
211211
*/
212-
public function getFoundPath(): ?string
212+
public function getFoundPath(): string|null
213213
{
214214
}
215215

‎src/Cli/Dispatcher.php

+5-2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
*/
3939
class Dispatcher extends \Phalcon\Dispatcher\AbstractDispatcher implements \Phalcon\Cli\DispatcherInterface
4040
{
41+
/**
42+
* @var string
43+
*/
4144
protected $defaultHandler = 'main';
4245

4346
/**
@@ -63,7 +66,7 @@ class Dispatcher extends \Phalcon\Dispatcher\AbstractDispatcher implements \Phal
6366
* @param array $params
6467
* @return mixed
6568
*/
66-
public function callActionMethod($handler, string $actionMethod, array $params = [])
69+
public function callActionMethod($handler, string $actionMethod, array $params = []): mixed
6770
{
6871
}
6972

@@ -93,7 +96,7 @@ public function getLastTask(): TaskInterface
9396
* @param mixed $defaultValue
9497
* @return mixed
9598
*/
96-
public function getOption($option, $filters = null, $defaultValue = null)
99+
public function getOption($option, $filters = null, $defaultValue = null): mixed
97100
{
98101
}
99102

‎src/Cli/Router.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public function getActionName(): string
135135
*
136136
* @return RouteInterface|null
137137
*/
138-
public function getMatchedRoute(): ?RouteInterface
138+
public function getMatchedRoute(): RouteInterface|null
139139
{
140140
}
141141

@@ -182,7 +182,7 @@ public function getParameters(): array
182182
* @param int $id
183183
* @return bool|RouteInterface
184184
*/
185-
public function getRouteById($id)
185+
public function getRouteById($id): RouteInterface|bool
186186
{
187187
}
188188

@@ -192,7 +192,7 @@ public function getRouteById($id)
192192
* @param string $name
193193
* @return bool|RouteInterface
194194
*/
195-
public function getRouteByName(string $name)
195+
public function getRouteByName(string $name): RouteInterface|bool
196196
{
197197
}
198198

‎src/Cli/Router/Route.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public static function delimiter(string $delimiter = null): void
130130
* @param string $pattern
131131
* @return array|bool
132132
*/
133-
public function extractNamedParams(string $pattern)
133+
public function extractNamedParams(string $pattern): bool|array
134134
{
135135
}
136136

@@ -139,7 +139,7 @@ public function extractNamedParams(string $pattern)
139139
*
140140
* @return mixed
141141
*/
142-
public function getBeforeMatch()
142+
public function getBeforeMatch(): mixed
143143
{
144144
}
145145

‎src/Cli/RouterInterface.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function getActionName(): string;
3737
*
3838
* @return RouteInterface|null
3939
*/
40-
public function getMatchedRoute(): ?RouteInterface;
40+
public function getMatchedRoute(): RouteInterface|null;
4141

4242
/**
4343
* Return the sub expressions in the regular expression matched

‎src/Cli/Task.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ final public function __construct()
5656
*
5757
* @return ManagerInterface|null
5858
*/
59-
public function getEventsManager(): ?ManagerInterface
59+
public function getEventsManager(): ManagerInterface|null
6060
{
6161
}
6262

‎src/Config/Adapter/Ini.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ public function __construct(string $filePath, int $mode = 1)
7575
*
7676
* @param mixed $ini
7777
*
78-
* @return array|float|int|mixed|string|null
78+
* @return mixed
7979
*/
80-
protected function cast($ini)
80+
protected function cast($ini): mixed
8181
{
8282
}
8383

‎src/Config/Config.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function merge($toMerge): ConfigInterface
9191
*
9292
* @return mixed
9393
*/
94-
public function path(string $path, $defaultValue = null, string $delimiter = null)
94+
public function path(string $path, $defaultValue = null, string $delimiter = null): mixed
9595
{
9696
}
9797

‎src/Config/ConfigInterface.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function merge($toMerge): ConfigInterface;
3737
*
3838
* @return mixed
3939
*/
40-
public function path(string $path, $defaultValue = null, string $delimiter = null);
40+
public function path(string $path, $defaultValue = null, string $delimiter = null): mixed;
4141

4242
/**
4343
* @param string|null $delimiter

0 commit comments

Comments
 (0)