chore: enable phpstan, fix: php 7.x compatibility (#65)

* chore: enable phpstan * fix: phpstan errors * Apply fixes from StyleCI * fix: php 7.3 compat * fix: php 7.x * chore: bump js deps --------- Co-authored-by: StyleCI Bot <[email protected]>
FriendsOfFlarum · Nov 12, 2023 · fe962ff · fe962ff
1 parent e01cd55
commit fe962ff
Show file tree

Hide file tree

Showing 14 changed files with 223 additions and 179 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -0,0 +1,12 @@
+name: FoF OAuth PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: flarum/framework/.github/workflows/REUSABLE_backend.yml@main
+    with:
+      enable_backend_testing: false
+      enable_phpstan: true
+
+      backend_directory: .
diff --git a/.github/workflows/build.yml → .github/workflows/frontend.yml b/.github/workflows/build.yml → .github/workflows/frontend.yml
@@ -1,4 +1,4 @@
-name: Javascript
+name: FoF OAuth JS
 
 on: [workflow_dispatch, push, pull_request]
 
@@ -8,11 +8,12 @@ jobs:
     with:
       enable_bundlewatch: false
       enable_prettier: true
-      enable_typescript: false
+      enable_typescript: true
 
       frontend_directory: ./js
       backend_directory: .
       js_package_manager: npm
       main_git_branch: master
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
         "league/oauth2-facebook": "^2.2.0",
         "league/oauth2-github": "^3.1.0",
         "league/oauth2-google": "^4.0.1",
-        "omines/oauth2-gitlab": "^3.5.0",
+        "omines/oauth2-gitlab": "^3.3.0",
         "wohali/oauth2-discord-new": "^1.2.1",
         "league/oauth2-linkedin": "^5.1.2",
         "fof/extend": "^1.2.1"
@@ -76,6 +76,21 @@
         },
         "flagrow": {
             "discuss": "https://discuss.flarum.org/d/25182"
+        },
+        "flarum-cli": {
+            "modules": {
+                "githubActions": true
+            }
         }
+    },
+    "require-dev": {
+        "flarum/phpstan": "*"
+    },
+    "scripts": {
+        "analyse:phpstan": "phpstan analyse",
+        "clear-cache:phpstan": "phpstan clear-result-cache"
+    },
+    "scripts-descriptions": {
+        "analyse:phpstan": "Run static analysis"
     }
 }
diff --git a/extend.php b/extend.php
@@ -73,7 +73,10 @@
     (new Extend\ApiSerializer(CurrentUserSerializer::class))
         ->attributes(function (CurrentUserSerializer $serializer, User $user, array $attributes) {
             $session = $serializer->getRequest()->getAttribute('session');
-            $attributes['loginProvider'] = $session?->get(AbstractOAuthController::SESSION_OAUTH2PROVIDER);
+
+            if ($session) {
+                $attributes['loginProvider'] = $session->get(AbstractOAuthController::SESSION_OAUTH2PROVIDER);
+            }
 
             return $attributes;
         }),