Switched to using helgesverre/toon

Author: Robert Gasch

README.md

@@ -2,15 +2,15 @@
 
 Laravel integration for TOON - A human-readable data serialization format.
 
-This package provides Laravel-specific features on top of the [robertgdev/php-toon](https://github.com/robertgdev/php-toon) core library.
+This package provides Laravel-specific features on top of the [helgesverre/toon](https://github.com/helgesverre/toon) core library.
 
 ## Installation
 
 ```bash
 composer require robertgdev/laravel-toon
 ```
 
-This will automatically install the `robertgdev/php-toon` core library as a dependency.
+This will automatically install the `helgesverre/toon` core library as a dependency.
 
 ## Configuration
 
@@ -57,7 +57,6 @@ TOON_ENCODE_LENGTH_MARKER=false
 # Decoding options
 TOON_DECODE_INDENT=2
 TOON_DECODE_STRICT=true
-TOON_DECODE_OBJECTS_AS_STDCLASS=false
 ```
 
 **Available Delimiters:**
@@ -69,9 +68,7 @@ TOON_DECODE_OBJECTS_AS_STDCLASS=false
 - `false` (default) - no marker
 - `true` or `#` - adds `#` prefix to array lengths
 
-**Objects as StdClass:**
-- `false` (default) - objects decode to associative arrays
-- `true` - objects decode to `StdClass` instances (enables perfect round-trips)
+
 
 ### Using Configured Defaults
 
@@ -85,7 +82,7 @@ $encoded = Toon::encode($data);
 $decoded = Toon::decode($encoded);
 
 // Override with custom options
-use RobertGDev\Toon\Types\EncodeOptions;
+use HelgeSverre\Toon\EncodeOptions;
 $encoded = Toon::encode($data, new EncodeOptions(indent: 4));
 ```
 
@@ -97,7 +94,7 @@ The package provides a Laravel facade for easy access:
 
 ```php
 use RobertGDev\LaravelToon\Facades\Toon;
-use RobertGDev\Toon\Types\EncodeOptions;
+use HelgeSverre\Toon\EncodeOptions;
 
 // Simple encoding
 $data = ['name' => 'Ada', 'age' => 30, 'active' => true];
@@ -127,13 +124,13 @@ $decoded = \Toon::decode($encoded);
 You can also use the core library directly:
 
 ```php
-use RobertGDev\Toon\Toon;
+use HelgeSverre\Toon\Toon;
 
 $encoded = Toon::encode(['name' => 'Ada']);
 $decoded = Toon::decode($encoded);
 ```
 
-For detailed API documentation, see the [robertgdev/php-toon](https://github.com/robertgdev/php-toon) package.
+For detailed API documentation, see the [helgesverre/toon](https://github.com/helgesverre/toon) package.
 
 ## Artisan Command
 
@@ -194,7 +191,7 @@ php artisan toon:convert input.toon --no-strict
 
 ## Package Structure
 
-This package is a thin Laravel integration layer. The core TOON functionality is provided by the `robertgdev/php-toon` package, which is a standalone PHP library.
+This package is a thin Laravel integration layer. The core TOON functionality is provided by the `helgesverre/toon` package, which is a standalone PHP library.
 
 ### What's in this package:
 - [`ToonServiceProvider`](src/ToonServiceProvider.php) - Registers the service and command
@@ -208,13 +205,13 @@ This package is a thin Laravel integration layer. The core TOON functionality is
 - Type definitions and options
 - Core TOON parser and serializer
 
-See [robertgdev/php-toon](https://github.com/robertgdev/php-toon) for the core library documentation.
+See [helgesverre/toon](https://github.com/helgesverre/toon) for the core library documentation.
 
 ## Requirements
 
 - PHP 8.2+
 - Laravel 10.x or 11.x or 12.x
-- robertgdev/php-toon (automatically installed)
+- helgesverre/toon (automatically installed)
 
 ## Testing
 

composer.json

@@ -10,14 +10,15 @@
     ],
     "require": {
         "php": "^8.2",
+        "helgesverre/toon": "^1.4",
         "illuminate/console": ">10",
-        "illuminate/support": ">10",
-        "robertgdev/php-toon": "^1.0"
+        "illuminate/support": ">10"
     },
     "require-dev": {
+        "larastan/larastan": "^3.0",
+        "orchestra/testbench": "^9.0",
         "pestphp/pest": "^4.0",
-        "phpunit/phpunit": "^12.0",
-        "orchestra/testbench": "^9.0"
+        "phpunit/phpunit": "^12.0"
     },
     "autoload": {
         "psr-4": {

config/toon.php

@@ -37,9 +37,6 @@
 
         // Enforce strict validation of array lengths and indentation
         'strict' => env('TOON_DECODE_STRICT', true),
-
-        // Decode objects as StdClass instances instead of arrays
-        'objectsAsStdClass' => env('TOON_DECODE_OBJECTS_AS_STDCLASS', false),
     ],
 
 ];

phpstan.neon

@@ -0,0 +1,25 @@
+includes:
+    - vendor/larastan/larastan/extension.neon
+    - vendor/nesbot/carbon/extension.neon
+
+parameters:
+    parallel:       
+        jobSize: 20
+        maximumNumberOfProcesses: 8
+        minimumNumberOfJobsPerProcess: 2
+
+    paths:
+        - src/
+
+    # Level 9 is the highest level
+    level: 9
+
+#    ignoreErrors:
+#
+#    excludePaths:
+#        - ./*/*/FileToBeExcluded.php
+#
+#    checkMissingIterableValueType: false
+#
+#    universalObjectCratesClasses:
+#        - App\Datatypes\Collection

src/Console/ToonCommand.php

@@ -3,9 +3,9 @@
 namespace  RobertGDev\LaravelToon\Console;
 
 use Illuminate\Console\Command;
-use RobertGDev\Toon\Toon;
-use RobertGDev\Toon\Types\DecodeOptions;
-use RobertGDev\Toon\Types\EncodeOptions;
+use HelgeSverre\Toon\Toon;
+use HelgeSverre\Toon\DecodeOptions;
+use HelgeSverre\Toon\EncodeOptions;
 
 class ToonCommand extends Command
 {
@@ -39,46 +39,46 @@ class ToonCommand extends Command
     public function handle(): int
     {
         $input = $this->argument('input');
+        if (!is_string($input)) {
+            $this->error('Input argument is required and must be a string');
+            return self::FAILURE;
+        }
+
         $output = $this->option('output');
+        $output = is_string($output) || $output === null ? $output : null;
 
         // Parse and validate indent
-        $indent = (int) $this->option('indent');
+        $indentOption = $this->option('indent');
+        $indent = is_numeric($indentOption) ? (int)$indentOption : 2;
         if ($indent < 0) {
-            $this->error("Invalid indent value: {$this->option('indent')}");
+            $this->error("Invalid indent value: {$indent}");
             return self::FAILURE;
         }
 
         // Validate delimiter
         $delimiter = $this->option('delimiter');
+        if (!is_string($delimiter)) {
+            $delimiter = ',';
+        }
         $validDelimiters = [',', "\t", '|'];
         if (!in_array($delimiter, $validDelimiters, true)) {
             $this->error("Invalid delimiter \"{$delimiter}\". Valid delimiters are: comma (,), tab (\\t), pipe (|)");
             return self::FAILURE;
         }
 
-        $mode = $this->detectMode(
-            $input,
-            $this->option('encode'),
-            $this->option('decode')
-        );
+        $encode = (bool)$this->option('encode');
+        $decode = (bool)$this->option('decode');
+
+        $mode = $this->detectMode($input, $encode, $decode);
 
         try {
             if ($mode === 'encode') {
-                $this->encodeToToon(
-                    $input,
-                    $output,
-                    $delimiter,
-                    $indent,
-                    $this->option('length-marker'),
-                    $this->option('stats')
-                );
+                $lengthMarker = (bool)$this->option('length-marker');
+                $stats        = (bool)$this->option('stats');
+
+                $this->encodeToToon($input, $output, $delimiter, $indent, $lengthMarker, $stats);
             } else {
-                $this->decodeToJson(
-                    $input,
-                    $output,
-                    $indent,
-                    !$this->option('no-strict')
-                );
+                $this->decodeToJson($input, $output, $indent, !$this->option('no-strict'));
             }
 
             return self::SUCCESS;
@@ -102,10 +102,10 @@ private function detectMode(?string $inputFile, bool $encodeFlag, bool $decodeFl
         }
 
         // Auto-detect based on file extension
-        if (str_ends_with($inputFile, '.json')) {
+        if ($inputFile !== null && str_ends_with($inputFile, '.json')) {
             return 'encode';
         }
-        if (str_ends_with($inputFile, '.toon')) {
+        if ($inputFile !== null && str_ends_with($inputFile, '.toon')) {
             return 'decode';
         }
 
@@ -129,6 +129,9 @@ private function encodeToToon(
         }
 
         $jsonContent = file_get_contents($input);
+        if ($jsonContent === false) {
+            throw new \RuntimeException("Failed to read input file: {$input}");
+        }
 
         try {
             $data = json_decode($jsonContent, true, 512, JSON_THROW_ON_ERROR);
@@ -179,6 +182,9 @@ private function decodeToJson(
         }
 
         $toonContent = file_get_contents($input);
+        if ($toonContent === false) {
+            throw new \RuntimeException("Failed to read input file: {$input}");
+        }
 
         try {
             $decodeOptions = new DecodeOptions(
@@ -190,7 +196,10 @@ private function decodeToJson(
             throw new \RuntimeException("Failed to decode TOON: {$e->getMessage()}");
         }
 
-        $jsonOutput = json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE, $indent);
+        $jsonOutput = json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE, 512);
+        if ($jsonOutput === false) {
+            throw new \RuntimeException("Failed to encode JSON output");
+        }
 
         if ($output) {
             file_put_contents($output, $jsonOutput);
@@ -208,7 +217,7 @@ private function decodeToJson(
     private function getRelativePath(string $path): string
     {
         $cwd = getcwd();
-        if (str_starts_with($path, $cwd)) {
+        if ($cwd !== false && str_starts_with($path, $cwd)) {
             return substr($path, strlen($cwd) + 1);
         }
         return $path;

src/Facades/Toon.php

@@ -5,8 +5,8 @@
 use Illuminate\Support\Facades\Facade;
 
 /**
- * @method static string encode(mixed $input, ?\RobertGDev\Toon\Types\EncodeOptions $options = null)
- * @method static mixed decode(string $input, ?\RobertGDev\Toon\Types\DecodeOptions $options = null)
+ * @method static string encode(mixed $input, ?\HelgeSverre\Toon\EncodeOptions $options = null)
+ * @method static mixed decode(string $input, ?\HelgeSverre\Toon\DecodeOptions $options = null)
  *
  * @see \RobertGDev\LaravelToon\Toon
  */

src/Toon.php

@@ -2,9 +2,9 @@
 
 namespace  RobertGDev\LaravelToon;
 
-use RobertGDev\Toon\Toon as BaseToon;
-use RobertGDev\Toon\Types\DecodeOptions;
-use RobertGDev\Toon\Types\EncodeOptions;
+use HelgeSverre\Toon\Toon as BaseToon;
+use HelgeSverre\Toon\DecodeOptions;
+use HelgeSverre\Toon\EncodeOptions;
 
 /**
  * Laravel wrapper for Toon encoding/decoding with config support.
@@ -34,23 +34,32 @@ public function decode(string $input, ?DecodeOptions $options = null): mixed
      */
     protected function getDefaultEncodeOptions(): EncodeOptions
     {
-        return new EncodeOptions(
-            indent: config('toon.encode.indent', 2),
-            delimiter: config('toon.encode.delimiter', ','),
-            lengthMarker: $this->parseLengthMarker(config('toon.encode.lengthMarker', false))
-        );
+        $indent = config('toon.encode.indent', 2);
+        $indent = is_numeric($indent) ? (int)$indent : 2;
+        
+        $delimiter = config('toon.encode.delimiter', ',');
+        if (!is_string($delimiter)) {
+            $delimiter = ',';
+        }
+        
+        $lengthMarker = config('toon.encode.lengthMarker', false);
+        $lengthMarker = $this->parseLengthMarker($lengthMarker);
+
+        return new EncodeOptions($indent, $delimiter, $lengthMarker);
     }
 
     /**
      * Get default decode options from Laravel config.
      */
     protected function getDefaultDecodeOptions(): DecodeOptions
     {
-        return new DecodeOptions(
-            indent: config('toon.decode.indent', 2),
-            strict: config('toon.decode.strict', true),
-            objectsAsStdClass: config('toon.decode.objectsAsStdClass', false)
-        );
+        $indent = config('toon.decode.indent', 2);
+        $indent = is_numeric($indent) ? (int)$indent : 2;
+        
+        $strict = config('toon.decode.strict', true);
+        $strict = is_bool($strict) || $strict === 'true' || $strict === 1;
+        
+        return new DecodeOptions($indent, $strict);
     }
 
     /**

tests/ConfigTest.php

@@ -9,7 +9,6 @@
         expect(config('toon.encode.lengthMarker'))->toBe(false);
         expect(config('toon.decode.indent'))->toBe(2);
         expect(config('toon.decode.strict'))->toBe(true);
-        expect(config('toon.decode.objectsAsStdClass'))->toBe(false);
     });
 
     it('can be overridden via config', function () {
@@ -67,7 +66,7 @@
         expect($config)->toHaveKey('encode');
         expect($config)->toHaveKey('decode');
         expect($config['encode'])->toHaveKey('indent');
-        expect($config['decode'])->toHaveKey('objectsAsStdClass');
+        expect($config['decode'])->toHaveKey('strict');
 
         // Clean up
         File::delete($configPath);
@@ -109,14 +108,11 @@
     });
 
     it('applies config defaults when decoding', function () {
-        config(['toon.decode.objectsAsStdClass' => true]);
-        
         $toon = app('toon');
         $toonStr = "name: Ada";
         $decoded = $toon->decode($toonStr);
 
-        expect($decoded)->toBeInstanceOf(StdClass::class);
-        expect($decoded->name)->toBe('Ada');
+        expect($decoded)->toBe(['name' => 'Ada']);
     });
 
     it('allows overriding config with explicit options', function () {
@@ -126,7 +122,7 @@
         $data = ['user' => ['name' => 'Ada']];
 
         // Override with 4-space indent
-        $options = new \RobertGDev\Toon\Types\EncodeOptions(indent: 4);
+        $options = new \HelgeSverre\Toon\EncodeOptions(indent: 4);
         $encoded = $toon->encode($data, $options);
 
         expect($encoded)->toBe("user:\n    name: Ada");