edit namespace

Sylius · Oct 23, 2024 · 9edf05d · 9edf05d
1 parent 02d4392
commit 9edf05d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/docs/custom_filter.md b/docs/custom_filter.md
@@ -13,7 +13,7 @@ namespace App\Grid\Filter;
 use App\Form\Type\Filter\SuppliersStatisticsFilterType;
 use Sylius\Bundle\GridBundle\Doctrine\DataSourceInterface;
 use Sylius\Component\Grid\Filtering\FilterInterface;
-use Sylius\Component\Grid\Metadata\AsFilter;
+use Sylius\Component\Grid\Attribute\AsFilter;
 
 #[AsFilter(formType: SuppliersStatisticsFilterType::class)]
 class SuppliersStatisticsFilter implements FilterInterface

diff --git a/src/Bundle/DependencyInjection/SyliusGridExtension.php b/src/Bundle/DependencyInjection/SyliusGridExtension.php
@@ -16,9 +16,9 @@
 use Sylius\Bundle\CurrencyBundle\SyliusCurrencyBundle;
 use Sylius\Bundle\GridBundle\Grid\GridInterface;
 use Sylius\Bundle\GridBundle\SyliusGridBundle;
+use Sylius\Component\Grid\Attribute\AsFilter;
 use Sylius\Component\Grid\Data\DataProviderInterface;
 use Sylius\Component\Grid\Filtering\FilterInterface;
-use Sylius\Component\Grid\Metadata\AsFilter;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -65,7 +65,12 @@ public function load(array $configs, ContainerBuilder $container): void
         $container->registerAttributeForAutoconfiguration(
             AsFilter::class,
             static function (ChildDefinition $definition, AsFilter $attribute, \Reflector $reflector): void {
-                $definition->addTag(AsFilter::SERVICE_TAG, [
+                    // Helps to avoid issues with psalm
+                    if (!$reflector instanceof \ReflectionClass) {
+                        return;
+                    }
+
+                    $definition->addTag(AsFilter::SERVICE_TAG, [
                     'type' => $attribute->getType() ?? $reflector->getName(),
                     'form_type' => $attribute->getFormType(),
                 ]);

diff --git a/src/Component/Metadata/AsFilter.php → src/Component/Attribute/AsFilter.php b/src/Component/Metadata/AsFilter.php → src/Component/Attribute/AsFilter.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Component\Grid\Metadata;
+namespace Sylius\Component\Grid\Attribute;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
 final class AsFilter

diff --git a/tests/Application/src/Filter/AttributeNationalityFilter.php b/tests/Application/src/Filter/AttributeNationalityFilter.php
@@ -14,10 +14,10 @@
 namespace App\Filter;
 
 use App\Grid\Type\NationalityFilterType;
+use Sylius\Component\Grid\Attribute\AsFilter;
 use Sylius\Component\Grid\Data\DataSourceInterface;
 use Sylius\Component\Grid\Filter\EntityFilter;
 use Sylius\Component\Grid\Filtering\FilterInterface;
-use Sylius\Component\Grid\Metadata\AsFilter;
 
 #[AsFilter(
     formType: NationalityFilterType::class,