fix: resolve usort() deprecation warnings in PHP 8.1+

Author: nanasess

codeception/_support/Page/Admin/OrderManagePage.php

@@ -300,7 +300,7 @@ public function assertSortedStatusList($order)
             // order_status でソート
             $statusList = ['新規受付', '注文取消し', '対応中', '発送済み', '入金済み', '決済処理中', '購入処理中', '返品'];
 
-            return array_search($a, $statusList) > array_search($b, $statusList);
+            return array_search($a, $statusList) <=> array_search($b, $statusList);
         });
 
         if ($order === 'desc') {

src/Eccube/Controller/Admin/Setting/Shop/DeliveryController.php

@@ -92,6 +92,7 @@ public function __construct(PaymentOptionRepository $paymentOptionRepository, De
 
     /**
      * @Route("/%eccube_admin_route%/setting/shop/delivery", name="admin_setting_shop_delivery", methods={"GET"})
+     *
      * @Template("@admin/Setting/Shop/delivery.twig")
      */
     public function index(Request $request)
@@ -115,6 +116,7 @@ public function index(Request $request)
     /**
      * @Route("/%eccube_admin_route%/setting/shop/delivery/new", name="admin_setting_shop_delivery_new", methods={"GET", "POST"})
      * @Route("/%eccube_admin_route%/setting/shop/delivery/{id}/edit", requirements={"id" = "\d+"}, name="admin_setting_shop_delivery_edit", methods={"GET", "POST"})
+     *
      * @Template("@admin/Setting/Shop/delivery_edit.twig")
      */
     public function edit(Request $request, EccubeExtension $extension, $id = null)
@@ -437,7 +439,7 @@ private function getMergeRules(array $PaymentsData)
                 return 0;
             }
 
-            return ($a['min'] < $b['min']) ? -1 : 1;
+            return $a['min'] <=> $b['min'];
         });
 
         return $mergeRules;

src/Eccube/Entity/Product.php

@@ -21,12 +21,16 @@
      * Product
      *
      * @ORM\Table(name="dtb_product")
+     *
      * @ORM\InheritanceType("SINGLE_TABLE")
+     *
      * @ORM\DiscriminatorColumn(name="discriminator_type", type="string", length=255)
+     *
      * @ORM\HasLifecycleCallbacks()
+     *
      * @ORM\Entity(repositoryClass="Eccube\Repository\ProductRepository")
      */
