Merge pull request #12 from feleCornejo/feature/update-to-oro-6

feat:Update to oro 6
synolia · May 6, 2024 · e0b9dd7 · e0b9dd7
2 parents c09368d + 9996736
commit e0b9dd7
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 92 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.1]
+        php: [8.3]
 
     steps:
       - uses: actions/checkout@v2

diff --git a/README.md b/README.md
@@ -15,9 +15,9 @@ This plugin allows the customer to subscribe to a product whose stock level is e
 ## Requirements
 
 | | Version |
-| :--- | :-- |
-| PHP  | 8.2 |
-| OroCommerce | 5.1 |
+| :--- |:--------|
+| PHP  | 8.2     |
+| OroCommerce | 5.1     |
 
 ## Installation
 

diff --git a/composer.json b/composer.json
@@ -20,8 +20,8 @@
         "exclude-from-classmap": ["/Tests/"]
     },
     "require": {
-        "php": "~8.2.0",
-        "oro/commerce": "5.1.*"
+        "php": "~8.3.0",
+        "oro/commerce": "6.0.*"
     },
     "repositories": {
         "oro": {

diff --git a/src/Synolia/Bundle/StockAlertBundle/Controller/Frontend/StockAlertController.php b/src/Synolia/Bundle/StockAlertBundle/Controller/Frontend/StockAlertController.php
@@ -5,9 +5,9 @@
 namespace Synolia\Bundle\StockAlertBundle\Controller\Frontend;
 
 use Doctrine\Persistence\ObjectManager;
-use Oro\Bundle\LayoutBundle\Annotation\Layout;
+use Oro\Bundle\LayoutBundle\Attribute\Layout;
 use Oro\Bundle\ProductBundle\Entity\Product;
-use Oro\Bundle\SecurityBundle\Annotation\CsrfProtection;
+use Oro\Bundle\SecurityBundle\Attribute\CsrfProtection;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -40,9 +40,7 @@ public function setHandler(StockAlertHandler $handler): void
         $this->handler = $handler;
     }
 
-    /**
-     * @Route(path="/form/{productId}", name="synolia_frontend_stock_alert_form", methods={"POST"})
-     */
+    #[Route(path: '/form/{productId}', name: 'synolia_frontend_stock_alert_form', methods: ['POST']) ]
     public function form(Request $request, int $productId): Response
     {
         $product = $this->manager->getRepository(Product::class)->find($productId);
@@ -81,10 +79,8 @@ public function form(Request $request, int $productId): Response
         ]);
     }
 
-    /**
-     * @Route("/", name="synolia_stock_alert_frontend_index")
-     * @Layout(vars={"entity_class", "organization_id", "customer_user_id"})
-     */
+    #[Route(path: '/', name: 'synolia_stock_alert_frontend_index')]
+    #[Layout(vars: ['entity_class','organization_id','customer_user_id'])]
     public function indexAction(): array
     {
         $entityClass = StockAlert::class;
@@ -98,10 +94,8 @@ public function indexAction(): array
         ];
     }
 
-    /**
-     * @Route("/create/{id}", name="synolia_stock_alert_create", requirements={"id"="\d+"})
-     * @ParamConverter("product", class="OroProductBundle:Product", options={"id" = "id"})
-     */
+    #[Route(path: '/create/{id}', name: 'synolia_stock_alert_create', requirements: ['id' => '\d+']) ]
+    #[ParamConverter('product', class: Product::class, options: ['id' => 'id'])]
     public function createAction(Product $product): JsonResponse
     {
         try {
@@ -122,16 +116,9 @@ public function createAction(Product $product): JsonResponse
         ]);
     }
 
