Reduce the number of uncovered files (Deptrac) (#415)

gomzyakov · Nov 20, 2022 · 727b61f · 727b61f
1 parent 8aab520
commit 727b61f
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 25 deletions.
diff --git a/app/Http/Controllers/NoteController.php b/app/Http/Controllers/NoteController.php
@@ -4,7 +4,7 @@
 
 use App\Http\Requests\NoteCreateRequest;
 use App\Models\Note;
-use App\Services\NotesRepository;
+use App\Repository\NotesRepository;
 use Carbon\Carbon;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory as ViewFactory;

diff --git a/app/Providers/NotesRepositoryServiceProvider.php b/app/Providers/NotesRepositoryServiceProvider.php
@@ -2,7 +2,7 @@
 
 namespace App\Providers;
 
-use App\Services\NotesRepository;
+use App\Repository\NotesRepository;
 use Hashids\Hashids;
 use Illuminate\Support\ServiceProvider;
 

diff --git a/app/Services/NotesRepository.php → app/Repository/NotesRepository.php b/app/Services/NotesRepository.php → app/Repository/NotesRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Repository;
 
 use App\Models\Note;
 use Carbon\Carbon;

diff --git a/composer.json b/composer.json
@@ -45,8 +45,8 @@
     "scripts": {
         "phpunit": "@php ./vendor/bin/phpunit ./tests --no-coverage --color=always",
         "phpstan": "@php ./vendor/bin/phpstan analyze -c ./phpstan.neon.dist --no-progress --ansi --verbose",
-        "deptrac": "@php ./vendor/bin/deptrac analyse --config-file=deptrac.yaml",
-        "deptrac-uncovered": "@php ./vendor/bin/deptrac analyse --config-file=deptrac.yaml --report-uncovered",
+        "deptrac": "@php ./vendor/bin/deptrac analyse --config-file=deptrac.yaml --no-cache",
+        "deptrac-uncovered": "@php ./vendor/bin/deptrac analyse --config-file=deptrac.yaml --no-cache --report-uncovered",
         "cs-check": "@php ./vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php --dry-run --diff",
         "cs-fix": "@php ./vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php",
         "rector-check": "@php ./vendor/bin/rector process --dry-run",

diff --git a/deptrac.yaml b/deptrac.yaml
@@ -3,41 +3,74 @@ deptrac:
   paths:
     - ./app
   exclude_files:
-    - '#.*test.*#'
+    - .*test.*
   layers:
-    -
-      name: Controller
+    - name: Controller
       collectors:
-        -
-          type: className
-          value: .*Controller.*
-    -
-      name: Service
+        - type: directory
+          value: /app/Http/Controller/.*
+    - name: Request
       collectors:
-        -
-          type: directory
+        - type: directory
+          value: /app/Http/Requests/.*
+    - name: Repository
+      collectors:
+        - type: directory
+          value: /app/Repository/.*
+    - name: Service
+      collectors:
+        - type: directory
           value: /app/Services/.*
-    -
-      name: ServiceProvider
+    - name: ServiceProvider
       collectors:
-        -
-          type: directory
+        - type: directory
           value: /app/Providers/.*
-    -
-      name: Model
+    - name: Model
       collectors:
-        -
-          type: directory
+        - type: directory
           value: /app/Models/.*
+    # TODO Too general union -- divide by IlluminateDatabase, IlluminateSupport and ...
+    - name: Illuminate
+      collectors:
+        - type: classLike
+          value: Illuminate\\.*
+    - name: Hashids
+      collectors:
+        - type: classLike
+          value: Hashids\\Hashids
+    - name: Carbon
+      collectors:
+        - type: classLike
+          value: Carbon\\Carbon
+    - name: Laravel Sanctum
+      collectors:
+        - type: classLike
+          value: Laravel\\Sanctum\\.*
   ruleset:
     Controller:
+      - Request
+      - Illuminate
       - Service
       - Repository
       - Model
+      - Carbon
+    Repository:
+      - Service
+      - Model
+      - Hashids
+      - Illuminate
+      - Carbon
     Service:
       - Repository
       - Model
     ServiceProvider:
       - Service
-    # Models should not depend on other layers
-    Model: ~
+      - Repository
+      - Illuminate
+      - Hashids
+    Model:
+      - Illuminate
+      - Laravel Sanctum
+      - Carbon
+    Request:
+      - Illuminate