chore: enable phpstan (#30)

* chore: enable phpstan

* fix: phpstan fixes

* Apply fixes from StyleCI

* chore: bump js deps

---------

Co-authored-by: StyleCI Bot <[email protected]>

Author: imorland

.github/workflows/backend.yml

@@ -0,0 +1,12 @@
+name: FoF Sentry 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: .

.github/workflows/build.yml renamed to .github/workflows/frontend.yml

@@ -1,4 +1,4 @@
-name: Javascript
+name: FoF Sentry 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 }}

composer.json

@@ -45,6 +45,26 @@
         },
         "flagrow": {
             "discuss": "https://discuss.flarum.org/d/18089"
+        },
+        "flarum-cli": {
+            "modules": {
+                "githubActions": true
+            }
+        }
+    },
+    "config": {
+        "allow-plugins": {
+            "php-http/discovery": true
         }
+    },
+    "scripts": {
+        "analyse:phpstan": "phpstan analyse",
+        "clear-cache:phpstan": "phpstan clear-result-cache"
+    },
+    "scripts-descriptions": {
+        "analyse:phpstan": "Run static analysis"
+    },
+    "require-dev": {
+        "flarum/phpstan": "*"
     }
 }

js/package-lock.json

@@ -10,7 +10,7 @@
     "@sentry/tracing": "^7.56.0",
     "flarum-tsconfig": "^1.0.2",
     "flarum-webpack-config": "^2.0.0",
-    "webpack": "^5.76.0",
+    "webpack": "^5.89.0",
     "webpack-cli": "^5.1.4"
   },
   "scripts": {
@@ -20,7 +20,7 @@
     "format-check": "prettier --check src"
   },
   "devDependencies": {
-    "prettier": "^2.6.2",
+    "prettier": "^3.0.3",
     "webpack-bundle-analyzer": "^4.9.0",
     "webpack-merge": "^5.9.0"
   }

js/package.json

@@ -0,0 +1,13 @@
+includes:
+  - vendor/flarum/phpstan/extension.neon
+
+parameters:
+  # The level will be increased in Flarum 2.0
+  level: 5
+  paths:
+    - extend.php
+    - src
+  excludePaths:
+    - *.blade.php
+  checkMissingIterableValueType: false
+  databaseMigrationsPath: ['migrations']

phpstan.neon

@@ -48,14 +48,14 @@ public function measure($event)
             ));
 
             static::$measure->setDescription($event->extension->name);
-        } elseif (static::$measure) {
+        } elseif (static::$measure !== null) {
             static::$measure->finish();
         }
     }
 
     public function __destruct()
     {
-        if (static::$parent) {
+        if (static::$parent !== null) {
             static::$parent->finish();
         }
     }

src/Performance/Extension.php

@@ -17,14 +17,17 @@
 use Psr\Http\Server\RequestHandlerInterface;
 use Sentry\Tracing\Span;
 use Sentry\Tracing\SpanContext;
-use Sentry\Tracing\Transaction;
 
 class MeasurePerformanceMiddleware implements Middleware
 {
     /**
-     * @var Transaction
+     * @var Span
      */
     protected $transaction;
+
+    /**
+     * @var string
+     */
     protected $frontend;
 
     public function __construct(string $frontend, Span $transaction)

src/Performance/Middleware/MeasurePerformanceMiddleware.php

@@ -41,18 +41,12 @@ public function report(Throwable $error)
         /** @var HubInterface $hub */
         $hub = $this->container->make('sentry');
 
-        if ($hub === null) {
-            $this->logger->warning('[fof/sentry] sentry dsn not set');
-
-            return;
-        }
-
         if ($this->container->bound('sentry.request')) {
             $hub->configureScope(function (Scope $scope) {
                 $request = $this->container->make('sentry.request');
                 $user = RequestUtil::getActor($request);
 
-                if ($user && $user->id !== 0) {
+                if (!$user->isGuest() && $user->id !== 0) {
                     $data = $user->only('id', 'username');
 
                     // Only send email if enabled in settings