chevere 4

Author: rodber

composer.json

@@ -17,7 +17,8 @@
         }
     ],
     "require": {
-        "chevere/chevere": "^4.0.x-dev"
+        "chevere/chevere": "^4.0.x-dev",
+        "kevinlebrun/colors.php": "^1.0"
     },
     "require-dev": {
         "phpstan/phpstan": "^1.9",

src/Highlights/Traits/AssertKeyTrait.php

@@ -13,7 +13,7 @@
 
 namespace Chevere\VarDump\Highlights\Traits;
 
-use Chevere\Throwable\Exceptions\OutOfRangeException;
+use OutOfRangeException;
 use function Chevere\Message\message;
 
 trait AssertKeyTrait
@@ -28,9 +28,11 @@ protected function assertKey(string $key): void
     {
         if (! array_key_exists($key, $this->palette())) {
             throw new OutOfRangeException(
-                message('Invalid key %keyName%, expecting one of the following palette keys: %keys%')
-                    ->withCode('%keyName%', $key)
-                    ->withCode('%keys%', implode(', ', array_keys($this->palette())))
+                (string) message(
+                    'Invalid key `%keyName%`, expecting one of the following palette keys: `%keys%`',
+                    keyName: $key,
+                    keys: implode(', ', array_keys($this->palette())),
+                )
             );
         }
     }

src/Interfaces/HighlightInterface.php

@@ -13,7 +13,6 @@
 
 namespace Chevere\VarDump\Interfaces;
 
-use Chevere\Throwable\Exceptions\OutOfRangeException;
 use Chevere\Type\Interfaces\TypeInterface;
 
 /**
@@ -43,7 +42,6 @@ interface HighlightInterface
      * Constructs a highlight instance specified by `$key`.
      *
      * @see `VarDumpHighlightInterface::KEYS`
-     * @throws OutOfRangeException
      */
     public function __construct(string $key);
 

src/Processors/Traits/ProcessorTrait.php

@@ -13,9 +13,9 @@
 
 namespace Chevere\VarDump\Processors\Traits;
 
-use Chevere\Throwable\Exceptions\InvalidArgumentException;
 use Chevere\Type\Type;
 use Chevere\VarDump\Interfaces\VarDumperInterface;
+use InvalidArgumentException;
 use function Chevere\Message\message;
 
 trait ProcessorTrait
@@ -66,11 +66,13 @@ private function assertType(): void
         $type = new Type($this->type());
         if (! $type->validate($this->varDumper->dumpable()->var())) {
             throw new InvalidArgumentException(
-                message('Instance of %className% expects a type %expected% for the return value of %method%, type %provided% returned')
-                    ->withCode('%className%', static::class)
-                    ->withCode('%expected%', $this->type())
-                    ->withCode('%method%', $this->varDumper::class . '::var()')
-                    ->withCode('%provided%', get_debug_type($this->varDumper->dumpable()->var()))
+                (string) message(
+                    'Instance of `%className%` expects a type `%expected%` for the return value of `%method%`, type `%provided%` returned',
+                    className: static::class,
+                    expected: $this->type(),
+                    method: $this->varDumper::class . '::var()',
+                    provided: get_debug_type($this->varDumper->dumpable()->var()),
+                )
             );
         }
     }

src/VarDumpInstance.php

@@ -13,8 +13,8 @@
 
 namespace Chevere\VarDump;
 
-use Chevere\Throwable\Exceptions\LogicException;
 use Chevere\VarDump\Interfaces\VarDumpInterface;
+use LogicException;
 use function Chevere\Message\message;
 
 final class VarDumpInstance
