Merge pull request #2397 from flow-php/mago-adapters

Mago adapters

Author: norberttech

.codecov.yaml

@@ -207,6 +207,10 @@ component_management:
       name: bridge-phpunit-telemetry
       paths:
         - src/bridge/phpunit/telemetry/**
+    - component_id: bridge-phpstan-types
+      name: bridge-phpstan-types
+      paths:
+        - src/bridge/phpstan/types/**
     - component_id: bridge-postgresql-valinor
       name: bridge-postgresql-valinor
       paths:

.github/dependabot.yml

@@ -37,11 +37,6 @@ updates:
     schedule:
       interval: "daily"
 
-  - package-ecosystem: "composer"
-    directory: "/tools/phpstan"
-    schedule:
-      interval: "daily"
-
   - package-ecosystem: "composer"
     directory: "/tools/phpunit"
     schedule:

.github/workflows/baseline.yml

@@ -62,7 +62,7 @@ jobs:
         uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4
+        uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0

.github/workflows/job-static-analyze.yml

@@ -28,20 +28,12 @@ jobs:
           dependencies: "${{ matrix.dependencies }}"
           coverage: "none"
 
-      - name: "Create cache directories"
-        run: |
-          mkdir -p var/phpstan/cache
-
-      - name: "Cache phpstan results"
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
-        with:
-          path: "var/phpstan/cache"
-          key: "php-${{ matrix.php-version }}-cache-phpstan-${{ github.run_id }}"
-          restore-keys: |
-            php-${{ matrix.php-version }}-cache-phpstan-
+      - name: "Install web/landing dependencies"
+        run: "composer install --no-interaction --no-progress"
+        working-directory: "web/landing"
 
       - name: "Static Analyze (Mago)"
-        run: "just analyze-mago"
+        run: "just analyze"
 
       - name: "Install actionlint + zizmor"
         env:
@@ -54,6 +46,3 @@ jobs:
 
       - name: "Lint"
         run: "just lint"
-
-      - name: "Static Analyze"
-        run: "just analyze --error-format=github"

.github/workflows/monorepo-split.yml

@@ -89,6 +89,8 @@ jobs:
             split_repository: 'monolog-telemetry-bridge'
           - local_path: 'src/bridge/openapi/specification'
             split_repository: 'openapi-specification-bridge'
+          - local_path: 'src/bridge/phpstan/types'
+            split_repository: 'phpstan-types-bridge'
           - local_path: 'src/bridge/postgresql/valinor'
             split_repository: 'postgresql-valinor-bridge'
           - local_path: 'src/bridge/psr3/telemetry'

.github/workflows/release.yml

@@ -67,7 +67,7 @@ jobs:
         uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4
+        uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0

Justfile

@@ -54,45 +54,11 @@ lint-actions:
     zizmor --offline .github/workflows || rc=$?
     exit $rc
 
-# Run static analysis (PHPStan).
+# Run static analysis (Mago). The monorepo and web/landing are analyzed in separate runs because
+# web/landing is a standalone Composer sub-project with its own vendor (see web/landing/mago.toml).
 analyze *args:
-    tools/phpstan/vendor/bin/phpstan analyze -c phpstan.neon --memory-limit=-1 {{args}}
-
-# Run Mago static analyzer, scoped to packages we've finished migrating (add package paths below).
-analyze-mago *args:
-    tools/mago/vendor/bin/mago analyze {{args}} \
-        src/lib/types \
-        src/lib/telemetry \
-        src/lib/postgresql \
-        src/lib/filesystem \
-        src/lib/array-dot \
-        src/lib/azure-sdk \
-        src/lib/doctrine-dbal-bulk \
-        src/lib/snappy \
-        src/lib/parquet \
-        src/core/etl \
-        src/lib/parquet-viewer \
-        src/bridge/openapi/specification \
-        src/bridge/psr3/telemetry \
-        src/bridge/symfony/http-foundation-telemetry \
-        src/bridge/telemetry/otlp \
-        src/bridge/filesystem/async-aws \
-        src/bridge/filesystem/azure \
-        src/bridge/monolog/http \
-        src/bridge/monolog/telemetry \
-        src/bridge/phpunit/postgresql \
-        src/bridge/phpunit/telemetry \
-        src/bridge/postgresql/valinor \
-        src/bridge/psr18/telemetry \
-        src/bridge/psr7/telemetry \
-        src/bridge/symfony/filesystem-bundle \
-        src/bridge/symfony/filesystem-cache \
-        src/bridge/symfony/http-foundation \
-        src/bridge/symfony/postgresql-bundle \
-        src/bridge/symfony/postgresql-cache \
-        src/bridge/symfony/postgresql-messenger \
-        src/bridge/symfony/postgresql-session \
-        src/bridge/symfony/telemetry-bundle
+    tools/mago/vendor/bin/mago analyze {{args}}
+    tools/mago/vendor/bin/mago --workspace web/landing analyze {{args}}
 
 # Auto-fix code style (Mago format + lint --fix) and GitHub Actions findings (zizmor --fix).
 fix:

bin/docs.php

@@ -36,7 +36,7 @@
 
 $application = new Application('Flow-PHP - Documentation');
 
-$application->add(new class extends Command {
+$application->addCommand(new class extends Command {
     public function configure(): void
     {
         $this
@@ -90,7 +90,10 @@ public function execute(InputInterface $input, OutputInterface $output): int
             __DIR__ . '/../src/bridge/telemetry/otlp/src/Flow/Bridge/Telemetry/OTLP/DSL/functions.php',
         ];
 
-        $extractor = new FunctionsExtractor($input->getOption('repository-root-path'), new FunctionCollector());
+        $extractor = new FunctionsExtractor(
+            (string) $input->getOption('repository-root-path'),
+            new FunctionCollector(),
+        );
 
         $normalizedFunctions = [];
 
@@ -113,7 +116,7 @@ public function execute(InputInterface $input, OutputInterface $output): int
     }
 });
 
-$application->add(new class extends Command {
+$application->addCommand(new class extends Command {
     public function configure(): void
     {
         $this

composer.json

@@ -60,6 +60,7 @@
         "nyholm/psr7": "^1.8",
         "php-http/curl-client": "^2.2",
         "php-http/mock-client": "^1.5",
+        "phpstan/phpstan": "^2.1",
         "ramsey/uuid": "^4.5",
         "symfony/cache": "^6.4 || ^7.4 || ^8.0",
         "symfony/dotenv": "^6.4 || ^7.4 || ^8.0",
@@ -103,6 +104,7 @@
         "flow-php/openapi-specification-bridge": "self.version",
         "flow-php/parquet": "self.version",
         "flow-php/parquet-viewer": "self.version",
+        "flow-php/phpstan-types-bridge": "self.version",
         "flow-php/postgresql": "self.version",
         "flow-php/postgresql-valinor-bridge": "self.version",
         "flow-php/psr3-telemetry-bridge": "self.version",
@@ -149,6 +151,7 @@
                 "src/bridge/monolog/http/src/Flow",
                 "src/bridge/monolog/telemetry/src/Flow",
                 "src/bridge/openapi/specification/src/Flow",
+                "src/bridge/phpstan/types/src/Flow",
                 "src/bridge/postgresql/valinor/src/Flow",
                 "src/bridge/psr3/telemetry/src/Flow",
                 "src/bridge/psr7/telemetry/src/Flow",
@@ -266,6 +269,7 @@
                 "src/bridge/monolog/http/tests/Flow",
                 "src/bridge/monolog/telemetry/tests/Flow",
                 "src/bridge/openapi/specification/tests/Flow",
+                "src/bridge/phpstan/types/tests/Flow",
                 "src/bridge/postgresql/valinor/tests/Flow",
                 "src/bridge/psr3/telemetry/tests/Flow",
                 "src/bridge/psr7/telemetry/tests/Flow",
@@ -331,7 +335,6 @@
             "composer install --working-dir=./tools/infection",
             "composer install --working-dir=./tools/mago",
             "composer install --working-dir=./tools/monorepo",
-            "composer install --working-dir=./tools/phpstan",
             "composer install --working-dir=./tools/phpunit",
             "composer install --working-dir=./tools/phpdocumentor"
         ],
@@ -341,7 +344,6 @@
             "composer update --working-dir=./tools/infection",
             "composer update --working-dir=./tools/mago",
             "composer update --working-dir=./tools/monorepo",
-            "composer update --working-dir=./tools/phpstan",
             "composer update --working-dir=./tools/phpunit",
             "composer update --working-dir=./tools/phpdocumentor"
         ]