status check 3

Author: webDevWay

src/Differ.php

@@ -40,7 +40,9 @@ function buildDiff(object $data1, object $data2): array
     $keys1 = array_keys(get_object_vars($data1));
     $keys2 = array_keys(get_object_vars($data2));
     $allKeys = array_unique(array_merge($keys1, $keys2));
-    $sortedKeys = sortKeys($allKeys);
+    $sortedKeys = sort($allKeys, function($a, $b) {
+        return strcmp($a, $b);
+    });
 
     return array_map(function ($key) use ($data1, $data2) {
         return buildNode($key, $data1, $data2);
@@ -130,9 +132,3 @@ function isObject(mixed $value): bool
     return is_object($value);
 }
 
-function sortKeys(array $keys): array
-{
-    return sort($keys, function ($a, $b) {
-        return strcmp($a, $b);
-    });
-}

src/Formatters.php

@@ -6,7 +6,7 @@
 use function Differ\Formatters\Plain\format as formatPlain;
 use function Differ\Formatters\Json\format as formatJson;
 
-function render(array $diff, string $formatName = 'stylish'): string
+function render(array $diff, string $formatName): string
 {
     switch ($formatName) {
         case 'stylish':

tests/DifferTest.php

@@ -12,12 +12,6 @@ function getFixturePath(string $filename): string
     return __DIR__ . '/fixtures/' . $filename;
 }
 
-function getFixtureContent(string $filename): string
-{
-    $path = getFixturePath($filename);
-    return file_get_contents($path);
-}
-
 class DifferTest extends TestCase
 {
     public static function fileFormatsProvider(): array
@@ -31,19 +25,19 @@ public static function fileFormatsProvider(): array
     #[DataProvider('fileFormatsProvider')]
     public function testRecursiveComparisonJsonStylishFormat(string $format): void
     {
-        $expected = file_get_contents(getFixturePath('expected_nested.txt'));
+        $expected = getFixturePath('expected_nested.txt');
 
         $actual = genDiff(getFixturePath("file1.{$format}"), getFixturePath("file2.{$format}"));
-        $this->assertNotEquals($expected, $actual);
+        $this->assertStringNotEqualsFile($expected, $actual);
     }
 
     #[DataProvider('fileFormatsProvider')]
     public function testPlainFormatOutput(string $format): void
     {
-        $expected = file_get_contents(getFixturePath('expected_plain.txt'));
+        $expected = getFixturePath('expected_plain.txt');
 
         $actual = genDiff(getFixturePath("file1.{$format}"), getFixturePath("file2.{$format}"), 'plain');
-        $this->assertEquals($expected, $actual);
+        $this->assertStringEqualsFile($expected, $actual);
     }
 
     #[DataProvider('fileFormatsProvider')]