wip

.github/workflows/php-cs-fixer.yml → .github/workflows/pint.yml

@@ -12,12 +12,10 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
 
-      - name: Run PHP CS Fixer
-        uses: docker://oskarstark/php-cs-fixer-ga
-        with:
-          args: --config=.php_cs.dist.php --allow-risky=yes
+      - name: Fix styling issues
+        uses: aglipanci/[email protected]
 
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v5
+        uses: stefanzweifel/git-auto-commit-action@v4
         with:
           commit_message: Fix styling

composer.json

@@ -48,11 +48,11 @@
         "mockery/mockery": "^1.4",
         "nunomaduro/larastan": "^2.0",
         "orchestra/testbench": "^7.0|^8.0",
-        "pestphp/pest": "^1.21",
+        "pestphp/pest": "^2.0",
         "phpstan/extension-installer": "^1.1",
         "spatie/laravel-ray": "^1.28",
         "spatie/pdf-to-image": "^2.1",
-        "spatie/phpunit-snapshot-assertions": "^4.2"
+        "spatie/pest-plugin-snapshots": "^2.1"
     },
     "conflict": {
         "php-ffmpeg/php-ffmpeg": "<0.6.1"
@@ -91,7 +91,6 @@
     "scripts": {
         "analyse": "vendor/bin/phpstan analyse",
         "baseline": "vendor/bin/phpstan analyse --generate-baseline",
-        "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes",
         "test": "vendor/bin/pest"
     }
 }

phpunit.xml.dist

@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage/>
   <testsuites>
     <testsuite name="Spatie Test Suite">
       <directory>tests</directory>
     </testsuite>
   </testsuites>
-    <php>
+  <php>
     <env name="MAIL_MAILER" value="log"/>
-    </php>
+  </php>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>

src/Conversions/ConversionCollection.php

@@ -77,7 +77,6 @@ protected function addConversionsFromRelatedModel(Media $media): void
     protected function addManipulationsFromDb(Media $media): void
     {
         collect($media->manipulations)->each(function ($manipulation, $conversionName) {
-            ray($manipulation, $conversionName)->red();
             $manipulations = new Manipulations($manipulation);
 
             $this->addManipulationToConversion($manipulations, $conversionName);

tests/ArchTest.php

@@ -0,0 +1,5 @@
+<?php
+
+it('will not use debugging functions')
+    ->expect(['dd', 'dump', 'ray'])
+    ->not->toBeUsed();

tests/Conversions/ImageGenerators/SvgTest.php

@@ -18,4 +18,4 @@
     $imageFile = $imageGenerator->convert($media->getPath());
 
     expect(mime_content_type($imageFile))->toEqual('image/jpeg');
-});
+})->skipWhenRunningLocally();

tests/Pest.php

@@ -55,3 +55,13 @@ function unserializeAndSerializeModel($model)
 {
     return unserialize(serialize($model));
 }
+
+function skipWhenRunningOnGitHub(): bool
+{
+    return getenv('GITHUB_ACTIONS') !== false;
+}
+
+function skipWhenRunningLocally(): bool
+{
+    return getenv('GITHUB_ACTIONS') === false;
+}