fix: fix psalm and tests (#478)

* fix: fix psalm and tests * fix: wip * fix: wip
BinarCode · Jul 15, 2022 · 98d7e9e · 98d7e9e
1 parent 4b767f6
commit 98d7e9e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -54,7 +54,10 @@
         "test-coverage": "./vendor/bin/phpunit --coverage-html coverage"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "phpstan/extension-installer": true
+        }
     },
     "extra": {
         "laravel": {

diff --git a/src/Http/Controllers/RepositoryDestroyBulkController.php b/src/Http/Controllers/RepositoryDestroyBulkController.php
@@ -8,16 +8,16 @@
 
 class RepositoryDestroyBulkController
 {
-    private array $repositories = [];
-
     public function __invoke(RepositoryDestroyBulkRequest $request)
     {
-        $collection = DB::transaction(function () use ($request) {
+        $repositories = collect();
+
+        DB::transaction(function () use ($request, $repositories) {
             return $request->collect()
-                ->each(function (int|string $key, int $row) use ($request) {
+                ->each(function (int|string $key, int $row) use ($request, $repositories) {
                     $model = $request->modelQuery($key)->lockForUpdate()->firstOrFail();
 
-                    $this->repositories[] = $model->attributesToArray();
+                    $repositories->push($model->attributesToArray());
 
                     /**
                      * @var Repository $repository
@@ -34,7 +34,7 @@ public function __invoke(RepositoryDestroyBulkRequest $request)
                 });
         });
 
-        $request->repository()::deletedBulk(collect($this->repositories), $request);
+        $request->repository()::deletedBulk($repositories, $request);
 
         return ok();
     }

diff --git a/src/Repositories/Repository.php b/src/Repositories/Repository.php
@@ -38,7 +38,7 @@
 use ReturnTypeWillChange;
 
 /**
- * @property static $type Repository type
+ * @property $type Repository type
  */
 abstract class Repository implements RestifySearchable, JsonSerializable
 {
@@ -812,7 +812,7 @@ public function updateBulk(RestifyRequest $request, $repositoryId, int $row)
 
     public function deleteBulk(RestifyRequest $request, $repositoryId, int $row)
     {
-        $status = DB::transaction(function () use ($request) {
+        DB::transaction(function () use ($request) {
             if (in_array(HasActionLogs::class, class_uses_recursive($this->resource))) {
                 Restify::actionLog()
                     ->forRepositoryDestroy($this->resource, $request->user())