Merge branch 'main' into readme

.github/workflows/lint_test_pull_requests.yaml

@@ -12,7 +12,7 @@ jobs:
  matrix:
  composer-command:
  - name: PHP Code Style
- command: 'style:php'
+ command: 'style:php:check'
  - name: Composer normalize
  command: 'normalize --dry-run'
  - name: PHPStan

extension-installer/composer.json

@@ -36,6 +36,7 @@
  },
  "scripts": {
  "analyze:php": "phpstan analyze",
- "style:php": "ecs"
+ "style:php:check": "ecs",
+ "style:php:fix": "ecs --fix"
  }
 }

fractor-xml/composer.json

@@ -48,7 +48,8 @@
  },
  "scripts": {
  "analyze:php": "phpstan analyze",
- "style:php": "ecs",
+ "style:php:check": "ecs",
+ "style:php:fix": "ecs --fix",
  "test:php": "phpunit tests/"
  }
 }

fractor/composer.json

@@ -45,7 +45,8 @@
  },
  "scripts": {
  "analyze:php": "phpstan analyze",
- "style:php": "ecs",
+ "style:php:check": "ecs",
+ "style:php:fix": "ecs --fix",
  "test:php": "phpunit tests/"
  }
 }

fractor/src/FileSystem/FileFinder.php

@@ -13,15 +13,18 @@ final class FileFinder
  */
  public function findFiles(array $directories, array $fileExtensions): array
  {
+ if ($directories === []) {
+ throw new \UnexpectedValueException('Directories must not be an empty array');
+ }
+
  $finder = Finder::create()
  ->files()
  // skip empty files
  ->size('> 0')
  ->in($directories);
 
- if ($fileExtensions !== []) {
- $pattern = sprintf('/(%s)/', implode('|', $fileExtensions));
- $finder->name($pattern);
+ foreach ($fileExtensions as $fileExtension) {
+ $finder->name('*.' . $fileExtension);
  }
 
  $files = [];

fractor/tests/FileSystem/FileFinderTest.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FileSystem;
+
+use a9f\Fractor\FileSystem\FileFinder;
+use PHPUnit\Framework\Attributes\Test;
+use PHPUnit\Framework\TestCase;
+use UnexpectedValueException;
+
+final class FileFinderTest extends TestCase
+{
+ private FileFinder $subject;
+
+ protected function setUp(): void
+ {
+ $this->subject = new FileFinder();
+ }
+
+ #[Test]
+ public function anExceptionIsThrownWhenDirectoriesAreEmpty(): void
+ {
+ $this->expectException(UnexpectedValueException::class);
+ $this->subject->findFiles([], []);
+ }
+
+ #[Test]
+ public function findAllNonEmptyFilesInGivenDirectories(): void
+ {
+ self::assertCount(4, $this->subject->findFiles([__DIR__ . '/Fixture/DirectorToSearchIn'], []));
+ }
+
+ #[Test]
+ public function findAllNonEmptyFilesInGivenDirectoriesWithGivenExtensions(): void
+ {
+ self::assertCount(2, $this->subject->findFiles([__DIR__ . '/Fixture/DirectorToSearchIn'], ['txt', 'json']));
+ }
+}

fractor/tests/FileSystem/Fixture/DirectorToSearchIn/my_file.txt

@@ -0,0 +1 @@
+My file

fractor/tests/FileSystem/Fixture/DirectorToSearchIn/my_file.yaml

@@ -0,0 +1,2 @@
+yaml:
+ test: 1

fractor/tests/FileSystem/Fixture/DirectorToSearchIn/my_json.json

@@ -0,0 +1,3 @@
+{
+
+}

fractor/tests/FileSystem/Fixture/DirectorToSearchIn/my_txt.yaml

@@ -0,0 +1 @@
+My file

typo3-fractor/composer.json

@@ -48,7 +48,8 @@
  },
  "scripts": {
  "analyze:php": "phpstan analyze",
- "style:php": "ecs",
+ "style:php:check": "ecs",
+ "style:php:fix": "ecs --fix",
  "test:php": "phpunit tests/"
  }
 }