@@ -30,7 +30,7 @@ public static function get(): VarDumpInterface
     {
         if (! isset(self::$instance)) {
             throw new LogicException(
-                message('No VarDump instance present')
+                (string) message('No instance')
             );
         }
 

src/VarDumpable.php

@@ -13,10 +13,10 @@
 
 namespace Chevere\VarDump;
 
-use Chevere\Throwable\Exceptions\LogicException;
 use Chevere\VarDump\Interfaces\ProcessorInterface;
 use Chevere\VarDump\Interfaces\VarDumpableInterface;
 use Chevere\VarDump\Interfaces\VarDumperInterface;
+use LogicException;
 use function Chevere\Message\message;
 use function Chevere\Type\getType;
 
@@ -57,15 +57,19 @@ private function assertSetProcessorName(): void
         $processorName = VarDumperInterface::PROCESSORS[$this->type] ?? null;
         if (! isset($processorName)) {
             throw new LogicException(
-                message('No processor for variable of type %type%')
-                    ->withCode('%type%', $this->type)
+                (string) message(
+                    'No processor for variable of type `%type%`',
+                    type: $this->type
+                )
             );
         }
         if (! is_subclass_of($processorName, ProcessorInterface::class, true)) {
             throw new LogicException(
-                message('Processor %processorName% must implement the %interfaceName% interface')
-                    ->withCode('%processorName%', $processorName)
-                    ->withCode('%interfaceName%', ProcessorInterface::class)
+                (string) message(
+                    'Processor `%processorName%` must implement the `%interfaceName%` interface',
+                    processorName: $processorName,
+                    interfaceName: ProcessorInterface::class,
+                )
             );
         }
         $this->processorName = $processorName;

src/functions.php

@@ -14,7 +14,6 @@
 // @codeCoverageIgnoreStart
 
 namespace Chevere\VarDump {
-    use Chevere\Throwable\Exceptions\LogicException;
     use Chevere\VarDump\Formats\ConsoleFormat;
     use Chevere\VarDump\Formats\HtmlFormat;
     use Chevere\VarDump\Formats\PlainFormat;
@@ -26,6 +25,7 @@
     use Chevere\Writer\StreamWriter;
     use Chevere\Writer\Writers;
     use Chevere\Writer\WritersInstance;
+    use LogicException;
     use function Chevere\Writer\streamFor;
 
     function varDumpPlain(): VarDumpInterface

tests/Highlights/ConsoleHighlightTest.php

@@ -14,12 +14,12 @@
 namespace Chevere\Tests\Highlights;
 
 use Chevere\String\StringModify;
-use Chevere\Throwable\Exceptions\OutOfRangeException;
 use Chevere\Type\Interfaces\TypeInterface;
 use Chevere\VarDump\Highlights\ConsoleHighlight;
 use Chevere\VarDump\Interfaces\HighlightInterface;
 use Chevere\VarDump\Interfaces\VarDumperInterface;
 use Colors\Color;
+use OutOfRangeException;
 use PHPUnit\Framework\TestCase;
 
 final class ConsoleHighlightTest extends TestCase

tests/Highlights/HtmlHighlightTest.php

@@ -13,9 +13,9 @@
 
 namespace Chevere\Tests\Highlights;
 
-use Chevere\Throwable\Exceptions\OutOfRangeException;
 use Chevere\VarDump\Highlights\HtmlHighlight;
 use Chevere\VarDump\Interfaces\HighlightInterface;
+use OutOfRangeException;
 use PHPUnit\Framework\TestCase;
 
 final class HtmlHighlightTest extends TestCase

tests/Processors/ArrayProcessorTest.php

@@ -27,7 +27,7 @@ public function testInvalidArgument(): void
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage(
-            'type array for the return value of ' . VarDumper::class . '::var()'
+            'type `array` for the return value of `' . VarDumper::class . '::var()`'
         );
         new ArrayProcessor($this->getVarDumper(null));
     }

tests/Processors/ObjectProcessorTest.php

@@ -15,8 +15,8 @@
 
 use Chevere\Tests\src\DummyClass;
 use Chevere\Tests\Traits\VarDumperTrait;
-use Chevere\Throwable\Exceptions\InvalidArgumentException;
 use Chevere\VarDump\Processors\ObjectProcessor;
+use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 

tests/Processors/StringProcessorTest.php

@@ -14,8 +14,8 @@
 namespace Chevere\Tests\Processors;
 
 use Chevere\Tests\Traits\VarDumperTrait;
-use Chevere\Throwable\Exceptions\InvalidArgumentException;
 use Chevere\VarDump\Processors\StringProcessor;
+use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 
 final class StringProcessorTest extends TestCase

tests/VarDumpInstanceTest.php

@@ -13,10 +13,10 @@
 
 namespace Chevere\Tests;
 
-use Chevere\Throwable\Exceptions\LogicException;
-use function Chevere\VarDump\varDumpConsole;
 use Chevere\VarDump\VarDumpInstance;
+use LogicException;
 use PHPUnit\Framework\TestCase;
+use function Chevere\VarDump\varDumpConsole;
 
 final class VarDumpInstanceTest extends TestCase
 {