-    /**
-     * @Route(
-     *     "/delete/{id}",
-     *     name="synolia_stock_alert_delete",
-     *     methods={"DELETE"},
-     *     requirements={"id"="\d+"}
-     * )
-     * @CsrfProtection()
-     * @ParamConverter("product", class="OroProductBundle:Product", options={"id" = "id"})
-     */
+    #[Route(path: '/delete/{id}', name: 'synolia_stock_alert_delete', requirements: ['id' => '\d+'], methods: ['DELETE']) ]
+    #[CsrfProtection()]
+    #[ParamConverter('product', class: Product::class, options: ['id' => 'id'])]
     public function deleteAction(Product $product): JsonResponse
     {
         try {

diff --git a/src/Synolia/Bundle/StockAlertBundle/Controller/StockAlertController.php b/src/Synolia/Bundle/StockAlertBundle/Controller/StockAlertController.php
@@ -11,10 +11,8 @@
 
 class StockAlertController extends AbstractController
 {
-    /**
-     * @Route("/", name="synolia_stock_alert_index")
-     * @Template
-     */
+    #[Route(path: '/', name: 'synolia_stock_alert_index')]
+    #[Template('@SynoliaStockAlert/StockAlert/index.html.twig')]
     public function indexAction(): array
     {
         return [

diff --git a/src/Synolia/Bundle/StockAlertBundle/Entity/StockAlert.php b/src/Synolia/Bundle/StockAlertBundle/Entity/StockAlert.php
@@ -4,46 +4,42 @@
 
 namespace Synolia\Bundle\StockAlertBundle\Entity;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use Oro\Bundle\CustomerBundle\Entity\CustomerOwnerAwareInterface;
 use Oro\Bundle\CustomerBundle\Entity\Ownership\FrontendCustomerAwareTrait;
 use Oro\Bundle\CustomerBundle\Entity\Ownership\FrontendCustomerUserAwareTrait;
 use Oro\Bundle\EntityBundle\EntityProperty\DatesAwareInterface;
 use Oro\Bundle\EntityBundle\EntityProperty\DatesAwareTrait;
-use Oro\Bundle\EntityConfigBundle\Metadata\Annotation\Config;
+use Oro\Bundle\EntityConfigBundle\Metadata\Attribute\Config;
 use Oro\Bundle\EntityExtendBundle\Entity\ExtendEntityInterface;
 use Oro\Bundle\EntityExtendBundle\Entity\ExtendEntityTrait;
 use Oro\Bundle\OrganizationBundle\Entity\OrganizationAwareInterface;
 use Oro\Bundle\ProductBundle\Entity\Product;
 use Oro\Bundle\UserBundle\Entity\Ownership\UserAwareTrait;
+use Synolia\Bundle\StockAlertBundle\Entity\Repository\StockAlertRepository;
 use Synolia\Bundle\StockAlertBundle\Model\ExtendStockAlert;
 
-/**
- * @ORM\Table(name="synolia_stock_alert")
- * @ORM\Entity(repositoryClass="Synolia\Bundle\StockAlertBundle\Entity\Repository\StockAlertRepository")
- * @Config(
- *      defaultValues={
- *          "ownership"={
- *              "owner_type"="USER",
- *              "owner_field_name"="owner",
- *              "owner_column_name"="user_owner_id",
- *              "organization_field_name"="organization",
- *              "organization_column_name"="organization_id",
- *              "frontend_owner_type"="FRONTEND_USER",
- *              "frontend_owner_field_name"="customerUser",
- *              "frontend_owner_column_name"="customer_user_id",
- *              "frontend_customer_field_name"="customer",
- *              "frontend_customer_column_name"="customer_id"
- *          },
- *          "dataaudit"={
- *              "auditable"=true
- *          },
- *          "entity"={
- *              "icon"="fa-shopping-cart"
- *          }
- *      }
- * )
- */
+#[ORM\Entity(repositoryClass: StockAlertRepository::class)]
+#[ORM\Table(name: 'synolia_stock_alert')]
+#[Config(
+    defaultValues: [
+        'entity' => ['icon' => 'fa-shopping-cart'],
+        'dataaudit' => ['auditable' => true],
+        'ownership' => [
+            'owner_type' => 'USER',
+            'owner_field_name' => 'owner',
+            'owner_column_name' => 'user_owner_id',
+            'organization_field_name' => 'organization',
+            'organization_column_name' => 'organization_id',
+            'frontend_owner_type' => 'FRONTEND_USER',
+            'frontend_owner_field_name' => 'customerUser',
+            'frontend_owner_column_name' => 'customer_user_id',
+            'frontend_customer_field_name' => 'customer',
+            'frontend_customer_column_name' => 'customer_id',
+        ],
+    ]
+)]
 class StockAlert extends ExtendStockAlert implements
     ExtendEntityInterface,
     OrganizationAwareInterface,
@@ -56,22 +52,16 @@ class StockAlert extends ExtendStockAlert implements
     use FrontendCustomerUserAwareTrait;
     use UserAwareTrait;
 
-    /**
-     * @ORM\Id
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
+    #[ORM\Id]
+    #[ORM\Column(name: 'id', type: Types::INTEGER)]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
     protected int $id;
 
-    /**
-     * @ORM\ManyToOne(targetEntity="Oro\Bundle\ProductBundle\Entity\Product")
-     * @ORM\JoinColumn(name="product_id", referencedColumnName="id", nullable=false, onDelete="CASCADE")
-     */
+    #[ORM\ManyToOne(targetEntity: Product::class)]
+    #[ORM\JoinColumn(name: 'product_id', referencedColumnName: 'id', nullable: false, onDelete: 'CASCADE')]
     protected Product $product;
 
-    /**
-     * @ORM\Column(name="expiration_date", type="datetime", nullable=true)
-     */
+    #[ORM\Column(name: 'expiration_date', type: Types::DATETIME_MUTABLE, nullable: true)]
     protected ?\DateTime $expirationDate;
 
     public function getId(): int

diff --git a/src/Synolia/Bundle/StockAlertBundle/Migrations/Data/ORM/Email/LoadEmailTemplates.php b/src/Synolia/Bundle/StockAlertBundle/Migrations/Data/ORM/Email/LoadEmailTemplates.php
@@ -6,7 +6,7 @@
 
 use Doctrine\Persistence\ObjectManager;
 use Oro\Bundle\EmailBundle\Migrations\Data\ORM\AbstractEmailFixture;
-use Oro\Bundle\EmailBundle\Model\EmailTemplate;
+use Oro\Bundle\EmailBundle\Entity\EmailTemplate;
 use Oro\Bundle\MigrationBundle\Fixture\VersionedFixtureInterface;
 
 class LoadEmailTemplates extends AbstractEmailFixture implements VersionedFixtureInterface
@@ -16,7 +16,7 @@ public function getEmailsDir(): string
         return $this->container
             ->get('kernel')
             ->locateResource('@SynoliaStockAlertBundle/Migrations/Data/ORM/data/emails')
-        ;
+            ;
     }
 
     public function getVersion(): string
@@ -30,7 +30,7 @@ protected function findExistingTemplate(ObjectManager $manager, array $template)
             return null;
         }
 
-        return $manager->getRepository('OroEmailBundle:EmailTemplate')->findOneBy([
+        return $manager->getRepository(EmailTemplate::class)->findOneBy([
             'name' => $template['params']['name'],
         ]);
     }

diff --git a/.../Data/ORM/data/emails/available.html.twig → ...mails/synolia_stock_alert_email.html.twig b/.../Data/ORM/data/emails/available.html.twig → ...mails/synolia_stock_alert_email.html.twig
diff --git a/src/Synolia/Bundle/StockAlertBundle/Resources/public/js/app/views/stock-alert.js b/src/Synolia/Bundle/StockAlertBundle/Resources/public/js/app/views/stock-alert.js
@@ -16,6 +16,9 @@ const StockAlert = BaseView.extend({
         this.options = {...this.options, ...options};
 
         this.productId = this.options.productId;
+        if(this.productId === undefined){
+            this.productId = this.options.product.id;
+        }
         this.hasStock = this.options.hasStock;
         if (this.hasStock) {
             $('.delete-stock-alert', this.options.el).show();
@@ -63,4 +66,4 @@ const StockAlert = BaseView.extend({
     }
 });
 
-export default StockAlert
+export default StockAlert
diff --git a/...urces/views/layouts/default/imports/oro_product_list_item/oro_product_list_item.html.twig b/...urces/views/layouts/default/imports/oro_product_list_item/oro_product_list_item.html.twig
@@ -12,22 +12,22 @@
                 </p>
             </div>
             {% if (quantity <= 0) %}
-            <div class="col">
-                <a class="create-stock-alert pull-right"
-                   href=""
-                   title="{{ 'synolia.stockalert.alert.register.title'|trans }}"
-                   style="display: none"
-                >
-                    <span class="fa-envelope"></span>
-                </a>
-                <a class="delete-stock-alert pull-right"
-                   href=""
-                   title="{{ 'synolia.stockalert.alert.unregister.title'|trans }}"
-                   style="display: none"
-                >
-                    <span class="fa-trash"></span>
-                </a>
-            </div>
+                <div class="col">
+                    <a class="create-stock-alert pull-right"
+                       href=""
+                       title="{{ 'synolia.stockalert.alert.register.title'|trans }}"
+                       style="display: none"
+                    >
+                        <span class="fa-envelope"></span>
+                    </a>
+                    <a class="delete-stock-alert pull-right"
+                       href=""
+                       title="{{ 'synolia.stockalert.alert.unregister.title'|trans }}"
+                       style="display: none"
+                    >
+                        <span class="fa-trash"></span>
+                    </a>
+                </div>
             {% endif %}
         </div>
     </div>