From 5323b56b78f088b9c267bc3a61a21ac168af3890 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 8 Feb 2024 12:12:01 -0600
Subject: [PATCH 1/3] 5.6.1
---
src/Cache/AbstractCache.php | 5 +++--
src/Cli/Router.php | 6 ++++--
src/Filter/Validation.php | 6 +++---
src/Filter/Validation/ValidationInterface.php | 6 +++---
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/Cache/AbstractCache.php b/src/Cache/AbstractCache.php
index 5045709..0db74cb 100644
--- a/src/Cache/AbstractCache.php
+++ b/src/Cache/AbstractCache.php
@@ -114,7 +114,7 @@ protected function doDeleteMultiple($keys): bool
* @throws InvalidArgumentException MUST be thrown if the $key string is
* not a legal value.
*/
- protected function doGet(string $key, $defaultValue = null)
+ protected function doGet(string $key, $defaultValue = null): mixed
{
}
@@ -123,8 +123,9 @@ protected function doGet(string $key, $defaultValue = null)
*
* @param mixed $keys
* @param mixed $defaultValue
+ * @return array
*/
- protected function doGetMultiple($keys, $defaultValue = null)
+ protected function doGetMultiple($keys, $defaultValue = null): array
{
}
diff --git a/src/Cli/Router.php b/src/Cli/Router.php
index a925d49..1b27cc8 100644
--- a/src/Cli/Router.php
+++ b/src/Cli/Router.php
@@ -227,8 +227,9 @@ public function handle($arguments = null)
* Sets the default action name
*
* @param string $actionName
+ * @return Router
*/
- public function setDefaultAction(string $actionName)
+ public function setDefaultAction(string $actionName): Router
{
}
@@ -236,8 +237,9 @@ public function setDefaultAction(string $actionName)
* Sets the name of the default module
*
* @param string $moduleName
+ * @return Router
*/
- public function setDefaultModule(string $moduleName)
+ public function setDefaultModule(string $moduleName): Router
{
}
diff --git a/src/Filter/Validation.php b/src/Filter/Validation.php
index 5e1f2c7..74b58a7 100644
--- a/src/Filter/Validation.php
+++ b/src/Filter/Validation.php
@@ -264,10 +264,10 @@ public function setValidators(array $validators): Validation
* Validate a set of data according to a set of rules
*
* @param array|object $data
- * @param object $entity
- * @return Messages
+ * @param object $entity
+ * @return Messages|false
*/
- public function validate($data = null, $entity = null): Messages
+ public function validate($data = null, $entity = null): Messages|bool
{
}
diff --git a/src/Filter/Validation/ValidationInterface.php b/src/Filter/Validation/ValidationInterface.php
index 9e1229b..60d1aad 100644
--- a/src/Filter/Validation/ValidationInterface.php
+++ b/src/Filter/Validation/ValidationInterface.php
@@ -129,8 +129,8 @@ public function setLabels(array $labels): void;
* Validate a set of data according to a set of rules
*
* @param array|object $data
- * @param object $entity
- * @return Messages
+ * @param object $entity
+ * @return Messages|false
*/
- public function validate($data = null, $entity = null): Messages;
+ public function validate($data = null, $entity = null): Messages|bool;
}
From 42a3e9ac58c3cf3870281a04e2a6f58203511f80 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 8 Feb 2024 12:26:35 -0600
Subject: [PATCH 2/3] phpcs
---
src/Filter/Validation.php | 2 +-
src/Filter/Validation/ValidationInterface.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Filter/Validation.php b/src/Filter/Validation.php
index 74b58a7..d867935 100644
--- a/src/Filter/Validation.php
+++ b/src/Filter/Validation.php
@@ -264,7 +264,7 @@ public function setValidators(array $validators): Validation
* Validate a set of data according to a set of rules
*
* @param array|object $data
- * @param object $entity
+ * @param object $entity
* @return Messages|false
*/
public function validate($data = null, $entity = null): Messages|bool
diff --git a/src/Filter/Validation/ValidationInterface.php b/src/Filter/Validation/ValidationInterface.php
index 60d1aad..2b16c26 100644
--- a/src/Filter/Validation/ValidationInterface.php
+++ b/src/Filter/Validation/ValidationInterface.php
@@ -129,7 +129,7 @@ public function setLabels(array $labels): void;
* Validate a set of data according to a set of rules
*
* @param array|object $data
- * @param object $entity
+ * @param object $entity
* @return Messages|false
*/
public function validate($data = null, $entity = null): Messages|bool;
From fef7ea3ca0b99a4b7a128eb783cd1e36d73aa4d0 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 8 Feb 2024 12:28:38 -0600
Subject: [PATCH 3/3] upgrading actions checkout
---
.github/workflows/main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 128dc7d..a916ae4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
php-versions: ["7.4", "8.0", "8.1", "8.2"]
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2