Merge pull request #248 from cakephp/merge-2x

merge 2.x => 3.x
cakephp · Sep 5, 2023 · 83219a4 · 83219a4
2 parents 64663dc + 5fa2077
commit 83219a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/deploy_docs_2x.yml b/.github/workflows/deploy_docs_2x.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cloning repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

diff --git a/src/Identity.php b/src/Identity.php
@@ -49,9 +49,9 @@ public function __construct(AuthorizationServiceInterface $service, AuthenIdenti
     /**
      * Get the primary key/id field for the identity.
      *
-     * @return string|int|null|array
+     * @return array|string|int|null
      */
-    public function getIdentifier(): string|int|null|array
+    public function getIdentifier(): string|int|array|null
     {
         return $this->identity->getIdentifier();
     }