Update tooling

Author: cracksalad

.github/workflows/ci.yml

@@ -13,9 +13,9 @@ jobs:
     name: Coding Standard
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: Cache Composer dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: /tmp/composer-cache
           key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Psalm
         uses: docker://ghcr.io/psalm/psalm-github-actions
@@ -55,17 +55,17 @@ jobs:
     name: "Test: PHP ${{ matrix.php.version }}"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: Cache Composer dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: /tmp/composer-cache
           key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
       - uses: php-actions/composer@v6
         with:
           dev: no
           php_version: "${{ matrix.php.version }}"
-      - uses: php-actions/phpunit@v3
+      - uses: php-actions/phpunit@v4
         env:
           XDEBUG_MODE: coverage
         with:

.phive/phars.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpunit" version="^10.0.0" installed="10.5.3" location="./tools/phpunit" copy="true"/>
-  <phar name="psalm" version="^5.12.0" installed="5.17.0" location="./tools/psalm" copy="true"/>
+  <phar name="phpunit" version="^12.0.0" installed="12.4.2" location="./tools/phpunit" copy="true"/>
+  <phar name="psalm" version="^6.0.0" installed="6.13.1" location="./tools/psalm" copy="true"/>
   <phar name="phpcpd" version="^6.0.0" installed="6.0.3" location="./tools/phpcpd" copy="true"/>
-  <phar name="composer-require-checker" version="^4.2.0" installed="4.8.0" location="./tools/composer-require-checker" copy="true"/>
-  <phar name="phploc" version="^7.0.0" installed="7.0.2" location="./tools/phploc" copy="true"/>
 </phive>

bin/json-schema-validator

@@ -7,6 +7,6 @@
     ],
     "force-autodiscovery": true,
     "algorithm": "SHA256",
-    "banner": "JSON Schema Validator by Andreas Wahlen",
+    "banner": "JSON Schema Validator by nerou GmbH",
     "git": "git-version"
 }

box.json

