From 5173db2328f277a25fa30e782c4afab79300792b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=9E=E3=82=A4=E3=83=A4=E3=83=BC=E3=82=AF=E3=83=AA?= =?UTF-8?q?=E3=82=B9?= Date: Fri, 27 Oct 2023 15:50:32 +0900 Subject: [PATCH 01/21] =?UTF-8?q?PHPStan=20Doctrine=20=E3=83=97=E3=83=A9?= =?UTF-8?q?=E3=82=B0=E3=82=A4=E3=83=B3=E8=BF=BD=E5=8A=A0=E5=BE=8C=E3=81=AB?= =?UTF-8?q?=E7=99=BA=E7=94=9F=E3=81=97=E3=81=9F=E5=95=8F=E9=A1=8C=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 5 +- src/Eccube/Entity/AuthorityRole.php | 4 +- src/Eccube/Entity/BaseInfo.php | 8 +-- src/Eccube/Entity/Block.php | 8 ++- src/Eccube/Entity/BlockPosition.php | 4 +- src/Eccube/Entity/Calendar.php | 2 +- src/Eccube/Entity/Cart.php | 16 +++-- src/Eccube/Entity/CartItem.php | 8 +-- src/Eccube/Entity/Category.php | 12 ++-- src/Eccube/Entity/ClassCategory.php | 6 +- src/Eccube/Entity/ClassName.php | 8 +-- src/Eccube/Entity/Csv.php | 4 +- src/Eccube/Entity/Customer.php | 24 +++---- src/Eccube/Entity/CustomerAddress.php | 10 +-- src/Eccube/Entity/CustomerFavoriteProduct.php | 4 +- src/Eccube/Entity/Delivery.php | 16 ++--- src/Eccube/Entity/DeliveryFee.php | 4 +- src/Eccube/Entity/DeliveryTime.php | 2 +- src/Eccube/Entity/ExportCsvRow.php | 8 ++- src/Eccube/Entity/Layout.php | 18 +++-- src/Eccube/Entity/LoginHistory.php | 6 +- src/Eccube/Entity/MailHistory.php | 4 +- src/Eccube/Entity/MailTemplate.php | 2 +- src/Eccube/Entity/Member.php | 12 ++-- src/Eccube/Entity/News.php | 2 +- src/Eccube/Entity/Order.php | 70 ++++++++++--------- src/Eccube/Entity/OrderItem.php | 33 +++++---- src/Eccube/Entity/OrderPdf.php | 14 ++-- src/Eccube/Entity/Page.php | 8 ++- src/Eccube/Entity/PageLayout.php | 4 +- src/Eccube/Entity/Payment.php | 8 +-- src/Eccube/Entity/PaymentOption.php | 4 +- src/Eccube/Entity/PointRateTrait.php | 2 +- src/Eccube/Entity/Product.php | 24 +++---- src/Eccube/Entity/ProductCategory.php | 4 +- src/Eccube/Entity/ProductClass.php | 26 +++---- src/Eccube/Entity/ProductImage.php | 4 +- src/Eccube/Entity/ProductStock.php | 4 +- src/Eccube/Entity/ProductTag.php | 6 +- src/Eccube/Entity/Shipping.php | 24 +++---- src/Eccube/Entity/Tag.php | 4 +- src/Eccube/Entity/TaxRule.php | 16 ++--- src/Eccube/Entity/Template.php | 2 +- tests/object-manager.php | 11 +++ 44 files changed, 249 insertions(+), 216 deletions(-) create mode 100644 tests/object-manager.php diff --git a/Dockerfile b/Dockerfile index ded4d2dc42b..b3895e73733 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG TAG=7.4-apache-bullseye +ARG TAG=8.1-apache-bullseye FROM php:${TAG} ENV APACHE_DOCUMENT_ROOT /var/www/html @@ -32,10 +32,13 @@ RUN apt update \ && echo "en_US.UTF-8 UTF-8" >/etc/locale.gen \ && locale-gen \ ; +RUN pecl search xdebug-3.1.6\ + && pecl install xdebug-3.1.6 RUN docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \ && docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp \ && docker-php-ext-install -j$(nproc) zip gd mysqli pdo_mysql opcache intl pgsql pdo_pgsql \ + && docker-php-ext-enable xdebug \ ; RUN pecl install apcu && echo "extension=apcu.so" > /usr/local/etc/php/conf.d/apc.ini diff --git a/src/Eccube/Entity/AuthorityRole.php b/src/Eccube/Entity/AuthorityRole.php index d6296e3db7c..e8ca610db14 100644 --- a/src/Eccube/Entity/AuthorityRole.php +++ b/src/Eccube/Entity/AuthorityRole.php @@ -58,7 +58,7 @@ class AuthorityRole extends \Eccube\Entity\AbstractEntity private $update_date; /** - * @var \Eccube\Entity\Master\Authority + * @var \Eccube\Entity\Master\Authority|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Authority") * @ORM\JoinColumns({ @@ -68,7 +68,7 @@ class AuthorityRole extends \Eccube\Entity\AbstractEntity private $Authority; /** - * @var \Eccube\Entity\Member + * @var \Eccube\Entity\Member|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Member") * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/BaseInfo.php b/src/Eccube/Entity/BaseInfo.php index a9768d16d7b..eee7bc5afde 100644 --- a/src/Eccube/Entity/BaseInfo.php +++ b/src/Eccube/Entity/BaseInfo.php @@ -257,21 +257,21 @@ class BaseInfo extends \Eccube\Entity\AbstractEntity private $option_point = true; /** - * @var string + * @var string|null * * @ORM\Column(name="basic_point_rate", type="decimal", precision=10, scale=0, options={"unsigned":true, "default":1}, nullable=true) */ private $basic_point_rate = '1'; /** - * @var string + * @var string|null * * @ORM\Column(name="point_conversion_rate", type="decimal", precision=10, scale=0, options={"unsigned":true, "default":1}, nullable=true) */ private $point_conversion_rate = '1'; /** - * @var \Eccube\Entity\Master\Country + * @var \Eccube\Entity\Master\Country|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Country") * @ORM\JoinColumns({ @@ -282,7 +282,7 @@ class BaseInfo extends \Eccube\Entity\AbstractEntity private $Country; /** - * @var \Eccube\Entity\Master\Pref + * @var \Eccube\Entity\Master\Pref|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Pref") * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/Block.php b/src/Eccube/Entity/Block.php index ddb5098d455..bb25c822bf8 100644 --- a/src/Eccube/Entity/Block.php +++ b/src/Eccube/Entity/Block.php @@ -84,14 +84,14 @@ class Block extends \Eccube\Entity\AbstractEntity private $update_date; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\BlockPosition", mappedBy="Block", cascade={"persist","remove"}) */ private $BlockPositions; /** - * @var \Eccube\Entity\Master\DeviceType + * @var \Eccube\Entity\Master\DeviceType|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\DeviceType") * @ORM\JoinColumns({ @@ -294,6 +294,8 @@ public function addBlockPosition(BlockPosition $blockPosition) * Remove blockPosition * * @param \Eccube\Entity\BlockPosition $blockPosition + * + * @return void */ public function removeBlockPosition(BlockPosition $blockPosition) { @@ -303,7 +305,7 @@ public function removeBlockPosition(BlockPosition $blockPosition) /** * Get blockPositions * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getBlockPositions() { diff --git a/src/Eccube/Entity/BlockPosition.php b/src/Eccube/Entity/BlockPosition.php index b657b85679a..2c12b92e711 100644 --- a/src/Eccube/Entity/BlockPosition.php +++ b/src/Eccube/Entity/BlockPosition.php @@ -62,7 +62,7 @@ class BlockPosition extends \Eccube\Entity\AbstractEntity private $block_row; /** - * @var \Eccube\Entity\Block + * @var \Eccube\Entity\Block|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Block", inversedBy="BlockPositions") * @ORM\JoinColumns({ @@ -72,7 +72,7 @@ class BlockPosition extends \Eccube\Entity\AbstractEntity private $Block; /** - * @var \Eccube\Entity\Layout + * @var \Eccube\Entity\Layout|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Layout", inversedBy="BlockPositions") * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/Calendar.php b/src/Eccube/Entity/Calendar.php index d2587eef158..0a1a7a2a631 100644 --- a/src/Eccube/Entity/Calendar.php +++ b/src/Eccube/Entity/Calendar.php @@ -52,7 +52,7 @@ public function isDefaultCalendar() private $id; /** - * @var string + * @var string|null * * @ORM\Column(name="title", type="string", length=255, nullable=true) */ diff --git a/src/Eccube/Entity/Cart.php b/src/Eccube/Entity/Cart.php index 2b84b3919f8..d06ec5dcd8d 100644 --- a/src/Eccube/Entity/Cart.php +++ b/src/Eccube/Entity/Cart.php @@ -47,14 +47,14 @@ class Cart extends AbstractEntity implements PurchaseInterface, ItemHolderInterf private $id; /** - * @var string + * @var string|null * * @ORM\Column(name="cart_key", type="string", nullable=true) */ private $cart_key; /** - * @var \Eccube\Entity\Customer + * @var \Eccube\Entity\Customer|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Customer") * @ORM\JoinColumns({ @@ -69,7 +69,7 @@ class Cart extends AbstractEntity implements PurchaseInterface, ItemHolderInterf private $lock = false; /** - * @var \Doctrine\Common\Collections\Collection|CartItem[] + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\CartItem", mappedBy="Cart", cascade={"persist"}) * @ORM\OrderBy({"id" = "ASC"}) @@ -84,7 +84,7 @@ class Cart extends AbstractEntity implements PurchaseInterface, ItemHolderInterf private $pre_order_id = null; /** - * @var string + * @var string|float * * @ORM\Column(name="total_price", type="decimal", precision=12, scale=2, options={"unsigned":true,"default":0}) */ @@ -151,6 +151,8 @@ public function getCartKey() /** * @param string $cartKey + * + * @return Cart */ public function setCartKey(string $cartKey) { @@ -192,7 +194,7 @@ public function getPreOrderId() } /** - * @param integer $pre_order_id + * @param string|integer $pre_order_id * * @return \Eccube\Entity\Cart */ @@ -226,7 +228,7 @@ public function clearCartItems() } /** - * @return ArrayCollection|CartItem[] + * @return \Doctrine\Common\Collections\Collection */ public function getCartItems() { @@ -256,7 +258,7 @@ public function setCartItems($CartItems) /** * Set total. * - * @param integer $total_price + * @param float|string|integer $total_price * * @return Cart */ diff --git a/src/Eccube/Entity/CartItem.php b/src/Eccube/Entity/CartItem.php index 549c60ef386..61c907974fe 100644 --- a/src/Eccube/Entity/CartItem.php +++ b/src/Eccube/Entity/CartItem.php @@ -39,21 +39,21 @@ class CartItem extends \Eccube\Entity\AbstractEntity implements ItemInterface private $id; /** - * @var string + * @var string|float * * @ORM\Column(name="price", type="decimal", precision=12, scale=2, options={"default":0}) */ private $price = 0; /** - * @var string + * @var string|float * * @ORM\Column(name="quantity", type="decimal", precision=10, scale=0, options={"default":0}) */ private $quantity = 0; /** - * @var \Eccube\Entity\ProductClass + * @var \Eccube\Entity\ProductClass|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\ProductClass") * @ORM\JoinColumns({ @@ -63,7 +63,7 @@ class CartItem extends \Eccube\Entity\AbstractEntity implements ItemInterface private $ProductClass; /** - * @var \Eccube\Entity\Cart + * @var \Eccube\Entity\Cart|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Cart", inversedBy="CartItems", cascade={"persist"}) * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/Category.php b/src/Eccube/Entity/Category.php index 8abd03433d1..19b63488440 100644 --- a/src/Eccube/Entity/Category.php +++ b/src/Eccube/Entity/Category.php @@ -185,14 +185,14 @@ public function hasProductCategories() private $update_date; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\ProductCategory", mappedBy="Category", fetch="EXTRA_LAZY") */ private $ProductCategories; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\Category", mappedBy="Parent") * @ORM\OrderBy({ @@ -202,7 +202,7 @@ public function hasProductCategories() private $Children; /** - * @var \Eccube\Entity\Category + * @var \Eccube\Entity\Category|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Category", inversedBy="Children") * @ORM\JoinColumns({ @@ -212,7 +212,7 @@ public function hasProductCategories() private $Parent; /** - * @var \Eccube\Entity\Member + * @var \Eccube\Entity\Member|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Member") * @ORM\JoinColumns({ @@ -389,7 +389,7 @@ public function removeProductCategory(ProductCategory $productCategory) /** * Get productCategories. * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getProductCategories() { @@ -425,7 +425,7 @@ public function removeChild(Category $child) /** * Get children. * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getChildren() { diff --git a/src/Eccube/Entity/ClassCategory.php b/src/Eccube/Entity/ClassCategory.php index c4690c51872..fbd9ede66c2 100644 --- a/src/Eccube/Entity/ClassCategory.php +++ b/src/Eccube/Entity/ClassCategory.php @@ -45,7 +45,7 @@ public function __toString() private $id; /** - * @var string + * @var string|null * * @ORM\Column(name="backend_name", type="string", length=255, nullable=true) */ @@ -87,7 +87,7 @@ public function __toString() private $update_date; /** - * @var \Eccube\Entity\ClassName + * @var \Eccube\Entity\ClassName|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\ClassName", inversedBy="ClassCategories") * @ORM\JoinColumns({ @@ -97,7 +97,7 @@ public function __toString() private $ClassName; /** - * @var \Eccube\Entity\Member + * @var \Eccube\Entity\Member|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Member") * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/ClassName.php b/src/Eccube/Entity/ClassName.php index e8f2ff5b005..1ca9c342796 100644 --- a/src/Eccube/Entity/ClassName.php +++ b/src/Eccube/Entity/ClassName.php @@ -45,7 +45,7 @@ public function __toString() private $id; /** - * @var string + * @var string|null * * @ORM\Column(name="backend_name", type="string", length=255, nullable=true) */ @@ -80,7 +80,7 @@ public function __toString() private $update_date; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\ClassCategory", mappedBy="ClassName") * @ORM\OrderBy({ @@ -90,7 +90,7 @@ public function __toString() private $ClassCategories; /** - * @var \Eccube\Entity\Member + * @var \Eccube\Entity\Member|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Member") * @ORM\JoinColumns({ @@ -266,7 +266,7 @@ public function removeClassCategory(ClassCategory $classCategory) /** * Get classCategories. * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getClassCategories() { diff --git a/src/Eccube/Entity/Csv.php b/src/Eccube/Entity/Csv.php index 249e57a1179..3bef2e06795 100644 --- a/src/Eccube/Entity/Csv.php +++ b/src/Eccube/Entity/Csv.php @@ -93,7 +93,7 @@ class Csv extends \Eccube\Entity\AbstractEntity private $update_date; /** - * @var \Eccube\Entity\Master\CsvType + * @var \Eccube\Entity\Master\CsvType|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\CsvType") * @ORM\JoinColumns({ @@ -103,7 +103,7 @@ class Csv extends \Eccube\Entity\AbstractEntity private $CsvType; /** - * @var \Eccube\Entity\Member + * @var \Eccube\Entity\Member|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Member") * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/Customer.php b/src/Eccube/Entity/Customer.php index 611414b58d4..acd706a5120 100644 --- a/src/Eccube/Entity/Customer.php +++ b/src/Eccube/Entity/Customer.php @@ -124,7 +124,7 @@ class Customer extends \Eccube\Entity\AbstractEntity implements UserInterface, \ private $plain_password; /** - * @var string|null + * @var string * * @ORM\Column(name="password", type="string", length=255) */ @@ -215,14 +215,14 @@ class Customer extends \Eccube\Entity\AbstractEntity implements UserInterface, \ private $update_date; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\CustomerFavoriteProduct", mappedBy="Customer", cascade={"remove"}) */ private $CustomerFavoriteProducts; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\CustomerAddress", mappedBy="Customer", cascade={"remove"}) * @ORM\OrderBy({ @@ -232,14 +232,14 @@ class Customer extends \Eccube\Entity\AbstractEntity implements UserInterface, \ private $CustomerAddresses; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\Order", mappedBy="Customer") */ private $Orders; /** - * @var \Eccube\Entity\Master\CustomerStatus + * @var \Eccube\Entity\Master\CustomerStatus|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\CustomerStatus") * @ORM\JoinColumns({ @@ -249,7 +249,7 @@ class Customer extends \Eccube\Entity\AbstractEntity implements UserInterface, \ private $Status; /** - * @var \Eccube\Entity\Master\Sex + * @var \Eccube\Entity\Master\Sex|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Sex") * @ORM\JoinColumns({ @@ -259,7 +259,7 @@ class Customer extends \Eccube\Entity\AbstractEntity implements UserInterface, \ private $Sex; /** - * @var \Eccube\Entity\Master\Job + * @var \Eccube\Entity\Master\Job|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Job") * @ORM\JoinColumns({ @@ -269,7 +269,7 @@ class Customer extends \Eccube\Entity\AbstractEntity implements UserInterface, \ private $Job; /** - * @var \Eccube\Entity\Master\Country + * @var \Eccube\Entity\Master\Country|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Country") * @ORM\JoinColumns({ @@ -279,7 +279,7 @@ class Customer extends \Eccube\Entity\AbstractEntity implements UserInterface, \ private $Country; /** - * @var \Eccube\Entity\Master\Pref + * @var \Eccube\Entity\Master\Pref|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Pref") * @ORM\JoinColumns({ @@ -953,7 +953,7 @@ public function removeCustomerFavoriteProduct(CustomerFavoriteProduct $customerF /** * Get customerFavoriteProducts. * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getCustomerFavoriteProducts() { @@ -989,7 +989,7 @@ public function removeCustomerAddress(CustomerAddress $customerAddress) /** * Get customerAddresses. * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getCustomerAddresses() { @@ -1025,7 +1025,7 @@ public function removeOrder(Order $order) /** * Get orders. * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getOrders() { diff --git a/src/Eccube/Entity/CustomerAddress.php b/src/Eccube/Entity/CustomerAddress.php index 15724d1e3a3..f594b954613 100644 --- a/src/Eccube/Entity/CustomerAddress.php +++ b/src/Eccube/Entity/CustomerAddress.php @@ -96,14 +96,14 @@ public function setFromShipping(Shipping $Shipping) private $id; /** - * @var string|null + * @var string * * @ORM\Column(name="name01", type="string", length=255) */ private $name01; /** - * @var string|null + * @var string * * @ORM\Column(name="name02", type="string", length=255) */ @@ -173,7 +173,7 @@ public function setFromShipping(Shipping $Shipping) private $update_date; /** - * @var \Eccube\Entity\Customer + * @var \Eccube\Entity\Customer|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Customer", inversedBy="CustomerAddresses") * @ORM\JoinColumns({ @@ -183,7 +183,7 @@ public function setFromShipping(Shipping $Shipping) private $Customer; /** - * @var \Eccube\Entity\Master\Country + * @var \Eccube\Entity\Master\Country|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Country") * @ORM\JoinColumns({ @@ -193,7 +193,7 @@ public function setFromShipping(Shipping $Shipping) private $Country; /** - * @var \Eccube\Entity\Master\Pref + * @var \Eccube\Entity\Master\Pref|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Pref") * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/CustomerFavoriteProduct.php b/src/Eccube/Entity/CustomerFavoriteProduct.php index cac9d0fd0fc..4ba87fce05c 100644 --- a/src/Eccube/Entity/CustomerFavoriteProduct.php +++ b/src/Eccube/Entity/CustomerFavoriteProduct.php @@ -51,7 +51,7 @@ class CustomerFavoriteProduct extends \Eccube\Entity\AbstractEntity private $update_date; /** - * @var \Eccube\Entity\Customer + * @var \Eccube\Entity\Customer|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Customer", inversedBy="CustomerFavoriteProducts") * @ORM\JoinColumns({ @@ -61,7 +61,7 @@ class CustomerFavoriteProduct extends \Eccube\Entity\AbstractEntity private $Customer; /** - * @var \Eccube\Entity\Product + * @var \Eccube\Entity\Product|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Product", inversedBy="CustomerFavoriteProducts") * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/Delivery.php b/src/Eccube/Entity/Delivery.php index f126815882a..df56b5273db 100644 --- a/src/Eccube/Entity/Delivery.php +++ b/src/Eccube/Entity/Delivery.php @@ -101,21 +101,21 @@ public function __toString() private $update_date; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\PaymentOption", mappedBy="Delivery", cascade={"persist","remove"}) */ private $PaymentOptions; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\DeliveryFee", mappedBy="Delivery", cascade={"persist","remove"}) */ private $DeliveryFees; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\DeliveryTime", mappedBy="Delivery", cascade={"persist","remove"}) * @ORM\OrderBy({ @@ -125,7 +125,7 @@ public function __toString() private $DeliveryTimes; /** - * @var \Eccube\Entity\Member + * @var \Eccube\Entity\Member|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Member") * @ORM\JoinColumns({ @@ -135,7 +135,7 @@ public function __toString() private $Creator; /** - * @var \Eccube\Entity\Master\SaleType + * @var \Eccube\Entity\Master\SaleType|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\SaleType") * @ORM\JoinColumns({ @@ -361,7 +361,7 @@ public function removePaymentOption(PaymentOption $paymentOption) /** * Get paymentOptions. * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getPaymentOptions() { @@ -397,7 +397,7 @@ public function removeDeliveryFee(DeliveryFee $deliveryFee) /** * Get deliveryFees. * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getDeliveryFees() { @@ -433,7 +433,7 @@ public function removeDeliveryTime(DeliveryTime $deliveryTime) /** * Get deliveryTimes. * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getDeliveryTimes() { diff --git a/src/Eccube/Entity/DeliveryFee.php b/src/Eccube/Entity/DeliveryFee.php index 41a33310804..133f1cd574c 100644 --- a/src/Eccube/Entity/DeliveryFee.php +++ b/src/Eccube/Entity/DeliveryFee.php @@ -44,7 +44,7 @@ class DeliveryFee extends \Eccube\Entity\AbstractEntity private $fee; /** - * @var \Eccube\Entity\Delivery + * @var \Eccube\Entity\Delivery|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Delivery", inversedBy="DeliveryFees") * @ORM\JoinColumns({ @@ -54,7 +54,7 @@ class DeliveryFee extends \Eccube\Entity\AbstractEntity private $Delivery; /** - * @var \Eccube\Entity\Master\Pref + * @var \Eccube\Entity\Master\Pref|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Pref") * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/DeliveryTime.php b/src/Eccube/Entity/DeliveryTime.php index 664a4bac5ff..27a75a01f90 100644 --- a/src/Eccube/Entity/DeliveryTime.php +++ b/src/Eccube/Entity/DeliveryTime.php @@ -49,7 +49,7 @@ public function __toString() private $delivery_time; /** - * @var \Eccube\Entity\Delivery + * @var \Eccube\Entity\Delivery|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Delivery", inversedBy="DeliveryTimes") * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/ExportCsvRow.php b/src/Eccube/Entity/ExportCsvRow.php index b779200dbdd..cac8206aafd 100644 --- a/src/Eccube/Entity/ExportCsvRow.php +++ b/src/Eccube/Entity/ExportCsvRow.php @@ -17,12 +17,12 @@ class ExportCsvRow extends \Eccube\Entity\AbstractEntity { /** - * @var \Doctrine\Common\Collections\Collection + * @var array */ private $row = []; /** - * @var string + * @var string|null */ private $data = null; @@ -56,6 +56,8 @@ public function isDataNull() /** * Push data + * + * @return void */ public function pushData() { @@ -66,7 +68,7 @@ public function pushData() /** * Get row * - * @return \Doctrine\Common\Collections\Collection + * @return array */ public function getRow() { diff --git a/src/Eccube/Entity/Layout.php b/src/Eccube/Entity/Layout.php index 5450244c5b4..faba18cac22 100644 --- a/src/Eccube/Entity/Layout.php +++ b/src/Eccube/Entity/Layout.php @@ -222,7 +222,7 @@ public function getColumnNum() private $id; /** - * @var string + * @var string|null * * @ORM\Column(name="layout_name", type="string", length=255, nullable=true) */ @@ -243,14 +243,14 @@ public function getColumnNum() private $update_date; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\BlockPosition", mappedBy="Layout", cascade={"persist","remove"}) */ private $BlockPositions; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\PageLayout", mappedBy="Layout", cascade={"persist","remove"}) * @ORM\OrderBy({"sort_no" = "ASC"}) @@ -258,7 +258,7 @@ public function getColumnNum() private $PageLayouts; /** - * @var \Eccube\Entity\Master\DeviceType + * @var \Eccube\Entity\Master\DeviceType|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\DeviceType") * @ORM\JoinColumns({ @@ -376,6 +376,8 @@ public function addBlockPosition(BlockPosition $blockPosition) * Remove blockPosition * * @param \Eccube\Entity\BlockPosition $blockPosition + * + * @return void */ public function removeBlockPosition(BlockPosition $blockPosition) { @@ -385,7 +387,7 @@ public function removeBlockPosition(BlockPosition $blockPosition) /** * Get blockPositions * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getBlockPositions() { @@ -410,6 +412,8 @@ public function addPageLayout(PageLayout $PageLayout) * Remove pageLayoutLayout * * @param \Eccube\Entity\PageLayout $PageLayout + * + * @return void */ public function removePageLayout(PageLayout $PageLayout) { @@ -419,7 +423,7 @@ public function removePageLayout(PageLayout $PageLayout) /** * Get pageLayoutLayouts * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getPageLayouts() { @@ -443,7 +447,7 @@ public function setDeviceType(Master\DeviceType $deviceType = null) /** * Get deviceType * - * @return \Eccube\Entity\Master\DeviceType + * @return \Eccube\Entity\Master\DeviceType|null */ public function getDeviceType() { diff --git a/src/Eccube/Entity/LoginHistory.php b/src/Eccube/Entity/LoginHistory.php index c2bb66e5d0f..17ca1863283 100644 --- a/src/Eccube/Entity/LoginHistory.php +++ b/src/Eccube/Entity/LoginHistory.php @@ -38,13 +38,13 @@ class LoginHistory extends AbstractEntity private $id; /** - * @var string + * @var string|null * @ORM\Column(type="text",nullable=true) */ private $user_name; /** - * @var string + * @var string|null * @ORM\Column(type="text",nullable=true) */ private $client_ip; @@ -73,7 +73,7 @@ class LoginHistory extends AbstractEntity private $Status; /** - * @var Member + * @var Member|null * @ORM\ManyToOne(targetEntity="Eccube\Entity\Member") * @ORM\JoinColumns({ * @ORM\JoinColumn(name="member_id", referencedColumnName="id", onDelete="SET NULL") diff --git a/src/Eccube/Entity/MailHistory.php b/src/Eccube/Entity/MailHistory.php index dae0af11135..fc45adec811 100644 --- a/src/Eccube/Entity/MailHistory.php +++ b/src/Eccube/Entity/MailHistory.php @@ -73,7 +73,7 @@ public function __toString() private $mail_html_body; /** - * @var \Eccube\Entity\Order + * @var \Eccube\Entity\Order|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Order", inversedBy="MailHistories") * @ORM\JoinColumns({ @@ -83,7 +83,7 @@ public function __toString() private $Order; /** - * @var \Eccube\Entity\Member + * @var \Eccube\Entity\Member|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Member") * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/MailTemplate.php b/src/Eccube/Entity/MailTemplate.php index 03155117a95..af70bb790df 100644 --- a/src/Eccube/Entity/MailTemplate.php +++ b/src/Eccube/Entity/MailTemplate.php @@ -80,7 +80,7 @@ public function __toString() private $update_date; /** - * @var \Eccube\Entity\Member + * @var \Eccube\Entity\Member|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Member") * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/Member.php b/src/Eccube/Entity/Member.php index 18127b3ebe9..2f66e1cb29b 100644 --- a/src/Eccube/Entity/Member.php +++ b/src/Eccube/Entity/Member.php @@ -114,7 +114,7 @@ public function eraseCredentials() private $password; /** - * @var string + * @var string|null * * @ORM\Column(name="salt", type="string", length=255, nullable=true) */ @@ -128,7 +128,7 @@ public function eraseCredentials() private $sort_no; /** - * @var string + * @var string|null * * @ORM\Column(name="two_factor_auth_key",type="string",length=255,nullable=true,options={"fixed":false}) */ @@ -137,7 +137,7 @@ public function eraseCredentials() /** * @ORM\Column(name="two_factor_auth_enabled",type="boolean",nullable=false,options={"default":false}) * - * @var integer + * @var boolean */ private $two_factor_auth_enabled = false; @@ -163,7 +163,7 @@ public function eraseCredentials() private $login_date; /** - * @var \Eccube\Entity\Master\Work + * @var \Eccube\Entity\Master\Work|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Work") * @ORM\JoinColumns({ @@ -173,7 +173,7 @@ public function eraseCredentials() private $Work; /** - * @var \Eccube\Entity\Master\Authority + * @var \Eccube\Entity\Master\Authority|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Authority") * @ORM\JoinColumns({ @@ -183,7 +183,7 @@ public function eraseCredentials() private $Authority; /** - * @var \Eccube\Entity\Member + * @var \Eccube\Entity\Member|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Member") * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/News.php b/src/Eccube/Entity/News.php index f0006a59614..3f5cab3eab5 100644 --- a/src/Eccube/Entity/News.php +++ b/src/Eccube/Entity/News.php @@ -102,7 +102,7 @@ public function __toString() private $visible; /** - * @var \Eccube\Entity\Member + * @var \Eccube\Entity\Member|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Member") * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/Order.php b/src/Eccube/Entity/Order.php index de1bf425186..182408cb0a3 100644 --- a/src/Eccube/Entity/Order.php +++ b/src/Eccube/Entity/Order.php @@ -352,14 +352,14 @@ public function getTotalPrice() private $message; /** - * @var string|null + * @var string * * @ORM\Column(name="name01", type="string", length=255) */ private $name01; /** - * @var string|null + * @var string * * @ORM\Column(name="name02", type="string", length=255) */ @@ -429,35 +429,35 @@ public function getTotalPrice() private $birth; /** - * @var string + * @var float|string * * @ORM\Column(name="subtotal", type="decimal", precision=12, scale=2, options={"unsigned":true,"default":0}) */ private $subtotal = 0; /** - * @var string + * @var float|string * * @ORM\Column(name="discount", type="decimal", precision=12, scale=2, options={"unsigned":true,"default":0}) */ private $discount = 0; /** - * @var string + * @var float|string * * @ORM\Column(name="delivery_fee_total", type="decimal", precision=12, scale=2, options={"unsigned":true,"default":0}) */ private $delivery_fee_total = 0; /** - * @var string + * @var float|string * * @ORM\Column(name="charge", type="decimal", precision=12, scale=2, options={"unsigned":true,"default":0}) */ private $charge = 0; /** - * @var string + * @var float|string * * @ORM\Column(name="tax", type="decimal", precision=12, scale=2, options={"unsigned":true,"default":0}) * @@ -466,14 +466,14 @@ public function getTotalPrice() private $tax = 0; /** - * @var string + * @var float|string * * @ORM\Column(name="total", type="decimal", precision=12, scale=2, options={"unsigned":true,"default":0}) */ private $total = 0; /** - * @var string + * @var float|string * * @ORM\Column(name="payment_total", type="decimal", precision=12, scale=2, options={"unsigned":true,"default":0}) */ @@ -554,21 +554,21 @@ public function getTotalPrice() private $complete_mail_message; /** - * @var \Doctrine\Common\Collections\Collection|OrderItem[] + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\OrderItem", mappedBy="Order", cascade={"persist","remove"}) */ private $OrderItems; /** - * @var \Doctrine\Common\Collections\Collection|Shipping[] + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\Shipping", mappedBy="Order", cascade={"persist","remove"}) */ private $Shippings; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\MailHistory", mappedBy="Order", cascade={"remove"}) * @ORM\OrderBy({ @@ -578,7 +578,7 @@ public function getTotalPrice() private $MailHistories; /** - * @var \Eccube\Entity\Customer + * @var \Eccube\Entity\Customer|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Customer", inversedBy="Orders") * @ORM\JoinColumns({ @@ -588,7 +588,7 @@ public function getTotalPrice() private $Customer; /** - * @var \Eccube\Entity\Master\Country + * @var \Eccube\Entity\Master\Country|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Country") * @ORM\JoinColumns({ @@ -598,7 +598,7 @@ public function getTotalPrice() private $Country; /** - * @var \Eccube\Entity\Master\Pref + * @var \Eccube\Entity\Master\Pref|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Pref") * @ORM\JoinColumns({ @@ -608,7 +608,7 @@ public function getTotalPrice() private $Pref; /** - * @var \Eccube\Entity\Master\Sex + * @var \Eccube\Entity\Master\Sex|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Sex") * @ORM\JoinColumns({ @@ -618,7 +618,7 @@ public function getTotalPrice() private $Sex; /** - * @var \Eccube\Entity\Master\Job + * @var \Eccube\Entity\Master\Job|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Job") * @ORM\JoinColumns({ @@ -628,7 +628,7 @@ public function getTotalPrice() private $Job; /** - * @var \Eccube\Entity\Payment + * @var \Eccube\Entity\Payment|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Payment") * @ORM\JoinColumns({ @@ -638,7 +638,7 @@ public function getTotalPrice() private $Payment; /** - * @var \Eccube\Entity\Master\DeviceType + * @var \Eccube\Entity\Master\DeviceType|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\DeviceType") * @ORM\JoinColumns({ @@ -650,7 +650,7 @@ public function getTotalPrice() /** * OrderStatusより先にプロパティを定義しておかないとセットされなくなる * - * @var \Eccube\Entity\Master\CustomerOrderStatus + * @var \Eccube\Entity\Master\CustomerOrderStatus|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\CustomerOrderStatus") * @ORM\JoinColumns({ @@ -662,7 +662,7 @@ public function getTotalPrice() /** * OrderStatusより先にプロパティを定義しておかないとセットされなくなる * - * @var \Eccube\Entity\Master\OrderStatusColor + * @var \Eccube\Entity\Master\OrderStatusColor|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\OrderStatusColor") * @ORM\JoinColumns({ @@ -672,7 +672,7 @@ public function getTotalPrice() private $OrderStatusColor; /** - * @var \Eccube\Entity\Master\OrderStatus + * @var \Eccube\Entity\Master\OrderStatus|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\OrderStatus") * @ORM\JoinColumns({ @@ -1079,7 +1079,7 @@ public function getBirth() /** * Set subtotal. * - * @param string $subtotal + * @param float|int|string $subtotal * * @return Order */ @@ -1129,7 +1129,7 @@ public function getDiscount() /** * Set deliveryFeeTotal. * - * @param string $deliveryFeeTotal + * @param float|int|string $deliveryFeeTotal * * @return Order */ @@ -1143,7 +1143,7 @@ public function setDeliveryFeeTotal($deliveryFeeTotal) /** * Get deliveryFeeTotal. * - * @return string + * @return float|int|string */ public function getDeliveryFeeTotal() { @@ -1153,7 +1153,7 @@ public function getDeliveryFeeTotal() /** * Set charge. * - * @param string $charge + * @param float|int|string $charge * * @return Order */ @@ -1177,7 +1177,7 @@ public function getCharge() /** * Set tax. * - * @param string $tax + * @param float|int|string $tax * * @return Order * @@ -1205,7 +1205,7 @@ public function getTax() /** * Set total. * - * @param string $total + * @param float|int|string $total * * @return Order */ @@ -1219,7 +1219,7 @@ public function setTotal($total) /** * Get total. * - * @return string + * @return float|int|string */ public function getTotal() { @@ -1229,7 +1229,7 @@ public function getTotal() /** * Set paymentTotal. * - * @param string $paymentTotal + * @param float|int|string $paymentTotal * * @return Order */ @@ -1461,7 +1461,7 @@ public function getCompleteMailMessage() /** * @param string|null $complete_mail_message * - * @return + * @return $this */ public function setCompleteMailMessage($complete_mail_message = null) { @@ -1473,7 +1473,7 @@ public function setCompleteMailMessage($complete_mail_message = null) /** * @param string|null $complete_mail_message * - * @return + * @return $this */ public function appendCompleteMailMessage($complete_mail_message = null) { @@ -1523,7 +1523,7 @@ public function removeOrderItem(OrderItem $OrderItem) /** * Get orderItems. * - * @return \Doctrine\Common\Collections\Collection|OrderItem[] + * @return \Doctrine\Common\Collections\Collection */ public function getOrderItems() { @@ -1569,7 +1569,7 @@ public function removeShipping(Shipping $Shipping) /** * Get shippings. * - * @return \Doctrine\Common\Collections\Collection|\Eccube\Entity\Shipping[] + * @return \Doctrine\Common\Collections\Collection */ public function getShippings() { @@ -1857,6 +1857,8 @@ public function getOrderStatus() /** * @param ItemInterface $item + * + * @return void */ public function addItem(ItemInterface $item) { diff --git a/src/Eccube/Entity/OrderItem.php b/src/Eccube/Entity/OrderItem.php index aa00f4a2452..6ba7e059b05 100644 --- a/src/Eccube/Entity/OrderItem.php +++ b/src/Eccube/Entity/OrderItem.php @@ -179,35 +179,35 @@ public function isPoint() private $class_category_name2; /** - * @var string + * @var float|int|string * * @ORM\Column(name="price", type="decimal", precision=12, scale=2, options={"default":0}) */ private $price = 0; /** - * @var string + * @var float|int|string * * @ORM\Column(name="quantity", type="decimal", precision=10, scale=0, options={"default":0}) */ private $quantity = 0; /** - * @var string + * @var float|int|string * * @ORM\Column(name="tax", type="decimal", precision=10, scale=0, options={"default":0}) */ private $tax = 0; /** - * @var string + * @var float|int|string * * @ORM\Column(name="tax_rate", type="decimal", precision=10, scale=0, options={"unsigned":true,"default":0}) */ private $tax_rate = 0; /** - * @var string + * @var float|int|string * * @ORM\Column(name="tax_adjust", type="decimal", precision=10, scale=0, options={"unsigned":true,"default":0}) */ @@ -235,7 +235,7 @@ public function isPoint() private $processor_name; /** - * @var \Eccube\Entity\Order + * @var \Eccube\Entity\Order|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Order", inversedBy="OrderItems") * @ORM\JoinColumns({ @@ -245,7 +245,7 @@ public function isPoint() private $Order; /** - * @var \Eccube\Entity\Product + * @var \Eccube\Entity\Product|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Product") * @ORM\JoinColumns({ @@ -255,7 +255,7 @@ public function isPoint() private $Product; /** - * @var \Eccube\Entity\ProductClass + * @var \Eccube\Entity\ProductClass|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\ProductClass") * @ORM\JoinColumns({ @@ -265,7 +265,7 @@ public function isPoint() private $ProductClass; /** - * @var \Eccube\Entity\Shipping + * @var \Eccube\Entity\Shipping|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Shipping", inversedBy="OrderItems") * @ORM\JoinColumns({ @@ -275,7 +275,7 @@ public function isPoint() private $Shipping; /** - * @var \Eccube\Entity\Master\RoundingType + * @var \Eccube\Entity\Master\RoundingType|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\RoundingType") * @ORM\JoinColumns({ @@ -285,7 +285,7 @@ public function isPoint() private $RoundingType; /** - * @var \Eccube\Entity\Master\TaxType + * @var \Eccube\Entity\Master\TaxType|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\TaxType") * @ORM\JoinColumns({ @@ -295,7 +295,7 @@ public function isPoint() private $TaxType; /** - * @var \Eccube\Entity\Master\TaxDisplayType + * @var \Eccube\Entity\Master\TaxDisplayType|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\TaxDisplayType") * @ORM\JoinColumns({ @@ -305,7 +305,7 @@ public function isPoint() private $TaxDisplayType; /** - * @var \Eccube\Entity\Master\OrderItemType + * @var \Eccube\Entity\Master\OrderItemType|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\OrderItemType") * @ORM\JoinColumns({ @@ -684,6 +684,9 @@ public function getOrder() return $this->Order; } + /** + * @return int|null + */ public function getOrderId() { if (is_object($this->getOrder())) { @@ -775,6 +778,8 @@ public function getRoundingType() /** * @param RoundingType $RoundingType + * + * @return $this */ public function setRoundingType(RoundingType $RoundingType = null) { @@ -800,7 +805,7 @@ public function setTaxType(Master\TaxType $taxType = null) /** * Get taxType * - * @return \Eccube\Entity\Master\TaxType + * @return \Eccube\Entity\Master\TaxType|null */ public function getTaxType() { diff --git a/src/Eccube/Entity/OrderPdf.php b/src/Eccube/Entity/OrderPdf.php index 711085983a2..37b8291eb76 100644 --- a/src/Eccube/Entity/OrderPdf.php +++ b/src/Eccube/Entity/OrderPdf.php @@ -41,49 +41,49 @@ class OrderPdf extends AbstractEntity private $member_id; /** - * @var string + * @var string|null * * @ORM\Column(name="title", type="string", nullable=true) */ private $title; /** - * @var string + * @var string|null * * @ORM\Column(name="message1", type="string", nullable=true) */ private $message1; /** - * @var string + * @var string|null * * @ORM\Column(name="message2", type="string", nullable=true) */ private $message2; /** - * @var string + * @var string|null * * @ORM\Column(name="message3", type="string", nullable=true) */ private $message3; /** - * @var string + * @var string|null * * @ORM\Column(name="note1", type="string", nullable=true) */ private $note1; /** - * @var string + * @var string|null * * @ORM\Column(name="note2", type="string", nullable=true) */ private $note2; /** - * @var string + * @var string|null * * @ORM\Column(name="note3", type="string", nullable=true) */ diff --git a/src/Eccube/Entity/Page.php b/src/Eccube/Entity/Page.php index e054f6b223e..c5a2ad59e44 100644 --- a/src/Eccube/Entity/Page.php +++ b/src/Eccube/Entity/Page.php @@ -136,14 +136,14 @@ public function getLayouts() private $meta_tags; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\PageLayout", mappedBy="Page", cascade={"persist","remove"}) */ private $PageLayouts; /** - * @var \Eccube\Entity\Page + * @var \Eccube\Entity\Page|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Page") * @ORM\JoinColumns({ @@ -449,7 +449,7 @@ public function getMetaTags() /** * Get pageLayoutLayout. * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getPageLayouts() { @@ -474,6 +474,8 @@ public function addPageLayout(PageLayout $PageLayout) * Remove pageLayoutLayout * * @param \Eccube\Entity\PageLayout $PageLayout + * + * @return void */ public function removePageLayout(PageLayout $PageLayout) { diff --git a/src/Eccube/Entity/PageLayout.php b/src/Eccube/Entity/PageLayout.php index 95a4f0c14c7..3886fb9cb5d 100644 --- a/src/Eccube/Entity/PageLayout.php +++ b/src/Eccube/Entity/PageLayout.php @@ -53,7 +53,7 @@ class PageLayout extends AbstractEntity private $sort_no; /** - * @var \Eccube\Entity\Page + * @var \Eccube\Entity\Page|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Page", inversedBy="PageLayouts") * @ORM\JoinColumns({ @@ -63,7 +63,7 @@ class PageLayout extends AbstractEntity private $Page; /** - * @var \Eccube\Entity\Layout + * @var \Eccube\Entity\Layout|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Layout", inversedBy="PageLayouts") * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/Payment.php b/src/Eccube/Entity/Payment.php index b5d762c3fcb..1354c7d809c 100644 --- a/src/Eccube/Entity/Payment.php +++ b/src/Eccube/Entity/Payment.php @@ -101,7 +101,7 @@ public function __toString() private $method_class; /** - * @var int + * @var boolean * * @ORM\Column(name="visible", type="boolean", options={"default":true}) */ @@ -122,14 +122,14 @@ public function __toString() private $update_date; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\PaymentOption", mappedBy="Payment") */ private $PaymentOptions; /** - * @var \Eccube\Entity\Member + * @var \Eccube\Entity\Member|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Member") * @ORM\JoinColumns({ @@ -445,7 +445,7 @@ public function removePaymentOption(PaymentOption $paymentOption) /** * Get paymentOptions. * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getPaymentOptions() { diff --git a/src/Eccube/Entity/PaymentOption.php b/src/Eccube/Entity/PaymentOption.php index a4c892eac24..7d8d43ea9b3 100644 --- a/src/Eccube/Entity/PaymentOption.php +++ b/src/Eccube/Entity/PaymentOption.php @@ -46,7 +46,7 @@ class PaymentOption extends \Eccube\Entity\AbstractEntity private $payment_id; /** - * @var \Eccube\Entity\Delivery + * @var \Eccube\Entity\Delivery|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Delivery", inversedBy="PaymentOptions") * @ORM\JoinColumns({ @@ -56,7 +56,7 @@ class PaymentOption extends \Eccube\Entity\AbstractEntity private $Delivery; /** - * @var \Eccube\Entity\Payment + * @var \Eccube\Entity\Payment|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Payment", inversedBy="PaymentOptions") * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/PointRateTrait.php b/src/Eccube/Entity/PointRateTrait.php index a7177340dac..cb6c030ad2c 100644 --- a/src/Eccube/Entity/PointRateTrait.php +++ b/src/Eccube/Entity/PointRateTrait.php @@ -18,7 +18,7 @@ trait PointRateTrait { /** - * @var string + * @var string|null * * @ORM\Column(name="point_rate", type="decimal", precision=10, scale=0, options={"unsigned":true}, nullable=true) */ diff --git a/src/Eccube/Entity/Product.php b/src/Eccube/Entity/Product.php index 9c934e63372..091b240de98 100644 --- a/src/Eccube/Entity/Product.php +++ b/src/Eccube/Entity/Product.php @@ -509,21 +509,21 @@ public function hasProductClass() private $update_date; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\ProductCategory", mappedBy="Product", cascade={"persist","remove"}) */ private $ProductCategories; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\ProductClass", mappedBy="Product", cascade={"persist","remove"}) */ private $ProductClasses; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\ProductImage", mappedBy="Product", cascade={"remove"}) * @ORM\OrderBy({ @@ -533,21 +533,21 @@ public function hasProductClass() private $ProductImage; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\ProductTag", mappedBy="Product", cascade={"remove"}) */ private $ProductTag; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\CustomerFavoriteProduct", mappedBy="Product") */ private $CustomerFavoriteProducts; /** - * @var \Eccube\Entity\Member + * @var \Eccube\Entity\Member|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Member") * @ORM\JoinColumns({ @@ -557,7 +557,7 @@ public function hasProductClass() private $Creator; /** - * @var \Eccube\Entity\Master\ProductStatus + * @var \Eccube\Entity\Master\ProductStatus|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\ProductStatus") * @ORM\JoinColumns({ @@ -854,7 +854,7 @@ public function removeProductCategory(ProductCategory $productCategory) /** * Get productCategories. * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getProductCategories() { @@ -890,7 +890,7 @@ public function removeProductClass(ProductClass $productClass) /** * Get productClasses. * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getProductClasses() { @@ -926,7 +926,7 @@ public function removeProductImage(ProductImage $productImage) /** * Get productImage. * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getProductImage() { @@ -962,7 +962,7 @@ public function removeProductTag(ProductTag $productTag) /** * Get productTag. * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getProductTag() { @@ -1019,7 +1019,7 @@ public function removeCustomerFavoriteProduct(CustomerFavoriteProduct $customerF /** * Get customerFavoriteProducts. * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getCustomerFavoriteProducts() { diff --git a/src/Eccube/Entity/ProductCategory.php b/src/Eccube/Entity/ProductCategory.php index a97e41a74da..fe16d297670 100644 --- a/src/Eccube/Entity/ProductCategory.php +++ b/src/Eccube/Entity/ProductCategory.php @@ -46,7 +46,7 @@ class ProductCategory extends \Eccube\Entity\AbstractEntity private $category_id; /** - * @var \Eccube\Entity\Product + * @var \Eccube\Entity\Product|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Product", inversedBy="ProductCategories") * @ORM\JoinColumns({ @@ -56,7 +56,7 @@ class ProductCategory extends \Eccube\Entity\AbstractEntity private $Product; /** - * @var \Eccube\Entity\Category + * @var \Eccube\Entity\Category|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Category", inversedBy="ProductCategories") * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/ProductClass.php b/src/Eccube/Entity/ProductClass.php index fbd2d957143..e058a2049c3 100644 --- a/src/Eccube/Entity/ProductClass.php +++ b/src/Eccube/Entity/ProductClass.php @@ -196,28 +196,28 @@ public function hasClassCategory2() private $stock_unlimited = false; /** - * @var string|null + * @var float|string|null * * @ORM\Column(name="sale_limit", type="decimal", precision=10, scale=0, nullable=true, options={"unsigned":true}) */ private $sale_limit; /** - * @var string|null + * @var float|string|null * * @ORM\Column(name="price01", type="decimal", precision=12, scale=2, nullable=true) */ private $price01; /** - * @var string + * @var float|int|string * * @ORM\Column(name="price02", type="decimal", precision=12, scale=2) */ private $price02; /** - * @var string|null + * @var float|string|null * * @ORM\Column(name="delivery_fee", type="decimal", precision=12, scale=2, nullable=true, options={"unsigned":true}) */ @@ -252,28 +252,28 @@ public function hasClassCategory2() private $currency_code; /** - * @var string + * @var string|null * * @ORM\Column(name="point_rate", type="decimal", precision=10, scale=0, options={"unsigned":true}, nullable=true) */ private $point_rate; /** - * @var \Eccube\Entity\ProductStock + * @var \Eccube\Entity\ProductStock|null * * @ORM\OneToOne(targetEntity="Eccube\Entity\ProductStock", mappedBy="ProductClass", cascade={"persist","remove"}) */ private $ProductStock; /** - * @var \Eccube\Entity\TaxRule + * @var \Eccube\Entity\TaxRule|null * * @ORM\OneToOne(targetEntity="Eccube\Entity\TaxRule", mappedBy="ProductClass", cascade={"persist","remove"}) */ private $TaxRule; /** - * @var \Eccube\Entity\Product + * @var \Eccube\Entity\Product|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Product", inversedBy="ProductClasses") * @ORM\JoinColumns({ @@ -283,7 +283,7 @@ public function hasClassCategory2() private $Product; /** - * @var \Eccube\Entity\Master\SaleType + * @var \Eccube\Entity\Master\SaleType|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\SaleType") * @ORM\JoinColumns({ @@ -293,7 +293,7 @@ public function hasClassCategory2() private $SaleType; /** - * @var \Eccube\Entity\ClassCategory + * @var \Eccube\Entity\ClassCategory|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\ClassCategory") * @ORM\JoinColumns({ @@ -303,7 +303,7 @@ public function hasClassCategory2() private $ClassCategory1; /** - * @var \Eccube\Entity\ClassCategory + * @var \Eccube\Entity\ClassCategory|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\ClassCategory") * @ORM\JoinColumns({ @@ -313,7 +313,7 @@ public function hasClassCategory2() private $ClassCategory2; /** - * @var \Eccube\Entity\DeliveryDuration + * @var \Eccube\Entity\DeliveryDuration|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\DeliveryDuration") * @ORM\JoinColumns({ @@ -323,7 +323,7 @@ public function hasClassCategory2() private $DeliveryDuration; /** - * @var \Eccube\Entity\Member + * @var \Eccube\Entity\Member|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Member") * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/ProductImage.php b/src/Eccube/Entity/ProductImage.php index c56a1af35c2..50459d2debe 100644 --- a/src/Eccube/Entity/ProductImage.php +++ b/src/Eccube/Entity/ProductImage.php @@ -66,7 +66,7 @@ public function __toString() private $create_date; /** - * @var \Eccube\Entity\Product + * @var \Eccube\Entity\Product|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Product", inversedBy="ProductImage") * @ORM\JoinColumns({ @@ -76,7 +76,7 @@ public function __toString() private $Product; /** - * @var \Eccube\Entity\Member + * @var \Eccube\Entity\Member|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Member") * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/ProductStock.php b/src/Eccube/Entity/ProductStock.php index 13804ae466a..775dbda6612 100644 --- a/src/Eccube/Entity/ProductStock.php +++ b/src/Eccube/Entity/ProductStock.php @@ -90,7 +90,7 @@ public function getProductClassId() private $update_date; /** - * @var \Eccube\Entity\ProductClass + * @var \Eccube\Entity\ProductClass|null * * @ORM\OneToOne(targetEntity="Eccube\Entity\ProductClass", inversedBy="ProductStock") * @ORM\JoinColumns({ @@ -100,7 +100,7 @@ public function getProductClassId() private $ProductClass; /** - * @var \Eccube\Entity\Member + * @var \Eccube\Entity\Member|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Member") * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/ProductTag.php b/src/Eccube/Entity/ProductTag.php index 4d6094f4db7..17a21bff4c9 100644 --- a/src/Eccube/Entity/ProductTag.php +++ b/src/Eccube/Entity/ProductTag.php @@ -59,7 +59,7 @@ public function getTagId() private $create_date; /** - * @var \Eccube\Entity\Product + * @var \Eccube\Entity\Product|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Product", inversedBy="ProductTag") * @ORM\JoinColumns({ @@ -69,7 +69,7 @@ public function getTagId() private $Product; /** - * @var \Eccube\Entity\Tag + * @var \Eccube\Entity\Tag|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Tag", inversedBy="ProductTag") * @ORM\JoinColumns({ @@ -79,7 +79,7 @@ public function getTagId() private $Tag; /** - * @var \Eccube\Entity\Member + * @var \Eccube\Entity\Member|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Member") * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/Shipping.php b/src/Eccube/Entity/Shipping.php index 0f7d4b5c0b8..042db4686a1 100644 --- a/src/Eccube/Entity/Shipping.php +++ b/src/Eccube/Entity/Shipping.php @@ -69,14 +69,14 @@ public function getShippingMultipleDefaultName() private $name02; /** - * @var string + * @var string|null * * @ORM\Column(name="kana01", type="string", length=255, nullable=true) */ private $kana01; /** - * @var string + * @var string|null * * @ORM\Column(name="kana02", type="string", length=255, nullable=true) */ @@ -125,7 +125,7 @@ public function getShippingMultipleDefaultName() private $shipping_delivery_name; /** - * @var int + * @var int|null * * @ORM\Column(name="time_id", type="integer", options={"unsigned":true}, nullable=true) */ @@ -157,14 +157,14 @@ public function getShippingMultipleDefaultName() private $shipping_date; /** - * @var string + * @var string|null * * @ORM\Column(name="tracking_number", type="string", length=255, nullable=true) */ private $tracking_number; /** - * @var string + * @var string|null * * @ORM\Column(name="note", type="string", length=4000, nullable=true) */ @@ -199,7 +199,7 @@ public function getShippingMultipleDefaultName() private $mail_send_date; /** - * @var \Eccube\Entity\Order + * @var \Eccube\Entity\Order|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Order", inversedBy="Shippings", cascade={"persist"}) * @ORM\JoinColumns({ @@ -209,14 +209,14 @@ public function getShippingMultipleDefaultName() private $Order; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\OrderItem", mappedBy="Shipping", cascade={"persist"}) */ private $OrderItems; /** - * @var \Eccube\Entity\Master\Country + * @var \Eccube\Entity\Master\Country|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Country") * @ORM\JoinColumns({ @@ -226,7 +226,7 @@ public function getShippingMultipleDefaultName() private $Country; /** - * @var \Eccube\Entity\Master\Pref + * @var \Eccube\Entity\Master\Pref|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Pref") * @ORM\JoinColumns({ @@ -236,7 +236,7 @@ public function getShippingMultipleDefaultName() private $Pref; /** - * @var \Eccube\Entity\Delivery + * @var \Eccube\Entity\Delivery|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Delivery") * @ORM\JoinColumns({ @@ -251,7 +251,7 @@ public function getShippingMultipleDefaultName() private $ProductClassOfTemp; /** - * @var \Eccube\Entity\Member + * @var \Eccube\Entity\Member|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Member") * @ORM\JoinColumns({ @@ -761,7 +761,7 @@ public function removeOrderItem(OrderItem $OrderItem) /** * Get orderItems. * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getOrderItems() { diff --git a/src/Eccube/Entity/Tag.php b/src/Eccube/Entity/Tag.php index 572b0d1f1d5..8c79d874a17 100644 --- a/src/Eccube/Entity/Tag.php +++ b/src/Eccube/Entity/Tag.php @@ -60,7 +60,7 @@ public function __toString() protected $sort_no; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection * * @ORM\OneToMany(targetEntity="Eccube\Entity\ProductTag", mappedBy="Tag") */ @@ -175,7 +175,7 @@ public function removeProductTag(ProductTag $productTag) /** * Get productTag. * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getProductTag() { diff --git a/src/Eccube/Entity/TaxRule.php b/src/Eccube/Entity/TaxRule.php index 006cb8e99fd..a7eda026c97 100644 --- a/src/Eccube/Entity/TaxRule.php +++ b/src/Eccube/Entity/TaxRule.php @@ -81,14 +81,14 @@ public function getSortNo() private $id; /** - * @var string + * @var float|int|string * * @ORM\Column(name="tax_rate", type="decimal", precision=10, scale=0, options={"unsigned":true,"default":0}) */ private $tax_rate = 0; /** - * @var string + * @var float|int|string * * @ORM\Column(name="tax_adjust", type="decimal", precision=10, scale=0, options={"unsigned":true,"default":0}) */ @@ -116,7 +116,7 @@ public function getSortNo() private $update_date; /** - * @var \Eccube\Entity\ProductClass + * @var \Eccube\Entity\ProductClass|null * * @ORM\OneToOne(targetEntity="Eccube\Entity\ProductClass", inversedBy="TaxRule") * @ORM\JoinColumns({ @@ -126,7 +126,7 @@ public function getSortNo() private $ProductClass; /** - * @var \Eccube\Entity\Member + * @var \Eccube\Entity\Member|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Member") * @ORM\JoinColumns({ @@ -136,7 +136,7 @@ public function getSortNo() private $Creator; /** - * @var \Eccube\Entity\Master\Country + * @var \Eccube\Entity\Master\Country|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Country") * @ORM\JoinColumns({ @@ -146,7 +146,7 @@ public function getSortNo() private $Country; /** - * @var \Eccube\Entity\Master\Pref + * @var \Eccube\Entity\Master\Pref|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Pref") * @ORM\JoinColumns({ @@ -156,7 +156,7 @@ public function getSortNo() private $Pref; /** - * @var \Eccube\Entity\Product + * @var \Eccube\Entity\Product|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Product") * @ORM\JoinColumns({ @@ -166,7 +166,7 @@ public function getSortNo() private $Product; /** - * @var \Eccube\Entity\Master\RoundingType + * @var \Eccube\Entity\Master\RoundingType|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\RoundingType") * @ORM\JoinColumns({ diff --git a/src/Eccube/Entity/Template.php b/src/Eccube/Entity/Template.php index 2acae204336..863d016e462 100644 --- a/src/Eccube/Entity/Template.php +++ b/src/Eccube/Entity/Template.php @@ -86,7 +86,7 @@ public function __toString() private $update_date; /** - * @var \Eccube\Entity\Master\DeviceType + * @var \Eccube\Entity\Master\DeviceType|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\DeviceType") * @ORM\JoinColumns({ diff --git a/tests/object-manager.php b/tests/object-manager.php new file mode 100644 index 00000000000..43c5bedeeec --- /dev/null +++ b/tests/object-manager.php @@ -0,0 +1,11 @@ +bootEnv(__DIR__ . '/../.env'); + +$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']); +$kernel->boot(); +return $kernel->getContainer()->get('doctrine')->getManager(); From 9a2c7bd0d09d44d4bb56ce54b66109973f53ba0b Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Fri, 27 Oct 2023 17:04:00 +0900 Subject: [PATCH 02/21] =?UTF-8?q?PHPStan=E3=83=90=E3=83=83=E3=83=81?= =?UTF-8?q?=E6=A9=9F=E8=83=BD=E3=81=AE=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 20 +++++-- composer.lock | 106 ++++++++++++++++++++++++++++++++++++++ phpdoc_result_script.sh | 8 +++ phpstan.neon.dist | 9 +++- tests/results/.gitignore | 2 + tests/results/convert.php | 67 ++++++++++++++++++++++++ 6 files changed, 208 insertions(+), 4 deletions(-) create mode 100644 phpdoc_result_script.sh create mode 100644 tests/results/.gitignore create mode 100644 tests/results/convert.php diff --git a/composer.json b/composer.json index ca8d8dcc670..f5b05ea69b8 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ }, "minimum-stability": "stable", "require": { - "php": "^7.4 || ^8.0", + "php": "^8.1", "ext-curl": "*", "ext-intl": "*", "ext-json": "*", @@ -115,7 +115,9 @@ "dama/doctrine-test-bundle": "^6.6", "fakerphp/faker": "^1.16", "mikey179/vfsstream": "^1.6", + "phpstan/extension-installer": "^1.3", "phpstan/phpstan": "^1.7", + "phpstan/phpstan-doctrine": "^1.3", "symfony/browser-kit": "^5.4", "symfony/phpunit-bridge": "^5.4" }, @@ -186,7 +188,7 @@ }, "config": { "platform": { - "php": "7.4.0" + "php": "8.1.18" }, "preferred-install": { "*": "dist" @@ -197,7 +199,19 @@ "composer/*": true, "kylekatarnls/update-helper": true, "ec-cube/plugin-installer": true, - "symfony/flex": true + "symfony/flex": true, + "phpstan/extension-installer": true + } + }, + "repositories": { + "eccube": { + "type": "composer", + "url": "https://package-api-c2.ec-cube.net/v42", + "options": { + "http": { + "header": ["X-ECCUBE-KEY: d285840e84bb5ab7c5650250818a75970877c761"] + } + } } } } diff --git a/composer.lock b/composer.lock index 3a602ea2f7a..cc926954aa9 100644 --- a/composer.lock +++ b/composer.lock @@ -11977,6 +11977,46 @@ }, "time": "2022-10-11T11:49:44+00:00" }, + { + "name": "phpstan/extension-installer", + "version": "1.3.1", + "source": { + "type": "git", + "url": "https://github.com/phpstan/extension-installer.git", + "reference": "f45734bfb9984c6c56c4486b71230355f066a58a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/f45734bfb9984c6c56c4486b71230355f066a58a", + "reference": "f45734bfb9984c6c56c4486b71230355f066a58a", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^2.0", + "php": "^7.2 || ^8.0", + "phpstan/phpstan": "^1.9.0" + }, + "require-dev": { + "composer/composer": "^2.0", + "php-parallel-lint/php-parallel-lint": "^1.2.0", + "phpstan/phpstan-strict-rules": "^0.11 || ^0.12 || ^1.0" + }, + "type": "composer-plugin", + "extra": { + "class": "PHPStan\\ExtensionInstaller\\Plugin" + }, + "autoload": { + "psr-4": { + "PHPStan\\ExtensionInstaller\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Composer plugin for automatic installation of PHPStan extensions", + "time": "2023-05-24T08:59:17+00:00" + }, { "name": "phpstan/phpstan", "version": "1.9.8", @@ -12036,6 +12076,72 @@ ], "time": "2023-01-08T21:26:18+00:00" }, + { + "name": "phpstan/phpstan-doctrine", + "version": "1.3.31", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan-doctrine.git", + "reference": "ed1a207922cc963430d61aa87eac63ceb51f8504" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/ed1a207922cc963430d61aa87eac63ceb51f8504", + "reference": "ed1a207922cc963430d61aa87eac63ceb51f8504", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0", + "phpstan/phpstan": "^1.9.7" + }, + "conflict": { + "doctrine/collections": "<1.0", + "doctrine/common": "<2.7", + "doctrine/mongodb-odm": "<1.2", + "doctrine/orm": "<2.5", + "doctrine/persistence": "<1.3" + }, + "require-dev": { + "composer/semver": "^3.3.2", + "doctrine/annotations": "^1.11.0", + "doctrine/collections": "^1.6", + "doctrine/common": "^2.7 || ^3.0", + "doctrine/dbal": "^2.13.8 || ^3.3.3", + "doctrine/lexer": "^1.2.1", + "doctrine/mongodb-odm": "^1.3 || ^2.1", + "doctrine/orm": "^2.11.0", + "doctrine/persistence": "^1.3.8 || ^2.2.1", + "gedmo/doctrine-extensions": "^3.8", + "nesbot/carbon": "^2.49", + "nikic/php-parser": "^4.13.2", + "php-parallel-lint/php-parallel-lint": "^1.2", + "phpstan/phpstan-phpunit": "^1.0", + "phpstan/phpstan-strict-rules": "^1.0", + "phpunit/phpunit": "^9.5.10", + "ramsey/uuid-doctrine": "^1.5.0", + "symfony/cache": "^4.4.35" + }, + "type": "phpstan-extension", + "extra": { + "phpstan": { + "includes": [ + "extension.neon", + "rules.neon" + ] + } + }, + "autoload": { + "psr-4": { + "PHPStan\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Doctrine extensions for PHPStan", + "time": "2023-01-08T19:57:59+00:00" + }, { "name": "phpunit/php-code-coverage", "version": "9.2.23", diff --git a/phpdoc_result_script.sh b/phpdoc_result_script.sh new file mode 100644 index 00000000000..369f64b5824 --- /dev/null +++ b/phpdoc_result_script.sh @@ -0,0 +1,8 @@ +#bin/bash + +for level in {0..9} +do + docker exec my_eccube-ec-cube-1 bash -c "vendor/bin/phpstan analyse src --level ${level} > tests/results/level_${level}.json" +done + +php tests/results/convert.php diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 213da6dad2a..73ef73cf38f 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -1,2 +1,9 @@ parameters: - level: 1 + level: 0 + doctrine: + objectManagerLoader: tests/object-manager.php + ormRepositoryClass: Eccube\Repository\AbstractRepository + errorFormat: json +services: + errorFormatter.csv: + class: Eccube\Service\Command\CsvErrorFormatter diff --git a/tests/results/.gitignore b/tests/results/.gitignore new file mode 100644 index 00000000000..f40e6330db0 --- /dev/null +++ b/tests/results/.gitignore @@ -0,0 +1,2 @@ +*.json +*.csv diff --git a/tests/results/convert.php b/tests/results/convert.php new file mode 100644 index 00000000000..23207866e3e --- /dev/null +++ b/tests/results/convert.php @@ -0,0 +1,67 @@ + 0, + 1 => 0, + 2 => 0, + 3 => 0, + 4 => 0, + 5 => 0, + 6 => 0, + 7 => 0, + 8 => 0, + 9 => 0, +]; +for ($i = 0; $i <= 9; $i++) { + $str = file_get_contents(__DIR__.'/level_'.$i.'.json'); + $json = json_decode($str, true); + $files = $json['files']; + foreach ($files as $error_file => $error_array) { + foreach ($error_array['messages'] as $message) { + $validator = true; + $line_data = []; + $line_data['file_name'] = $error_file; + $line_data['level'] = $i; + $line_data['line'] = $message['line']; + $line_data['message'] = $message['message']; + foreach ($existence_check as $check) { + if ($line_data['file_name'] == $check['file_name'] && + $line_data['line'] == $check['line'] && + $line_data['message'] == $check['message'] && + $message['ignorable'] == $check['ignorable'] + ) { + $validator = false; + } + } + if ($validator) { + $amount[$i]++; + fputcsv($fp, $line_data); + $line_data['ignorable'] = $message['ignorable']; + $existence_check[] = $line_data; + } + } + } +} +fclose($fp); +// 結果件数をJSONに書き込み +$fp = fopen(__DIR__.'/amount.json', 'w'); +$json = []; +foreach ($amount as $key => $value) { + $json["Level {$key}"] = $value; +} +fwrite($fp, json_encode($json)); +fclose($fp); From a5f5c9b72e97ec85a936aaa036da208b87b44591 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Mon, 6 Nov 2023 12:19:36 +0900 Subject: [PATCH 03/21] =?UTF-8?q?Symfony=20Service=E3=81=AELevel=200?= =?UTF-8?q?=E5=AE=9A=E7=BE=A9=E3=83=9F=E3=82=B9=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Service/CsvImportService.php | 26 +++++++++++++------ .../SameSiteNoneCompatSessionHandler.php | 12 ++++----- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/Eccube/Service/CsvImportService.php b/src/Eccube/Service/CsvImportService.php index fee2a35af85..f54796f7ae3 100644 --- a/src/Eccube/Service/CsvImportService.php +++ b/src/Eccube/Service/CsvImportService.php @@ -37,6 +37,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ + +/** + * @template TKey + * + * @template-covariant TValue + * + * @template-implements \Iterator + */ class CsvImportService implements \Iterator, \SeekableIterator, \Countable { public const DUPLICATE_HEADERS_INCREMENT = 1; @@ -132,9 +140,9 @@ public function __construct(\SplFileObject $file, $delimiter = ',', $enclosure = * * If a header row has been set, an associative array will be returned * - * @return array + * @return TValue */ - public function current() + public function current(): mixed { // If the CSV has no column headers just return the line if (empty($this->columnHeaders)) { @@ -217,8 +225,10 @@ public function setHeaderRowNumber($rowNumber, $duplicates = null) * If a header row has been set, the pointer is set just below the header * row. That way, when you iterate over the rows, that header row is * skipped. + * + * @return void */ - public function rewind() + public function rewind(): void { $this->file->rewind(); if (null !== $this->headerRowNumber) { @@ -229,7 +239,7 @@ public function rewind() /** * {@inheritdoc} */ - public function count() + public function count(): int { if (null === $this->count) { $position = $this->key(); @@ -245,7 +255,7 @@ public function count() /** * {@inheritdoc} */ - public function next() + public function next(): void { $this->file->next(); } @@ -253,7 +263,7 @@ public function next() /** * {@inheritdoc} */ - public function valid() + public function valid(): bool { return $this->file->valid(); } @@ -261,7 +271,7 @@ public function valid() /** * {@inheritdoc} */ - public function key() + public function key(): mixed { return $this->file->key(); } @@ -269,7 +279,7 @@ public function key() /** * {@inheritdoc} */ - public function seek($pointer) + public function seek($pointer): void { $this->file->seek($pointer); } diff --git a/src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php b/src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php index 165b346f6df..c382fe55aba 100644 --- a/src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php +++ b/src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php @@ -46,7 +46,7 @@ public function __construct(\SessionHandlerInterface $handler) /** * {@inheritdoc} */ - public function open($savePath, $sessionName) + public function open($savePath, $sessionName): bool { $this->sessionName = $sessionName; // see https://github.com/symfony/symfony/blob/2adc85d49cbe14e346068fa7e9c2e1f08ab31de6/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/AbstractSessionHandler.php#L35-L37 @@ -68,7 +68,7 @@ protected function doRead($sessionId) /** * {@inheritdoc} */ - public function updateTimestamp($sessionId, $data) + public function updateTimestamp($sessionId, $data): bool { return $this->write($sessionId, $data); } @@ -86,7 +86,7 @@ protected function doWrite($sessionId, $data) * * @see https://github.com/symfony/symfony/blob/2adc85d49cbe14e346068fa7e9c2e1f08ab31de6/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/AbstractSessionHandler.php#L126-L167 */ - public function destroy($sessionId) + public function destroy($sessionId): bool { if (\PHP_VERSION_ID < 70000) { $this->prefetchData = null; @@ -152,15 +152,15 @@ protected function doDestroy($sessionId) /** * {@inheritdoc} */ - public function close() + public function close(): bool { return $this->handler->close(); } /** - * @return bool + * @return false|int */ - public function gc($maxlifetime) + public function gc($maxlifetime): int|false { return $this->handler->gc($maxlifetime); } From 73a9b8603a80dfbc8657fae08d049d03d1a34a4b Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Mon, 6 Nov 2023 12:41:33 +0900 Subject: [PATCH 04/21] =?UTF-8?q?=E3=82=B2=E3=83=83=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=BB=E3=82=BB=E3=83=83=E3=82=BF=E3=83=BC=E3=81=AE=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E3=83=92=E3=83=B3=E3=83=88=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Entity/BaseInfo.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Eccube/Entity/BaseInfo.php b/src/Eccube/Entity/BaseInfo.php index eee7bc5afde..9bd747ff9c4 100644 --- a/src/Eccube/Entity/BaseInfo.php +++ b/src/Eccube/Entity/BaseInfo.php @@ -1074,7 +1074,7 @@ public function isOptionPoint() /** * Set pointConversionRate * - * @param string $pointConversionRate + * @param string|null $pointConversionRate * * @return BaseInfo */ @@ -1088,7 +1088,7 @@ public function setPointConversionRate($pointConversionRate) /** * Get pointConversionRate * - * @return string + * @return string|null */ public function getPointConversionRate() { @@ -1098,7 +1098,7 @@ public function getPointConversionRate() /** * Set basicPointRate * - * @param string $basicPointRate + * @param string|null $basicPointRate * * @return BaseInfo */ @@ -1112,7 +1112,7 @@ public function setBasicPointRate($basicPointRate) /** * Get basicPointRate * - * @return string + * @return string|null */ public function getBasicPointRate() { From 0fd9f4fc41e0704ef359b4523f225b22c5680f25 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Mon, 6 Nov 2023 12:52:38 +0900 Subject: [PATCH 05/21] =?UTF-8?q?=E3=82=B2=E3=83=83=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=BB=E3=82=BB=E3=83=83=E3=82=BF=E3=83=BC=E3=81=AE=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E3=83=92=E3=83=B3=E3=83=88=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Entity/Block.php | 4 ++-- src/Eccube/Entity/Calendar.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Eccube/Entity/Block.php b/src/Eccube/Entity/Block.php index bb25c822bf8..e4ffcbb4490 100644 --- a/src/Eccube/Entity/Block.php +++ b/src/Eccube/Entity/Block.php @@ -315,7 +315,7 @@ public function getBlockPositions() /** * Set deviceType * - * @param \Eccube\Entity\Master\DeviceType $deviceType + * @param \Eccube\Entity\Master\DeviceType|null $deviceType * * @return Block */ @@ -329,7 +329,7 @@ public function setDeviceType(Master\DeviceType $deviceType = null) /** * Get deviceType * - * @return \Eccube\Entity\Master\DeviceType + * @return \Eccube\Entity\Master\DeviceType|null */ public function getDeviceType() { diff --git a/src/Eccube/Entity/Calendar.php b/src/Eccube/Entity/Calendar.php index 0a1a7a2a631..2086a9f2a98 100644 --- a/src/Eccube/Entity/Calendar.php +++ b/src/Eccube/Entity/Calendar.php @@ -92,7 +92,7 @@ public function getId() /** * Set title. * - * @param string $title + * @param string|null $title * * @return Calendar */ @@ -106,7 +106,7 @@ public function setTitle($title) /** * Get title. * - * @return string + * @return string|null */ public function getTitle() { From 39430dcc372d0535b5c510ecb2c8a449a64e8d68 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Mon, 6 Nov 2023 12:57:55 +0900 Subject: [PATCH 06/21] =?UTF-8?q?=E3=82=B2=E3=83=83=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=BB=E3=82=BB=E3=83=83=E3=82=BF=E3=83=BC=E3=81=AE=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E3=83=92=E3=83=B3=E3=83=88=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Entity/Cart.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Eccube/Entity/Cart.php b/src/Eccube/Entity/Cart.php index d06ec5dcd8d..54265ff4823 100644 --- a/src/Eccube/Entity/Cart.php +++ b/src/Eccube/Entity/Cart.php @@ -142,7 +142,7 @@ public function getId() } /** - * @return string + * @return string|null */ public function getCartKey() { @@ -359,7 +359,7 @@ public function getCustomer(): ?Customer } /** - * @param Customer $Customer + * @param Customer|null $Customer */ public function setCustomer(Customer $Customer = null) { From f202f222be564f527ee779e4c2bf28802f323a95 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Mon, 6 Nov 2023 14:50:23 +0900 Subject: [PATCH 07/21] =?UTF-8?q?=E3=82=B2=E3=83=83=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=BB=E3=82=BB=E3=83=83=E3=82=BF=E3=83=BC=E3=81=AE=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E3=83=92=E3=83=B3=E3=83=88=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Entity/CartItem.php | 12 ++++++------ src/Eccube/Entity/ClassCategory.php | 4 ++-- src/Eccube/Entity/ClassName.php | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Eccube/Entity/CartItem.php b/src/Eccube/Entity/CartItem.php index 61c907974fe..8ad9a9a3475 100644 --- a/src/Eccube/Entity/CartItem.php +++ b/src/Eccube/Entity/CartItem.php @@ -39,7 +39,7 @@ class CartItem extends \Eccube\Entity\AbstractEntity implements ItemInterface private $id; /** - * @var string|float + * @var string|float|int * * @ORM\Column(name="price", type="decimal", precision=12, scale=2, options={"default":0}) */ @@ -93,7 +93,7 @@ public function getId() } /** - * @param integer $price + * @param integer|string|float $price * * @return CartItem */ @@ -105,7 +105,7 @@ public function setPrice($price) } /** - * @return string + * @return string|int|float */ public function getPrice() { @@ -113,7 +113,7 @@ public function getPrice() } /** - * @param integer $quantity + * @param integer|float|string $quantity * * @return CartItem */ @@ -125,7 +125,7 @@ public function setQuantity($quantity) } /** - * @return string + * @return string|float|integer */ public function getQuantity() { @@ -224,7 +224,7 @@ public function setProductClass(ProductClass $ProductClass) } /** - * @return ProductClass + * @return ProductClass|null */ public function getProductClass() { diff --git a/src/Eccube/Entity/ClassCategory.php b/src/Eccube/Entity/ClassCategory.php index fbd9ede66c2..7b22db5b3a6 100644 --- a/src/Eccube/Entity/ClassCategory.php +++ b/src/Eccube/Entity/ClassCategory.php @@ -119,7 +119,7 @@ public function getId() /** * Set backend_name. * - * @param string $backendName + * @param string|null $backendName * * @return ClassCategory */ @@ -133,7 +133,7 @@ public function setBackendName($backendName) /** * Get backend_name. * - * @return string + * @return string|null */ public function getBackendName() { diff --git a/src/Eccube/Entity/ClassName.php b/src/Eccube/Entity/ClassName.php index 1ca9c342796..a8cd1851ee1 100644 --- a/src/Eccube/Entity/ClassName.php +++ b/src/Eccube/Entity/ClassName.php @@ -120,7 +120,7 @@ public function getId() /** * Set backend_name. * - * @param string $backendName + * @param string|null $backendName * * @return ClassName */ @@ -134,7 +134,7 @@ public function setBackendName($backendName) /** * Get backend_name. * - * @return string + * @return string|null */ public function getBackendName() { From b8f9ab4a21c34a93bcd5cc2b759b3fea0ee0b6d8 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Mon, 6 Nov 2023 15:01:57 +0900 Subject: [PATCH 08/21] =?UTF-8?q?=E3=82=B2=E3=83=83=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=BB=E3=82=BB=E3=83=83=E3=82=BF=E3=83=BC=E3=81=AE=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E3=83=92=E3=83=B3=E3=83=88=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Entity/Customer.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Eccube/Entity/Customer.php b/src/Eccube/Entity/Customer.php index acd706a5120..d454376442c 100644 --- a/src/Eccube/Entity/Customer.php +++ b/src/Eccube/Entity/Customer.php @@ -639,11 +639,11 @@ public function getPlainPassword(): ?string /** * Set password. * - * @param string|null $password + * @param string $password * * @return Customer */ - public function setPassword($password = null) + public function setPassword($password) { $this->password = $password; @@ -653,7 +653,7 @@ public function setPassword($password = null) /** * Get password. * - * @return string|null + * @return string */ public function getPassword() { From 4b0f2ce38375e4e4fb7f2fe4d3dcf0e970538160 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Mon, 6 Nov 2023 15:05:08 +0900 Subject: [PATCH 09/21] =?UTF-8?q?=E3=82=B2=E3=83=83=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=BB=E3=82=BB=E3=83=83=E3=82=BF=E3=83=BC=E3=81=AE=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E3=83=92=E3=83=B3=E3=83=88=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Entity/CustomerAddress.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Eccube/Entity/CustomerAddress.php b/src/Eccube/Entity/CustomerAddress.php index f594b954613..af3fe2f93da 100644 --- a/src/Eccube/Entity/CustomerAddress.php +++ b/src/Eccube/Entity/CustomerAddress.php @@ -215,11 +215,11 @@ public function getId() /** * Set name01. * - * @param string|null $name01 + * @param string $name01 * * @return CustomerAddress */ - public function setName01($name01 = null) + public function setName01($name01) { $this->name01 = $name01; @@ -229,7 +229,7 @@ public function setName01($name01 = null) /** * Get name01. * - * @return string|null + * @return string */ public function getName01() { @@ -239,11 +239,11 @@ public function getName01() /** * Set name02. * - * @param string|null $name02 + * @param string $name02 * * @return CustomerAddress */ - public function setName02($name02 = null) + public function setName02($name02) { $this->name02 = $name02; @@ -253,7 +253,7 @@ public function setName02($name02 = null) /** * Get name02. * - * @return string|null + * @return string */ public function getName02() { From 2f9311eb1f32107f4272a089710e60fcdaa606c4 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Mon, 6 Nov 2023 15:37:08 +0900 Subject: [PATCH 10/21] =?UTF-8?q?=E3=82=B2=E3=83=83=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=BB=E3=82=BB=E3=83=83=E3=82=BF=E3=83=BC=E3=81=AE=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E3=83=92=E3=83=B3=E3=83=88=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Entity/Layout.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Eccube/Entity/Layout.php b/src/Eccube/Entity/Layout.php index faba18cac22..a44ef455d5c 100644 --- a/src/Eccube/Entity/Layout.php +++ b/src/Eccube/Entity/Layout.php @@ -289,7 +289,7 @@ public function getId() /** * Set name * - * @param string $name + * @param string|null $name * * @return Layout */ @@ -303,7 +303,7 @@ public function setName($name) /** * Get name * - * @return string + * @return string|null */ public function getName() { From 3eaa9206b469c253909a2b4a6aabdeaa0ec55d94 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Mon, 6 Nov 2023 15:42:34 +0900 Subject: [PATCH 11/21] =?UTF-8?q?=E3=82=B2=E3=83=83=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=BB=E3=82=BB=E3=83=83=E3=82=BF=E3=83=BC=E3=81=AE=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E3=83=92=E3=83=B3=E3=83=88=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Entity/LoginHistory.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Eccube/Entity/LoginHistory.php b/src/Eccube/Entity/LoginHistory.php index 17ca1863283..0573e20b24a 100644 --- a/src/Eccube/Entity/LoginHistory.php +++ b/src/Eccube/Entity/LoginHistory.php @@ -94,7 +94,7 @@ public function getId() /** * Set user_name * - * @param string $userName + * @param string|null $userName * * @return LoginHistory */ @@ -108,7 +108,7 @@ public function setUserName($userName) /** * Get user_name * - * @return string + * @return string|null */ public function getUserName() { @@ -138,7 +138,7 @@ public function getStatus() /** * Set client_ip * - * @param string $clientIp + * @param string|null $clientIp * * @return LoginHistory */ @@ -152,7 +152,7 @@ public function setClientIp($clientIp) /** * Get client_ip * - * @return string + * @return string|null */ public function getClientIp() { @@ -210,7 +210,7 @@ public function getUpdateDate() /** * Set LoginUser * - * @param Member $loginUser + * @param Member|null $loginUser * * @return LoginHistory */ @@ -224,7 +224,7 @@ public function setLoginUser(Member $loginUser = null) /** * Get LoginUser * - * @return Member + * @return Member|null */ public function getLoginUser() { From e92359be2fa892e793a0b04ea2be8418636f6463 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Mon, 6 Nov 2023 15:50:05 +0900 Subject: [PATCH 12/21] =?UTF-8?q?=E3=82=B2=E3=83=83=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=BB=E3=82=BB=E3=83=83=E3=82=BF=E3=83=BC=E3=81=AE=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E3=83=92=E3=83=B3=E3=83=88=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Entity/Member.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Eccube/Entity/Member.php b/src/Eccube/Entity/Member.php index 2f66e1cb29b..a3a28008777 100644 --- a/src/Eccube/Entity/Member.php +++ b/src/Eccube/Entity/Member.php @@ -321,7 +321,7 @@ public function getPassword() /** * Set salt. * - * @param string $salt + * @param string|null $salt * * @return Member */ @@ -335,7 +335,7 @@ public function setSalt($salt) /** * Get salt. * - * @return string + * @return string|null */ public function getSalt() { @@ -369,7 +369,7 @@ public function getSortNo() /** * Set twoFactorAuthKey. * - * @param string $two_factor_auth_key + * @param string|null $two_factor_auth_key * * @return Member */ @@ -383,7 +383,7 @@ public function setTwoFactorAuthKey($two_factor_auth_key) /** * Get twoFactorAuthKey. * - * @return string + * @return string|null */ public function getTwoFactorAuthKey() { @@ -489,7 +489,7 @@ public function getLoginDate() /** * Set Work * - * @param \Eccube\Entity\Master\Work + * @param \Eccube\Entity\Master\Work|null $work * * @return Member */ From ff1b7ebaf96d3cdd125d8338823098bbf0786b61 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Mon, 6 Nov 2023 16:30:45 +0900 Subject: [PATCH 13/21] =?UTF-8?q?=E3=82=B2=E3=83=83=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=BB=E3=82=BB=E3=83=83=E3=82=BF=E3=83=BC=E3=81=AE=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E3=83=92=E3=83=B3=E3=83=88=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Entity/Order.php | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/Eccube/Entity/Order.php b/src/Eccube/Entity/Order.php index 182408cb0a3..e344dd1130d 100644 --- a/src/Eccube/Entity/Order.php +++ b/src/Eccube/Entity/Order.php @@ -429,35 +429,35 @@ public function getTotalPrice() private $birth; /** - * @var float|string + * @var float|string|int * * @ORM\Column(name="subtotal", type="decimal", precision=12, scale=2, options={"unsigned":true,"default":0}) */ private $subtotal = 0; /** - * @var float|string + * @var float|string|int * * @ORM\Column(name="discount", type="decimal", precision=12, scale=2, options={"unsigned":true,"default":0}) */ private $discount = 0; /** - * @var float|string + * @var float|string|int * * @ORM\Column(name="delivery_fee_total", type="decimal", precision=12, scale=2, options={"unsigned":true,"default":0}) */ private $delivery_fee_total = 0; /** - * @var float|string + * @var float|string|int * * @ORM\Column(name="charge", type="decimal", precision=12, scale=2, options={"unsigned":true,"default":0}) */ private $charge = 0; /** - * @var float|string + * @var float|string|int * * @ORM\Column(name="tax", type="decimal", precision=12, scale=2, options={"unsigned":true,"default":0}) * @@ -466,14 +466,14 @@ public function getTotalPrice() private $tax = 0; /** - * @var float|string + * @var float|string|int * * @ORM\Column(name="total", type="decimal", precision=12, scale=2, options={"unsigned":true,"default":0}) */ private $total = 0; /** - * @var float|string + * @var float|string|int * * @ORM\Column(name="payment_total", type="decimal", precision=12, scale=2, options={"unsigned":true,"default":0}) */ @@ -815,11 +815,11 @@ public function getMessage() /** * Set name01. * - * @param string|null $name01 + * @param string $name01 * * @return Order */ - public function setName01($name01 = null) + public function setName01($name01) { $this->name01 = $name01; @@ -829,7 +829,7 @@ public function setName01($name01 = null) /** * Get name01. * - * @return string|null + * @return string */ public function getName01() { @@ -839,11 +839,11 @@ public function getName01() /** * Set name02. * - * @param string|null $name02 + * @param string $name02 * * @return Order */ - public function setName02($name02 = null) + public function setName02($name02) { $this->name02 = $name02; @@ -853,7 +853,7 @@ public function setName02($name02 = null) /** * Get name02. * - * @return string|null + * @return string */ public function getName02() { @@ -1093,7 +1093,7 @@ public function setSubtotal($subtotal) /** * Get subtotal. * - * @return string + * @return string|int|float */ public function getSubtotal() { @@ -1103,7 +1103,7 @@ public function getSubtotal() /** * Set discount. * - * @param string $discount + * @param string|float|int $discount * * @return Order */ @@ -1117,7 +1117,7 @@ public function setDiscount($discount) /** * Get discount. * - * @return string + * @return string|int|float * @deprecated 4.0.3 から値引きは課税値引きと 非課税・不課税の値引きの2種に分かれる. 課税値引きについてはgetTaxableDiscountを利用してください. * */ @@ -1167,7 +1167,7 @@ public function setCharge($charge) /** * Get charge. * - * @return string + * @return string|float|int */ public function getCharge() { @@ -1193,7 +1193,7 @@ public function setTax($tax) /** * Get tax. * - * @return string + * @return string|float|int * * @deprecated 明細ごとに集計した税額と差異が発生する場合があるため非推奨 */ @@ -1243,7 +1243,7 @@ public function setPaymentTotal($paymentTotal) /** * Get paymentTotal. * - * @return string + * @return string|int|float */ public function getPaymentTotal() { From 0d247c0fd9437c04cc6b85d3ba9a9343db9a15bb Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Mon, 6 Nov 2023 16:39:53 +0900 Subject: [PATCH 14/21] =?UTF-8?q?=E3=82=B2=E3=83=83=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=BB=E3=82=BB=E3=83=83=E3=82=BF=E3=83=BC=E3=81=AE=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E3=83=92=E3=83=B3=E3=83=88=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Entity/OrderItem.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Eccube/Entity/OrderItem.php b/src/Eccube/Entity/OrderItem.php index 6ba7e059b05..f265c2f3f9e 100644 --- a/src/Eccube/Entity/OrderItem.php +++ b/src/Eccube/Entity/OrderItem.php @@ -35,7 +35,7 @@ class OrderItem extends \Eccube\Entity\AbstractEntity implements ItemInterface /** * Get price IncTax * - * @return string + * @return string|int|float */ public function getPriceIncTax() { @@ -48,7 +48,7 @@ public function getPriceIncTax() } /** - * @return integer + * @return integer|float */ public function getTotalPrice() { @@ -471,7 +471,7 @@ public function getClassCategoryName2() /** * Set price. * - * @param string $price + * @param string|int|float $price * * @return OrderItem */ @@ -485,7 +485,7 @@ public function setPrice($price) /** * Get price. * - * @return string + * @return string|float|int */ public function getPrice() { @@ -495,7 +495,7 @@ public function getPrice() /** * Set quantity. * - * @param string $quantity + * @param string|int|float $quantity * * @return OrderItem */ @@ -509,7 +509,7 @@ public function setQuantity($quantity) /** * Get quantity. * - * @return string + * @return string|int|float */ public function getQuantity() { @@ -517,7 +517,7 @@ public function getQuantity() } /** - * @return string + * @return string|float|int */ public function getTax() { @@ -525,7 +525,7 @@ public function getTax() } /** - * @param string $tax + * @param string|int|float $tax * * @return $this */ @@ -539,7 +539,7 @@ public function setTax($tax) /** * Set taxRate. * - * @param string $taxRate + * @param string|int|float $taxRate * * @return OrderItem */ @@ -553,7 +553,7 @@ public function setTaxRate($taxRate) /** * Get taxRate. * - * @return string + * @return string|int|float */ public function getTaxRate() { @@ -563,7 +563,7 @@ public function getTaxRate() /** * Set taxAdjust. * - * @param string $tax_adjust + * @param string|int|float $tax_adjust * * @return OrderItem */ @@ -577,7 +577,7 @@ public function setTaxAdjust($tax_adjust) /** * Get taxAdjust. * - * @return string + * @return string|int|float */ public function getTaxAdjust() { From 9909a12127e43d1c328a0198f135df657de77e77 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Mon, 6 Nov 2023 16:45:55 +0900 Subject: [PATCH 15/21] =?UTF-8?q?=E3=82=B2=E3=83=83=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=BB=E3=82=BB=E3=83=83=E3=82=BF=E3=83=BC=E3=81=AE=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E3=83=92=E3=83=B3=E3=83=88=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Entity/OrderPdf.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Eccube/Entity/OrderPdf.php b/src/Eccube/Entity/OrderPdf.php index 37b8291eb76..f7ab14c31fe 100644 --- a/src/Eccube/Entity/OrderPdf.php +++ b/src/Eccube/Entity/OrderPdf.php @@ -131,7 +131,7 @@ public function setMemberId($member_id) } /** - * @return string + * @return string|null */ public function getTitle() { @@ -139,7 +139,7 @@ public function getTitle() } /** - * @param $title + * @param string|null $title * * @return $this */ @@ -151,7 +151,7 @@ public function setTitle($title) } /** - * @return string + * @return string|null */ public function getMessage1() { @@ -159,7 +159,7 @@ public function getMessage1() } /** - * @param $message1 + * @param string|null $message1 * * @return $this */ @@ -171,7 +171,7 @@ public function setMessage1($message1) } /** - * @return string + * @return string|null */ public function getMessage2() { @@ -179,7 +179,7 @@ public function getMessage2() } /** - * @param $message2 + * @param string|null $message2 * * @return $this */ @@ -191,7 +191,7 @@ public function setMessage2($message2) } /** - * @return string + * @return string|null */ public function getMessage3() { @@ -199,7 +199,7 @@ public function getMessage3() } /** - * @param $message3 + * @param $message3|null * * @return $this */ @@ -211,7 +211,7 @@ public function setMessage3($message3) } /** - * @return string + * @return string|null */ public function getNote1() { @@ -219,7 +219,7 @@ public function getNote1() } /** - * @param $note1 + * @param string|null $note1 * * @return $this */ @@ -231,7 +231,7 @@ public function setNote1($note1) } /** - * @return string + * @return string|null */ public function getNote2() { @@ -239,7 +239,7 @@ public function getNote2() } /** - * @param $note2 + * @param string|null $note2 * * @return $this */ @@ -251,7 +251,7 @@ public function setNote2($note2) } /** - * @return string + * @return string|null */ public function getNote3() { @@ -259,7 +259,7 @@ public function getNote3() } /** - * @param $note3 + * @param string|null $note3 * * @return $this */ From bf9081bd9d0bea2ed675fd5cfb3becf6665d7784 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Mon, 6 Nov 2023 16:51:30 +0900 Subject: [PATCH 16/21] =?UTF-8?q?=E3=82=B2=E3=83=83=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=BB=E3=82=BB=E3=83=83=E3=82=BF=E3=83=BC=E3=81=AE=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E3=83=92=E3=83=B3=E3=83=88=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Entity/PageLayout.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Eccube/Entity/PageLayout.php b/src/Eccube/Entity/PageLayout.php index 3886fb9cb5d..0eed5aefee2 100644 --- a/src/Eccube/Entity/PageLayout.php +++ b/src/Eccube/Entity/PageLayout.php @@ -147,7 +147,7 @@ public function getSortNo() /** * Set pageLayout * - * @param \Eccube\Entity\Page $Page + * @param \Eccube\Entity\Page|null $Page * * @return PageLayout */ @@ -161,7 +161,7 @@ public function setPage(Page $Page = null) /** * Get pageLayout * - * @return Page + * @return Page|null */ public function getPage() { @@ -171,7 +171,7 @@ public function getPage() /** * Set layout * - * @param \Eccube\Entity\Layout $layout + * @param \Eccube\Entity\Layout|null$layout * * @return PageLayout */ @@ -185,7 +185,7 @@ public function setLayout(Layout $layout = null) /** * Get layout * - * @return \Eccube\Entity\Layout + * @return \Eccube\Entity\Layout|null */ public function getLayout() { From a17f574d5f6b555221c97bfb7f971a0e30dd8215 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Mon, 6 Nov 2023 16:54:17 +0900 Subject: [PATCH 17/21] =?UTF-8?q?=E3=82=B2=E3=83=83=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=BB=E3=82=BB=E3=83=83=E3=82=BF=E3=83=BC=E3=81=AE=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E3=83=92=E3=83=B3=E3=83=88=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Entity/Payment.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Eccube/Entity/Payment.php b/src/Eccube/Entity/Payment.php index 1354c7d809c..c2c8b4ae84e 100644 --- a/src/Eccube/Entity/Payment.php +++ b/src/Eccube/Entity/Payment.php @@ -349,7 +349,7 @@ public function getMethodClass() } /** - * @return integer + * @return boolean */ public function isVisible() { From d14f1f82bfde2881fb0bc6e6e15524b0be11cc5d Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Mon, 6 Nov 2023 17:05:50 +0900 Subject: [PATCH 18/21] =?UTF-8?q?=E3=82=B2=E3=83=83=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=BB=E3=82=BB=E3=83=83=E3=82=BF=E3=83=BC=E3=81=AE=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E3=83=92=E3=83=B3=E3=83=88=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Entity/PointRateTrait.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Eccube/Entity/PointRateTrait.php b/src/Eccube/Entity/PointRateTrait.php index cb6c030ad2c..c03cd581ba7 100644 --- a/src/Eccube/Entity/PointRateTrait.php +++ b/src/Eccube/Entity/PointRateTrait.php @@ -27,7 +27,7 @@ trait PointRateTrait /** * Set pointRate * - * @param string $pointRate + * @param string|null $pointRate * * @return OrderItem */ @@ -41,7 +41,7 @@ public function setPointRate($pointRate) /** * Get pointRate * - * @return string + * @return string|null */ public function getPointRate() { From 70985f7324e58f502b39e78880fa42475f60ec34 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Mon, 6 Nov 2023 17:19:19 +0900 Subject: [PATCH 19/21] =?UTF-8?q?=E3=82=B2=E3=83=83=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=BB=E3=82=BB=E3=83=83=E3=82=BF=E3=83=BC=E3=81=AE=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E3=83=92=E3=83=B3=E3=83=88=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Entity/ProductClass.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Eccube/Entity/ProductClass.php b/src/Eccube/Entity/ProductClass.php index e058a2049c3..969de953f49 100644 --- a/src/Eccube/Entity/ProductClass.php +++ b/src/Eccube/Entity/ProductClass.php @@ -203,7 +203,7 @@ public function hasClassCategory2() private $sale_limit; /** - * @var float|string|null + * @var int|float|string|null * * @ORM\Column(name="price01", type="decimal", precision=12, scale=2, nullable=true) */ @@ -217,7 +217,7 @@ public function hasClassCategory2() private $price02; /** - * @var float|string|null + * @var int|float|string|null * * @ORM\Column(name="delivery_fee", type="decimal", precision=12, scale=2, nullable=true, options={"unsigned":true}) */ @@ -422,7 +422,7 @@ public function isStockUnlimited() /** * Set saleLimit. * - * @param string|null $saleLimit + * @param float|string|null $saleLimit * * @return ProductClass */ @@ -436,7 +436,7 @@ public function setSaleLimit($saleLimit = null) /** * Get saleLimit. * - * @return string|null + * @return float|string|null */ public function getSaleLimit() { @@ -446,7 +446,7 @@ public function getSaleLimit() /** * Set price01. * - * @param string|null $price01 + * @param int|float|string|null $price01 * * @return ProductClass */ @@ -460,7 +460,7 @@ public function setPrice01($price01 = null) /** * Get price01. * - * @return string|null + * @return int|float|string|null */ public function getPrice01() { @@ -470,7 +470,7 @@ public function getPrice01() /** * Set price02. * - * @param string $price02 + * @param string|float|int $price02 * * @return ProductClass */ @@ -484,7 +484,7 @@ public function setPrice02($price02) /** * Get price02. * - * @return string + * @return string|float|int */ public function getPrice02() { @@ -494,7 +494,7 @@ public function getPrice02() /** * Set deliveryFee. * - * @param string|null $deliveryFee + * @param float|int|string|null $deliveryFee * * @return ProductClass */ @@ -508,7 +508,7 @@ public function setDeliveryFee($deliveryFee = null) /** * Get deliveryFee. * - * @return string|null + * @return float|int|string|null */ public function getDeliveryFee() { @@ -802,7 +802,7 @@ public function getCreator() /** * Set pointRate * - * @param string $pointRate + * @param string|null $pointRate * * @return ProductClass */ @@ -816,7 +816,7 @@ public function setPointRate($pointRate) /** * Get pointRate * - * @return string + * @return string|null */ public function getPointRate() { From 3f7d6ff247e8a2917dbd2c3957dfa00c1c6092b3 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Mon, 6 Nov 2023 17:29:13 +0900 Subject: [PATCH 20/21] =?UTF-8?q?=E3=82=B2=E3=83=83=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=BB=E3=82=BB=E3=83=83=E3=82=BF=E3=83=BC=E3=81=AE=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E3=83=92=E3=83=B3=E3=83=88=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Entity/Shipping.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Eccube/Entity/Shipping.php b/src/Eccube/Entity/Shipping.php index 042db4686a1..d94d11d1fe3 100644 --- a/src/Eccube/Entity/Shipping.php +++ b/src/Eccube/Entity/Shipping.php @@ -375,7 +375,7 @@ public function getName02() /** * Set kana01. * - * @param string $kana01 + * @param string|null $kana01 * * @return Shipping */ @@ -389,7 +389,7 @@ public function setKana01($kana01) /** * Get kana01. * - * @return string + * @return string|null */ public function getKana01() { @@ -399,7 +399,7 @@ public function getKana01() /** * Set kana02. * - * @param string $kana02 + * @param string|null $kana02 * * @return Shipping */ @@ -413,7 +413,7 @@ public function setKana02($kana02) /** * Get kana02. * - * @return string + * @return string|null */ public function getKana02() { @@ -893,7 +893,7 @@ public function setOrder(Order $Order) /** * Get order. * - * @return Order + * @return Order|null */ public function getOrder() { @@ -903,7 +903,7 @@ public function getOrder() /** * Set trackingNumber * - * @param string $trackingNumber + * @param string|null $trackingNumber * * @return Shipping */ @@ -917,7 +917,7 @@ public function setTrackingNumber($trackingNumber) /** * Get trackingNumber * - * @return string + * @return string|null */ public function getTrackingNumber() { @@ -961,7 +961,7 @@ public function isShipped() /** * Set timeId * - * @param integer $timeId + * @param integer|null $timeId * * @return Shipping */ @@ -975,7 +975,7 @@ public function setTimeId($timeId) /** * Get timeId * - * @return integer + * @return integer|null */ public function getTimeId() { From b716c401f2786bae42a518088a09c52481046316 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Mon, 6 Nov 2023 17:35:05 +0900 Subject: [PATCH 21/21] =?UTF-8?q?=E3=82=B2=E3=83=83=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=BB=E3=82=BB=E3=83=83=E3=82=BF=E3=83=BC=E3=81=AE=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E3=83=92=E3=83=B3=E3=83=88=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Entity/TaxRule.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Eccube/Entity/TaxRule.php b/src/Eccube/Entity/TaxRule.php index a7eda026c97..cf4d3e5ae04 100644 --- a/src/Eccube/Entity/TaxRule.php +++ b/src/Eccube/Entity/TaxRule.php @@ -188,7 +188,7 @@ public function getId() /** * Set taxRate. * - * @param string $taxRate + * @param string|int|float $taxRate * * @return TaxRule */ @@ -202,7 +202,7 @@ public function setTaxRate($taxRate) /** * Get taxRate. * - * @return string + * @return string|int|float */ public function getTaxRate() { @@ -212,7 +212,7 @@ public function getTaxRate() /** * Set taxAdjust. * - * @param string $taxAdjust + * @param float|int|string $taxAdjust * * @return TaxRule */ @@ -226,7 +226,7 @@ public function setTaxAdjust($taxAdjust) /** * Get taxAdjust. * - * @return string + * @return float|int|string */ public function getTaxAdjust() { @@ -428,6 +428,8 @@ public function getProduct() /** * Set roundingType. * + * @param \Eccube\Entity\Master\RoundingType|null $RoundingType + * * @return TaxRule */ public function setRoundingType(Master\RoundingType $RoundingType = null)