chore: update tooling configuration and documentation

Update makefile targets to use dot notation (lint.phpstan instead of lint-phpstan). Update deptrac layer dependencies to include Hyperf and Testing layers. Adjust CI workflow step ordering and improve documentation references.

Author: wilcorrea

.ai/guidelines.md

@@ -18,7 +18,7 @@ The project uses PHP-CS-Fixer with a combination of PSR2, Symfony, DoctrineAnnot
 
 ```bash
 # Check code style
-make lint-phpcs
+make lint.phpcs
 
 # Fix code style issues
 make fix
@@ -30,19 +30,19 @@ The project uses multiple static analysis tools to maintain code quality:
 
 ```bash
 # Run PHPStan
-make lint-phpstan
+make lint.phpstan
 
 # Run Psalm
-make lint-psalm
+make lint.psalm
 
 # Run Deptrac (dependency analysis)
-make lint-deptrac
+make lint.deptrac
 
 # Run PHP Mess Detector
-make lint-phpmd
+make lint.phpmd
 
 # Run Rector (with dry-run)
-make lint-rector
+make lint.rector
 
 # Run all linting tools
 make lint

.ai/quickstart.md

@@ -156,9 +156,9 @@ docker-compose exec app composer test -- --filter=ExampleTest
 make lint
 
 # Check specific tools
