Merge branch '5.2' into 5

.github/workflows/add-prs-to-project.yml

@@ -0,0 +1,22 @@
+name: Add new PRs to github project
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - ready_for_review
+
+permissions: {}
+
+jobs:
+  addprtoproject:
+    name: Add PR to GitHub Project
+    # Only run on the silverstripe account
+    if: github.repository_owner == 'silverstripe'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Add PR to github project
+        uses: silverstripe/gha-add-pr-to-project@v1
+        with:
+          app_id: ${{ vars.PROJECT_PERMISSIONS_APP_ID }}
+          private_key: ${{ secrets.PROJECT_PERMISSIONS_APP_PRIVATE_KEY }}

client/src/bundles/bundle.scss

@@ -1,4 +1,3 @@
 @import '../styles/variables';
-
 @import '../components/WebAuthn/Register';
 @import '../components/WebAuthn/Verify';

client/src/components/LoadingIndicator.scss

@@ -21,7 +21,7 @@
   animation: $loading-indicator-animation;
 }
 
-@-webkit-keyframes spinner-loader {
+@keyframes spinner-loader {
   0% {
     -webkit-transform: rotate(0deg);
     transform: rotate(0deg);
@@ -31,6 +31,7 @@
     transform: rotate(360deg);
   }
 }
+
 @keyframes spinner-loader {
   0% {
     -webkit-transform: rotate(0deg);

package.json

@@ -12,7 +12,7 @@
     "test": "jest",
     "coverage": "jest --coverage",
     "lock": "npm-shrinkwrap --dev",
-    "lint": "eslint client/src && yarn lint-sass",
+    "lint": "yarn lint-js && yarn lint-sass",
     "lint-js": "eslint client/src",
     "lint-js-fix": "eslint client/src --fix",
     "lint-sass": "stylelint client/src"
@@ -25,7 +25,7 @@
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@silverstripe/eslint-config": "^1.2.1",
+    "@silverstripe/eslint-config": "^1.3.0",
     "@silverstripe/webpack-config": "^2.1.0",
     "@testing-library/react": "^14.0.0",
     "babel-jest": "^29.2.2",

src/CredentialRepository.php

@@ -189,7 +189,7 @@ public function toArray(): array
      * @param string $memberID
      * @return CredentialRepository
      */
-    public static function fromArray(array $credentials, string $memberID): self
+    public static function fromArray(array $credentials, string $memberID): CredentialRepository
     {
         $new = new static($memberID);
         $new->setCredentials($credentials);

src/RegisterHandler.php

@@ -72,9 +72,9 @@ class RegisterHandler implements RegisterHandlerInterface
      * Sets the {@see $logger} member variable
      *
      * @param LoggerInterface|null $logger
-     * @return self
+     * @return RegisterHandler
      */
-    public function setLogger(?LoggerInterface $logger): self
+    public function setLogger(?LoggerInterface $logger): RegisterHandler
     {
         $this->logger = $logger;
         return $this;

src/VerifyHandler.php

@@ -47,9 +47,9 @@ class VerifyHandler implements VerifyHandlerInterface
      * Sets the {@see $logger} member variable
      *
      * @param LoggerInterface|null $logger
-     * @return self
+     * @return VerifyHandler
      */
-    public function setLogger(?LoggerInterface $logger): self
+    public function setLogger(?LoggerInterface $logger): VerifyHandler
     {
         $this->logger = $logger;
         return $this;

yarn.lock

@@ -1565,10 +1565,10 @@
   resolved "https://registry.yarnpkg.com/@sect/modernizr-loader/-/modernizr-loader-1.0.5.tgz#512afc60c715cd658fdffab244123661e1339083"
   integrity sha512-L8y2BTVeLtdSe1XzBcD2DOlc+7fR7Z/uNdhsKvf3d3x3gmEKz9sfl2wJ3VzFhEd+a/O6qgacuhbziphG2p4s8g==
 
-"@silverstripe/eslint-config@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@silverstripe/eslint-config/-/eslint-config-1.2.1.tgz#17ed5e955308a4a89e87f5090df66ca1e8ea462d"
-  integrity sha512-T4Lz1aZEDLxRpSNe4EgEmLKPfofxba0p0+YkL/AOD8VM/sng7VM9vKwMoqICbsUGvNoymHfeWtARlCa575O4PA==
+"@silverstripe/eslint-config@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@silverstripe/eslint-config/-/eslint-config-1.3.0.tgz#fa88f47cacd6103f6b759d81e1d86f9e93799413"
+  integrity sha512-Q3+sQKO1ysyMLhJ91kOl2LqJhQICfHFeqMx09EH0xx3dRHgjsQvqHIzVWEzPkM/l7D79m+Ma/WBnon30S7TVlA==
   dependencies:
     eslint "^8.26.0"
     eslint-config-airbnb "^19.0.4"