Update CS fixes

- Added `phpcs` and `phpcs:apply`
- Added `rector:apply`
- Updated from `PSR12` to `PER-CS`
- Updated dependencies
- Applied CS rules

Author: tomkyle

.php-cs-fixer.dist.php

@@ -12,7 +12,9 @@
     ]);
 
 return (new PhpCsFixer\Config())->setRules([
-    '@PSR12' => true,
+    '@PER-CS' => true,
+    '@PHP82Migration' => true,
+
     'header_comment' => [
         'comment_type' => 'PHPDoc',
         'header' => $header,

composer.lock

@@ -4,7 +4,7 @@
   "private": true,
   "devDependencies": {
     "chokidar-cli": "^3.0.0",
-    "@mermaid-js/mermaid-cli": "^10.7",
+    "@mermaid-js/mermaid-cli": "^10.8",
     "npm-run-all": "^4.1.5"
   },
   "scripts": {
@@ -14,8 +14,13 @@
     "watch:tests": "chokidar \"tests/**/*.php\"      -c \"npm run phpunit {path}\"",
     "watch:mermaid": "chokidar \"**/*.mmd\"          -c \"mmdc -e svg -i {path}\"",
 
+    "phpcs"       : "./vendor/bin/php-cs-fixer fix --verbose --diff --dry-run",
+    "phpcs:apply" : "./vendor/bin/php-cs-fixer fix --verbose --diff",
+
     "phpstan": "./vendor/bin/phpstan --no-progress analyse",
+
     "rector": "./vendor/bin/rector process --dry-run",
+    "rector:apply": "./vendor/bin/rector process",
 
     "phpunit": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --configuration phpunit.npm.xml",
     "phpunit:filter": "npm run phpunit -- --testsuite unit --filter",

package-lock.json

@@ -23,7 +23,7 @@ abstract class FilePersistenceAbstract implements FilePersistence
     /**
      * @var int The output directory permissions.
      */
-    protected int $directory_permissions = 0755;
+    protected int $directory_permissions = 0o755;
 
     /**
      * Examples: "json", "yaml"
@@ -220,8 +220,8 @@ public function readAll(): array
         $ext = $this->getExtension(dot: true);
         $files = glob($this->basedir . ('/*' . $ext)) ?: [];
 
-        $id_array = array_map(static fn ($file) => basename($file, $ext), $files);
-        $all_read = array_map(fn (string|int $id): array => $this->read($id), $id_array);
+        $id_array = array_map(static fn($file) => basename($file, $ext), $files);
+        $all_read = array_map(fn(string|int $id): array => $this->read($id), $id_array);
 
         return array_filter($all_read);
     }

package.json

@@ -83,9 +83,9 @@ public function readAll(): array
 
         $files = glob($base_dir . '/*' . $ext) ?: [];
 
-        $id_array = array_map(static fn ($file) => basename((string) $file, $ext), $files);
+        $id_array = array_map(static fn($file) => basename($file, $ext), $files);
 
-        $all_read = array_map(fn (string|int $id, &$store = null): array => $this->read($id, $store), $id_array);
+        $all_read = array_map(fn(string|int $id, &$store = null): array => $this->read($id, $store), $id_array);
         return array_filter($all_read);
     }
 
@@ -117,6 +117,7 @@ public function writeToFile(string $file_path, \Stringable|string $file_content,
         if ($file_content instanceof \Stringable) {
             $file_content = $file_content->__toString();
         }
+
         return $this->persistence->writeToFile($file_path, $frontmatter . $file_content);
     }
 

src/Persistence/FilePersistenceAbstract.php

@@ -94,7 +94,7 @@ public function findOneBy(array $criteria): null|array|object
      */
     public function findAll(): iterable
     {
-        $items = array_map(fn ($item) => ($this->item_factory)($item), $this->persistence->readAll());
+        $items = array_map(fn($item) => ($this->item_factory)($item), $this->persistence->readAll());
 
         return ($this->collection_factory)($items);
     }

src/Persistence/FrontmatterFilePersistence.php

@@ -184,7 +184,7 @@ public static function buildFixturesPath(string $dir): string
             dirname(__DIR__, 2),
             'tests',
             'fixtures',
-            $dir
+            $dir,
         ]);
 
         // Copy fixtures to a temp directory which will be deleted afterwards

src/Repositories/Repository.php

@@ -30,8 +30,8 @@ protected function setUp(): void
 
         $this->sut = $this->getMockForAbstractClass(FilePersistenceAbstract::class, [$temp_dir]);
 
-        $this->sut->method('encode')->willReturnCallback(static fn ($data) => json_encode($data));
-        $this->sut->method('decode')->willReturnCallback(static fn ($content) => json_decode((string) $content, true));
+        $this->sut->method('encode')->willReturnCallback(static fn($data) => json_encode($data));
+        $this->sut->method('decode')->willReturnCallback(static fn($content) => json_decode((string) $content, true));
     }
 
     protected function tearDown(): void
@@ -62,7 +62,7 @@ public static function invalidBaseDirProvider(): array
     {
         return [
             'root directory' => ['/'],
-            'empty directory' => ['']
+            'empty directory' => [''],
         ];
     }
 

tests/Integration/RepositoryWithFilePersistenceTest.php

@@ -155,7 +155,7 @@ public static function invalidBaseDirProvider(): array
     {
         return [
             'root directory' => ['/'],
-            'empty directory' => ['']
+            'empty directory' => [''],
         ];
     }
 

tests/Unit/FilePersistenceAbstractTest.php

@@ -99,7 +99,7 @@ public function testReadWithFrontmatterFromFile(): void
     {
         $sample = ['foo' => 'bar'];
 
-        $fileContent = "---\ntitle: Test Title\n".Yaml::dump($sample)."\n---\n" . $this->testContent;
+        $fileContent = "---\ntitle: Test Title\n" . Yaml::dump($sample) . "\n---\n" . $this->testContent;
         $this->filePersistenceMock->method('readFromFile')->willReturn($fileContent);
         $this->filePersistenceMock->method('decode')->willReturn($sample);
 
@@ -137,7 +137,7 @@ public function testWriteToFile(): void
         $this->filePersistenceMock->expects($this->once())->method('writeToFile')
             ->with(
                 $this->equalTo($this->tempFilePath),
-                $this->callback(fn ($fileContent) => str_starts_with((string) $fileContent, "---\n") && str_contains((string) $fileContent, $this->testContent))
+                $this->callback(fn($fileContent) => str_starts_with((string) $fileContent, "---\n") && str_contains((string) $fileContent, $this->testContent))
             )
             ->willReturn(true);
 

tests/Unit/FilePersistenceTestBase.php

@@ -33,7 +33,7 @@ protected function setUp(): void
         // Initialize PersistenceChain with the mock Persistence object
         $this->sut = new PersistenceChain([
             $this->mockPersistence1,
-            $this->mockPersistence2
+            $this->mockPersistence2,
         ]);
     }
 

tests/Unit/FrontmatterFilePersistenceTest.php

@@ -89,7 +89,7 @@ public static function provideRepositoryAndPersistencesWithCriteria(): array
         $repo = new Repository(new InMemoryPersistence([
             ['some' => 'criteria', 'color' => 'blue'],
             ['some' => 'criteria', 'color' => 'orange'],
-            ['some' => 'other', 'color' => 'red']
+            ['some' => 'other', 'color' => 'red'],
         ]));
 
         $empty_repo = new Repository(new NoPersistence());
@@ -98,7 +98,7 @@ public static function provideRepositoryAndPersistencesWithCriteria(): array
             'Empty repo with "NoPersistence"'            => [ $empty_repo, ['color' => 'yellow'], 0 ],
             'Look for color that does not exist in repo' => [ $repo,       ['color' => 'yellow'], 0 ],
             'Should return only 1 item for unique value' => [ $repo,       ['some' => 'criteria', 'color' => 'orange'], 1 ],
-            'Should return 2 matching items'             => [ $repo,       ['some' => 'criteria'],                      2 ]
+            'Should return 2 matching items'             => [ $repo,       ['some' => 'criteria'],                      2 ],
         ];
     }