Merge pull request #29 from maximehuran/feature/fixes-updates

Author: maximehuran

.github/workflows/recipe.yaml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         php: [ '8.2', '8.3' ]
-        sylius: [ '~2.0.0' ]
+        sylius: [ '~2.0.0', '~2.0.1' ]
 
     steps:
       - name: Setup PHP

Makefile

@@ -1,7 +1,7 @@
 .DEFAULT_GOAL := help
 SHELL=/bin/bash
 APP_DIR=tests/Application
-SYLIUS_VERSION=2.0.0
+SYLIUS_VERSION=2.1.0
 SYMFONY=cd ${APP_DIR} && symfony
 COMPOSER=symfony composer
 CONSOLE=${SYMFONY} console
@@ -72,6 +72,9 @@ setup_application:
 	(cd ${APP_DIR} && ${COMPOSER} config --no-plugins allow-plugins true)
 	(cd ${APP_DIR} && ${COMPOSER} config --no-plugins --json extra.symfony.endpoint '["https://api.github.com/repos/monsieurbiz/symfony-recipes/contents/index.json?ref=flex/master","flex://defaults"]')
 	(cd ${APP_DIR} && ${COMPOSER} require --no-install --no-scripts --no-progress sylius/sylius="~${SYLIUS_VERSION}") # Make sure to install the required version of sylius because the sylius-standard has a soft constraint
+	# Temporary fix for Sylius 2.1
+	(cd ${APP_DIR} && ${COMPOSER} require --no-install --no-scripts --no-progress api-platform/state)
+	# End Temporary fix for Sylius 2.1
 	$(MAKE) ${APP_DIR}/.php-version
 	$(MAKE) ${APP_DIR}/php.ini
 	(cd ${APP_DIR} && ${COMPOSER} install --no-interaction)

README.md

@@ -17,7 +17,7 @@ This plugin adds a media manager to your images, videos and other files type fie
 
 | Sylius Version | PHP Version |
 |----------------|-------------|
-| 2.0            | 8.2 - 8.3   |
+| 2.0, 2,1       | 8.2 - 8.3   |
 
 ℹ️ For Sylius 1.x, see our [1.x branch](https://github.com/monsieurbiz/SyliusMediaManagerPlugin/tree/1.x) and all 1.x releases.
 

composer.json

@@ -6,7 +6,7 @@
     "license": "MIT",
     "require": {
         "php": "^8.2",
-        "sylius/sylius": "~2.0.0",
+        "sylius/sylius": "~2.0",
         "phpdocumentor/reflection-docblock": "^5.6"
     },
     "require-dev": {

dist/migrations/Version20250410102216.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace App;
+namespace DoctrineMigrations;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;

dist/src/Context/Channel/RequestBased/HostnameAndPortBasedRequestResolver.php

@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of Monsieur Biz' Media Manager plugin for Sylius.
+ *
+ * (c) Monsieur Biz <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace App\Context\Channel\RequestBased;
+
+use Sylius\Component\Channel\Context\RequestBased\RequestResolverInterface;
+use Sylius\Component\Channel\Model\ChannelInterface;
+use Sylius\Component\Channel\Repository\ChannelRepositoryInterface;
+use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
+use Symfony\Component\HttpFoundation\Request;
+
+#[AutoconfigureTag('sylius.context.channel.request_based.resolver')]
+final class HostnameAndPortBasedRequestResolver implements RequestResolverInterface
+{
+    public function __construct(private ChannelRepositoryInterface $channelRepository)
+    {
+    }
+
+    public function findChannel(Request $request): ?ChannelInterface
+    {
+        return $this->channelRepository->findOneEnabledByHostname($request->getHost() . ':' . $request->getPort());
+    }
+}

dist/src/Entity/Product/Product.php

@@ -16,11 +16,15 @@
 use Doctrine\ORM\Mapping as ORM;
 use Sylius\Component\Core\Model\Product as BaseProduct;
 use Sylius\Component\Product\Model\ProductTranslationInterface;
+use Sylius\MolliePlugin\Entity\ProductInterface;
+use Sylius\MolliePlugin\Entity\ProductTrait;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'sylius_product')]
-class Product extends BaseProduct
+class Product extends BaseProduct implements ProductInterface
 {
+    use ProductTrait;
+
     #[ORM\Column(name: 'image_path', type: 'string', nullable: true)]
     private ?string $imagePath;
 

src/Components/ConfirmationModal.php

@@ -21,7 +21,7 @@
 use Symfony\UX\LiveComponent\ComponentToolsTrait;
 use Symfony\UX\LiveComponent\DefaultActionTrait;
 
-#[AsLiveComponent]
+#[AsLiveComponent(route: 'sylius_admin_live_component')]
 class ConfirmationModal
 {
     use ComponentToolsTrait;

src/Components/FormField.php

@@ -21,7 +21,7 @@
 use Symfony\UX\LiveComponent\ComponentToolsTrait;
 use Symfony\UX\LiveComponent\DefaultActionTrait;
 
-#[AsLiveComponent]
+#[AsLiveComponent(route: 'sylius_admin_live_component')]
 class FormField
 {
     use ComponentToolsTrait;

src/Components/SelectionModal.php

@@ -26,7 +26,7 @@
 use Symfony\UX\LiveComponent\ComponentToolsTrait;
 use Symfony\UX\LiveComponent\DefaultActionTrait;
 
-#[AsLiveComponent]
+#[AsLiveComponent(route: 'sylius_admin_live_component')]
 class SelectionModal
 {
     use ComponentToolsTrait;