-make lint-phpstan    # Static analysis
-make lint-phpcs      # Code style
-make lint-psalm      # Additional static analysis
+make lint.phpstan    # Static analysis
+make lint.phpcs      # Code style
+make lint.psalm      # Additional static analysis
 ```
 
 ## Development Environment

.github/workflows/test.yml

@@ -15,7 +15,7 @@ jobs:
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
     steps:
-      - name: Cache Docker images.
+      - name: Cache Docker images
         uses: ScribeMD/docker-cache@0.5.0
         with:
           key: docker-${{ runner.os }}-${{ hashFiles('compose.yaml') }}
@@ -31,9 +31,6 @@ jobs:
       - name: Put everything up
         run: docker compose --profile postgres up -d
 
-      - name: Setup the application environment
-        run: docker compose exec app composer install
-
       - name: Wait until 1 minute for postgres be ready to GO
         uses: nick-fields/retry@v3
         with:
@@ -43,6 +40,9 @@ jobs:
           warning_on_retry: false
           command: docker compose exec postgres pg_isready
 
+      - name: Setup the application environment
+        run: docker compose exec app composer install
+
       - name: Configure database environment
         run: docker compose exec app php bin/hyperf.php migrate --database=postgres
 

composer.json

@@ -12,7 +12,6 @@
       "Serendipity\\": "src/"
     },
     "files": [
-      "src/_/mirror.php",
       "src/_/runtime.php"
     ]
   },

deptrac.yaml

@@ -21,6 +21,11 @@ deptrac:
             ^Constructo\\Type\\.*|\
             ^Constructo\\Factory\\.*
 
+    - name: Hyperf
+      collectors:
+        - type: classLike
+          value: ^Serendipity\\Hyperf\\.*
+
     - name: Infrastructure
       collectors:
         - type: classLike
@@ -31,61 +36,42 @@ deptrac:
         - type: classLike
           value: ^Serendipity\\Presentation\\.*
 
-    # Define the supported global layers
+    - name: Testing
+      collectors:
+        - type: classLike
+          value: ^Serendipity\\Testing\\.*
+
     - name: Contract
       collectors:
         - type: classLike
           value:
+            ^Psr\\.*|\
+            ^Constructo\\Contract\\.*|\
             ^Hyperf\\Contract\\.*|\
-            ^Psr\\Container\\ContainerExceptionInterface$|\
-            ^Psr\\Container\\NotFoundExceptionInterface$|\
-            ^Psr\\EventDispatcher\\EventDispatcherInterface$|\
-            ^Constructo\\Contract\\.*
+            ^Hyperf\\HttpServer\\Contract\\.*|\
+            ^Hyperf\\Validation\\.*|\
+            ^Hyperf\\Context\\Context$
 
     - name: Native
       collectors:
         - type: classLike
           value: ^\w+$|^(DS|Decimal)\\.*$
 
     - name: Vendor
-      collectors:
-        - type: bool
-          must:
-            - type: classLike
-              value:
-                ^Psr\\(Http|Log|Container)\\.*|\
-                ^Hyperf\\(Command|Context|Coordinator|DB|Event|ExceptionHandler|Guzzle|HttpMessage|HttpServer)\\.*|\
-                ^Google\\.*|\
-                ^GuzzleHttp\\.*|\
-                ^SleekDB\\.*|\
-                ^Visus\\Cuid2\\.*|\
-                ^Sentry\\.*|\
-                ^Swow\\.*|\
-                ^MongoDB\\.*|\
-                ^Symfony\\.*
-          must_not:
-            - type: classLike
-              value:
-                ^Hyperf\\Contract\\.*|\
-                ^Psr\\Container\\ContainerInterface$|\
-                ^Psr\\Container\\ContainerExceptionInterface$|\
-                ^Psr\\Container\\NotFoundExceptionInterface$|\
-                ^Psr\\Http\\Message\\ServerRequestInterface$|\
-                ^Psr\\EventDispatcher\\EventDispatcherInterface$|\
-                ^Hyperf\\Context\\Context$|\
-                ^Hyperf\\Validation\\ValidationException$|\
-                ^Hyperf\\Validation\\Request\\FormRequest$
-
-    - name: Validation
       collectors:
         - type: classLike
           value:
-            ^Serendipity\\Hyperf\\Request\\HyperfFormRequest$|\
-            ^Psr\\Container\\ContainerInterface$|\
-            ^Psr\\Http\\Message\\ServerRequestInterface$|\
-            ^Hyperf\\Context\\Context$|\
-            ^Hyperf\\Validation\\ValidationException$|\
-            ^Hyperf\\Validation\\Request\\FormRequest$
+            ^Google\\.*|\
+            ^GuzzleHttp\\.*|\
+            ^SleekDB\\.*|\
+            ^Visus\\Cuid2\\.*|\
+            ^Sentry\\.*|\
+            ^Swow\\.*|\
+            ^MongoDB\\.*|\
+            ^Symfony\\.*|\
+            ^Hyperf\\(?!Contract|Validation|Context\\Context).*|\
+            ^FastRoute\\.*|\
+            ^PHPUnit\\.*
 
   ruleset:
     Application:
@@ -95,20 +81,30 @@ deptrac:
     Domain:
       - Contract
       - Native
+    Hyperf:
+      - Domain
+      - Contract
+      - Native
+      - Infrastructure
+      - Testing
+      - Presentation
+      - Vendor
     Infrastructure:
       - Domain
       - Contract
       - Native
+      - Hyperf
       - Vendor
-      - Validation
     Presentation:
       - Domain
       - Contract
       - Native
-      - Application
       - Infrastructure
-      - Validation
-    Validation:
+      - Hyperf
+    Testing:
       - Domain
-      - Native
       - Contract
+      - Native
+      - Presentation
+      - Hyperf
+      - Vendor

makefile

@@ -45,22 +45,22 @@ dump: ## Run the composer dump
 lint: ## Perform code style lint
 	@$(COMPOSE_RUNNER) run --rm --entrypoint composer app lint
 
-lint-phpcs: ## Perform code style list using phpcs
+lint.phpcs: ## Perform code style list using phpcs
 	@$(COMPOSE_RUNNER) run --rm --entrypoint composer app lint:phpcs
 
-lint-phpstan: ## Perform code style list using phpstan
+lint.phpstan: ## Perform code style list using phpstan
 	@$(COMPOSE_RUNNER) run --rm --entrypoint composer app lint:phpstan
 
-lint-deptrac: ## Perform code style list using deptrac
+lint.deptrac: ## Perform code style list using deptrac
 	@$(COMPOSE_RUNNER) run --rm --entrypoint composer app lint:deptrac
 
-lint-phpmd: ## Perform code style list using phpmd
+lint.phpmd: ## Perform code style list using phpmd
 	@$(COMPOSE_RUNNER) run --rm --entrypoint composer app lint:phpmd
 
-lint-rector: ## Perform code style list using rector
+lint.rector: ## Perform code style list using rector
 	@$(COMPOSE_RUNNER) run --rm --entrypoint composer app lint:rector
 
-lint-psalm: ## Perform code style list using psalm
+lint.psalm: ## Perform code style list using psalm
 	@$(COMPOSE_RUNNER) run --rm --entrypoint composer app lint:psalm
 
 fix: ## Perform code style fix