Fix upgrade plugin related product for ec-cube 4.2

Controller/Admin/RelatedProductController.php

@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Plugin\RelatedProduct4\Controller\Admin;
+namespace Plugin\RelatedProduct42\Controller\Admin;
 
 use Eccube\Controller\AbstractController;
 use Eccube\Repository\CategoryRepository;
@@ -69,7 +69,7 @@ public function __construct(
      * @Route("/%eccube_admin_route%/related_product/search/product", name="admin_related_product_search")
      * @Route("/%eccube_admin_route%/related_product/search/product/page/{page_no}", name="admin_related_product_search_product_page", requirements={"page_no":"\d+"})
      *
-     * @Template("@RelatedProduct4/admin/modal_result.twig")
+     * @Template("@RelatedProduct42/admin/modal_result.twig")
      */
     public function searchProduct(Request $request, $page_no = null)
     {

Entity/ProductTrait.php

@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Plugin\RelatedProduct4\Entity;
+namespace Plugin\RelatedProduct42\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
@@ -25,7 +25,7 @@ trait ProductTrait
     /**
      * @var RelatedProduct[]|Collection
      *
-     * @ORM\OneToMany(targetEntity="Plugin\RelatedProduct4\Entity\RelatedProduct", mappedBy="Product", cascade={"persist", "remove"})
+     * @ORM\OneToMany(targetEntity="Plugin\RelatedProduct42\Entity\RelatedProduct", mappedBy="Product", cascade={"persist", "remove"})
      * @ORM\OrderBy({
      *     "id"="ASC"
      * })

Entity/RelatedProduct.php

@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Plugin\RelatedProduct4\Entity;
+namespace Plugin\RelatedProduct42\Entity;
 
 use Eccube\Entity\AbstractEntity;
 use Eccube\Entity\Product;
@@ -21,7 +21,7 @@
  * Class RelatedProduct.
  *
  * @ORM\Table(name="plg_related_product")
- * @ORM\Entity(repositoryClass="Plugin\RelatedProduct4\Repository\RelatedProductRepository")
+ * @ORM\Entity(repositoryClass="Plugin\RelatedProduct42\Repository\RelatedProductRepository")
  */
 class RelatedProduct extends AbstractEntity
 {

Form/Extension/Admin/RelatedCollectionExtension.php

@@ -11,14 +11,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Plugin\RelatedProduct4\Form\Extension\Admin;
+namespace Plugin\RelatedProduct42\Form\Extension\Admin;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Eccube\Common\EccubeConfig;
 use Eccube\Entity\Product;
 use Eccube\Form\Type\Admin\ProductType;
-use Plugin\RelatedProduct4\Entity\RelatedProduct;
-use Plugin\RelatedProduct4\Form\Type\Admin\RelatedProductType;
+use Plugin\RelatedProduct42\Entity\RelatedProduct;
+use Plugin\RelatedProduct42\Form\Type\Admin\RelatedProductType;
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -105,7 +105,7 @@ public function getExtendedType()
      *
      * @return string[]
      */
-    public static function getExtendedTypes()
+    public static function getExtendedTypes(): iterable
     {
         yield ProductType::class;
     }

Form/Type/Admin/RelatedProductType.php

@@ -11,13 +11,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Plugin\RelatedProduct4\Form\Type\Admin;
+namespace Plugin\RelatedProduct42\Form\Type\Admin;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Eccube\Common\EccubeConfig;
 use Eccube\Entity\Product;
 use Eccube\Form\DataTransformer\EntityToIdTransformer;
-use Plugin\RelatedProduct4\Entity\RelatedProduct;
+use Plugin\RelatedProduct42\Entity\RelatedProduct;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;

PluginManager.php

@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Plugin\RelatedProduct4;
+namespace Plugin\RelatedProduct42;
 
 use Eccube\Plugin\AbstractPluginManager;
 

README.md

@@ -1,6 +1,6 @@
 # 関連商品プラグイン
 
-[![CI for RelatedProduct4](https://github.com/EC-CUBE/related-product-plugin/actions/workflows/main.yml/badge.svg)](https://github.com/EC-CUBE/related-product-plugin/actions/workflows/main.yml)
+[![CI for RelatedProduct42](https://github.com/EC-CUBE/related-product-plugin/actions/workflows/main.yml/badge.svg)](https://github.com/EC-CUBE/related-product-plugin/actions/workflows/main.yml)
 
 ## 概要
 商品詳細ページに、関連する商品を表示できるようになるプラグイン。

RelatedProductEvent.php

@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Plugin\RelatedProduct4;
+namespace Plugin\RelatedProduct42;
 
 use Eccube\Event\TemplateEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -33,7 +33,7 @@ public static function getSubscribedEvents()
      */
     public function onRenderProductDetail(TemplateEvent $event)
     {
-        $event->addSnippet('@RelatedProduct4/front/related_product.twig');
+        $event->addSnippet('@RelatedProduct42/front/related_product.twig');
     }
 
     /**
@@ -43,6 +43,6 @@ public function onRenderProductDetail(TemplateEvent $event)
      */
     public function onRenderAdminProduct(TemplateEvent $event)
     {
-        $event->addSnippet('@RelatedProduct4/admin/related_product.twig');
+        $event->addSnippet('@RelatedProduct42/admin/related_product.twig');
     }
 }

Repository/RelatedProductRepository.php

@@ -11,11 +11,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Plugin\RelatedProduct4\Repository;
+namespace Plugin\RelatedProduct42\Repository;
 
 use Eccube\Repository\AbstractRepository;
-use Plugin\RelatedProduct4\Entity\RelatedProduct;
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Plugin\RelatedProduct42\Entity\RelatedProduct;
+use Doctrine\Persistence\ManagerRegistry;
 
 /**
  * RelatedProductRepository.

Tests/Web/RelatedProductAdminControllerTest.php

@@ -14,9 +14,9 @@
 namespace Plugin\RelatedProduct\Tests\Web;
 
 use Eccube\Tests\Web\Admin\AbstractAdminWebTestCase;
-use Plugin\RelatedProduct4\Entity\RelatedProduct;
+use Plugin\RelatedProduct42\Entity\RelatedProduct;
 use Eccube\Repository\ProductRepository;
-use Plugin\RelatedProduct4\Repository\RelatedProductRepository;
+use Plugin\RelatedProduct42\Repository\RelatedProductRepository;
 use Eccube\Entity\Master\ProductStatus;
 use Eccube\Repository\Master\ProductStatusRepository;
 use Eccube\Common\Constant;
@@ -56,7 +56,7 @@ class RelatedProductAdminControllerTest extends AbstractAdminWebTestCase
     /**
      * call parent setUp.
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->deleteAllRows(['plg_related_product']);

Tests/Web/RelatedProductControllerTest.php

@@ -14,7 +14,7 @@
 namespace Plugin\RelatedProduct\Tests\Web;
 
 use Eccube\Tests\Web\AbstractWebTestCase;
-use Plugin\RelatedProduct4\Entity\RelatedProduct;
+use Plugin\RelatedProduct42\Entity\RelatedProduct;
 use Eccube\Repository\ProductRepository;
 use Eccube\Entity\Product;
 
@@ -36,7 +36,7 @@ class RelatedProductControllerTest extends AbstractWebTestCase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

composer.json

@@ -1,12 +1,12 @@
 {
-  "name": "ec-cube/relatedproduct4",
-  "version": "4.1.0",
+  "name": "ec-cube/relatedproduct42",
+  "version": "4.2.0",
   "description": "関連商品プラグイン",
   "type": "eccube-plugin",
   "require": {
-    "ec-cube/plugin-installer": "~0.0.6 || ^2.0"
+    "ec-cube/plugin-installer": "^2.0"
   },
   "extra": {
-    "code": "RelatedProduct4"
+    "code": "RelatedProduct42"
   }
 }