fix

Author: Florian-Merle

phpstan.neon

@@ -1,9 +1,7 @@
 includes:
     - phpstan-baseline.neon
-
     - vendor/phpstan/phpstan-webmozart-assert/extension.neon
     - vendor/phpstan/phpstan-phpunit/extension.neon
-
     - vendor/phpstan/phpstan-phpunit/rules.neon
 
 parameters:

src/Bundle/Parser/OptionsParser.php

@@ -13,6 +13,8 @@
 
 namespace Sylius\Bundle\GridBundle\Parser;
 
+use Sylius\Component\Grid\Exception\InvalidArgumentException;
+
 final class OptionsParser implements OptionsParserInterface
 {
     public function parseOptions(array $parameters): array
@@ -45,7 +47,7 @@ private function parseOption(mixed $parameter): mixed
     private function parseOptionCallable(string $callable): \Closure
     {
         if (!is_callable($callable)) {
-            throw new \RuntimeException(\sprintf('%s is not a callable.', $callable));
+            throw new InvalidArgumentException(\sprintf('%s is not a callable.', $callable));
         }
 
         return $callable(...);

src/Bundle/Resources/config/services.xml

@@ -129,7 +129,7 @@
         </service>
         <service id="Sylius\Bundle\GridBundle\Maker\MakeGrid" alias="sylius.grid.maker" />
 
-        <service id="sylius_grid.options_parser" class="Sylius\Bundle\GridBundle\Parser\OptionsParser" />
-        <service id="Sylius\Bundle\GridBundle\Parser\OptionsParserInterface" alias="sylius_grid.options_parser" />
+        <service id="sylius.grid.options_parser" class="Sylius\Bundle\GridBundle\Parser\OptionsParser" public="false" />
+        <service id="Sylius\Bundle\GridBundle\Parser\OptionsParserInterface" alias="sylius.grid.options_parser" public="false" />
     </services>
 </container>

src/Bundle/Resources/config/services/twig.xml

@@ -23,7 +23,7 @@
             <argument>@SyliusGrid/_grid.html.twig</argument>
             <argument>%sylius.grid.templates.action%</argument>
             <argument>%sylius.grid.templates.filter%</argument>
-            <argument type="service" id="sylius_grid.options_parser" />
+            <argument type="service" id="sylius.grid.options_parser" />
         </service>
         <service id="Sylius\Bundle\GridBundle\Renderer\TwigGridRenderer" alias="sylius.grid.renderer.twig" />
 

src/Bundle/Tests/Unit/Parser/OptionsParserTest.php

@@ -16,6 +16,7 @@
 use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\GridBundle\Parser\OptionsParser;
 use Sylius\Bundle\GridBundle\Parser\OptionsParserInterface;
+use Sylius\Component\Grid\Exception\InvalidArgumentException;
 
 final class OptionsParserTest extends TestCase
 {
@@ -24,7 +25,7 @@ public function testItImplementsOptionsParserInterface(): void
         $this->assertInstanceOf(OptionsParserInterface::class, new OptionsParser());
     }
 
-    public function testItParserOptionsWithCallable(): void
+    public function testItParsesOptionsWithCallable(): void
     {
         $options = (new OptionsParser())->parseOptions([
             'type' => 'callable',
@@ -43,7 +44,7 @@ public function testItParserOptionsWithCallable(): void
 
     public function testItFailsWhileParsingOptionsWithInvalidCallable(): void
     {
-        $this->expectException(\RuntimeException::class);
+        $this->expectException(InvalidArgumentException::class);
 
         $options = (new OptionsParser())->parseOptions([
             'type' => 'callable',

src/Component/Exception/ExceptionInterface.php

@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Sylius Sp. z o.o.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Sylius\Component\Grid\Exception;
+
+interface ExceptionInterface extends \Throwable
+{
+}

src/Component/Exception/InvalidArgumentException.php

@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Sylius Sp. z o.o.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Sylius\Component\Grid\Exception;
+
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}

src/Component/Exception/UnexpectedValueException.php

@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Sylius Sp. z o.o.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Sylius\Component\Grid\Exception;
+
+class UnexpectedValueException extends \UnexpectedValueException implements ExceptionInterface
+{
+}

src/Component/FieldTypes/CallableFieldType.php

@@ -15,6 +15,7 @@
 
 use Sylius\Component\Grid\DataExtractor\DataExtractorInterface;
 use Sylius\Component\Grid\Definition\Field;
+use Sylius\Component\Grid\Exception\UnexpectedValueException;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 final class CallableFieldType implements FieldTypeInterface
@@ -30,8 +31,12 @@ public function render(Field $field, $data, array $options): string
 
         try {
             $value = (string) $value;
-        } catch (\Throwable) {
-            throw new \RuntimeException(\sprintf('The callback for field "%s" returned a value that could not be converted to string.', $field->getName()));
+        } catch (\Throwable $e) {
+            throw new UnexpectedValueException(\sprintf(
+                'Callable field (name "%s") returned value could not be converted to string: "%s".',
+                $field->getName(),
+                $e->getMessage(),
+            ));
         }
 
         if ($options['htmlspecialchars']) {

src/Component/spec/FieldTypes/CallableFieldTypeSpec.php

@@ -16,6 +16,7 @@
 use PhpSpec\ObjectBehavior;
 use Sylius\Component\Grid\DataExtractor\DataExtractorInterface;
 use Sylius\Component\Grid\Definition\Field;
+use Sylius\Component\Grid\Exception\UnexpectedValueException;
 use Sylius\Component\Grid\FieldTypes\FieldTypeInterface;
 
 final class CallableFieldTypeSpec extends ObjectBehavior
@@ -70,9 +71,9 @@ function it_uses_data_extractor_to_obtain_data_and_passes_it_to_a_static_callabl
         DataExtractorInterface $dataExtractor,
         Field $field,
     ): void {
-        $dataExtractor->get($field, ['foo' => 'bar'])->willReturn('BAR');
+        $dataExtractor->get($field, ['foo' => 'BAR'])->willReturn('BAR');
 
-        $this->render($field, ['foo' => 'bar'], [
+        $this->render($field, ['foo' => 'BAR'], [
             'callable' => [self::class, 'callable'],
             'htmlspecialchars' => true,
         ])->shouldReturn('bar');
@@ -86,7 +87,7 @@ function it_throws_an_exception_when_a_callable_return_value_cannot_be_casted_to
         $dataExtractor->get($field, ['foo' => 'bar'])->willReturn('BAR');
 
         $this
-            ->shouldThrow(\RuntimeException::class)
+            ->shouldThrow(UnexpectedValueException::class)
             ->during('render', [
                 $field,
                 ['foo' => 'bar'],