-    class Product extends \Eccube\Entity\AbstractEntity
+    class Product extends AbstractEntity
     {
         private $_calc = false;
         private $stockFinds = [];
@@ -55,7 +59,7 @@ public function _calc()
             if (!$this->_calc) {
                 $i = 0;
                 foreach ($this->getProductClasses() as $ProductClass) {
-                    /** @var \Eccube\Entity\ProductClass $ProductClass */
+                    /** @var ProductClass $ProductClass */
                     // stock_find
                     if ($ProductClass->isVisible() == false) {
                         continue;
@@ -128,7 +132,7 @@ public function _calc()
          */
         public function isEnable()
         {
-            return $this->getStatus()->getId() === \Eccube\Entity\Master\ProductStatus::DISPLAY_SHOW ? true : false;
+            return $this->getStatus()->getId() === Master\ProductStatus::DISPLAY_SHOW ? true : false;
         }
 
         /**
@@ -447,7 +451,9 @@ public function hasProductClass()
          * @var integer
          *
          * @ORM\Column(name="id", type="integer", options={"unsigned":true})
+         *
          * @ORM\Id
+         *
          * @ORM\GeneratedValue(strategy="IDENTITY")
          */
         private $id;
@@ -526,6 +532,7 @@ public function hasProductClass()
          * @var \Doctrine\Common\Collections\Collection
          *
          * @ORM\OneToMany(targetEntity="Eccube\Entity\ProductImage", mappedBy="Product", cascade={"remove"})
+         *
          * @ORM\OrderBy({
          *     "sort_no"="ASC"
          * })
@@ -547,20 +554,24 @@ public function hasProductClass()
         private $CustomerFavoriteProducts;
 
         /**
-         * @var \Eccube\Entity\Member
+         * @var Member
          *
          * @ORM\ManyToOne(targetEntity="Eccube\Entity\Member")
+         *
          * @ORM\JoinColumns({
+         *
          *   @ORM\JoinColumn(name="creator_id", referencedColumnName="id")
          * })
          */
         private $Creator;
 
         /**
-         * @var \Eccube\Entity\Master\ProductStatus
+         * @var Master\ProductStatus
          *
          * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\ProductStatus")
+         *
          * @ORM\JoinColumns({
+         *
          *   @ORM\JoinColumn(name="product_status_id", referencedColumnName="id")
          * })
          */
@@ -571,11 +582,11 @@ public function hasProductClass()
          */
         public function __construct()
         {
-            $this->ProductCategories = new \Doctrine\Common\Collections\ArrayCollection();
-            $this->ProductClasses = new \Doctrine\Common\Collections\ArrayCollection();
-            $this->ProductImage = new \Doctrine\Common\Collections\ArrayCollection();
-            $this->ProductTag = new \Doctrine\Common\Collections\ArrayCollection();
-            $this->CustomerFavoriteProducts = new \Doctrine\Common\Collections\ArrayCollection();
+            $this->ProductCategories = new ArrayCollection();
+            $this->ProductClasses = new ArrayCollection();
+            $this->ProductImage = new ArrayCollection();
+            $this->ProductTag = new ArrayCollection();
+            $this->CustomerFavoriteProducts = new ArrayCollection();
         }
 
         public function __clone()
@@ -828,7 +839,7 @@ public function getUpdateDate()
         /**
          * Add productCategory.
          *
-         * @param \Eccube\Entity\ProductCategory $productCategory
+         * @param ProductCategory $productCategory
          *
          * @return Product
          */
@@ -842,7 +853,7 @@ public function addProductCategory(ProductCategory $productCategory)
         /**
          * Remove productCategory.
          *
-         * @param \Eccube\Entity\ProductCategory $productCategory
+         * @param ProductCategory $productCategory
          *
          * @return boolean TRUE if this collection contained the specified element, FALSE otherwise.
          */
@@ -864,7 +875,7 @@ public function getProductCategories()
         /**
          * Add productClass.
          *
-         * @param \Eccube\Entity\ProductClass $productClass
+         * @param ProductClass $productClass
          *
          * @return Product
          */
@@ -878,7 +889,7 @@ public function addProductClass(ProductClass $productClass)
         /**
          * Remove productClass.
          *
-         * @param \Eccube\Entity\ProductClass $productClass
+         * @param ProductClass $productClass
          *
          * @return boolean TRUE if this collection contained the specified element, FALSE otherwise.
          */
@@ -900,7 +911,7 @@ public function getProductClasses()
         /**
          * Add productImage.
          *
-         * @param \Eccube\Entity\ProductImage $productImage
+         * @param ProductImage $productImage
          *
          * @return Product
          */
@@ -914,7 +925,7 @@ public function addProductImage(ProductImage $productImage)
         /**
          * Remove productImage.
          *
-         * @param \Eccube\Entity\ProductImage $productImage
+         * @param ProductImage $productImage
          *
          * @return boolean TRUE if this collection contained the specified element, FALSE otherwise.
          */
@@ -936,7 +947,7 @@ public function getProductImage()
         /**
          * Add productTag.
          *
-         * @param \Eccube\Entity\ProductTag $productTag
+         * @param ProductTag $productTag
          *
          * @return Product
          */
@@ -950,7 +961,7 @@ public function addProductTag(ProductTag $productTag)
         /**
          * Remove productTag.
          *
-         * @param \Eccube\Entity\ProductTag $productTag
+         * @param ProductTag $productTag
          *
          * @return boolean TRUE if this collection contained the specified element, FALSE otherwise.
          */
@@ -984,7 +995,7 @@ public function getTags()
             }
 
             usort($tags, function (Tag $tag1, Tag $tag2) {
-                return $tag1->getSortNo() < $tag2->getSortNo();
+                return $tag1->getSortNo() <=> $tag2->getSortNo();
             });
 
             return $tags;
@@ -993,7 +1004,7 @@ public function getTags()
         /**
          * Add customerFavoriteProduct.
          *
-         * @param \Eccube\Entity\CustomerFavoriteProduct $customerFavoriteProduct
+         * @param CustomerFavoriteProduct $customerFavoriteProduct
          *
          * @return Product
          */
@@ -1007,7 +1018,7 @@ public function addCustomerFavoriteProduct(CustomerFavoriteProduct $customerFavo
         /**
          * Remove customerFavoriteProduct.
          *
-         * @param \Eccube\Entity\CustomerFavoriteProduct $customerFavoriteProduct
+         * @param CustomerFavoriteProduct $customerFavoriteProduct
          *
          * @return boolean TRUE if this collection contained the specified element, FALSE otherwise.
          */
@@ -1029,11 +1040,11 @@ public function getCustomerFavoriteProducts()
         /**
          * Set creator.
          *
-         * @param \Eccube\Entity\Member|null $creator
+         * @param Member|null $creator
          *
          * @return Product
          */
-        public function setCreator(Member $creator = null)
+        public function setCreator(?Member $creator = null)
         {
             $this->Creator = $creator;
 
@@ -1043,7 +1054,7 @@ public function setCreator(Member $creator = null)
         /**
          * Get creator.
          *
-         * @return \Eccube\Entity\Member|null
+         * @return Member|null
          */
         public function getCreator()
         {
@@ -1053,11 +1064,11 @@ public function getCreator()
         /**
          * Set status.
          *
-         * @param \Eccube\Entity\Master\ProductStatus|null $status
+         * @param Master\ProductStatus|null $status
          *
          * @return Product
          */
-        public function setStatus(Master\ProductStatus $status = null)
+        public function setStatus(?Master\ProductStatus $status = null)
         {
             $this->Status = $status;
 
@@ -1067,7 +1078,7 @@ public function setStatus(Master\ProductStatus $status = null)
         /**
          * Get status.
          *
-         * @return \Eccube\Entity\Master\ProductStatus|null
+         * @return Master\ProductStatus|null
          */
         public function getStatus()
         {

src/Eccube/Service/PurchaseFlow/ItemCollection.php

@@ -114,7 +114,7 @@ public function sort()
         $Items = $this->toArray();
         usort($Items, function (ItemInterface $a, ItemInterface $b) {
             if ($a->getOrderItemType() === $b->getOrderItemType()) {
-                return ($a->getId() < $b->getId()) ? -1 : 1;
+                return $a->getId() <=> $b->getId();
             } elseif ($a->isProduct()) {
                 return -1;
             } elseif ($a->isDeliveryFee()) {