chore: fix composer.json script section; fix CS

buggregator · May 27, 2024 · 8c20628 · 8c20628
1 parent 7262bde
commit 8c20628
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 25 deletions.
diff --git a/composer.json b/composer.json
@@ -108,20 +108,35 @@
         "sort-packages": true
     },
     "scripts": {
-        "cs:diff": "php vendor/bin/php-cs-fixer fix --dry-run -v --diff",
-        "cs:fix": "php vendor/bin/php-cs-fixer fix -v",
-        "infect": "XDEBUG_MODE=coverage php vendor/bin/roave-infection-static-analysis-plugin --configuration=infection.json.dist",
-        "infect:ci": "XDEBUG_MODE=coverage php vendor/bin/roave-infection-static-analysis-plugin --ansi --configuration=infection.json.dist --logger-github --ignore-msi-with-no-mutations --only-covered",
-        "psalm": "php vendor/bin/psalm --show-info=true",
-        "psalm:baseline": "php vendor/bin/psalm --set-baseline=psalm-baseline.xml",
-        "psalm:ci": "php vendor/bin/psalm --output-format=github --shepherd --show-info=false --stats --threads=4",
-        "refactor": "php vendor/bin/rector process --config=rector.php",
-        "refactor:ci": "php vendor/bin/rector process --config=rector.php --dry-run --ansi",
-        "stan": "php vendor/bin/phpstan analyse --memory-limit=2G",
-        "stan:baseline": "php vendor/bin/phpstan analyse --generate-baseline --memory-limit=2G --allow-empty-baseline",
-        "stan:ci": "php vendor/bin/phpstan analyse --memory-limit=2G --error-format=github",
-        "test": "XDEBUG_MODE=coverage php vendor/bin/pest --exclude-group=phpunit-only --color=always",
-        "test:cc": "XDEBUG_MODE=coverage php vendor/bin/pest --coverage --coverage-clover=.build/phpunit/logs/clover.xml --exclude-group=phpunit-only --color=always",
-        "test:sep": "XDEBUG_MODE=coverage php vendor/bin/phpunit --group=phpunit-only --color=always --exclude-testsuite=Arch"
+        "cs:diff": "php-cs-fixer fix --dry-run -v --diff",
+        "cs:fix": "php-cs-fixer fix -v",
+        "infect": [
+            "@putenv XDEBUG_MODE=coverage",
+            "roave-infection-static-analysis-plugin --configuration=infection.json.dist"
+        ],
+        "infect:ci": [
+            "@putenv XDEBUG_MODE=coverage",
+            "roave-infection-static-analysis-plugin --ansi --configuration=infection.json.dist --logger-github --ignore-msi-with-no-mutations --only-covered"
+        ],
+        "psalm": "psalm --show-info=true",
+        "psalm:baseline": "psalm --set-baseline=psalm-baseline.xml",
+        "psalm:ci": "psalm --output-format=github --shepherd --show-info=false --stats --threads=4",
+        "refactor": "rector process --config=rector.php",
+        "refactor:ci": "rector process --config=rector.php --dry-run --ansi",
+        "stan": "phpstan analyse --memory-limit=2G",
+        "stan:baseline": "phpstan analyse --generate-baseline --memory-limit=2G --allow-empty-baseline",
+        "stan:ci": "phpstan analyse --memory-limit=2G --error-format=github",
+        "test": [
+            "@putenv XDEBUG_MODE=coverage",
+            "pest --exclude-group=phpunit-only --color=always"
+        ],
+        "test:cc": [
+            "@putenv XDEBUG_MODE=coverage",
+            "pest --coverage --coverage-clover=.build/phpunit/logs/clover.xml --exclude-group=phpunit-only --color=always"
+        ],
+        "test:sep": [
+            "@putenv XDEBUG_MODE=coverage",
+            "phpunit --group=phpunit-only --color=always --exclude-testsuite=Arch"
+        ]
     }
 }
diff --git a/src/Support/Caster/Trace.php b/src/Support/Caster/Trace.php
@@ -30,8 +30,7 @@ public function __construct(
         public readonly float $delta,
         public readonly int $memory,
         public readonly array $stack,
-    ) {
-    }
+    ) {}
 
     public function __toString(): string
     {

diff --git a/src/Support/Caster/TraceFile.php b/src/Support/Caster/TraceFile.php
@@ -21,8 +21,7 @@ final class TraceFile
      */
     public function __construct(
         public readonly array $line,
-    ) {
-    }
+    ) {}
 
     public function __toString(): string
     {

diff --git a/src/functions.php b/src/functions.php
@@ -43,25 +43,25 @@ function trap(mixed ...$values): TrapHandle
      */
     function tr(mixed ...$values): mixed
     {
-        /** @var int<0, max> $counter */
+        /** @var int<-1, max> $counter */
         static $counter = -1;
         /** @var float $time */
         static $time = 0.0;
 
         ++$counter;
 
+        $previous = $time;
+        $mem = $time = \microtime(true);
         try {
             if ($values === []) {
-                $previous = $time;
-                $mem = $time = \microtime(true);
+                /** @psalm-suppress InternalMethod */
                 return TrapHandle::fromTicker(
                     $counter,
                     $counter === 0 ? 0 : $mem - $previous,
-                    memory_get_usage(),
+                    \memory_get_usage(),
                 )->return();
             }
 
-            $mem = $time = \microtime(true);
             /** @psalm-suppress InternalMethod */
             return TrapHandle::fromArray($values)->return();
         } finally {
@@ -92,7 +92,7 @@ function td(mixed ...$values): never
 /**
  * Register the var-dump caster for protobuf messages
  */
-if (class_exists(AbstractCloner::class)) {
+if (\class_exists(AbstractCloner::class)) {
     /** @psalm-suppress MixedAssignment */
     AbstractCloner::$defaultCasters[Message::class] ??= [ProtobufCaster::class, 'cast'];
     /** @psalm-suppress MixedAssignment */
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,8 +21,7 @@ final class TraceFile @@
          */
         public function __construct(
             public readonly array $line,
-        ) {
-        }
+        ) {}
         public function __toString(): string
         {
@@ Expand Down @@