Merge pull request #95 from niden/master

5.5.0

src/Acl/Adapter/AbstractAdapter.php

@@ -59,7 +59,7 @@ abstract class AbstractAdapter extends AbstractEventsAware implements \Phalcon\A
      *
      * @return string|null
      */
-    public function getActiveAccess(): ?string
+    public function getActiveAccess(): string|null
     {
     }
 
@@ -68,7 +68,7 @@ public function getActiveAccess(): ?string
      *
      * @return string|null
      */
-    public function getActiveComponent(): ?string
+    public function getActiveComponent(): string|null
     {
     }
 
@@ -78,7 +78,7 @@ public function getActiveComponent(): ?string
      *
      * @return string|null
      */
-    public function getActiveRole(): ?string
+    public function getActiveRole(): string|null
     {
     }
 

src/Acl/Adapter/AdapterInterface.php

@@ -93,23 +93,23 @@ public function dropComponentAccess(string $componentName, $accessList): void;
      *
      * @return string|null
      */
-    public function getActiveAccess(): ?string;
+    public function getActiveAccess(): string|null;
 
     /**
      * Returns the role which the list is checking if it's allowed to certain
      * component/access
      *
      * @return string|null
      */
-    public function getActiveRole(): ?string;
+    public function getActiveRole(): string|null;
 
     /**
      * Returns the component which the list is checking if some role can access
      * it
      *
      * @return string|null
      */
-    public function getActiveComponent(): ?string;
+    public function getActiveComponent(): string|null;
 
     /**
      * Return an array with every component registered in the list

src/Acl/Adapter/Memory.php

@@ -274,6 +274,7 @@ public function addRole($role, $accessInherits = null): bool
      *
      * // Allow access to any role to browse on any component
      * $acl->allow("", "", "browse");
+     * ```
      *
      * @param string $roleName
      * @param string $componentName
@@ -328,7 +329,7 @@ public function dropComponentAccess(string $componentName, $accessList): void
      *
      * @return mixed
      */
-    public function getActiveFunction()
+    public function getActiveFunction(): mixed
     {
     }
 
@@ -346,7 +347,7 @@ public function getActiveFunctionCustomArgumentsCount(): int
      *
      * @return string|null
      */
-    public function getActiveKey(): ?string
+    public function getActiveKey(): string|null
     {
     }
 
