Chore: cleanup (#58)

* style: fix

* Refactor: move thecodingmachine/safe to dev requirements

* chore: fix coverage

* chore: update CI configuration for PHP versions and checkout action

* chore: update pestphp/pest to version 3.8

* chore: modify CI to handle PHP 8.5 platform requirements during dependency installation

Author: bpolaszek

.github/workflows/ci.yml

@@ -6,22 +6,29 @@ on:
 
 jobs:
   tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         php:
           - 8.2
           - 8.3
+          - 8.4
+          - 8.5
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
 
       - name: Install dependencies
-        run: composer install --prefer-dist --no-progress
+        run: |
+          if [[ "${{ matrix.php }}" == "8.5" ]]; then
+            composer install --prefer-dist --no-progress --ignore-platform-req=php
+          else
+            composer install --prefer-dist --no-progress
+          fi
 
       - name: Check types
         run: vendor/bin/phpstan analyse

composer.json

@@ -6,20 +6,20 @@
     "php": ">=8.2",
     "psr/event-dispatcher": "^1.0",
     "psr/log": "^3.0",
-    "symfony/options-resolver": "@stable",
-    "thecodingmachine/safe": "^2.5"
+    "symfony/options-resolver": "@stable"
   },
   "require-dev": {
     "bentools/iterable-functions": "^2.1",
     "doctrine/orm": "^2.16",
     "friendsofphp/php-cs-fixer": "^3.35",
     "mockery/mockery": "^1.6",
     "monolog/monolog": "^3.5",
-    "pestphp/pest": "^2.24",
+    "pestphp/pest": "^3.8",
     "phpstan/phpstan": "^1.10",
     "phpstan/phpstan-mockery": "^1.1",
     "react/stream": "^1.3",
-    "symfony/var-dumper": "*"
+    "symfony/var-dumper": "*",
+    "thecodingmachine/safe": "^3.3"
   },
   "license": "MIT",
   "autoload": {

phpstan.dist.neon

@@ -3,9 +3,5 @@ parameters:
     paths:
         - src/
         - tests/
-    ignoreErrors:
-        -
-          message: "#Access to an undefined property#"
-          path: "tests/Unit/Recipe/LoggerRecipeTest.php"
 includes:
     - vendor/phpstan/phpstan-mockery/extension.neon

src/Internal/EtlBuilderTrait.php

@@ -35,7 +35,7 @@ trait EtlBuilderTrait
 
     public function extractFrom(
         ExtractorInterface|callable $extractor,
-        ExtractorInterface|callable ...$extractors
+        ExtractorInterface|callable ...$extractors,
     ): self {
         $extractors = [$extractor, ...$extractors];
 
@@ -54,7 +54,7 @@ public function extractFrom(
 
     public function transformWith(
         TransformerInterface|callable $transformer,
-        TransformerInterface|callable ...$transformers
+        TransformerInterface|callable ...$transformers,
     ): self {
         $transformers = [$transformer, ...$transformers];
 

src/Iterator/PregSplitIterator.php

@@ -7,8 +7,8 @@
 use IteratorAggregate;
 use Traversable;
 
+use function preg_split;
 use function rtrim;
-use function Safe\preg_split;
 
 /**
  * @internal

src/functions.php

@@ -42,13 +42,13 @@ function array_fill_from(array $keys, array $values, array ...$extraValues): arr
 }
 
 /**
- * @internal
- *
- * @template T
- *
  * @param iterable<T> $items
  *
  * @return Iterator<T>
+ *
+ * @internal
+ *
+ * @template T
  */
 function iterable_to_iterator(iterable $items): Iterator
 {
@@ -62,7 +62,7 @@ function extractFrom(ExtractorInterface|callable $extractor, ExtractorInterface|
 
 function transformWith(
     TransformerInterface|callable $transformer,
-    TransformerInterface|callable ...$transformers
+    TransformerInterface|callable ...$transformers,
 ): EtlExecutor {
     return (new EtlExecutor())->transformWith(...func_get_args());
 }
@@ -107,6 +107,6 @@ function skipWhen(callable $filter, ?string $eventClass = ExtractEvent::class, i
         $filter(...),
         $eventClass ?? ExtractEvent::class,
         $priority,
-        FilterRecipeMode::EXCLUDE
+        FilterRecipeMode::EXCLUDE,
     );
 }

tests/Unit/EtlExecutorTest.php

@@ -63,7 +63,7 @@
 
 it('loads conditionally', function () {
     // Background
-    $loader = new class() implements ConditionalLoaderInterface {
+    $loader = new class implements ConditionalLoaderInterface {
         public function supports(mixed $item, EtlState $state): bool
         {
             return 'foo' !== $item;
@@ -98,7 +98,7 @@ public function flush(bool $isPartial, EtlState $state): mixed
 it('yells if it cannot process extracted data', function () {
     // Given
     $executor = (new EtlExecutor())->withProcessor(
-        new class() implements ProcessorInterface {
+        new class implements ProcessorInterface {
             public function supports(mixed $extracted): bool
             {
                 return false;

tests/Unit/EventDispatcher/EventDispatcherTest.php

@@ -29,10 +29,10 @@ public function visit(string $visitor): void
 it('dispatches events, to the appropriate listeners, in the correct order', function () {
     $listenerProvider = new PrioritizedListenerProvider();
     $bus = new EventDispatcher($listenerProvider);
-    $ignored = new class() {
+    $ignored = new class {
         use EventVisitor;
     };
-    $event = new class() {
+    $event = new class {
         use EventVisitor;
     };
 
@@ -55,7 +55,7 @@ public function visit(string $visitor): void
 it('stops propagation of events', function () {
     $listenerProvider = new PrioritizedListenerProvider();
     $bus = new EventDispatcher($listenerProvider);
-    $event = new class() implements StoppableEventInterface {
+    $event = new class implements StoppableEventInterface {
         use EventVisitor;
     };
 

tests/Unit/Extractor/ChainExtractorTest.php

@@ -6,6 +6,7 @@
 
 use BenTools\ETL\EtlExecutor;
 use BenTools\ETL\Extractor\CallableExtractor;
+use BenTools\ETL\Extractor\ChainExtractor;
 
 use function BenTools\ETL\chain;
 use function BenTools\ETL\extractFrom;
@@ -40,3 +41,8 @@
     // Then
     expect($report->output)->toBe(['banana', 'apple', 'strawberry', 'raspberry', 'peach']);
 });
+
+it('returns self', function () {
+    $chainTransformer = new ChainExtractor(fn () => null);
+    expect(ChainExtractor::from($chainTransformer))->toBe($chainTransformer);
+});

tests/Unit/Loader/ChainLoaderTest.php

@@ -8,6 +8,7 @@
 use BenTools\ETL\EtlExecutor;
 use BenTools\ETL\EtlState;
 use BenTools\ETL\Loader\CallableLoader;
+use BenTools\ETL\Loader\ChainLoader;
 use BenTools\ETL\Loader\ConditionalLoaderInterface;
 
 use function BenTools\ETL\chain;
@@ -26,7 +27,7 @@
         chain($executor->loader)
             ->with(fn (string $item) => $b[] = $item) // @phpstan-ignore-line
             ->with(
-                new class() implements ConditionalLoaderInterface {
+                new class implements ConditionalLoaderInterface {
                     public function supports(mixed $item, EtlState $state): bool
                     {
                         return 'foo' !== $item;
@@ -80,3 +81,8 @@ public function flush(bool $isPartial, EtlState $state): mixed
     expect([...$a])->toBe(['foo', 'bar'])
         ->and([...$b])->toBe(['foo', 'bar']);
 });
+
+it('returns self', function () {
+    $chainTransformer = new ChainLoader(fn () => null);
+    expect(ChainLoader::from($chainTransformer))->toBe($chainTransformer);
+});