Merge pull request #15 from netgen-layouts/fix-mapping-layout-to-specific-resource

Fix mapping layout to a specific resource

Author: emodric

Diff for: bundle/EventListener/Shop/ProductIndexListener.php

@@ -13,6 +13,9 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 
+/**
+ * @deprecated since 1.4.6 together with nglayouts_sylius_taxon attribute, use nglayouts_sylius_resource (set by ResourceShowListener) instead
+ */
 final class ProductIndexListener implements EventSubscriberInterface
 {
     /**

Diff for: bundle/EventListener/Shop/ProductShowListener.php

@@ -11,6 +11,9 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 
+/**
+ * @deprecated since 1.4.6 together with nglayouts_sylius_product attribute, use nglayouts_sylius_resource (set by ResourceShowListener) instead
+ */
 final class ProductShowListener implements EventSubscriberInterface
 {
     public function __construct(private RequestStack $requestStack, private Context $context) {}

Diff for: lib/Layout/Resolver/TargetType/Product.php

@@ -29,7 +29,7 @@ public function getConstraints(): array
 
     public function provideValue(Request $request): ?int
     {
-        $product = $request->attributes->get('nglayouts_sylius_product');
+        $product = $request->attributes->get('nglayouts_sylius_resource');
 
         return $product instanceof ProductInterface ? $product->getId() : null;
     }

Diff for: lib/Layout/Resolver/TargetType/Taxon.php

@@ -32,7 +32,7 @@ public function getConstraints(): array
      */
     public function provideValue(Request $request): ?array
     {
-        $taxon = $request->attributes->get('nglayouts_sylius_taxon');
+        $taxon = $request->attributes->get('nglayouts_sylius_resource');
         if (!$taxon instanceof TaxonInterface) {
             return null;
         }

Diff for: lib/Layout/Resolver/TargetType/TaxonProduct.php

@@ -35,7 +35,7 @@ public function getConstraints(): array
      */
     public function provideValue(Request $request): ?array
     {
-        $product = $request->attributes->get('nglayouts_sylius_product');
+        $product = $request->attributes->get('nglayouts_sylius_resource');
         if (!$product instanceof ProductInterface) {
             return null;
         }

Diff for: tests/lib/Layout/Resolver/TargetType/ProductTest.php

@@ -68,7 +68,7 @@ public function testValidationInvalid(): void
     public function testProvideValue(): void
     {
         $request = Request::create('/');
-        $request->attributes->set('nglayouts_sylius_product', new ProductStub(42));
+        $request->attributes->set('nglayouts_sylius_resource', new ProductStub(42));
 
         self::assertSame(42, $this->targetType->provideValue($request));
     }

Diff for: tests/lib/Layout/Resolver/TargetType/TaxonProductTest.php

@@ -78,7 +78,7 @@ public function testProvideValue(): void
         }
 
         $request = Request::create('/');
-        $request->attributes->set('nglayouts_sylius_product', $product);
+        $request->attributes->set('nglayouts_sylius_resource', $product);
 
         self::assertSame([12, 13], $this->targetType->provideValue($request));
     }

Diff for: tests/lib/Layout/Resolver/TargetType/TaxonTest.php

@@ -71,7 +71,7 @@ public function testProvideValue(): void
         $taxon->setParent(new TaxonStub(24));
 
         $request = Request::create('/');
-        $request->attributes->set('nglayouts_sylius_taxon', $taxon);
+        $request->attributes->set('nglayouts_sylius_resource', $taxon);
 
         self::assertSame([42, 24], $this->targetType->provideValue($request));
     }