@@ -465,7 +466,7 @@ private function allowOrDeny(string $roleName, string $componentName, $access, $
      * @param string $access
      * @return string|bool
      */
-    private function canAccess(string $roleName, string $componentName, string $access)
+    private function canAccess(string $roleName, string $componentName, string $access): bool|string
     {
     }
 

src/Annotations/Adapter/Apcu.php

@@ -50,7 +50,7 @@ public function __construct(array $options = [])
      * @param string $key
      * @return bool|Reflection
      */
-    public function read(string $key)
+    public function read(string $key): Reflection|bool
     {
     }
 

src/Annotations/Adapter/Memory.php

@@ -28,7 +28,7 @@ class Memory extends \Phalcon\Annotations\Adapter\AbstractAdapter
      * @param string $key
      * @return bool|Reflection
      */
-    public function read(string $key)
+    public function read(string $key): Reflection|bool
     {
     }
 

src/Annotations/Adapter/Stream.php

@@ -50,7 +50,7 @@ public function __construct(array $options = [])
      * @param string $key
      * @return bool|int|Reflection
      */
-    public function read(string $key)
+    public function read(string $key): Reflection|int|bool
     {
     }
 

src/Annotations/Annotation.php

@@ -50,7 +50,7 @@ public function __construct(array $reflectionData)
      * @param mixed $position
      * @return mixed|null
      */
-    public function getArgument($position)
+    public function getArgument($position): mixed
     {
     }
 
@@ -78,7 +78,7 @@ public function getExprArguments(): array
      * @param array $expr
      * @return mixed
      */
-    public function getExpression(array $expr)
+    public function getExpression(array $expr): mixed
     {
     }
 
@@ -87,7 +87,7 @@ public function getExpression(array $expr)
      *
      * @return string|null
      */
-    public function getName(): ?string
+    public function getName(): string|null
     {
     }
 
@@ -97,7 +97,7 @@ public function getName(): ?string
      * @param string $name
      * @return mixed|null
      */
-    public function getNamedArgument(string $name)
+    public function getNamedArgument(string $name): mixed
     {
     }
 
@@ -107,7 +107,7 @@ public function getNamedArgument(string $name)
      * @param string $name
      * @return mixed
      */
-    public function getNamedParameter(string $name)
+    public function getNamedParameter(string $name): mixed
     {
     }
 

src/Annotations/AnnotationsFactory.php

@@ -40,7 +40,7 @@ public function __construct(array $services = [])
      * Factory to create an instance from a Config object
      * @return mixed
      */
-    public function load($config)
+    public function load($config): mixed
     {
     }
 

src/Annotations/Collection.php

@@ -64,7 +64,7 @@ public function count(): int
      *
      * @return mixed
      */
-    public function current()
+    public function current(): mixed
     {
     }
 

src/Annotations/Reflection.php

@@ -66,7 +66,7 @@ public function __construct(array $reflectionData = [])
      *
      * @return Collection|null
      */
-    public function getClassAnnotations(): ?Collection
+    public function getClassAnnotations(): Collection|null
     {
     }
 

src/Application/AbstractApplication.php

@@ -62,7 +62,7 @@ public function getDefaultModule(): string
      *
      * @return ManagerInterface|null
      */
-    public function getEventsManager(): ?ManagerInterface
+    public function getEventsManager(): ManagerInterface|null
     {
     }
 
@@ -72,7 +72,7 @@ public function getEventsManager(): ?ManagerInterface
      * @param string $name *
      * @return array|mixed
      */
-    public function getModule(string $name)
+    public function getModule(string $name): object|array
     {
     }
 

src/Assets/Asset.php

@@ -194,7 +194,7 @@ public function getType(): string
      *
      * @return string|null
      */
-    public function getVersion(): ?string
+    public function getVersion(): string|null
     {
     }
 

src/Assets/AssetInterface.php

@@ -26,7 +26,7 @@ public function getAssetKey(): string;
      *
      * @return array|null
      */
-    public function getAttributes(): ?array;
+    public function getAttributes(): array|null;
 
     /**
      * Gets if the asset must be filtered or not.

src/Assets/Manager.php

@@ -272,7 +272,7 @@ public function has(string $name): bool
      * @return string|null
      * @throws Exception
      */
-    public function output(Collection $collection, string $type): ?string
+    public function output(Collection $collection, string $type): string|null
     {
     }
 

src/Autoload/Loader.php

@@ -155,7 +155,7 @@ public function autoload(string $className): bool
      *
      * @return string|null
      */
-    public function getCheckedPath(): ?string
+    public function getCheckedPath(): string|null
     {
     }
 
@@ -209,7 +209,7 @@ public function getFiles(): array
      *
      * @return string|null
      */
-    public function getFoundPath(): ?string
+    public function getFoundPath(): string|null
     {
     }
 

src/Cli/Dispatcher.php

@@ -38,6 +38,9 @@
  */
 class Dispatcher extends \Phalcon\Dispatcher\AbstractDispatcher implements \Phalcon\Cli\DispatcherInterface
 {
+    /**
+     * @var string
+     */
     protected $defaultHandler = 'main';
 
     /**
@@ -63,7 +66,7 @@ class Dispatcher extends \Phalcon\Dispatcher\AbstractDispatcher implements \Phal
      * @param array $params
      * @return mixed
      */
-    public function callActionMethod($handler, string $actionMethod, array $params = [])
+    public function callActionMethod($handler, string $actionMethod, array $params = []): mixed
     {
     }
 
@@ -93,7 +96,7 @@ public function getLastTask(): TaskInterface
      * @param  mixed $defaultValue
      * @return mixed
      */
-    public function getOption($option, $filters = null, $defaultValue = null)
+    public function getOption($option, $filters = null, $defaultValue = null): mixed
     {
     }
 

src/Cli/Router.php

@@ -135,7 +135,7 @@ public function getActionName(): string
      *
      * @return RouteInterface|null
      */
-    public function getMatchedRoute(): ?RouteInterface
+    public function getMatchedRoute(): RouteInterface|null
     {
     }
 
@@ -182,7 +182,7 @@ public function getParameters(): array
      * @param int $id
      * @return bool|RouteInterface
      */
-    public function getRouteById($id)
+    public function getRouteById($id): RouteInterface|bool
     {
     }
 
@@ -192,7 +192,7 @@ public function getRouteById($id)
      * @param string $name
      * @return bool|RouteInterface
      */
-    public function getRouteByName(string $name)
+    public function getRouteByName(string $name): RouteInterface|bool
     {
     }
 

src/Cli/Router/Route.php

@@ -130,7 +130,7 @@ public static function delimiter(string $delimiter = null): void
      * @param string $pattern
      * @return array|bool
      */
-    public function extractNamedParams(string $pattern)
+    public function extractNamedParams(string $pattern): bool|array
     {
     }
 
@@ -139,7 +139,7 @@ public function extractNamedParams(string $pattern)
      *
      * @return mixed
      */
-    public function getBeforeMatch()
+    public function getBeforeMatch(): mixed
     {
     }
 

src/Cli/RouterInterface.php

@@ -37,7 +37,7 @@ public function getActionName(): string;
      *
      * @return RouteInterface|null
      */
-    public function getMatchedRoute(): ?RouteInterface;
+    public function getMatchedRoute(): RouteInterface|null;
 
     /**
      * Return the sub expressions in the regular expression matched

src/Cli/Task.php

@@ -56,7 +56,7 @@ final public function __construct()
      *
      * @return ManagerInterface|null
      */
-    public function getEventsManager(): ?ManagerInterface
+    public function getEventsManager(): ManagerInterface|null
     {
     }
 

src/Config/Adapter/Ini.php

@@ -75,9 +75,9 @@ public function __construct(string $filePath, int $mode = 1)
      *
      * @param mixed $ini
      *
-     * @return array|float|int|mixed|string|null
+     * @return mixed
      */
-    protected function cast($ini)
+    protected function cast($ini): mixed
     {
     }
 

src/Config/Config.php

@@ -91,7 +91,7 @@ public function merge($toMerge): ConfigInterface
      *
      * @return mixed
      */
-    public function path(string $path, $defaultValue = null, string $delimiter = null)
+    public function path(string $path, $defaultValue = null, string $delimiter = null): mixed
     {
     }
 

src/Config/ConfigInterface.php

@@ -37,7 +37,7 @@ public function merge($toMerge): ConfigInterface;
      *
      * @return mixed
      */
-    public function path(string $path, $defaultValue = null, string $delimiter = null);
+    public function path(string $path, $defaultValue = null, string $delimiter = null): mixed;
 
     /**
      * @param string|null $delimiter