3 commit

Author: webDevWay

Makefile

@@ -13,8 +13,27 @@ require:
 lint:
 	composer exec --verbose phpcs -- --standard=PSR12 src bin tests
 
+lint-fix:
+	composer lint-fix
+
 test:
-	composer test
+	composer exec --verbose phpunit tests
 
-lint-fix:
-	composer lint-fix
+test-coverage:
+	XDEBUG_MODE=coverage composer exec --verbose phpunit tests -- --coverage-clover=build/logs/clover.xml
+
+test-coverage-text:
+	XDEBUG_MODE=coverage composer exec --verbose phpunit tests -- --coverage-text
+
+test1:
+	php ./bin/gendiff ./tests/fixtures/file1.yaml ./tests/fixtures/file2.yaml
+test2:
+	php ./bin/gendiff ./tests/fixtures/file1.json ./tests/fixtures/file2.json
+test3:
+	php ./bin/gendiff ./tests/fixtures/file1.json ./tests/fixtures/file2.json --format plain
+test4:
+	php ./bin/gendiff ./tests/fixtures/file1.yaml ./tests/fixtures/file2.yaml --format plain
+test5:
+	php ./bin/gendiff ./tests/fixtures/file1.yaml ./tests/fixtures/file2.yaml --format json
+test6:
+	php ./bin/gendiff ./tests/fixtures/file1.json ./tests/fixtures/file2.json --format json

bin/gendiff

@@ -48,7 +48,7 @@ function main(): void
         $file2 = $response['<secondFile>'];
         $format = $response['--format'];
 
-        $diff = genDiff($file1, $file2);
+        $diff = genDiff($file1, $file2, $format);
         echo $diff . "\n";
 
     } catch (Exception $e) {

phpunit.xml

@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
          bootstrap="vendor/autoload.php"
-         colors="true"
+         cacheResultFile=".phpunit.cache/test-results"
          executionOrder="depends,defects"
-         backupGlobals="false"
+         forceCoversAnnotation="true"
+         beStrictAboutCoversAnnotation="true"
          beStrictAboutOutputDuringTests="true"
-         displayDetailsOnTestsThatTriggerDeprecations="true"
-         displayDetailsOnTestsThatTriggerErrors="true"
-         displayDetailsOnTestsThatTriggerNotices="true"
-         displayDetailsOnTestsThatTriggerWarnings="true"
-         displayDetailsOnPhpunitDeprecations="true"
-         stopOnFailure="true"
->
+         beStrictAboutTodoAnnotatedTests="true"
+         convertDeprecationsToExceptions="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         verbose="true">
     <testsuites>
         <testsuite name="default">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
 
-    <logging>
-        <junit outputFile="build/logs/junit.xml"/>
-    </logging>
-</phpunit>
+    <coverage cacheDirectory=".phpunit.cache/code-coverage"
+              processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
+</phpunit>

src/Formatters/Plain.php

@@ -16,7 +16,6 @@ function buildLines(array $diff, string $path = ''): array
 
     foreach ($diff as $node) {
         $currentPath = $path === '' ? $node['key'] : "{$path}.{$node['key']}";
-
         switch ($node['type']) {
             case 'nested':
                 $nestedLines = buildLines($node['children'], $currentPath);