@@ -1,6 +1,6 @@
 {
     "name": "nerou/json-schema-validator",
-    "version": "1.0.3",
+    "description": "Validate JSON Schema files against the JSON Schema Standard",
     "type": "library",
     "license": "MIT",
     "authors": [
@@ -15,10 +15,11 @@
         "php": ">=8.0",
         "ext-json": "*",
         "opis/json-schema": "^2.3",
-        "nerou/cli-parser": "^0.1.0"
+        "nerou/cli-parser": "^0.1"
     },
     "require-dev": {
-        "squizlabs/php_codesniffer": ">=3.7"
+        "squizlabs/php_codesniffer": "^4.0",
+        "humbug/box": "^4.6"
     },
     "prefer-stable": true,
     "autoload": {
@@ -35,10 +36,7 @@
         "phpunit": "./tools/phpunit test",
         "phpcpd": "./tools/phpcpd src",
         "psalm": "./tools/psalm --no-diff --use-baseline=psalm.baseline.xml --php-version=8.1",
-        "psalm-stats": "./tools/psalm --no-diff --use-baseline=psalm.baseline.xml --php-version=8.1 --stats | grep -v 100",
         "update-psalm-baseline": "./tools/psalm --no-diff --set-baseline=psalm.baseline.xml",
-        "require-checker": "./tools/composer-require-checker check",
-        "lines": "./tools/phploc src",
         "build": "./vendor/bin/box compile",
         "tests": [
             "@phpcs",

composer.json

@@ -26,7 +26,8 @@
         <exclude name="Generic.Files.LowercasedFilename"/>
         <exclude name="Generic.Formatting.DisallowMultipleStatements"/>
         <exclude name="Generic.Formatting.MultipleStatementAlignment.NotSameWarning"/>
-        <exclude name="Generic.Formatting.NoSpaceAfterCast"/>
+        <exclude name="Generic.Formatting.MultipleStatementAlignment.NotSame"/>
+        <exclude name="Generic.Formatting.SpaceAfterCast"/>                     <!-- see below -->
         <exclude name="Generic.Formatting.SpaceBeforeCast"/>
         <exclude name="Generic.Functions.OpeningFunctionBraceBsdAllman"/>
         <exclude name="Generic.Metrics.CyclomaticComplexity"/>                  <!-- see below -->
@@ -39,10 +40,6 @@
         <exclude name="Generic.Strings.UnnecessaryStringConcat"/>
         <exclude name="Generic.WhiteSpace.DisallowSpaceIndent"/>
         <exclude name="Generic.WhiteSpace.ScopeIndent"/>                        <!-- see below -->
-        
-        <!-- temporary -->
-        <exclude name="Generic.CodeAnalysis.UnusedFunctionParameter"/>
-        <exclude name="Generic.Metrics.NestingLevel"/>
     </rule>
     <rule ref="Generic.Arrays.ArrayIndent">
         <properties>
@@ -56,6 +53,11 @@
     <rule ref="Generic.Commenting">
         <type>warning</type>
     </rule>
+    <rule ref="Generic.Formatting.SpaceAfterCast">
+        <properties>
+            <property name="spacing" value="0"/>
+        </properties>
+    </rule>
     <rule ref="Generic.Formatting.SpaceAfterNot">
         <properties>
             <property name="spacing" value="0"/>
@@ -104,7 +106,6 @@
     <rule ref="Squiz.Strings.DoubleQuoteUsage"/>
     <rule ref="Squiz.Strings.EchoedStrings"/>
     <rule ref="Squiz.WhiteSpace.CastSpacing"/>
-    <rule ref="Squiz.WhiteSpace.LanguageConstructSpacing"/>
     <rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing"/>
     <rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
 </ruleset>

phpcs.xml

@@ -5,7 +5,7 @@
 		    autoloader="vendor/autoload.php"
 		    allowStringToStandInForClass="true" 
 		    errorBaseline="psalm.baseline.xml"
-		    errorLevel="2"
+		    errorLevel="1"
 		    findUnusedBaselineEntry="false"
 		    findUnusedCode="false">
 

psalm.xml

@@ -29,11 +29,16 @@ function collectSchemaFiles(array $fileList): array {
 /**
  * @return string[]
  * @psalm-return list<string>
+ * @throws \InvalidArgumentException if given folder is not accessible
  */
 function listSchemasInFolder(string $folder): array {
   $folder = str_ends_with($folder, '/') ? substr($folder, 0, strlen($folder) - 1) : $folder;
+  $scanRes = scandir($folder);
+  if($scanRes === false){
+    throw new \InvalidArgumentException('folder '.$folder.' does not exist or is not readable');
+  }
   $res = [];
-  foreach(scandir($folder) as $filename){
+  foreach($scanRes as $filename){
     if(is_file($folder.'/'.$filename) && is_readable($folder.'/'.$filename) && str_ends_with($filename, '.json') !== false){
       $res[] = $folder.'/'.$filename;
     } else if(is_dir($folder.'/'.$filename) && is_readable($folder.'/'.$filename) && $filename !== '.' && $filename !== '..'){

src/functions.php

@@ -16,12 +16,7 @@
   exit(1);          // exit if not run via CLI
 }
 
-echo 'JSON Schema Validator @git-version@ by Andreas Wahlen'.PHP_EOL.PHP_EOL;
-
-if(!class_exists(\Opis\JsonSchema\Validator::class)){
-  echo "\033[31mFATAL: Opis\JsonSchema\Validator not found, is it required in your composer.json?\033[0m".PHP_EOL.PHP_EOL;
-  exit(10);
-}
+echo 'JSON Schema Validator @git-version@ by nerou GmbH'.PHP_EOL.PHP_EOL;
 
 $cliArgs = new CLIParser($_SERVER['argv']);
 $cliArgs->setAllowedOptions([]);
@@ -36,12 +31,15 @@
 // collect schema files to validate
 try {
   $files = collectSchemaFiles($cliArgs->getCommands());
-} catch(InvalidArgumentException $ex){
+} catch(\InvalidArgumentException $ex){
   echo "\033[31m".$ex->getMessage()."\033[0m".PHP_EOL;
   exit(20);
 }
 
 $cwd = getcwd();
+if($cwd === false){
+  throw new \UnexpectedValueException('unable to get current working directory');
+}
 $validator = new Validator();
 $validator->resolver()->registerPrefix('https://json-schema.org/', dirname(__DIR__).'/resource');
 $validator->resolver()->registerPrefix('http://json-schema.org/', dirname(__DIR__).'/resource');
@@ -52,10 +50,14 @@
   echo '['.str_pad(strval($index+1), $countChars, ' ', STR_PAD_LEFT).'/'.count($files).'] '.
       $formattedFilename;
   try {
+    $fileContent = file_get_contents($file);
+    if($fileContent === false){
+      throw new \UnexpectedValueException('file '.$file.' could not be read');
+    }
     /**
      * @var scalar|object $json
      */
-    $json = json_decode(file_get_contents($file), flags: JSON_THROW_ON_ERROR);
+    $json = json_decode($fileContent, flags: JSON_THROW_ON_ERROR);
   } catch(JsonException $ex){
     echo "[\033[31mSYNTAX ERROR\033[0m]".PHP_EOL;
     $errors++;
@@ -65,8 +67,10 @@
   try {
     /**
      * @psalm-suppress PossiblyInvalidPropertyFetch
+     * @var string $schema
      */
-    $result = $validator->validate($json, $json->{'$schema'} ?? 'https://json-schema.org/draft/2020-12/schema');
+    $schema = $json->{'$schema'} ?? 'https://json-schema.org/draft/2020-12/schema';
+    $result = $validator->validate($json, $schema);
     if(!$result->isValid()){
       $errorMessage = json_encode(((new ErrorFormatter())->format($result->error())),
           JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_THROW_ON_ERROR);
@@ -86,8 +90,10 @@
     }
   }
 }
-echo 'consumed '.number_format(microtime(true) - $startTime, 3).' s of processing time and '.
-    (memory_get_peak_usage(true) / 1024 / 1024).' MiB of memory'.PHP_EOL.PHP_EOL;
+echo sprintf('Time: %.3s s, Memory: %.2f MiB'.PHP_EOL.PHP_EOL,
+    microtime(true) - $startTime,
+    ((float) memory_get_peak_usage(true)) / 1024. / 1024.
+);
 echo 'JSON Schemas: '.count($files).', errors: '.$errors.PHP_EOL;
 if($errors > 0){
   exit(30);