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/90] =?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/90] =?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 a2b7f96f0e595deb4ed8af301db0cdaa3367f330 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, 20 Oct 2023 19:21:05 +0900 Subject: [PATCH 03/90] PHPSTAN bugfixes --- docker-compose.yml | 10 ++++++---- .../Command/GenerateDummyDataCommand.php | 4 ++-- src/Eccube/Command/InstallerCommand.php | 3 +++ .../Command/LoadDataFixturesEccubeCommand.php | 2 +- .../Controller/Admin/AdminController.php | 1 - .../Admin/Customer/CustomerController.php | 3 ++- .../Admin/Order/CsvImportController.php | 7 ++++++- .../Controller/Admin/Order/EditController.php | 4 ++-- .../Admin/Product/CsvImportController.php | 7 ++++--- .../Admin/Product/ProductController.php | 12 +++++++++--- .../Admin/Setting/System/LogController.php | 2 +- src/Eccube/Controller/ProductController.php | 1 + src/Eccube/Controller/ShoppingController.php | 2 +- src/Eccube/Doctrine/Query/Queries.php | 2 +- src/Eccube/Entity/BaseInfo.php | 2 +- src/Eccube/Entity/News.php | 2 +- src/Eccube/Entity/Order.php | 10 +++++----- src/Eccube/Entity/Payment.php | 18 +++++++++--------- src/Eccube/Form/Type/Admin/OrderType.php | 2 +- src/Eccube/Repository/AbstractRepository.php | 3 ++- .../CustomerFavoriteProductRepository.php | 5 +++-- src/Eccube/Repository/CustomerRepository.php | 2 +- src/Eccube/Repository/MemberRepository.php | 3 ++- .../Service/PurchaseFlow/PurchaseContext.php | 7 ++++++- 24 files changed, 70 insertions(+), 44 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index caa5344305b..c8d2909921f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,15 +22,17 @@ services: ### ローカルでビルドする場合は以下のコマンドを使用します ## docker build -t ec-cube --no-cache --pull --build-arg TAG=8.1-apache . ## docker tag ec-cube ghcr.io/ec-cube/ec-cube-php:8.1-apache - image: ${REGISTRY:-ghcr.io}/${IMAGE_NAME:-ec-cube/ec-cube-php}:${TAG:-8.1-apache} +# image: ${REGISTRY:-ghcr.io}/${IMAGE_NAME:-ec-cube/ec-cube-php}:${TAG:-8.1-apache} + build: + context: . ports: - 8080:80 - 4430:443 volumes: ### 同期対象からコストの重いフォルダを除外 ##################### - - "var:/var/www/html/var" - - "vendor:/var/www/html/vendor" - - "node_modules:/var/www/html/node_modules" + - ".:/var/www/html" +# - "vendor:/var/www/html/vendor" +# - "node_modules:/var/www/html/node_modules" environment: # EC-CUBE environments APP_ENV: "dev" diff --git a/src/Eccube/Command/GenerateDummyDataCommand.php b/src/Eccube/Command/GenerateDummyDataCommand.php index 023d210612b..b1777e3bf78 100644 --- a/src/Eccube/Command/GenerateDummyDataCommand.php +++ b/src/Eccube/Command/GenerateDummyDataCommand.php @@ -34,7 +34,7 @@ class GenerateDummyDataCommand extends Command protected $generator; /** - * @var EntityManager + * @var EntityManagerInterface */ protected $entityManager; @@ -181,7 +181,7 @@ protected function execute(InputInterface $input, OutputInterface $output) } $this->entityManager->flush(); $j++; - if ($output->getVerbosity() >= OutputInterface::VERBOSITY_NORMAL && ($j % 100) === 0 && $j > 0) { + if ($output->getVerbosity() >= OutputInterface::VERBOSITY_NORMAL && ($j % 100) === 0) { $output->writeln(' ...'.$j); } } diff --git a/src/Eccube/Command/InstallerCommand.php b/src/Eccube/Command/InstallerCommand.php index 3a4d921eebf..0bd49b138b8 100644 --- a/src/Eccube/Command/InstallerCommand.php +++ b/src/Eccube/Command/InstallerCommand.php @@ -54,6 +54,9 @@ public function __construct(ContainerInterface $container) /* env更新処理無名クラス */ $this->envFileUpdater = new class() { + /** + * @var mixed $appEnv + */ public $appEnv; public $appDebug; public $databaseUrl; diff --git a/src/Eccube/Command/LoadDataFixturesEccubeCommand.php b/src/Eccube/Command/LoadDataFixturesEccubeCommand.php index aa694761f1b..9e07bdc4432 100644 --- a/src/Eccube/Command/LoadDataFixturesEccubeCommand.php +++ b/src/Eccube/Command/LoadDataFixturesEccubeCommand.php @@ -56,7 +56,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $locale = env('ECCUBE_LOCALE', 'ja_JP'); $locale = str_replace('_', '-', $locale); $locales = \Locale::parseLocale($locale); - $localeDir = is_null($locales) ? 'ja' : $locales['language']; + $localeDir = empty($locales) ? 'ja' : $locales['language']; $loader = new \Eccube\Doctrine\Common\CsvDataFixtures\Loader(); $loader->loadFromDirectory(__DIR__.'/../Resource/doctrine/import_csv/'.$localeDir); diff --git a/src/Eccube/Controller/Admin/AdminController.php b/src/Eccube/Controller/Admin/AdminController.php index 7931b68222a..6b2f328d1c5 100644 --- a/src/Eccube/Controller/Admin/AdminController.php +++ b/src/Eccube/Controller/Admin/AdminController.php @@ -421,7 +421,6 @@ public function searchCustomer(Request $request) } /** - * @param \Doctrine\ORM\EntityManagerInterface $em * @param array $excludes * * @return Request|null diff --git a/src/Eccube/Controller/Admin/Customer/CustomerController.php b/src/Eccube/Controller/Admin/Customer/CustomerController.php index f8f145a5805..1d45dff8420 100644 --- a/src/Eccube/Controller/Admin/Customer/CustomerController.php +++ b/src/Eccube/Controller/Admin/Customer/CustomerController.php @@ -17,6 +17,7 @@ use Doctrine\ORM\QueryBuilder; use Eccube\Common\Constant; use Eccube\Controller\AbstractController; +use Eccube\Entity\Customer; use Eccube\Entity\Master\CsvType; use Eccube\Event\EccubeEvents; use Eccube\Event\EventArgs; @@ -304,7 +305,7 @@ public function export(Request $request) $this->csvExportService->exportData(function ($entity, $csvService) use ($request) { $Csvs = $csvService->getCsvs(); - /** @var $Customer \Eccube\Entity\Customer */ + /** @var Customer $Customer */ $Customer = $entity; $ExportCsvRow = new \Eccube\Entity\ExportCsvRow(); diff --git a/src/Eccube/Controller/Admin/Order/CsvImportController.php b/src/Eccube/Controller/Admin/Order/CsvImportController.php index d48ca23dd50..12fa87d9ef4 100644 --- a/src/Eccube/Controller/Admin/Order/CsvImportController.php +++ b/src/Eccube/Controller/Admin/Order/CsvImportController.php @@ -94,7 +94,12 @@ public function csvShipping(Request $request) ]; } - protected function loadCsv(CsvImportService $csv, &$errors) + /** + * @param CsvImportService|boolean $csv + * @param &$errors + * @return void + */ + protected function loadCsv($csv, &$errors) { $columnConfig = $this->getColumnConfig(); diff --git a/src/Eccube/Controller/Admin/Order/EditController.php b/src/Eccube/Controller/Admin/Order/EditController.php index 11cfc38fc1b..c504f90d64f 100644 --- a/src/Eccube/Controller/Admin/Order/EditController.php +++ b/src/Eccube/Controller/Admin/Order/EditController.php @@ -81,7 +81,7 @@ class EditController extends AbstractController protected $customerRepository; /** - * @var Serializer + * @var SerializerInterface */ protected $serializer; @@ -221,7 +221,7 @@ public function index(Request $request, RouterInterface $router, $id = null) $form->handleRequest($request); $purchaseContext = new PurchaseContext($OriginOrder, $OriginOrder->getCustomer()); - + foreach ($TargetOrder->getOrderItems() as $orderItem) { if ($orderItem->getTaxDisplayType() == null) { $orderItem->setTaxDisplayType($this->orderHelper->getTaxDisplayType($orderItem->getOrderItemType())); diff --git a/src/Eccube/Controller/Admin/Product/CsvImportController.php b/src/Eccube/Controller/Admin/Product/CsvImportController.php index 361b4a8a27d..f108cfb82b9 100644 --- a/src/Eccube/Controller/Admin/Product/CsvImportController.php +++ b/src/Eccube/Controller/Admin/Product/CsvImportController.php @@ -45,6 +45,7 @@ use Symfony\Component\Finder\Finder; use Symfony\Component\Form\FormInterface; use Symfony\Component\HttpFoundation\File\UploadedFile; +use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\StreamedResponse; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; @@ -363,7 +364,7 @@ public function csvProduct(Request $request, CacheUtil $cacheUtil) // 商品規格が存在しなければ新規登録 /** @var ProductClass[] $ProductClasses */ $ProductClasses = $Product->getProductClasses(); - if ($ProductClasses->count() < 1) { + if (count($ProductClasses) < 1) { // 規格分類1(ID)がセットされていると規格なし商品、規格あり商品を作成 $ProductClassOrg = $this->createProductClass($row, $Product, $data, $headerByKey); if ($this->BaseInfo->isOptionProductDeliveryFee()) { @@ -874,7 +875,7 @@ public function csvTemplate(Request $request, $type) * @param array $headers * @param bool $rollback * - * @return array + * @return JsonResponse | array * * @throws \Doctrine\DBAL\ConnectionException */ @@ -1148,7 +1149,7 @@ protected function createProductClass($row, Product $Product, $data, $headerByKe // 在庫数が設定されていなければエラー if (isset($row[$headerByKey['stock']]) && StringUtil::isNotBlank($row[$headerByKey['stock']])) { $stock = str_replace(',', '', $row[$headerByKey['stock']]); - if (preg_match('/^\d+$/', $stock) && $stock >= 0) { + if (preg_match('/^\d+$/', $stock) && (int)$stock >= 0) { $ProductClass->setStock($stock); } else { $message = trans('admin.common.csv_invalid_greater_than_zero', ['%line%' => $line, '%name%' => $headerByKey['stock']]); diff --git a/src/Eccube/Controller/Admin/Product/ProductController.php b/src/Eccube/Controller/Admin/Product/ProductController.php index d650a67cf3c..245d3911c3b 100644 --- a/src/Eccube/Controller/Admin/Product/ProductController.php +++ b/src/Eccube/Controller/Admin/Product/ProductController.php @@ -630,9 +630,15 @@ public function edit(Request $request, RouterInterface $router, CacheUtil $cache } $this->entityManager->flush(); - - if (array_key_exists('product_image', $request->request->get('admin_product'))) { - $product_image = $request->request->get('admin_product')['product_image']; + /** + * @var array|Product[] $admin_product + */ + $admin_product = $request->request->get('admin_product'); + if (array_key_exists('product_image', $admin_product)) { + /** + * @var array|ProductImage[] $product_image + */ + $product_image = $admin_product['product_image']; foreach ($product_image as $sortNo => $filename) { $ProductImage = $this->productImageRepository ->findOneBy([ diff --git a/src/Eccube/Controller/Admin/Setting/System/LogController.php b/src/Eccube/Controller/Admin/Setting/System/LogController.php index 060e1c036a7..989e83b379c 100644 --- a/src/Eccube/Controller/Admin/Setting/System/LogController.php +++ b/src/Eccube/Controller/Admin/Setting/System/LogController.php @@ -28,7 +28,7 @@ class LogController extends AbstractController * @Route("/%eccube_admin_route%/setting/system/log", name="admin_setting_system_log", methods={"GET", "POST"}) * @Template("@admin/Setting/System/log.twig") * - * @return array|Symfony\Component\HttpFoundation\StreamedResponse + * @return array | StreamedResponse */ public function index(Request $request) { diff --git a/src/Eccube/Controller/ProductController.php b/src/Eccube/Controller/ProductController.php index e8b4f11a385..7736a8d0b91 100644 --- a/src/Eccube/Controller/ProductController.php +++ b/src/Eccube/Controller/ProductController.php @@ -14,6 +14,7 @@ namespace Eccube\Controller; use Eccube\Entity\BaseInfo; +use Eccube\Entity\Customer; use Eccube\Entity\Master\ProductStatus; use Eccube\Entity\Product; use Eccube\Event\EccubeEvents; diff --git a/src/Eccube/Controller/ShoppingController.php b/src/Eccube/Controller/ShoppingController.php index 5117fd9421d..edadba4a603 100644 --- a/src/Eccube/Controller/ShoppingController.php +++ b/src/Eccube/Controller/ShoppingController.php @@ -835,7 +835,7 @@ private function createPaymentMethod(Order $Order, FormInterface $form) * * @param PaymentMethodInterface $paymentMethod * - * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response + * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response|null */ protected function executeApply(PaymentMethodInterface $paymentMethod) { diff --git a/src/Eccube/Doctrine/Query/Queries.php b/src/Eccube/Doctrine/Query/Queries.php index a2582dad974..e1bbdf5bb0d 100644 --- a/src/Eccube/Doctrine/Query/Queries.php +++ b/src/Eccube/Doctrine/Query/Queries.php @@ -32,7 +32,7 @@ public function customize($queryKey, QueryBuilder $builder, $params) { if (isset($this->customizers[$queryKey])) { /* @var QueryCustomizer $customizer */ - foreach ($this->customizers[$queryKey] as $customizer) { + foreach ((array)$this->customizers[$queryKey] as $customizer) { $customizer->customize($builder, $params, $queryKey); } } diff --git a/src/Eccube/Entity/BaseInfo.php b/src/Eccube/Entity/BaseInfo.php index a9768d16d7b..4978ad611de 100644 --- a/src/Eccube/Entity/BaseInfo.php +++ b/src/Eccube/Entity/BaseInfo.php @@ -785,7 +785,7 @@ public function isOptionMypageOrderStatusDisplay() /** * Set optionNostockHidden. * - * @param integer $optionNostockHidden + * @param boolean $optionNostockHidden * * @return BaseInfo */ diff --git a/src/Eccube/Entity/News.php b/src/Eccube/Entity/News.php index f0006a59614..3abfa2559be 100644 --- a/src/Eccube/Entity/News.php +++ b/src/Eccube/Entity/News.php @@ -290,7 +290,7 @@ public function getUpdateDate() } /** - * @return integer + * @return boolean */ public function isVisible() { diff --git a/src/Eccube/Entity/Order.php b/src/Eccube/Entity/Order.php index de1bf425186..9061f1a2d9f 100644 --- a/src/Eccube/Entity/Order.php +++ b/src/Eccube/Entity/Order.php @@ -110,7 +110,7 @@ public function getTaxableTotalByTaxRate() * * 不課税, 非課税の値引明細は税率ごとに按分する. * - * @return int[] + * @return float[] */ public function getTotalByTaxRate() { @@ -134,7 +134,7 @@ public function getTotalByTaxRate() * * 不課税, 非課税の値引明細は税率ごとに按分する. * - * @return int[] + * @return float[] */ public function getTaxByTaxRate() { @@ -436,7 +436,7 @@ public function getTotalPrice() private $subtotal = 0; /** - * @var string + * @var float * * @ORM\Column(name="discount", type="decimal", precision=12, scale=2, options={"unsigned":true,"default":0}) */ @@ -1103,7 +1103,7 @@ public function getSubtotal() /** * Set discount. * - * @param string $discount + * @param float $discount * * @return Order */ @@ -1117,7 +1117,7 @@ public function setDiscount($discount) /** * Get discount. * - * @return string + * @return float * @deprecated 4.0.3 から値引きは課税値引きと 非課税・不課税の値引きの2種に分かれる. 課税値引きについてはgetTaxableDiscountを利用してください. * */ diff --git a/src/Eccube/Entity/Payment.php b/src/Eccube/Entity/Payment.php index b5d762c3fcb..3920bea3f63 100644 --- a/src/Eccube/Entity/Payment.php +++ b/src/Eccube/Entity/Payment.php @@ -52,14 +52,14 @@ public function __toString() private $method; /** - * @var string|null + * @var float|null * * @ORM\Column(name="charge", type="decimal", precision=12, scale=2, nullable=true, options={"unsigned":true,"default":0}) */ private $charge = 0; /** - * @var string|null + * @var float|null * * @ORM\Column(name="rule_max", type="decimal", precision=12, scale=2, nullable=true, options={"unsigned":true}) */ @@ -87,7 +87,7 @@ public function __toString() private $payment_image; /** - * @var string|null + * @var float|null * * @ORM\Column(name="rule_min", type="decimal", precision=12, scale=2, nullable=true, options={"unsigned":true}) */ @@ -183,7 +183,7 @@ public function getMethod() /** * Set charge. * - * @param string|null $charge + * @param float|null $charge * * @return Payment */ @@ -197,7 +197,7 @@ public function setCharge($charge = null) /** * Get charge. * - * @return string|null + * @return float|null */ public function getCharge() { @@ -207,7 +207,7 @@ public function getCharge() /** * Set ruleMax. * - * @param string|null $ruleMax + * @param float|null $ruleMax * * @return Payment */ @@ -221,7 +221,7 @@ public function setRuleMax($ruleMax = null) /** * Get ruleMax. * - * @return string|null + * @return float|null */ public function getRuleMax() { @@ -303,7 +303,7 @@ public function getPaymentImage() /** * Set ruleMin. * - * @param string|null $ruleMin + * @param float|null $ruleMin * * @return Payment */ @@ -317,7 +317,7 @@ public function setRuleMin($ruleMin = null) /** * Get ruleMin. * - * @return string|null + * @return float|null */ public function getRuleMin() { diff --git a/src/Eccube/Form/Type/Admin/OrderType.php b/src/Eccube/Form/Type/Admin/OrderType.php index d98a637be29..baeb56e7bdd 100644 --- a/src/Eccube/Form/Type/Admin/OrderType.php +++ b/src/Eccube/Form/Type/Admin/OrderType.php @@ -277,7 +277,7 @@ public function sortOrderItems(FormEvent $event) { /** @var Order $Order */ $Order = $event->getData(); - if (null === $Order) { + if ($Order === null) { return; } $OrderItems = $Order->getItems(); diff --git a/src/Eccube/Repository/AbstractRepository.php b/src/Eccube/Repository/AbstractRepository.php index 61d36f5d858..29c42befcee 100644 --- a/src/Eccube/Repository/AbstractRepository.php +++ b/src/Eccube/Repository/AbstractRepository.php @@ -16,11 +16,12 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\DBAL\DBALException; use Eccube\Entity\AbstractEntity; +use Eccube\Common\EccubeConfig; abstract class AbstractRepository extends ServiceEntityRepository { /** - * @var array + * @var EccubeConfig */ protected $eccubeConfig; diff --git a/src/Eccube/Repository/CustomerFavoriteProductRepository.php b/src/Eccube/Repository/CustomerFavoriteProductRepository.php index a03bc91ddbc..7a17e62fe25 100644 --- a/src/Eccube/Repository/CustomerFavoriteProductRepository.php +++ b/src/Eccube/Repository/CustomerFavoriteProductRepository.php @@ -16,6 +16,7 @@ use Doctrine\ORM\QueryBuilder; use Doctrine\Persistence\ManagerRegistry as RegistryInterface; use Eccube\Entity\CustomerFavoriteProduct; +use Symfony\Component\Security\Core\User\UserInterface; /** * CustomerFavoriteProductRepository @@ -31,10 +32,10 @@ public function __construct(RegistryInterface $registry) } /** - * @param \Eccube\Entity\Customer $Customer + * @param \Eccube\Entity\Customer|UserInterface $Customer * @param \Eccube\Entity\Product $Product */ - public function addFavorite(\Eccube\Entity\Customer $Customer, \Eccube\Entity\Product $Product) + public function addFavorite(UserInterface $Customer, \Eccube\Entity\Product $Product) { if ($this->isFavorite($Customer, $Product)) { return; diff --git a/src/Eccube/Repository/CustomerRepository.php b/src/Eccube/Repository/CustomerRepository.php index 320ac5f5538..1d24da5bdd4 100644 --- a/src/Eccube/Repository/CustomerRepository.php +++ b/src/Eccube/Repository/CustomerRepository.php @@ -173,7 +173,7 @@ public function getQueryBuilderBySearchData($searchData) ->setParameter('sexs', $sexs); } - if (!empty($searchData['birth_month']) && $searchData['birth_month']) { + if (!empty($searchData['birth_month'])) { $qb ->andWhere('EXTRACT(MONTH FROM c.birth) = :birth_month') ->setParameter('birth_month', $searchData['birth_month']); diff --git a/src/Eccube/Repository/MemberRepository.php b/src/Eccube/Repository/MemberRepository.php index fb0f9f56928..c435e878f71 100644 --- a/src/Eccube/Repository/MemberRepository.php +++ b/src/Eccube/Repository/MemberRepository.php @@ -17,6 +17,7 @@ use Doctrine\DBAL\Exception\ForeignKeyConstraintViolationException; use Doctrine\Persistence\ManagerRegistry as RegistryInterface; use Eccube\Entity\Member; +use Symfony\Component\Security\Core\User\UserInterface; /** * MemberRepository @@ -84,7 +85,7 @@ public function down(Member $Member) /** * 管理ユーザを登録します. * - * @param Member $Member + * @param Member|UserInterface $Member */ public function save($Member) { diff --git a/src/Eccube/Service/PurchaseFlow/PurchaseContext.php b/src/Eccube/Service/PurchaseFlow/PurchaseContext.php index 184f514d9ec..aec6586888e 100644 --- a/src/Eccube/Service/PurchaseFlow/PurchaseContext.php +++ b/src/Eccube/Service/PurchaseFlow/PurchaseContext.php @@ -15,6 +15,7 @@ use Eccube\Entity\Customer; use Eccube\Entity\ItemHolderInterface; +use Symfony\Component\Security\Core\User\UserInterface; /** * PurchaseFlowの実行中コンテキスト. @@ -33,7 +34,11 @@ class PurchaseContext extends \SplObjectStorage public const CART_FLOW = 'cart'; - public function __construct(ItemHolderInterface $originHolder = null, ?Customer $user = null) + /** + * @param ItemHolderInterface|null $originHolder + * @param UserInterface|Customer|null $user + */ + public function __construct(ItemHolderInterface $originHolder = null, ?UserInterface $user = null) { $this->originHolder = $originHolder; $this->user = $user; From c652acab81057fd5f24c70401390d26d1b1ea9ea 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: Mon, 23 Oct 2023 16:36:32 +0900 Subject: [PATCH 04/90] PHPSTAN BUGFIX (2) --- docker-compose.yml | 10 ++++------ .../Controller/Admin/Product/CsvImportController.php | 5 +++-- src/Eccube/Form/Type/Admin/OrderType.php | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c8d2909921f..caa5344305b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,17 +22,15 @@ services: ### ローカルでビルドする場合は以下のコマンドを使用します ## docker build -t ec-cube --no-cache --pull --build-arg TAG=8.1-apache . ## docker tag ec-cube ghcr.io/ec-cube/ec-cube-php:8.1-apache -# image: ${REGISTRY:-ghcr.io}/${IMAGE_NAME:-ec-cube/ec-cube-php}:${TAG:-8.1-apache} - build: - context: . + image: ${REGISTRY:-ghcr.io}/${IMAGE_NAME:-ec-cube/ec-cube-php}:${TAG:-8.1-apache} ports: - 8080:80 - 4430:443 volumes: ### 同期対象からコストの重いフォルダを除外 ##################### - - ".:/var/www/html" -# - "vendor:/var/www/html/vendor" -# - "node_modules:/var/www/html/node_modules" + - "var:/var/www/html/var" + - "vendor:/var/www/html/vendor" + - "node_modules:/var/www/html/node_modules" environment: # EC-CUBE environments APP_ENV: "dev" diff --git a/src/Eccube/Controller/Admin/Product/CsvImportController.php b/src/Eccube/Controller/Admin/Product/CsvImportController.php index f108cfb82b9..97379d6e7d7 100644 --- a/src/Eccube/Controller/Admin/Product/CsvImportController.php +++ b/src/Eccube/Controller/Admin/Product/CsvImportController.php @@ -13,6 +13,7 @@ namespace Eccube\Controller\Admin\Product; +use Doctrine\Common\Collections\Collection; use Doctrine\DBAL\Exception\ForeignKeyConstraintViolationException; use Eccube\Common\Constant; use Eccube\Controller\Admin\AbstractCsvImportController; @@ -362,9 +363,9 @@ public function csvProduct(Request $request, CacheUtil $cacheUtil) $this->createProductTag($row, $Product, $data, $headerByKey); // 商品規格が存在しなければ新規登録 - /** @var ProductClass[] $ProductClasses */ + /** @var ProductClass[]|Collection $ProductClasses */ $ProductClasses = $Product->getProductClasses(); - if (count($ProductClasses) < 1) { + if ($ProductClasses->count() < 1) { // 規格分類1(ID)がセットされていると規格なし商品、規格あり商品を作成 $ProductClassOrg = $this->createProductClass($row, $Product, $data, $headerByKey); if ($this->BaseInfo->isOptionProductDeliveryFee()) { diff --git a/src/Eccube/Form/Type/Admin/OrderType.php b/src/Eccube/Form/Type/Admin/OrderType.php index baeb56e7bdd..f1e3e498e6b 100644 --- a/src/Eccube/Form/Type/Admin/OrderType.php +++ b/src/Eccube/Form/Type/Admin/OrderType.php @@ -275,9 +275,9 @@ public function getBlockPrefix() */ public function sortOrderItems(FormEvent $event) { - /** @var Order $Order */ + /** @var Order|null $Order */ $Order = $event->getData(); - if ($Order === null) { + if (null === $Order) { return; } $OrderItems = $Order->getItems(); From 3c7e049f080f6dc46db6e1e23e8bf72a707d33ee 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: Mon, 23 Oct 2023 19:12:40 +0900 Subject: [PATCH 05/90] PHPSTAN BUGFIX (3) --- src/Eccube/Controller/AbstractShoppingController.php | 5 +++-- src/Eccube/Controller/Admin/AdminController.php | 7 ++++++- src/Eccube/Controller/Admin/Order/MailController.php | 2 +- .../Controller/Admin/Setting/System/MemberController.php | 2 ++ .../Admin/Setting/System/TwoFactorAuthController.php | 3 +++ src/Eccube/Controller/Mypage/WithdrawController.php | 3 ++- src/Eccube/Entity/Order.php | 5 +++-- src/Eccube/EventListener/LogListener.php | 4 ++-- 8 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/Eccube/Controller/AbstractShoppingController.php b/src/Eccube/Controller/AbstractShoppingController.php index fd9a1316780..5f129676ac3 100644 --- a/src/Eccube/Controller/AbstractShoppingController.php +++ b/src/Eccube/Controller/AbstractShoppingController.php @@ -14,6 +14,7 @@ namespace Eccube\Controller; use Eccube\Entity\ItemHolderInterface; +use Eccube\Entity\Order; use Eccube\Service\PurchaseFlow\PurchaseContext; use Eccube\Service\PurchaseFlow\PurchaseFlow; use Eccube\Service\PurchaseFlow\PurchaseFlowResult; @@ -36,12 +37,12 @@ public function setPurchaseFlow(PurchaseFlow $shoppingPurchaseFlow) } /** - * @param ItemHolderInterface $itemHolder + * @param Order $itemHolder * @param bool $returnResponse レスポンスを返すかどうか. falseの場合はPurchaseFlowResultを返す. * * @return PurchaseFlowResult|RedirectResponse|null */ - protected function executePurchaseFlow(ItemHolderInterface $itemHolder, $returnResponse = true) + protected function executePurchaseFlow(Order $itemHolder, $returnResponse = true) { /** @var PurchaseFlowResult $flowResult */ $flowResult = $this->purchaseFlow->validate($itemHolder, new PurchaseContext(clone $itemHolder, $itemHolder->getCustomer())); diff --git a/src/Eccube/Controller/Admin/AdminController.php b/src/Eccube/Controller/Admin/AdminController.php index 6b2f328d1c5..add186284fe 100644 --- a/src/Eccube/Controller/Admin/AdminController.php +++ b/src/Eccube/Controller/Admin/AdminController.php @@ -21,6 +21,7 @@ use Eccube\Entity\Master\CustomerStatus; use Eccube\Entity\Master\OrderStatus; use Eccube\Entity\Master\ProductStatus; +use Eccube\Entity\Member; use Eccube\Entity\ProductStock; use Eccube\Event\EccubeEvents; use Eccube\Event\EventArgs; @@ -32,12 +33,15 @@ use Eccube\Repository\MemberRepository; use Eccube\Repository\OrderRepository; use Eccube\Repository\ProductRepository; +use Eccube\Security\Core\Encoder\PasswordEncoder; use Eccube\Service\PluginApiService; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; +use Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface; +use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Component\Security\Http\Authentication\AuthenticationUtils; class AdminController extends AbstractController @@ -339,10 +343,11 @@ public function changePassword(Request $request) $form->handleRequest($request); if ($form->isSubmitted() && $form->isValid()) { + /** @var Member $Member */ $Member = $this->getUser(); $salt = $Member->getSalt(); $password = $form->get('change_password')->getData(); - + /** @var PasswordEncoder $encoder */ $encoder = $this->encoderFactory->getEncoder($Member); // 2系からのデータ移行でsaltがセットされていない場合はsaltを生成. diff --git a/src/Eccube/Controller/Admin/Order/MailController.php b/src/Eccube/Controller/Admin/Order/MailController.php index 34a2aa1fe3b..bb675b0f474 100644 --- a/src/Eccube/Controller/Admin/Order/MailController.php +++ b/src/Eccube/Controller/Admin/Order/MailController.php @@ -54,7 +54,7 @@ class MailController extends AbstractController * @param MailService $mailService * @param MailHistoryRepository $mailHistoryRepository * @param OrderRepository $orderRepository - * @param twig $twig + * @param Environment $twig */ public function __construct( MailService $mailService, diff --git a/src/Eccube/Controller/Admin/Setting/System/MemberController.php b/src/Eccube/Controller/Admin/Setting/System/MemberController.php index 2a2a0507cf9..fe3afc3969b 100644 --- a/src/Eccube/Controller/Admin/Setting/System/MemberController.php +++ b/src/Eccube/Controller/Admin/Setting/System/MemberController.php @@ -20,6 +20,7 @@ use Eccube\Event\EventArgs; use Eccube\Form\Type\Admin\MemberType; use Eccube\Repository\MemberRepository; +use Eccube\Security\Core\Encoder\PasswordEncoder; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Annotation\Route; @@ -107,6 +108,7 @@ public function create(Request $request) $form->handleRequest($request); if ($form->isSubmitted() && $form->isValid()) { + /** @var PasswordEncoder $encoder */ $encoder = $this->encoderFactory->getEncoder($Member); $salt = $encoder->createSalt(); $password = $Member->getPlainPassword(); diff --git a/src/Eccube/Controller/Admin/Setting/System/TwoFactorAuthController.php b/src/Eccube/Controller/Admin/Setting/System/TwoFactorAuthController.php index a034fb90e78..b1c36b0ce6f 100644 --- a/src/Eccube/Controller/Admin/Setting/System/TwoFactorAuthController.php +++ b/src/Eccube/Controller/Admin/Setting/System/TwoFactorAuthController.php @@ -14,6 +14,7 @@ namespace Eccube\Controller\Admin\Setting\System; use Eccube\Controller\AbstractController; +use Eccube\Entity\Member; use Eccube\Form\Type\Admin\TwoFactorAuthType; use Eccube\Repository\MemberRepository; use Eccube\Service\TwoFactorAuthService; @@ -70,6 +71,7 @@ public function __construct( */ public function auth(Request $request) { + /** @var Member $Member */ $Member = $this->getUser(); if (!$this->twoFactorAuthService->isEnabled() || $this->twoFactorAuthService->isAuth($Member)) { @@ -143,6 +145,7 @@ public function edit(Request $request) private function createResponse(Request $request) { $error = null; + /** @var Member $Member */ $Member = $this->getUser(); $builder = $this->formFactory->createBuilder(TwoFactorAuthType::class); $form = null; diff --git a/src/Eccube/Controller/Mypage/WithdrawController.php b/src/Eccube/Controller/Mypage/WithdrawController.php index 982f85bdc55..54aa0c43ff4 100644 --- a/src/Eccube/Controller/Mypage/WithdrawController.php +++ b/src/Eccube/Controller/Mypage/WithdrawController.php @@ -14,6 +14,7 @@ namespace Eccube\Controller\Mypage; use Eccube\Controller\AbstractController; +use Eccube\Entity\Customer; use Eccube\Entity\Master\CustomerStatus; use Eccube\Event\EccubeEvents; use Eccube\Event\EventArgs; @@ -126,7 +127,7 @@ public function index(Request $request) case 'complete': log_info('退会処理開始'); - /* @var $Customer \Eccube\Entity\Customer */ + /** @var Customer $Customer */ $Customer = $this->getUser(); $email = $Customer->getEmail(); diff --git a/src/Eccube/Entity/Order.php b/src/Eccube/Entity/Order.php index 9061f1a2d9f..62c92e4d5a5 100644 --- a/src/Eccube/Entity/Order.php +++ b/src/Eccube/Entity/Order.php @@ -16,6 +16,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Criteria; use Doctrine\ORM\Mapping as ORM; +use Eccube\Entity\Master\OrderStatus; use Eccube\Entity\Master\RoundingType; use Eccube\Entity\Master\TaxType; use Eccube\Service\Calculator\OrderItemCollection; @@ -1834,11 +1835,11 @@ public function getOrderStatusColor() /** * Set orderStatus. * - * @param \Eccube\Entity\Master\OrderStatus|object|null $orderStatus + * @param OrderStatus|null $orderStatus * * @return Order */ - public function setOrderStatus(Master\OrderStatus $orderStatus = null) + public function setOrderStatus(OrderStatus $orderStatus = null) { $this->OrderStatus = $orderStatus; diff --git a/src/Eccube/EventListener/LogListener.php b/src/Eccube/EventListener/LogListener.php index 25fdfb552c2..62748d84edd 100644 --- a/src/Eccube/EventListener/LogListener.php +++ b/src/Eccube/EventListener/LogListener.php @@ -74,7 +74,7 @@ public function onKernelRequestEarly(RequestEvent $event) } /** - * @param ResponseEvent $event + * @param RequestEvent $event */ public function onKernelRequest(RequestEvent $event) { @@ -112,7 +112,7 @@ public function onKernelController(ControllerEvent $event) } /** - * @param FilterResponseEvent $event + * @param ResponseEvent $event */ public function onKernelResponse(ResponseEvent $event) { From a0559b74866edc3d0e3f313ae6c855cc73b59f30 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: Tue, 24 Oct 2023 15:11:19 +0900 Subject: [PATCH 06/90] =?UTF-8?q?PHPSTAN=20BUGFIX=20E2E=E3=83=86=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=83=BB=E5=8D=98=E4=BD=93=E3=83=86=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 3 ++ codeception/docker/docker-php-entrypoint.sh | 4 ++ docker-compose.yml | 9 +++-- .../Command/GenerateDummyDataCommand.php | 2 + .../Command/GenerateDummyDataCommandTest.php | 40 +++++++++++++++++++ .../Repository/CustomerRepositoryTest.php | 11 +++++ 6 files changed, 65 insertions(+), 4 deletions(-) create mode 100755 codeception/docker/docker-php-entrypoint.sh create mode 100644 tests/Eccube/Tests/Command/GenerateDummyDataCommandTest.php diff --git a/Dockerfile b/Dockerfile index ded4d2dc42b..6a1a0d2ded7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,10 +32,13 @@ RUN apt update \ && echo "en_US.UTF-8 UTF-8" >/etc/locale.gen \ && locale-gen \ ; +RUN pecl search xdebug-2.9.8 \ + && pecl install xdebug-2.9.8 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/codeception/docker/docker-php-entrypoint.sh b/codeception/docker/docker-php-entrypoint.sh new file mode 100755 index 00000000000..760d91805dc --- /dev/null +++ b/codeception/docker/docker-php-entrypoint.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +while ! nc -z ec-cube 80; do sleep 1; done; while ! nc -z chrome 4444; do sleep 1; done; ls -la && php bin/console cache:clear --no-warmup && /var/www/html/vendor/bin/codecept run -d acceptance --env chrome-headless,local -g customer + diff --git a/docker-compose.yml b/docker-compose.yml index caa5344305b..8aa43c835e2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,15 +22,16 @@ services: ### ローカルでビルドする場合は以下のコマンドを使用します ## docker build -t ec-cube --no-cache --pull --build-arg TAG=8.1-apache . ## docker tag ec-cube ghcr.io/ec-cube/ec-cube-php:8.1-apache - image: ${REGISTRY:-ghcr.io}/${IMAGE_NAME:-ec-cube/ec-cube-php}:${TAG:-8.1-apache} + # image: ${REGISTRY:-ghcr.io}/${IMAGE_NAME:-ec-cube/ec-cube-php}:${TAG:-8.1-apache} + build: + context: . ports: - 8080:80 - 4430:443 volumes: ### 同期対象からコストの重いフォルダを除外 ##################### - - "var:/var/www/html/var" - - "vendor:/var/www/html/vendor" - - "node_modules:/var/www/html/node_modules" + - ".:/var/www/html" + # - "./var/coverage:/opt/coverage" environment: # EC-CUBE environments APP_ENV: "dev" diff --git a/src/Eccube/Command/GenerateDummyDataCommand.php b/src/Eccube/Command/GenerateDummyDataCommand.php index b1777e3bf78..aed05eab130 100644 --- a/src/Eccube/Command/GenerateDummyDataCommand.php +++ b/src/Eccube/Command/GenerateDummyDataCommand.php @@ -83,6 +83,7 @@ protected function configure() protected function execute(InputInterface $input, OutputInterface $output) { + $startTime = microtime(true); $locale = $input->getOption('with-locale'); $notImage = $input->getOption('without-image'); $numberOfProducts = $input->getOption('products'); @@ -93,6 +94,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $Products = []; $faker = Faker::create($locale); + var_dump(microtime(true) - $startTime); for ($i = 0; $i < $numberOfCustomer; $i++) { $email = microtime(true).'.'.$faker->safeEmail; $Customer = $this->generator->createCustomer($email); diff --git a/tests/Eccube/Tests/Command/GenerateDummyDataCommandTest.php b/tests/Eccube/Tests/Command/GenerateDummyDataCommandTest.php new file mode 100644 index 00000000000..a010cca0b3d --- /dev/null +++ b/tests/Eccube/Tests/Command/GenerateDummyDataCommandTest.php @@ -0,0 +1,40 @@ +get(GenerateDummyDataCommand::class); + $CommandTester = new CommandTester($command); + $result = $CommandTester->execute($commandArg, $options); + + $this->expected = 0; + $this->actual = $result; + $this->verify(); + + + } +} diff --git a/tests/Eccube/Tests/Repository/CustomerRepositoryTest.php b/tests/Eccube/Tests/Repository/CustomerRepositoryTest.php index af8495044b7..061419b110d 100644 --- a/tests/Eccube/Tests/Repository/CustomerRepositoryTest.php +++ b/tests/Eccube/Tests/Repository/CustomerRepositoryTest.php @@ -136,6 +136,17 @@ public function testGetQueryBuilderBySearchDataByMulti2147483648() self::assertEquals($Customer, $actual[0]); } + + public function testGetQueryBuilderBySearchDataByBirthMonth() + { + $Customer = $this->createCustomer('20231024@example.com'); + $birthday = new \DateTime('now'); + $Customer->setBirth($birthday); + $actual = $this->customerRepo->getQueryBuilderBySearchData(['birth_month' => 10]) + ->getQuery() + ->getResult(); + self::assertEquals($Customer->getBirth()->format('m'),$actual[0]->getBirth()->format('m')); + } } class DummyCustomer implements UserInterface From 813ff1e5068cfe604ededfd3f125dc422196c79a 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: Wed, 25 Oct 2023 19:19:48 +0900 Subject: [PATCH 07/90] =?UTF-8?q?PHPSTAN=20BUGFIX=20E2E=E3=83=86=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=83=BB=E5=8D=98=E4=BD=93=E3=83=86=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Order/ShippingController.php | 2 +- .../Admin/Product/CsvImportController.php | 6 +-- .../System/TwoFactorAuthController.php | 2 +- .../Admin/Store/TemplateController.php | 4 +- .../Controller/Install/InstallController.php | 2 +- src/Eccube/Entity/ProductClass.php | 6 +-- .../Form/Extension/DoctrineOrmExtension.php | 2 +- src/Eccube/Form/Type/Admin/MasterdataType.php | 9 ++-- .../Form/Validator/TwigLintValidator.php | 1 + src/Eccube/Repository/CustomerRepository.php | 35 ++++++------- .../Repository/LoginHistoryRepository.php | 8 +-- src/Eccube/Repository/OrderRepository.php | 51 ++++++++++--------- src/Eccube/Repository/ProductRepository.php | 26 +++++----- src/Eccube/Repository/ShippingRepository.php | 16 +++--- src/Eccube/Service/Composer/OutputParser.php | 4 +- 15 files changed, 90 insertions(+), 84 deletions(-) diff --git a/src/Eccube/Controller/Admin/Order/ShippingController.php b/src/Eccube/Controller/Admin/Order/ShippingController.php index 2700057c2d2..38001054142 100644 --- a/src/Eccube/Controller/Admin/Order/ShippingController.php +++ b/src/Eccube/Controller/Admin/Order/ShippingController.php @@ -263,7 +263,7 @@ public function index(Request $request, Order $Order) log_error('出荷登録エラー', [$Order->getId(), $e]); $this->addError('admin.flash.register_failed', 'admin'); } - } elseif ($request->get('mode') == 'register' && $form->getErrors(true)) { + } elseif ($request->get('mode') == 'register' && $form->getErrors(true)->count() > 0) { $this->addError('admin.common.save_error', 'admin'); } } diff --git a/src/Eccube/Controller/Admin/Product/CsvImportController.php b/src/Eccube/Controller/Admin/Product/CsvImportController.php index 97379d6e7d7..ccc8c269c18 100644 --- a/src/Eccube/Controller/Admin/Product/CsvImportController.php +++ b/src/Eccube/Controller/Admin/Product/CsvImportController.php @@ -1170,7 +1170,7 @@ protected function createProductClass($row, Product $Product, $data, $headerByKe if (isset($row[$headerByKey['sale_limit']]) && StringUtil::isNotBlank($row[$headerByKey['sale_limit']])) { $saleLimit = str_replace(',', '', $row[$headerByKey['sale_limit']]); - if (preg_match('/^\d+$/', $saleLimit) && $saleLimit >= 0) { + if (preg_match('/^\d+$/', $saleLimit) && (float)$saleLimit >= 0) { $ProductClass->setSaleLimit($saleLimit); } else { $message = trans('admin.common.csv_invalid_greater_than_zero', ['%line%' => $line, '%name%' => $headerByKey['sale_limit']]); @@ -1333,7 +1333,7 @@ protected function updateProductClass($row, Product $Product, ProductClass $Prod $this->addErrors($message); } else { $stock = str_replace(',', '', $row[$headerByKey['stock']]); - if (preg_match('/^\d+$/', $stock) && $stock >= 0) { + if (preg_match('/^\d+$/', $stock) && (int)$stock >= 0) { $ProductClass->setStock($row[$headerByKey['stock']]); } else { $message = trans('admin.common.csv_invalid_greater_than_zero', ['%line%' => $line, '%name%' => $headerByKey['stock']]); @@ -1351,7 +1351,7 @@ protected function updateProductClass($row, Product $Product, ProductClass $Prod if (isset($row[$headerByKey['sale_limit']])) { if ($row[$headerByKey['sale_limit']] != '') { $saleLimit = str_replace(',', '', $row[$headerByKey['sale_limit']]); - if (preg_match('/^\d+$/', $saleLimit) && $saleLimit >= 0) { + if (preg_match('/^\d+$/', $saleLimit) && (float)$saleLimit >= 0) { $ProductClass->setSaleLimit($saleLimit); } else { $message = trans('admin.common.csv_invalid_greater_than_zero', ['%line%' => $line, '%name%' => $headerByKey['sale_limit']]); diff --git a/src/Eccube/Controller/Admin/Setting/System/TwoFactorAuthController.php b/src/Eccube/Controller/Admin/Setting/System/TwoFactorAuthController.php index b1c36b0ce6f..b2beb2c9442 100644 --- a/src/Eccube/Controller/Admin/Setting/System/TwoFactorAuthController.php +++ b/src/Eccube/Controller/Admin/Setting/System/TwoFactorAuthController.php @@ -164,7 +164,7 @@ private function createResponse(Request $request) $auth_key = $form->get('auth_key')->getData(); $device_token = $form->get('device_token')->getData(); if ($form->isSubmitted() && $form->isValid()) { - if ($this->twoFactorAuthService->verifyCode($auth_key, $device_token, 2)) { + if ($this->twoFactorAuthService->verifyCode($auth_key, $device_token)) { $Member->setTwoFactorAuthKey($auth_key); $this->memberRepository->save($Member); $this->addSuccess('admin.setting.system.two_factor_auth.complete_message', 'admin'); diff --git a/src/Eccube/Controller/Admin/Store/TemplateController.php b/src/Eccube/Controller/Admin/Store/TemplateController.php index 02490955276..bf64579a411 100644 --- a/src/Eccube/Controller/Admin/Store/TemplateController.php +++ b/src/Eccube/Controller/Admin/Store/TemplateController.php @@ -227,10 +227,10 @@ public function install(Request $request) $form->handleRequest($request); if ($form->isSubmitted() && $form->isValid()) { - /** @var $Template \Eccube\Entity\Template */ + /** @var \Eccube\Entity\Template $Template */ $Template = $form->getData(); - $TemplateExists = $this->templateRepository->findByCode($Template->getCode()); + $TemplateExists = $this->templateRepository->findBy(['code' => $Template->getCode()]); // テンプレートコードの重複チェック. if ($TemplateExists) { diff --git a/src/Eccube/Controller/Install/InstallController.php b/src/Eccube/Controller/Install/InstallController.php index a47192b07c5..88f71f47dbe 100644 --- a/src/Eccube/Controller/Install/InstallController.php +++ b/src/Eccube/Controller/Install/InstallController.php @@ -810,7 +810,7 @@ protected function importCsv(EntityManager $em) $locale = env('ECCUBE_LOCALE', 'ja_JP'); $locale = str_replace('_', '-', $locale); $locales = \Locale::parseLocale($locale); - $localeDir = is_null($locales) ? 'ja' : $locales['language']; + $localeDir = empty($locales) ? 'ja' : $locales['language']; $loader = new \Eccube\Doctrine\Common\CsvDataFixtures\Loader(); $loader->loadFromDirectory($this->getParameter('kernel.project_dir').'/src/Eccube/Resource/doctrine/import_csv/'.$localeDir); diff --git a/src/Eccube/Entity/ProductClass.php b/src/Eccube/Entity/ProductClass.php index fbd2d957143..ac824c57eff 100644 --- a/src/Eccube/Entity/ProductClass.php +++ b/src/Eccube/Entity/ProductClass.php @@ -196,7 +196,7 @@ public function hasClassCategory2() private $stock_unlimited = false; /** - * @var string|null + * @var float|null * * @ORM\Column(name="sale_limit", type="decimal", precision=10, scale=0, nullable=true, options={"unsigned":true}) */ @@ -422,7 +422,7 @@ public function isStockUnlimited() /** * Set saleLimit. * - * @param string|null $saleLimit + * @param string|float|null $saleLimit * * @return ProductClass */ @@ -436,7 +436,7 @@ public function setSaleLimit($saleLimit = null) /** * Get saleLimit. * - * @return string|null + * @return float|null */ public function getSaleLimit() { diff --git a/src/Eccube/Form/Extension/DoctrineOrmExtension.php b/src/Eccube/Form/Extension/DoctrineOrmExtension.php index 1669d9fb4ae..064454d1c04 100644 --- a/src/Eccube/Form/Extension/DoctrineOrmExtension.php +++ b/src/Eccube/Form/Extension/DoctrineOrmExtension.php @@ -76,7 +76,7 @@ function (FormEvent $event) { foreach ($props as $prop) { $anno = $this->reader->getPropertyAnnotation($prop, FormAppend::class); if ($anno) { - $options = is_null($anno->options) ? [] : $anno->options; + $options = empty($anno->options) ? [] : $anno->options; $options['eccube_form_options'] = [ 'auto_render' => (true === $anno->auto_render), 'form_theme' => $anno->form_theme, diff --git a/src/Eccube/Form/Type/Admin/MasterdataType.php b/src/Eccube/Form/Type/Admin/MasterdataType.php index 30d36f5a535..be4dcb9a5e1 100644 --- a/src/Eccube/Form/Type/Admin/MasterdataType.php +++ b/src/Eccube/Form/Type/Admin/MasterdataType.php @@ -13,8 +13,8 @@ namespace Eccube\Form\Type\Admin; -use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver; -use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain; +use Doctrine\Bundle\DoctrineBundle\Mapping\MappingDriver; +use Doctrine\Persistence\Mapping\Driver\MappingDriverChain; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Mapping\ClassMetadata; use Eccube\Entity\Master\CustomerOrderStatus; @@ -51,9 +51,10 @@ public function __construct(EntityManagerInterface $entityManager) public function buildForm(FormBuilderInterface $builder, array $options) { $masterdata = []; - + /** @var MappingDriver $mappingDriver */ + $mappingDriver = $this->entityManager->getConfiguration()->getMetadataDriverImpl(); /** @var MappingDriverChain $driverChain */ - $driverChain = $this->entityManager->getConfiguration()->getMetadataDriverImpl()->getDriver(); + $driverChain = $mappingDriver->getDriver(); /** @var MappingDriver[] $drivers */ $drivers = $driverChain->getDrivers(); diff --git a/src/Eccube/Form/Validator/TwigLintValidator.php b/src/Eccube/Form/Validator/TwigLintValidator.php index 4f336f1bcad..f8bad1ea0a9 100644 --- a/src/Eccube/Form/Validator/TwigLintValidator.php +++ b/src/Eccube/Form/Validator/TwigLintValidator.php @@ -54,6 +54,7 @@ public function validate($value, Constraint $constraint) $nodeTree = $this->twig->parse($this->twig->tokenize(new Source($value, ''))); $this->twig->compile($nodeTree); } catch (Error $e) { + /** @var TwigLint $constraint */ $this->context->buildViolation($constraint->message) ->setParameter('{{ error }}', $e->getMessage()) ->addViolation(); diff --git a/src/Eccube/Repository/CustomerRepository.php b/src/Eccube/Repository/CustomerRepository.php index 1d24da5bdd4..57d0eca864c 100644 --- a/src/Eccube/Repository/CustomerRepository.php +++ b/src/Eccube/Repository/CustomerRepository.php @@ -13,6 +13,7 @@ namespace Eccube\Repository; +use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\QueryBuilder; use Doctrine\Persistence\ManagerRegistry as RegistryInterface; @@ -106,7 +107,7 @@ public function newCustomer() * @param array{ * multi?:string, * pref?:Pref, - * sex?:Sex[], + * sex?:Sex[]|ArrayCollection, * birth_month?:string|int, * birth_start?:\DateTime, * birth_end?:\DateTime, @@ -127,7 +128,7 @@ public function newCustomer() * last_buy_datetime_end?:\DateTime, * last_buy_start?:\DateTime, * last_buy_end?:\DateTime, - * customer_status?:CustomerStatus[], + * customer_status?:CustomerStatus[]|ArrayCollection, * buy_product_name?:string, * sortkey?:string, * sorttype?:string @@ -155,7 +156,7 @@ public function getQueryBuilderBySearchData($searchData) } // Pref - if (!empty($searchData['pref']) && $searchData['pref']) { + if (!empty($searchData['pref'])) { $qb ->andWhere('c.Pref = :pref') ->setParameter('pref', $searchData['pref']->getId()); @@ -180,12 +181,12 @@ public function getQueryBuilderBySearchData($searchData) } // birth - if (!empty($searchData['birth_start']) && $searchData['birth_start']) { + if (!empty($searchData['birth_start'])) { $qb ->andWhere('c.birth >= :birth_start') ->setParameter('birth_start', $searchData['birth_start']); } - if (!empty($searchData['birth_end']) && $searchData['birth_end']) { + if (!empty($searchData['birth_end'])) { $date = clone $searchData['birth_end']; $date->modify('+1 days'); $qb @@ -226,23 +227,23 @@ public function getQueryBuilderBySearchData($searchData) } // create_date - if (!empty($searchData['create_datetime_start']) && $searchData['create_datetime_start']) { + if (!empty($searchData['create_datetime_start'])) { $date = $searchData['create_datetime_start']; $qb ->andWhere('c.create_date >= :create_date_start') ->setParameter('create_date_start', $date); - } elseif (!empty($searchData['create_date_start']) && $searchData['create_date_start']) { + } elseif (!empty($searchData['create_date_start'])) { $qb ->andWhere('c.create_date >= :create_date_start') ->setParameter('create_date_start', $searchData['create_date_start']); } - if (!empty($searchData['create_datetime_end']) && $searchData['create_datetime_end']) { + if (!empty($searchData['create_datetime_end'])) { $date = $searchData['create_datetime_end']; $qb ->andWhere('c.create_date < :create_date_end') ->setParameter('create_date_end', $date); - } elseif (!empty($searchData['create_date_end']) && $searchData['create_date_end']) { + } elseif (!empty($searchData['create_date_end'])) { $date = clone $searchData['create_date_end']; $date->modify('+1 days'); $qb @@ -251,23 +252,23 @@ public function getQueryBuilderBySearchData($searchData) } // update_date - if (!empty($searchData['update_datetime_start']) && $searchData['update_datetime_start']) { + if (!empty($searchData['update_datetime_start'])) { $date = $searchData['update_datetime_start']; $qb ->andWhere('c.update_date >= :update_date_start') ->setParameter('update_date_start', $date); - } elseif (!empty($searchData['update_date_start']) && $searchData['update_date_start']) { + } elseif (!empty($searchData['update_date_start'])) { $qb ->andWhere('c.update_date >= :update_date_start') ->setParameter('update_date_start', $searchData['update_date_start']); } - if (!empty($searchData['update_datetime_end']) && $searchData['update_datetime_end']) { + if (!empty($searchData['update_datetime_end'])) { $date = $searchData['update_datetime_end']; $qb ->andWhere('c.update_date < :update_date_end') ->setParameter('update_date_end', $date); - } elseif (!empty($searchData['update_date_end']) && $searchData['update_date_end']) { + } elseif (!empty($searchData['update_date_end'])) { $date = clone $searchData['update_date_end']; $date->modify('+1 days'); $qb @@ -276,23 +277,23 @@ public function getQueryBuilderBySearchData($searchData) } // last_buy - if (!empty($searchData['last_buy_datetime_start']) && $searchData['last_buy_datetime_start']) { + if (!empty($searchData['last_buy_datetime_start'])) { $date = $searchData['last_buy_datetime_start']; $qb ->andWhere('c.last_buy_date >= :last_buy_start') ->setParameter('last_buy_start', $date); - } elseif (!empty($searchData['last_buy_start']) && $searchData['last_buy_start']) { + } elseif (!empty($searchData['last_buy_start'])) { $qb ->andWhere('c.last_buy_date >= :last_buy_start') ->setParameter('last_buy_start', $searchData['last_buy_start']); } - if (!empty($searchData['last_buy_datetime_end']) && $searchData['last_buy_datetime_end']) { + if (!empty($searchData['last_buy_datetime_end'])) { $date = $searchData['last_buy_datetime_end']; $qb ->andWhere('c.last_buy_date < :last_buy_end') ->setParameter('last_buy_end', $date); - } elseif (!empty($searchData['last_buy_end']) && $searchData['last_buy_end']) { + } elseif (!empty($searchData['last_buy_end'])) { $date = clone $searchData['last_buy_end']; $date->modify('+1 days'); $qb diff --git a/src/Eccube/Repository/LoginHistoryRepository.php b/src/Eccube/Repository/LoginHistoryRepository.php index 2817e98dc9e..077da2fd28c 100644 --- a/src/Eccube/Repository/LoginHistoryRepository.php +++ b/src/Eccube/Repository/LoginHistoryRepository.php @@ -74,13 +74,13 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // create_datetime - if (!empty($searchData['create_datetime_start']) && $searchData['create_datetime_start']) { + if (!empty($searchData['create_datetime_start'])) { $qb ->andWhere('lh.create_date >= :create_datetime_start') ->setParameter('create_datetime_start', $searchData['create_datetime_start']); } - if (!empty($searchData['create_datetime_end']) && $searchData['create_datetime_end']) { + if (!empty($searchData['create_datetime_end'])) { $date = clone $searchData['create_datetime_end']; $qb ->andWhere('lh.create_date < :create_datetime_end') @@ -88,13 +88,13 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // create_date 時間までは要らない人のために残しておきたい - if (!empty($searchData['create_date_start']) && $searchData['create_date_start']) { + if (!empty($searchData['create_date_start'])) { $qb ->andWhere('lh.create_date >= :create_date_start') ->setParameter('create_date_start', $searchData['create_date_start']); } - if (!empty($searchData['create_date_end']) && $searchData['create_date_end']) { + if (!empty($searchData['create_date_end'])) { $date = clone $searchData['create_date_end']; $date->modify('+1 days'); $qb diff --git a/src/Eccube/Repository/OrderRepository.php b/src/Eccube/Repository/OrderRepository.php index 3f7b02e2ea9..f1c34cb4871 100644 --- a/src/Eccube/Repository/OrderRepository.php +++ b/src/Eccube/Repository/OrderRepository.php @@ -13,6 +13,7 @@ namespace Eccube\Repository; +use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\NoResultException; use Doctrine\ORM\QueryBuilder; use Doctrine\Persistence\ManagerRegistry as RegistryInterface; @@ -83,14 +84,14 @@ public function changeStatus($orderId, OrderStatus $Status) * order_id_start?:string|int, * order_id_end?:string|int, * multi?:string|int|null, - * status?:OrderStatus[]|int[], + * status?:OrderStatus[]|int[]|ArrayCollection, * company_name?:string, * name?:string, * kana?:string, * email?:string, * phone_number?:string, - * sex?:Sex[], - * payment?:Payment[], + * sex?:Sex[]|ArrayCollection, + * payment?:Payment[]|ArrayCollection, * order_datetime_start?:\DateTime, * order_datetime_end?:\DateTime, * order_date_start?:\DateTime, @@ -106,14 +107,15 @@ public function changeStatus($orderId, OrderStatus $Status) * payment_total_start?:string|int, * payment_total_end?:string|int, * payment_product_name?:string, - * shipping_mail?:Shipping::SHIPPING_MAIL_UNSENT|Shipping::SHIPPING_MAIL_SENT, + * shipping_mail?:Shipping::SHIPPING_MAIL_UNSENT|Shipping::SHIPPING_MAIL_SENT|ArrayCollection, * tracking_number?:string, * shipping_delivery_datetime_start?:\DateTime, * shipping_delivery_datetime_end?:\DateTime, * shipping_delivery_date_start?:\DateTime, * shipping_delivery_date_end?:\DateTime, * sortkey?:string, - * sorttype?:string + * sorttype?:string, + * buy_product_name?:string * } $searchData * * @return QueryBuilder @@ -173,7 +175,7 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) // status $filterStatus = false; - if (!empty($searchData['status']) && count($searchData['status'])) { + if (!empty($searchData['status']) && count($searchData['status']) > 0) { $qb ->andWhere($qb->expr()->in('o.OrderStatus', ':status')) ->setParameter('status', $searchData['status']); @@ -232,7 +234,7 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // payment - if (!empty($searchData['payment']) && count($searchData['payment'])) { + if (!empty($searchData['payment']) && count($searchData['payment']) > 0) { $payments = []; foreach ($searchData['payment'] as $payment) { $payments[] = $payment->getId(); @@ -244,24 +246,24 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // oreder_date - if (!empty($searchData['order_datetime_start']) && $searchData['order_datetime_start']) { + if (!empty($searchData['order_datetime_start'])) { $date = $searchData['order_datetime_start']; $qb ->andWhere('o.order_date >= :order_date_start') ->setParameter('order_date_start', $date); - } elseif (!empty($searchData['order_date_start']) && $searchData['order_date_start']) { + } elseif (!empty($searchData['order_date_start'])) { $date = $searchData['order_date_start']; $qb ->andWhere('o.order_date >= :order_date_start') ->setParameter('order_date_start', $date); } - if (!empty($searchData['order_datetime_end']) && $searchData['order_datetime_end']) { + if (!empty($searchData['order_datetime_end'])) { $date = $searchData['order_datetime_end']; $qb ->andWhere('o.order_date < :order_date_end') ->setParameter('order_date_end', $date); - } elseif (!empty($searchData['order_date_end']) && $searchData['order_date_end']) { + } elseif (!empty($searchData['order_date_end'])) { $date = clone $searchData['order_date_end']; $date = $date ->modify('+1 days'); @@ -271,24 +273,24 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // payment_date - if (!empty($searchData['payment_datetime_start']) && $searchData['payment_datetime_start']) { + if (!empty($searchData['payment_datetime_start'])) { $date = $searchData['payment_datetime_start']; $qb ->andWhere('o.payment_date >= :payment_date_start') ->setParameter('payment_date_start', $date); - } elseif (!empty($searchData['payment_date_start']) && $searchData['payment_date_start']) { + } elseif (!empty($searchData['payment_date_start'])) { $date = $searchData['payment_date_start']; $qb ->andWhere('o.payment_date >= :payment_date_start') ->setParameter('payment_date_start', $date); } - if (!empty($searchData['payment_datetime_end']) && $searchData['payment_datetime_end']) { + if (!empty($searchData['payment_datetime_end'])) { $date = $searchData['payment_datetime_end']; $qb ->andWhere('o.payment_date < :payment_date_end') ->setParameter('payment_date_end', $date); - } elseif (!empty($searchData['payment_date_end']) && $searchData['payment_date_end']) { + } elseif (!empty($searchData['payment_date_end'])) { $date = clone $searchData['payment_date_end']; $date = $date ->modify('+1 days'); @@ -298,24 +300,24 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // update_date - if (!empty($searchData['update_datetime_start']) && $searchData['update_datetime_start']) { + if (!empty($searchData['update_datetime_start'])) { $date = $searchData['update_datetime_start']; $qb ->andWhere('o.update_date >= :update_date_start') ->setParameter('update_date_start', $date); - } elseif (!empty($searchData['update_date_start']) && $searchData['update_date_start']) { + } elseif (!empty($searchData['update_date_start'])) { $date = $searchData['update_date_start']; $qb ->andWhere('o.update_date >= :update_date_start') ->setParameter('update_date_start', $date); } - if (!empty($searchData['update_datetime_end']) && $searchData['update_datetime_end']) { + if (!empty($searchData['update_datetime_end'])) { $date = $searchData['update_datetime_end']; $qb ->andWhere('o.update_date < :update_date_end') ->setParameter('update_date_end', $date); - } elseif (!empty($searchData['update_date_end']) && $searchData['update_date_end']) { + } elseif (!empty($searchData['update_date_end'])) { $date = clone $searchData['update_date_end']; $date = $date ->modify('+1 days'); @@ -344,8 +346,9 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // 発送メール送信/未送信. - if (isset($searchData['shipping_mail']) && $count = count($searchData['shipping_mail'])) { + if (isset($searchData['shipping_mail']) && count($searchData['shipping_mail']) > 0) { // 送信済/未送信両方にチェックされている場合は検索条件に追加しない + $count = count($searchData['shipping_mail']); if ($count < 2) { $checked = current($searchData['shipping_mail']); if ($checked == Shipping::SHIPPING_MAIL_UNSENT) { @@ -368,24 +371,24 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // お届け予定日(Shipping.delivery_date) - if (!empty($searchData['shipping_delivery_datetime_start']) && $searchData['shipping_delivery_datetime_start']) { + if (!empty($searchData['shipping_delivery_datetime_start'])) { $date = $searchData['shipping_delivery_datetime_start']; $qb ->andWhere('s.shipping_delivery_date >= :shipping_delivery_date_start') ->setParameter('shipping_delivery_date_start', $date); - } elseif (!empty($searchData['shipping_delivery_date_start']) && $searchData['shipping_delivery_date_start']) { + } elseif (!empty($searchData['shipping_delivery_date_start'])) { $date = $searchData['shipping_delivery_date_start']; $qb ->andWhere('s.shipping_delivery_date >= :shipping_delivery_date_start') ->setParameter('shipping_delivery_date_start', $date); } - if (!empty($searchData['shipping_delivery_datetime_end']) && $searchData['shipping_delivery_datetime_end']) { + if (!empty($searchData['shipping_delivery_datetime_end'])) { $date = $searchData['shipping_delivery_datetime_end']; $qb ->andWhere('s.shipping_delivery_date < :shipping_delivery_date_end') ->setParameter('shipping_delivery_date_end', $date); - } elseif (!empty($searchData['shipping_delivery_date_end']) && $searchData['shipping_delivery_date_end']) { + } elseif (!empty($searchData['shipping_delivery_date_end'])) { $date = clone $searchData['shipping_delivery_date_end']; $date = $date ->modify('+1 days'); diff --git a/src/Eccube/Repository/ProductRepository.php b/src/Eccube/Repository/ProductRepository.php index 26cff19cbeb..f6c05d48ed9 100644 --- a/src/Eccube/Repository/ProductRepository.php +++ b/src/Eccube/Repository/ProductRepository.php @@ -152,7 +152,7 @@ public function getQueryBuilderBySearchData($searchData) // category $categoryJoin = false; - if (!empty($searchData['category_id']) && $searchData['category_id']) { + if (!empty($searchData['category_id'])) { $Categories = $searchData['category_id']->getSelfAndDescendants(); if ($Categories) { $qb @@ -290,7 +290,7 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) */ // category - if (!empty($searchData['category_id']) && $searchData['category_id']) { + if (!empty($searchData['category_id'])) { $Categories = $searchData['category_id']->getSelfAndDescendants(); if ($Categories) { $qb @@ -302,7 +302,7 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // status - if (!empty($searchData['status']) && $searchData['status']) { + if (!empty($searchData['status'])) { $qb ->andWhere($qb->expr()->in('p.Status', ':Status')) ->setParameter('Status', $searchData['status']); @@ -323,7 +323,7 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // stock status - if (isset($searchData['stock']) && !empty($searchData['stock'])) { + if (isset($searchData['stock'])) { switch ($searchData['stock']) { case [ProductStock::IN_STOCK]: $qb->andWhere('pc.stock_unlimited = true OR pc.stock > 0'); @@ -337,7 +337,7 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // tag - if (!empty($searchData['tag_id']) && $searchData['tag_id']) { + if (!empty($searchData['tag_id'])) { $qb ->innerJoin('p.ProductTag', 'pt') ->andWhere('pt.Tag = :tag_id') @@ -345,24 +345,24 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // crate_date - if (!empty($searchData['create_datetime_start']) && $searchData['create_datetime_start']) { + if (!empty($searchData['create_datetime_start'])) { $date = $searchData['create_datetime_start']; $qb ->andWhere('p.create_date >= :create_date_start') ->setParameter('create_date_start', $date); - } elseif (!empty($searchData['create_date_start']) && $searchData['create_date_start']) { + } elseif (!empty($searchData['create_date_start'])) { $date = $searchData['create_date_start']; $qb ->andWhere('p.create_date >= :create_date_start') ->setParameter('create_date_start', $date); } - if (!empty($searchData['create_datetime_end']) && $searchData['create_datetime_end']) { + if (!empty($searchData['create_datetime_end'])) { $date = $searchData['create_datetime_end']; $qb ->andWhere('p.create_date < :create_date_end') ->setParameter('create_date_end', $date); - } elseif (!empty($searchData['create_date_end']) && $searchData['create_date_end']) { + } elseif (!empty($searchData['create_date_end'])) { $date = clone $searchData['create_date_end']; $date = $date ->modify('+1 days'); @@ -372,24 +372,24 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // update_date - if (!empty($searchData['update_datetime_start']) && $searchData['update_datetime_start']) { + if (!empty($searchData['update_datetime_start'])) { $date = $searchData['update_datetime_start']; $qb ->andWhere('p.update_date >= :update_date_start') ->setParameter('update_date_start', $date); - } elseif (!empty($searchData['update_date_start']) && $searchData['update_date_start']) { + } elseif (!empty($searchData['update_date_start'])) { $date = $searchData['update_date_start']; $qb ->andWhere('p.update_date >= :update_date_start') ->setParameter('update_date_start', $date); } - if (!empty($searchData['update_datetime_end']) && $searchData['update_datetime_end']) { + if (!empty($searchData['update_datetime_end'])) { $date = $searchData['update_datetime_end']; $qb ->andWhere('p.update_date < :update_date_end') ->setParameter('update_date_end', $date); - } elseif (!empty($searchData['update_date_end']) && $searchData['update_date_end']) { + } elseif (!empty($searchData['update_date_end'])) { $date = clone $searchData['update_date_end']; $date = $date ->modify('+1 days'); diff --git a/src/Eccube/Repository/ShippingRepository.php b/src/Eccube/Repository/ShippingRepository.php index 5cb9951042e..ad4d7992a87 100644 --- a/src/Eccube/Repository/ShippingRepository.php +++ b/src/Eccube/Repository/ShippingRepository.php @@ -145,13 +145,13 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // oreder_date - if (!empty($searchData['order_date_start']) && $searchData['order_date_start']) { + if (!empty($searchData['order_date_start'])) { $date = $searchData['order_date_start']; $qb ->andWhere('o.order_date >= :order_date_start') ->setParameter('order_date_start', $date); } - if (!empty($searchData['order_date_end']) && $searchData['order_date_end']) { + if (!empty($searchData['order_date_end'])) { $date = clone $searchData['order_date_end']; $date = $date ->modify('+1 days'); @@ -161,13 +161,13 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // shipping_delivery_date - if (!empty($searchData['shipping_delivery_date_start']) && $searchData['shipping_delivery_date_start']) { + if (!empty($searchData['shipping_delivery_date_start'])) { $date = $searchData['shipping_delivery_date_start']; $qb ->andWhere('s.shipping_delivery_date >= :shipping_delivery_date_start') ->setParameter('shipping_delivery_date_start', $date); } - if (!empty($searchData['shipping_delivery_date_end']) && $searchData['shipping_delivery_date_end']) { + if (!empty($searchData['shipping_delivery_date_end'])) { $date = clone $searchData['shipping_delivery_date_end']; $date = $date ->modify('+1 days'); @@ -177,13 +177,13 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // shipping_date - if (!empty($searchData['shipping_date_start']) && $searchData['shipping_date_start']) { + if (!empty($searchData['shipping_date_start'])) { $date = $searchData['shipping_date_start']; $qb ->andWhere('s.shipping_date >= :shipping_date_start') ->setParameter('shipping_date_start', $date); } - if (!empty($searchData['shipping_date_end']) && $searchData['shipping_date_end']) { + if (!empty($searchData['shipping_date_end'])) { $date = clone $searchData['shipping_date_end']; $date = $date ->modify('+1 days'); @@ -193,13 +193,13 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // update_date - if (!empty($searchData['update_date_start']) && $searchData['update_date_start']) { + if (!empty($searchData['update_date_start'])) { $date = $searchData['update_date_start']; $qb ->andWhere('s.update_date >= :update_date_start') ->setParameter('update_date_start', $date); } - if (!empty($searchData['update_date_end']) && $searchData['update_date_end']) { + if (!empty($searchData['update_date_end'])) { $date = clone $searchData['update_date_end']; $date = $date ->modify('+1 days'); diff --git a/src/Eccube/Service/Composer/OutputParser.php b/src/Eccube/Service/Composer/OutputParser.php index 6613bf7f580..7a18d6744f1 100644 --- a/src/Eccube/Service/Composer/OutputParser.php +++ b/src/Eccube/Service/Composer/OutputParser.php @@ -63,8 +63,8 @@ public static function parseInfo($output) // 'name' => 'value' $result = array_column($infoLogs, 2, 1); - $result['requires'] = static::parseArrayInfoOutput($rowArray, 'requires'); - $result['requires (dev)'] = static::parseArrayInfoOutput($rowArray, 'requires (dev)'); + $result['requires'] = OutputParser::parseArrayInfoOutput($rowArray, 'requires'); + $result['requires (dev)'] = OutputParser::parseArrayInfoOutput($rowArray, 'requires (dev)'); return $result; } From 828c36e9ea672ea4e1f9beecfe504b4a9eb38cbc 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: Mon, 30 Oct 2023 13:04:44 +0900 Subject: [PATCH 08/90] =?UTF-8?q?PHPStan=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...erRequireAlreadyInstalledPluginsCommand.php | 2 +- src/Eccube/Controller/AbstractController.php | 2 +- .../Controller/Admin/AdminController.php | 2 +- .../Admin/Customer/CustomerEditController.php | 2 ++ .../Controller/Admin/Order/EditController.php | 6 +++--- .../Controller/Admin/Order/MailController.php | 2 +- .../Admin/Product/CategoryController.php | 2 +- .../Admin/Product/CsvImportController.php | 6 +++--- .../Admin/Product/ProductClassController.php | 3 +++ .../Admin/Product/ProductController.php | 4 ++-- .../Admin/Setting/System/LogController.php | 3 ++- src/Eccube/Controller/EntryController.php | 9 +++++---- src/Eccube/Controller/ForgotController.php | 5 ++++- .../Controller/Install/InstallController.php | 5 ++--- .../Controller/InstallPluginController.php | 1 - .../Controller/Mypage/ChangeController.php | 4 +++- .../Controller/Mypage/DeliveryController.php | 4 +++- .../Controller/Mypage/MypageController.php | 3 ++- src/Eccube/Controller/ProductController.php | 4 ++-- src/Eccube/Controller/ShoppingController.php | 4 +++- .../Compiler/NavCompilerPass.php | 2 +- .../Compiler/TwigBlockPass.php | 2 +- src/Eccube/Entity/BaseInfo.php | 4 ++-- src/Eccube/Entity/Cart.php | 4 +++- src/Eccube/Entity/CartItem.php | 4 ++-- src/Eccube/Entity/Customer.php | 12 ++++++------ src/Eccube/Entity/Member.php | 2 +- src/Eccube/Entity/Order.php | 2 +- src/Eccube/Entity/OrderItem.php | 16 ++++++++-------- src/Eccube/Entity/Product.php | 2 +- src/Eccube/Entity/ProductClass.php | 6 +++--- .../EventListener/ForwardOnlyListener.php | 4 +++- src/Eccube/EventListener/LogListener.php | 6 +++++- .../EventListener/LoginHistoryListener.php | 4 ++++ .../EventListener/TransactionListener.php | 6 +++++- .../EventListener/TwoFactorAuthListener.php | 4 ++-- src/Eccube/Form/Type/AddCartType.php | 3 ++- src/Eccube/Form/Type/Shopping/OrderType.php | 2 +- src/Eccube/Log/Processor/TokenProcessor.php | 3 +++ .../Repository/BlockPositionRepository.php | 12 ++++++++---- src/Eccube/Repository/BlockRepository.php | 4 ++-- .../Repository/ClassCategoryRepository.php | 3 ++- .../Repository/MailHistoryRepository.php | 3 ++- .../Security/Core/User/CustomerProvider.php | 3 ++- .../Security/Core/User/MemberProvider.php | 3 ++- .../EccubeAuthenticationFailureHandler.php | 2 ++ .../EccubeAuthenticationSuccessHandler.php | 2 ++ .../Service/Calculator/OrderItemCollection.php | 3 ++- .../Service/Composer/ComposerApiService.php | 1 + .../Composer/ComposerProcessService.php | 2 +- src/Eccube/Service/CsvExportService.php | 2 ++ src/Eccube/Service/OrderHelper.php | 2 +- src/Eccube/Service/OrderStateMachine.php | 2 +- src/Eccube/Service/Payment/Method/Cash.php | 2 +- .../Service/Payment/PaymentDispatcher.php | 4 ++-- .../Service/Payment/PaymentMethodInterface.php | 4 ++-- src/Eccube/Service/PointHelper.php | 1 + .../Service/PurchaseFlow/ItemCollection.php | 5 +++-- .../CustomerPurchaseInfoProcessor.php | 5 +++++ .../Processor/StockMultipleValidator.php | 1 + src/Eccube/Service/SchemaService.php | 13 +++++++++---- src/Eccube/Service/TwoFactorAuthService.php | 18 ++++++++++++------ .../Extension/SafeTextmailEscaperExtension.php | 4 +++- 63 files changed, 167 insertions(+), 95 deletions(-) diff --git a/src/Eccube/Command/ComposerRequireAlreadyInstalledPluginsCommand.php b/src/Eccube/Command/ComposerRequireAlreadyInstalledPluginsCommand.php index f2bf5cfda9a..cbf33756b1b 100644 --- a/src/Eccube/Command/ComposerRequireAlreadyInstalledPluginsCommand.php +++ b/src/Eccube/Command/ComposerRequireAlreadyInstalledPluginsCommand.php @@ -90,7 +90,7 @@ protected function execute(InputInterface $input, OutputInterface $output) ]); $question = new ConfirmationQuestion($message); if (!$this->io->askQuestion($question)) { - return; + return $message; } } diff --git a/src/Eccube/Controller/AbstractController.php b/src/Eccube/Controller/AbstractController.php index f0b4c3b1b19..f7e93fccc13 100644 --- a/src/Eccube/Controller/AbstractController.php +++ b/src/Eccube/Controller/AbstractController.php @@ -54,7 +54,7 @@ class AbstractController extends Controller protected $eventDispatcher; /** - * @var Session + * @var SessionInterface */ protected $session; diff --git a/src/Eccube/Controller/Admin/AdminController.php b/src/Eccube/Controller/Admin/AdminController.php index add186284fe..7c7bf838f78 100644 --- a/src/Eccube/Controller/Admin/AdminController.php +++ b/src/Eccube/Controller/Admin/AdminController.php @@ -428,7 +428,7 @@ public function searchCustomer(Request $request) /** * @param array $excludes * - * @return Request|null + * @return array|Request|null */ protected function getOrderEachStatus(array $excludes) { diff --git a/src/Eccube/Controller/Admin/Customer/CustomerEditController.php b/src/Eccube/Controller/Admin/Customer/CustomerEditController.php index f6101a83543..7cfa6308dfc 100644 --- a/src/Eccube/Controller/Admin/Customer/CustomerEditController.php +++ b/src/Eccube/Controller/Admin/Customer/CustomerEditController.php @@ -22,6 +22,7 @@ use Eccube\Repository\CustomerRepository; use Eccube\Repository\Master\PageMaxRepository; use Eccube\Repository\OrderRepository; +use Eccube\Security\Core\Encoder\PasswordEncoder; use Eccube\Util\StringUtil; use Knp\Component\Pager\PaginatorInterface; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; @@ -140,6 +141,7 @@ public function index(Request $request, PaginatorInterface $paginator, $id = nul if ($Customer->getPlainPassword() !== $this->eccubeConfig['eccube_default_password']) { if ($Customer->getSalt() === null) { + /** @var PasswordEncoder $encoder */ $Customer->setSalt($encoder->createSalt()); $Customer->setSecretKey($this->customerRepository->getUniqueSecretKey()); } diff --git a/src/Eccube/Controller/Admin/Order/EditController.php b/src/Eccube/Controller/Admin/Order/EditController.php index c504f90d64f..b9bf14f7afa 100644 --- a/src/Eccube/Controller/Admin/Order/EditController.php +++ b/src/Eccube/Controller/Admin/Order/EditController.php @@ -466,7 +466,7 @@ public function searchCustomerHtml(Request $request, PaginatorInterface $paginat ['wrap-queries' => true] ); - /** @var $Customers \Eccube\Entity\Customer[] */ + /** @var \Eccube\Entity\Customer[] $Customers */ $Customers = $pagination->getItems(); if (empty($Customers)) { @@ -519,7 +519,7 @@ public function searchCustomerById(Request $request) if ($request->isXmlHttpRequest() && $this->isTokenValid()) { log_debug('search customer by id start.'); - /** @var $Customer \Eccube\Entity\Customer */ + /** @var \Eccube\Entity\Customer $Customer */ $Customer = $this->customerRepository ->find($request->get('id')); @@ -625,7 +625,7 @@ public function searchProduct(Request $request, PaginatorInterface $paginator, $ ['wrap-queries' => true] ); - /** @var $Products \Eccube\Entity\Product[] */ + /** @var \Eccube\Entity\Product[] $Products */ $Products = $pagination->getItems(); if (empty($Products)) { diff --git a/src/Eccube/Controller/Admin/Order/MailController.php b/src/Eccube/Controller/Admin/Order/MailController.php index bb675b0f474..fa6de733e55 100644 --- a/src/Eccube/Controller/Admin/Order/MailController.php +++ b/src/Eccube/Controller/Admin/Order/MailController.php @@ -100,7 +100,7 @@ public function index(Request $request, Order $Order) switch ($mode) { case 'change': if ($form->get('template')->isValid()) { - /** @var $data \Eccube\Entity\MailTemplate */ + /** @var \Eccube\Entity\MailTemplate $data */ $MailTemplate = $form->get('template')->getData(); if ($MailTemplate) { diff --git a/src/Eccube/Controller/Admin/Product/CategoryController.php b/src/Eccube/Controller/Admin/Product/CategoryController.php index 56abb930573..152ea001bd0 100644 --- a/src/Eccube/Controller/Admin/Product/CategoryController.php +++ b/src/Eccube/Controller/Admin/Product/CategoryController.php @@ -319,7 +319,7 @@ public function export(Request $request) $this->csvExportService->exportData(function ($entity, $csvService) use ($request) { $Csvs = $csvService->getCsvs(); - /** @var $Category \Eccube\Entity\Category */ + /** @var \Eccube\Entity\Category $Category */ $Category = $entity; // CSV出力項目と合致するデータを取得. diff --git a/src/Eccube/Controller/Admin/Product/CsvImportController.php b/src/Eccube/Controller/Admin/Product/CsvImportController.php index ccc8c269c18..b012361a287 100644 --- a/src/Eccube/Controller/Admin/Product/CsvImportController.php +++ b/src/Eccube/Controller/Admin/Product/CsvImportController.php @@ -735,7 +735,7 @@ public function csvCategory(Request $request, CacheUtil $cacheUtil) $this->entityManager->getConnection()->beginTransaction(); // CSVファイルの登録処理 foreach ($data as $row) { - /** @var $Category Category */ + /** @var Category $Category */ $Category = new Category(); if (isset($row[$headerByKey['id']]) && strlen($row[$headerByKey['id']]) > 0) { if (!preg_match('/^\d+$/', $row[$headerByKey['id']])) { @@ -792,7 +792,7 @@ public function csvCategory(Request $request, CacheUtil $cacheUtil) return $this->renderWithError($form, $headers); } - /** @var $ParentCategory Category */ + /** @var Category $ParentCategory */ $ParentCategory = $this->categoryRepository->find($row[$headerByKey['parent_category_id']]); if (!$ParentCategory) { $this->addErrors(($data->key() + 1).'行目の親カテゴリIDが存在しません。'); @@ -1696,7 +1696,7 @@ public function splitCsv(Request $request) * * @param Request $request * - * @return \Symfony\Component\HttpFoundation\JsonResponse + * @return \Symfony\Component\HttpFoundation\Response */ public function importCsv(Request $request, CsrfTokenManagerInterface $tokenManager) { diff --git a/src/Eccube/Controller/Admin/Product/ProductClassController.php b/src/Eccube/Controller/Admin/Product/ProductClassController.php index 79c6beefd98..a61f4f4870f 100644 --- a/src/Eccube/Controller/Admin/Product/ProductClassController.php +++ b/src/Eccube/Controller/Admin/Product/ProductClassController.php @@ -28,7 +28,9 @@ use Eccube\Repository\TaxRuleRepository; use Eccube\Util\CacheUtil; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; +use Symfony\Component\Form\ClickableInterface; use Symfony\Component\Form\Extension\Core\Type\FormType; +use Symfony\Component\Form\SubmitButton; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\Routing\Annotation\Route; @@ -145,6 +147,7 @@ public function index(Request $request, $id, CacheUtil $cacheUtil) $this->isTokenValid(); // 登録,更新ボタンが押下されたかどうか. + /** @var ClickableInterface $form['save'] */ $isSave = $form['save']->isClicked(); // 規格名1/2から商品規格の組み合わせを生成する. diff --git a/src/Eccube/Controller/Admin/Product/ProductController.php b/src/Eccube/Controller/Admin/Product/ProductController.php index 245d3911c3b..f6254c61b3f 100644 --- a/src/Eccube/Controller/Admin/Product/ProductController.php +++ b/src/Eccube/Controller/Admin/Product/ProductController.php @@ -1009,10 +1009,10 @@ public function export(Request $request) $this->csvExportService->exportData(function ($entity, CsvExportService $csvService) use ($request) { $Csvs = $csvService->getCsvs(); - /** @var $Product \Eccube\Entity\Product */ + /** @var \Eccube\Entity\Product $Product */ $Product = $entity; - /** @var $ProductClasses \Eccube\Entity\ProductClass[] */ + /** @var \Eccube\Entity\ProductClass[] $ProductClasses */ $ProductClasses = $Product->getProductClasses(); foreach ($ProductClasses as $ProductClass) { diff --git a/src/Eccube/Controller/Admin/Setting/System/LogController.php b/src/Eccube/Controller/Admin/Setting/System/LogController.php index 989e83b379c..0488919cf6d 100644 --- a/src/Eccube/Controller/Admin/Setting/System/LogController.php +++ b/src/Eccube/Controller/Admin/Setting/System/LogController.php @@ -18,6 +18,7 @@ use Eccube\Event\EventArgs; use Eccube\Form\Type\Admin\LogType; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; +use Symfony\Component\Form\Form; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\StreamedResponse; use Symfony\Component\Routing\Annotation\Route; @@ -67,7 +68,7 @@ public function index(Request $request) } $logDir = $this->getParameter('kernel.logs_dir').DIRECTORY_SEPARATOR.$this->getParameter('kernel.environment'); $logFile = $logDir.'/'.$formData['files']; - + /** @var Form $form */ if ($form->getClickedButton() && $form->getClickedButton()->getName() === 'download' && $form->isValid()) { $bufferSize = 1024 * 50; $response = new StreamedResponse(); diff --git a/src/Eccube/Controller/EntryController.php b/src/Eccube/Controller/EntryController.php index 6ed61ea3595..d7c907b1a18 100644 --- a/src/Eccube/Controller/EntryController.php +++ b/src/Eccube/Controller/EntryController.php @@ -22,6 +22,7 @@ use Eccube\Repository\CustomerRepository; use Eccube\Repository\Master\CustomerStatusRepository; use Eccube\Repository\PageRepository; +use Eccube\Security\Core\Encoder\PasswordEncoder; use Eccube\Service\CartService; use Eccube\Service\MailService; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; @@ -131,10 +132,10 @@ public function index(Request $request) return $this->redirectToRoute('mypage'); } - /** @var $Customer \Eccube\Entity\Customer */ + /** @var \Eccube\Entity\Customer $Customer */ $Customer = $this->customerRepository->newCustomer(); - /* @var $builder \Symfony\Component\Form\FormBuilderInterface */ + /* @var \Symfony\Component\Form\FormBuilderInterface $builder */ $builder = $this->formFactory->createBuilder(EntryType::class, $Customer); $event = new EventArgs( @@ -146,7 +147,7 @@ public function index(Request $request) ); $this->eventDispatcher->dispatch($event, EccubeEvents::FRONT_ENTRY_INDEX_INITIALIZE); - /* @var $form \Symfony\Component\Form\FormInterface */ + /* @var \Symfony\Component\Form\FormInterface $form */ $form = $builder->getForm(); $form->handleRequest($request); @@ -167,7 +168,7 @@ public function index(Request $request) case 'complete': log_info('会員登録開始'); - + /** @var PasswordEncoder $encoder */ $encoder = $this->encoderFactory->getEncoder($Customer); $salt = $encoder->createSalt(); $password = $encoder->encodePassword($Customer->getPlainPassword(), $salt); diff --git a/src/Eccube/Controller/ForgotController.php b/src/Eccube/Controller/ForgotController.php index e331eaf66bb..9091567d52a 100644 --- a/src/Eccube/Controller/ForgotController.php +++ b/src/Eccube/Controller/ForgotController.php @@ -18,6 +18,7 @@ use Eccube\Form\Type\Front\ForgotType; use Eccube\Form\Type\Front\PasswordResetType; use Eccube\Repository\CustomerRepository; +use Eccube\Security\Core\Encoder\PasswordEncoder; use Eccube\Service\MailService; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Component\HttpFoundation\Request; @@ -213,7 +214,9 @@ public function reset(Request $request, $reset_key) // 発行したパスワードの暗号化 if ($Customer->getSalt() === null) { - $Customer->setSalt($this->encoderFactory->getEncoder($Customer)->createSalt()); + /** @var PasswordEncoder $encoder */ + $encoder = $this->encoderFactory->getEncoder($Customer); + $Customer->setSalt($encoder->createSalt()); } $encPass = $encoder->encodePassword($pass, $Customer->getSalt()); diff --git a/src/Eccube/Controller/Install/InstallController.php b/src/Eccube/Controller/Install/InstallController.php index 88f71f47dbe..e4a2e305100 100644 --- a/src/Eccube/Controller/Install/InstallController.php +++ b/src/Eccube/Controller/Install/InstallController.php @@ -247,9 +247,8 @@ public function step2() * @Route("/install/step3", name="install_step3", methods={"GET", "POST"}) * @Template("step3.twig") * - * @return array|\Symfony\Component\HttpFoundation\RedirectResponse + * @return array|\Symfony\Component\HttpFoundation\RedirectResponse * - * @throws \Doctrine\DBAL\DBALException * @throws \Exception */ public function step3(Request $request) @@ -1006,7 +1005,7 @@ public function getDatabaseVersion(EntityManager $em) } /** - * @param string + * @param string $adminAllowHosts * * @return string */ diff --git a/src/Eccube/Controller/InstallPluginController.php b/src/Eccube/Controller/InstallPluginController.php index 863b5f027e2..2dc8b1c500c 100644 --- a/src/Eccube/Controller/InstallPluginController.php +++ b/src/Eccube/Controller/InstallPluginController.php @@ -55,7 +55,6 @@ public function __construct(CacheUtil $cacheUtil, PluginRepository $pluginRespos * @Route("/install/plugins", name="install_plugins", methods={"GET"}) * * @param Request $request - * @param string $code * * @return JsonResponse */ diff --git a/src/Eccube/Controller/Mypage/ChangeController.php b/src/Eccube/Controller/Mypage/ChangeController.php index 2d0d862f1ac..ef32ba694bd 100644 --- a/src/Eccube/Controller/Mypage/ChangeController.php +++ b/src/Eccube/Controller/Mypage/ChangeController.php @@ -20,6 +20,7 @@ use Eccube\Form\Type\Front\EntryType; use Eccube\Repository\BaseInfoRepository; use Eccube\Repository\CustomerRepository; +use Eccube\Security\Core\Encoder\PasswordEncoder; use Eccube\Service\MailService; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Component\HttpFoundation\Request; @@ -95,7 +96,7 @@ public function index(Request $request) ); $this->eventDispatcher->dispatch($event, EccubeEvents::FRONT_MYPAGE_CHANGE_INDEX_INITIALIZE); - /* @var $form \Symfony\Component\Form\FormInterface */ + /* @var \Symfony\Component\Form\FormInterface $form */ $form = $builder->getForm(); $form->handleRequest($request); @@ -103,6 +104,7 @@ public function index(Request $request) log_info('会員編集開始'); if ($Customer->getPlainPassword() !== $this->eccubeConfig['eccube_default_password']) { + /** @var PasswordEncoder $encoder */ $encoder = $this->encoderFactory->getEncoder($Customer); if ($Customer->getSalt() === null) { $Customer->setSalt($encoder->createSalt()); diff --git a/src/Eccube/Controller/Mypage/DeliveryController.php b/src/Eccube/Controller/Mypage/DeliveryController.php index 0d4cefed2bc..33fdf0d6e45 100644 --- a/src/Eccube/Controller/Mypage/DeliveryController.php +++ b/src/Eccube/Controller/Mypage/DeliveryController.php @@ -15,6 +15,7 @@ use Eccube\Controller\AbstractController; use Eccube\Entity\BaseInfo; +use Eccube\Entity\Customer; use Eccube\Entity\CustomerAddress; use Eccube\Event\EccubeEvents; use Eccube\Event\EventArgs; @@ -80,6 +81,7 @@ public function index(Request $request) */ public function edit(Request $request, $id = null) { + /** @var Customer $Customer */ $Customer = $this->getUser(); // 配送先住所最大値判定 @@ -181,7 +183,7 @@ public function delete(Request $request, CustomerAddress $CustomerAddress) $this->isTokenValid(); log_info('お届け先削除開始', [$CustomerAddress->getId()]); - + /** @var Customer $Customer */ $Customer = $this->getUser(); if ($Customer->getId() != $CustomerAddress->getCustomer()->getId()) { diff --git a/src/Eccube/Controller/Mypage/MypageController.php b/src/Eccube/Controller/Mypage/MypageController.php index a50e17fa13e..2f935847e15 100644 --- a/src/Eccube/Controller/Mypage/MypageController.php +++ b/src/Eccube/Controller/Mypage/MypageController.php @@ -320,6 +320,7 @@ public function favorite(Request $request, PaginatorInterface $paginator) if (!$this->BaseInfo->isOptionFavoriteProduct()) { throw new NotFoundHttpException(); } + /** @var Customer $Customer */ $Customer = $this->getUser(); // paginator @@ -354,7 +355,7 @@ public function favorite(Request $request, PaginatorInterface $paginator) public function delete(Request $request, Product $Product) { $this->isTokenValid(); - + /** @var Customer $Customer */ $Customer = $this->getUser(); log_info('お気に入り商品削除開始', [$Customer->getId(), $Product->getId()]); diff --git a/src/Eccube/Controller/ProductController.php b/src/Eccube/Controller/ProductController.php index 7736a8d0b91..5bb55656a1e 100644 --- a/src/Eccube/Controller/ProductController.php +++ b/src/Eccube/Controller/ProductController.php @@ -429,9 +429,9 @@ public function addCart(Request $request, Product $Product) /** * ページタイトルの設定 * - * @param array|null $searchData + * @param array|null $searchData * - * @return str + * @return string */ protected function getPageTitle($searchData) { diff --git a/src/Eccube/Controller/ShoppingController.php b/src/Eccube/Controller/ShoppingController.php index edadba4a603..b6ee45cb9da 100644 --- a/src/Eccube/Controller/ShoppingController.php +++ b/src/Eccube/Controller/ShoppingController.php @@ -149,6 +149,7 @@ public function index(PurchaseFlow $cartPurchaseFlow) // 受注の初期化. log_info('[注文手続] 受注の初期化処理を開始します.'); + /** @var Customer $Customer */ $Customer = $this->getUser() ? $this->getUser() : $this->orderHelper->getNonMember(); $Order = $this->orderHelper->initializeOrder($Cart, $Customer); @@ -752,10 +753,11 @@ public function login(Request $request, AuthenticationUtils $authenticationUtils return $this->redirectToRoute('shopping'); } - /* @var $form \Symfony\Component\Form\FormInterface */ + /* @var \Symfony\Component\Form\FormInterface $form */ $builder = $this->formFactory->createNamedBuilder('', CustomerLoginType::class); if ($this->isGranted('IS_AUTHENTICATED_REMEMBERED')) { + /** @var Customer|null $Customer */ $Customer = $this->getUser(); if ($Customer) { $builder->get('login_email')->setData($Customer->getEmail()); diff --git a/src/Eccube/DependencyInjection/Compiler/NavCompilerPass.php b/src/Eccube/DependencyInjection/Compiler/NavCompilerPass.php index 21735f296d4..fe26697832e 100644 --- a/src/Eccube/DependencyInjection/Compiler/NavCompilerPass.php +++ b/src/Eccube/DependencyInjection/Compiler/NavCompilerPass.php @@ -33,7 +33,7 @@ public function process(ContainerBuilder $container) throw new \InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, EccubeNav::class)); } - /** @var $class EccubeNav */ + /** @var EccubeNav $class */ $addNav = $class::getNav(); $nav = array_replace_recursive($nav, $addNav); } diff --git a/src/Eccube/DependencyInjection/Compiler/TwigBlockPass.php b/src/Eccube/DependencyInjection/Compiler/TwigBlockPass.php index 54705e28270..ee56c77c840 100644 --- a/src/Eccube/DependencyInjection/Compiler/TwigBlockPass.php +++ b/src/Eccube/DependencyInjection/Compiler/TwigBlockPass.php @@ -33,7 +33,7 @@ public function process(ContainerBuilder $container) throw new \InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, EccubeTwigBlock::class)); } - /** @var $class EccubeTwigBlock */ + /** @var EccubeTwigBlock $class */ $blocks = $class::getTwigBlock(); foreach ($blocks as $block) { $templates[] = $block; diff --git a/src/Eccube/Entity/BaseInfo.php b/src/Eccube/Entity/BaseInfo.php index 4978ad611de..e3162f0b7b1 100644 --- a/src/Eccube/Entity/BaseInfo.php +++ b/src/Eccube/Entity/BaseInfo.php @@ -157,7 +157,7 @@ class BaseInfo extends \Eccube\Entity\AbstractEntity private $message; /** - * @var string|null + * @var float|string|null * * @ORM\Column(name="delivery_free_amount", type="decimal", precision=12, scale=2, nullable=true, options={"unsigned":true}) */ @@ -727,7 +727,7 @@ public function setDeliveryFreeAmount($deliveryFreeAmount = null) /** * Get deliveryFreeAmount. * - * @return string|null + * @return float|string|null */ public function getDeliveryFreeAmount() { diff --git a/src/Eccube/Entity/Cart.php b/src/Eccube/Entity/Cart.php index 2b84b3919f8..d97bb75222b 100644 --- a/src/Eccube/Entity/Cart.php +++ b/src/Eccube/Entity/Cart.php @@ -235,6 +235,8 @@ public function getCartItems() /** * Alias of getCartItems() + * + * @return ItemCollection */ public function getItems() { @@ -268,7 +270,7 @@ public function setTotalPrice($total_price) } /** - * @return string + * @return float|string */ public function getTotalPrice() { diff --git a/src/Eccube/Entity/CartItem.php b/src/Eccube/Entity/CartItem.php index 549c60ef386..634bdd9ce7a 100644 --- a/src/Eccube/Entity/CartItem.php +++ b/src/Eccube/Entity/CartItem.php @@ -105,7 +105,7 @@ public function setPrice($price) } /** - * @return string + * @return float|string */ public function getPrice() { @@ -125,7 +125,7 @@ public function setQuantity($quantity) } /** - * @return string + * @return float|string */ public function getQuantity() { diff --git a/src/Eccube/Entity/Customer.php b/src/Eccube/Entity/Customer.php index 611414b58d4..71c51420a69 100644 --- a/src/Eccube/Entity/Customer.php +++ b/src/Eccube/Entity/Customer.php @@ -159,14 +159,14 @@ class Customer extends \Eccube\Entity\AbstractEntity implements UserInterface, \ private $last_buy_date; /** - * @var string|null + * @var float|string|null * * @ORM\Column(name="buy_times", type="decimal", precision=10, scale=0, nullable=true, options={"unsigned":true,"default":0}) */ private $buy_times = 0; /** - * @var string|null + * @var float|string|null * * @ORM\Column(name="buy_total", type="decimal", precision=12, scale=2, nullable=true, options={"unsigned":true,"default":0}) */ @@ -194,7 +194,7 @@ class Customer extends \Eccube\Entity\AbstractEntity implements UserInterface, \ private $reset_expire; /** - * @var string + * @var float|string * * @ORM\Column(name="point", type="decimal", precision=12, scale=0, options={"unsigned":false,"default":0}) */ @@ -773,7 +773,7 @@ public function setBuyTimes($buyTimes = null) /** * Get buyTimes. * - * @return string|null + * @return float|string|null */ public function getBuyTimes() { @@ -797,7 +797,7 @@ public function setBuyTotal($buyTotal = null) /** * Get buyTotal. * - * @return string|null + * @return float|string|null */ public function getBuyTotal() { @@ -1155,7 +1155,7 @@ public function getPref() /** * Set point * - * @param string $point + * @param float|string $point * * @return Customer */ diff --git a/src/Eccube/Entity/Member.php b/src/Eccube/Entity/Member.php index 18127b3ebe9..5b457c20793 100644 --- a/src/Eccube/Entity/Member.php +++ b/src/Eccube/Entity/Member.php @@ -489,7 +489,7 @@ public function getLoginDate() /** * Set Work * - * @param \Eccube\Entity\Master\Work + * @param \Eccube\Entity\Master\Work $work * * @return Member */ diff --git a/src/Eccube/Entity/Order.php b/src/Eccube/Entity/Order.php index 62c92e4d5a5..a4f2553d814 100644 --- a/src/Eccube/Entity/Order.php +++ b/src/Eccube/Entity/Order.php @@ -1244,7 +1244,7 @@ public function setPaymentTotal($paymentTotal) /** * Get paymentTotal. * - * @return string + * @return float|string */ public function getPaymentTotal() { diff --git a/src/Eccube/Entity/OrderItem.php b/src/Eccube/Entity/OrderItem.php index aa00f4a2452..76f11577ae1 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 float|string */ public function getPriceIncTax() { @@ -56,7 +56,7 @@ public function getTotalPrice() } /** - * @return integer + * @return integer|null */ public function getOrderItemTypeId() { @@ -471,7 +471,7 @@ public function getClassCategoryName2() /** * Set price. * - * @param string $price + * @param float|int|string $price * * @return OrderItem */ @@ -495,7 +495,7 @@ public function getPrice() /** * Set quantity. * - * @param string $quantity + * @param float|int|string $quantity * * @return OrderItem */ @@ -509,7 +509,7 @@ public function setQuantity($quantity) /** * Get quantity. * - * @return string + * @return float|string */ public function getQuantity() { @@ -525,7 +525,7 @@ public function getTax() } /** - * @param string $tax + * @param float|int|string $tax * * @return $this */ @@ -539,7 +539,7 @@ public function setTax($tax) /** * Set taxRate. * - * @param string $taxRate + * @param float|int|string $taxRate * * @return OrderItem */ @@ -848,7 +848,7 @@ public function setOrderItemType(OrderItemType $orderItemType = null) /** * Get orderItemType * - * @return \Eccube\Entity\Master\OrderItemType + * @return \Eccube\Entity\Master\OrderItemType|null */ public function getOrderItemType() { diff --git a/src/Eccube/Entity/Product.php b/src/Eccube/Entity/Product.php index 9c934e63372..e8fd3240fa4 100644 --- a/src/Eccube/Entity/Product.php +++ b/src/Eccube/Entity/Product.php @@ -973,7 +973,7 @@ public function getProductTag() * Get Tag * フロント側タグsort_no順の配列を作成する * - * @return []Tag + * @return Tag[] */ public function getTags() { diff --git a/src/Eccube/Entity/ProductClass.php b/src/Eccube/Entity/ProductClass.php index ac824c57eff..2894944bdb3 100644 --- a/src/Eccube/Entity/ProductClass.php +++ b/src/Eccube/Entity/ProductClass.php @@ -182,7 +182,7 @@ public function hasClassCategory2() private $code; /** - * @var string|null + * @var float|string|null * * @ORM\Column(name="stock", type="decimal", precision=10, scale=0, nullable=true) */ @@ -388,7 +388,7 @@ public function setStock($stock = null) /** * Get stock. * - * @return string|null + * @return float|string|null */ public function getStock() { @@ -508,7 +508,7 @@ public function setDeliveryFee($deliveryFee = null) /** * Get deliveryFee. * - * @return string|null + * @return float|string|null */ public function getDeliveryFee() { diff --git a/src/Eccube/EventListener/ForwardOnlyListener.php b/src/Eccube/EventListener/ForwardOnlyListener.php index 4ee86df4127..e15b791edc1 100644 --- a/src/Eccube/EventListener/ForwardOnlyListener.php +++ b/src/Eccube/EventListener/ForwardOnlyListener.php @@ -28,7 +28,9 @@ class ForwardOnlyListener implements EventSubscriberInterface /** * Kernel Controller listener callback. * - * @param FilterControllerEvent $event + * @param ControllerEvent $event + * + * @return void */ public function onController(ControllerEvent $event) { diff --git a/src/Eccube/EventListener/LogListener.php b/src/Eccube/EventListener/LogListener.php index 62748d84edd..c80f3e691d8 100644 --- a/src/Eccube/EventListener/LogListener.php +++ b/src/Eccube/EventListener/LogListener.php @@ -113,6 +113,8 @@ public function onKernelController(ControllerEvent $event) /** * @param ResponseEvent $event + * + * @return void */ public function onKernelResponse(ResponseEvent $event) { @@ -125,7 +127,9 @@ public function onKernelResponse(ResponseEvent $event) } /** - * @param PostResponseEvent $event + * @param TerminateEvent $event + * + * @return void */ public function onKernelTerminate(TerminateEvent $event) { diff --git a/src/Eccube/EventListener/LoginHistoryListener.php b/src/Eccube/EventListener/LoginHistoryListener.php index 5e46ef1fd53..73b4fefe0e8 100644 --- a/src/Eccube/EventListener/LoginHistoryListener.php +++ b/src/Eccube/EventListener/LoginHistoryListener.php @@ -103,6 +103,10 @@ public function onInteractiveLogin(InteractiveLoginEvent $event) } } + /** + * @param LoginFailureEvent $event + * @return void + */ public function onAuthenticationFailure(LoginFailureEvent $event) { $request = $this->requestStack->getCurrentRequest(); diff --git a/src/Eccube/EventListener/TransactionListener.php b/src/Eccube/EventListener/TransactionListener.php index d75b4ac9a5c..fe79dcd5498 100644 --- a/src/Eccube/EventListener/TransactionListener.php +++ b/src/Eccube/EventListener/TransactionListener.php @@ -90,6 +90,8 @@ public function onKernelRequest(RequestEvent $event) * Kernel exception listener callback. * * @param ExceptionEvent $event + * + * @return void */ public function onKernelException(ExceptionEvent $event) { @@ -116,7 +118,9 @@ public function onKernelException(ExceptionEvent $event) /** * Kernel terminate listener callback. * - * @param PostResponseEvent $event + * @param TerminateEvent $event + * + * @return void */ public function onKernelTerminate(TerminateEvent $event) { diff --git a/src/Eccube/EventListener/TwoFactorAuthListener.php b/src/Eccube/EventListener/TwoFactorAuthListener.php index 454f8cdc518..bb2511cb33e 100644 --- a/src/Eccube/EventListener/TwoFactorAuthListener.php +++ b/src/Eccube/EventListener/TwoFactorAuthListener.php @@ -52,9 +52,9 @@ class TwoFactorAuthListener implements EventSubscriberInterface /** * @param EccubeConfig $eccubeConfig - * @param Context $context, + * @param Context $requestContext, * @param UrlGeneratorInterface $router - * @param EncoderFactoryInterface $encoderFactory + * @param TwoFactorAuthService $twoFactorAuthService */ public function __construct( EccubeConfig $eccubeConfig, diff --git a/src/Eccube/Form/Type/AddCartType.php b/src/Eccube/Form/Type/AddCartType.php index c91c5ebfd41..9373ed7d078 100644 --- a/src/Eccube/Form/Type/AddCartType.php +++ b/src/Eccube/Form/Type/AddCartType.php @@ -192,8 +192,9 @@ public function getBlockPrefix() /** * validate * - * @param type $data + * @param mixed $data * @param ExecutionContext $context + * @return void */ public function validate($data, ExecutionContext $context) { diff --git a/src/Eccube/Form/Type/Shopping/OrderType.php b/src/Eccube/Form/Type/Shopping/OrderType.php index 7409d9bd2b9..6030e2f8325 100644 --- a/src/Eccube/Form/Type/Shopping/OrderType.php +++ b/src/Eccube/Form/Type/Shopping/OrderType.php @@ -125,7 +125,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) // 支払い方法のプルダウンを生成 $builder->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) { - /** @var Order $Order */ + /** @var Order|null $Order */ $Order = $event->getData(); if (null === $Order || !$Order->getId()) { return; diff --git a/src/Eccube/Log/Processor/TokenProcessor.php b/src/Eccube/Log/Processor/TokenProcessor.php index 7dd9ec54d8b..2c94741d83e 100644 --- a/src/Eccube/Log/Processor/TokenProcessor.php +++ b/src/Eccube/Log/Processor/TokenProcessor.php @@ -13,6 +13,8 @@ namespace Eccube\Log\Processor; +use Eccube\Entity\Customer; +use Eccube\Entity\Member; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; class TokenProcessor @@ -32,6 +34,7 @@ public function __invoke(array $records) $records['extra']['user_id'] = 'N/A'; if (null !== $token = $this->tokenStorage->getToken()) { + /** @var Customer|Member|null $user */ $user = $token->getUser(); $records['extra']['user_id'] = is_object($user) ? $user->getId() diff --git a/src/Eccube/Repository/BlockPositionRepository.php b/src/Eccube/Repository/BlockPositionRepository.php index e2a291e3299..032040507e6 100644 --- a/src/Eccube/Repository/BlockPositionRepository.php +++ b/src/Eccube/Repository/BlockPositionRepository.php @@ -14,7 +14,9 @@ namespace Eccube\Repository; use Doctrine\Persistence\ManagerRegistry as RegistryInterface; +use Eccube\Entity\Block; use Eccube\Entity\BlockPosition; +use Eccube\Entity\Layout; /** * BlockPositionRepository @@ -44,10 +46,12 @@ public function __construct(BlockRepository $blockRepository, RegistryInterface /** * レイアウトに紐づくブロックの個数分登録を行う * - * @param array|null $data - * @param $Blocks - * @param $UnusedBlocks - * @param Eccube\Entity\Layout|null $Layout + * @param array|null $data + * @param Block[] $Blocks + * @param Block[]|null $UnusedBlocks + * @param Layout|null $Layout + * + * @return void */ public function register($data, $Blocks, $UnusedBlocks, $Layout) { diff --git a/src/Eccube/Repository/BlockRepository.php b/src/Eccube/Repository/BlockRepository.php index db42d753b42..56d1407bb50 100644 --- a/src/Eccube/Repository/BlockRepository.php +++ b/src/Eccube/Repository/BlockRepository.php @@ -79,9 +79,9 @@ public function getList($DeviceType) /** * 未設定のブロックを取得 * - * @param Ecube\Entity\Block[] $Blocks + * @param Block[] $Blocks * - * @return Ecube\Entity\Block[]|null + * @return Block[]|null */ public function getUnusedBlocks($Blocks) { diff --git a/src/Eccube/Repository/ClassCategoryRepository.php b/src/Eccube/Repository/ClassCategoryRepository.php index b90eb1d32e0..b2bb29c5cfb 100644 --- a/src/Eccube/Repository/ClassCategoryRepository.php +++ b/src/Eccube/Repository/ClassCategoryRepository.php @@ -60,7 +60,8 @@ public function getList(\Eccube\Entity\ClassName $ClassName = null) /** * 規格カテゴリを登録します. * - * @param $ClassCategory + * @param ClassCategory $ClassCategory + * @return void */ public function save($ClassCategory) { diff --git a/src/Eccube/Repository/MailHistoryRepository.php b/src/Eccube/Repository/MailHistoryRepository.php index 484af257ec8..4b6493b23d4 100644 --- a/src/Eccube/Repository/MailHistoryRepository.php +++ b/src/Eccube/Repository/MailHistoryRepository.php @@ -16,6 +16,7 @@ use Doctrine\ORM\NonUniqueResultException; use Doctrine\ORM\NoResultException; use Doctrine\Persistence\ManagerRegistry as RegistryInterface; +use Eccube\Entity\Customer; use Eccube\Entity\MailHistory; /** @@ -37,7 +38,7 @@ public function __construct(RegistryInterface $registry) } /** - * @param \Eccube\Entity\Customer + * @param Customer $Customer * @param integer $id * @expectedException \Exception|NoResultException|NonUniqueResultException */ diff --git a/src/Eccube/Security/Core/User/CustomerProvider.php b/src/Eccube/Security/Core/User/CustomerProvider.php index 4b8ecccbb32..c1d7e26d1ae 100644 --- a/src/Eccube/Security/Core/User/CustomerProvider.php +++ b/src/Eccube/Security/Core/User/CustomerProvider.php @@ -34,7 +34,8 @@ public function __construct(CustomerRepository $customerRepository) } /** - * @return UserInterface + * @param string $username + * @return Customer * * @throws UserNotFoundException * diff --git a/src/Eccube/Security/Core/User/MemberProvider.php b/src/Eccube/Security/Core/User/MemberProvider.php index cf6729d16c4..4837a27d72c 100644 --- a/src/Eccube/Security/Core/User/MemberProvider.php +++ b/src/Eccube/Security/Core/User/MemberProvider.php @@ -34,7 +34,8 @@ public function __construct(MemberRepository $memberRepository) } /** - * @return UserInterface + * @param string $username + * @return Member * * @throws UserNotFoundException * diff --git a/src/Eccube/Security/Http/Authentication/EccubeAuthenticationFailureHandler.php b/src/Eccube/Security/Http/Authentication/EccubeAuthenticationFailureHandler.php index 0fad7ba9659..02263e4292c 100644 --- a/src/Eccube/Security/Http/Authentication/EccubeAuthenticationFailureHandler.php +++ b/src/Eccube/Security/Http/Authentication/EccubeAuthenticationFailureHandler.php @@ -13,6 +13,7 @@ namespace Eccube\Security\Http\Authentication; +use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\Routing\Exception\RouteNotFoundException; @@ -27,6 +28,7 @@ class EccubeAuthenticationFailureHandler extends DefaultAuthenticationFailureHan public function onAuthenticationFailure(Request $request, AuthenticationException $exception) { try { + /** @var RedirectResponse $response */ $response = parent::onAuthenticationFailure($request, $exception); } catch (RouteNotFoundException $e) { throw new BadRequestHttpException($e->getMessage(), $e, $e->getCode()); diff --git a/src/Eccube/Security/Http/Authentication/EccubeAuthenticationSuccessHandler.php b/src/Eccube/Security/Http/Authentication/EccubeAuthenticationSuccessHandler.php index df77821267e..919f6a5b771 100644 --- a/src/Eccube/Security/Http/Authentication/EccubeAuthenticationSuccessHandler.php +++ b/src/Eccube/Security/Http/Authentication/EccubeAuthenticationSuccessHandler.php @@ -13,6 +13,7 @@ namespace Eccube\Security\Http\Authentication; +use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\Routing\Exception\RouteNotFoundException; @@ -27,6 +28,7 @@ class EccubeAuthenticationSuccessHandler extends DefaultAuthenticationSuccessHan public function onAuthenticationSuccess(Request $request, TokenInterface $token) { try { + /** @var RedirectResponse $response */ $response = parent::onAuthenticationSuccess($request, $token); } catch (RouteNotFoundException $e) { throw new BadRequestHttpException($e->getMessage(), $e, $e->getCode()); diff --git a/src/Eccube/Service/Calculator/OrderItemCollection.php b/src/Eccube/Service/Calculator/OrderItemCollection.php index 3c8fb9df84b..c9f66dc9596 100644 --- a/src/Eccube/Service/Calculator/OrderItemCollection.php +++ b/src/Eccube/Service/Calculator/OrderItemCollection.php @@ -16,6 +16,7 @@ use Eccube\Entity\ItemInterface; use Eccube\Entity\Master\OrderItemType; use Eccube\Entity\Order; +use Eccube\Entity\OrderItem; class OrderItemCollection extends \Doctrine\Common\Collections\ArrayCollection { @@ -75,7 +76,7 @@ public function hasProductByName($productName) { $OrderItems = $this->filter( function (ItemInterface $OrderItem) use ($productName) { - /* @var OrderItem $OrderItem */ + /** @var OrderItem $OrderItem */ return $OrderItem->getProductName() == $productName; }); diff --git a/src/Eccube/Service/Composer/ComposerApiService.php b/src/Eccube/Service/Composer/ComposerApiService.php index 1970081dc54..ec86700d03c 100644 --- a/src/Eccube/Service/Composer/ComposerApiService.php +++ b/src/Eccube/Service/Composer/ComposerApiService.php @@ -348,6 +348,7 @@ public function runCommand($commands, $output = null, $init = true) if ($useBufferedOutput) { ob_end_clean(); + /** @var BufferedOutput $output */ $log = $output->fetch(); if ($exitCode) { log_error($log); diff --git a/src/Eccube/Service/Composer/ComposerProcessService.php b/src/Eccube/Service/Composer/ComposerProcessService.php index 11b5f0ae247..1ff1b504524 100644 --- a/src/Eccube/Service/Composer/ComposerProcessService.php +++ b/src/Eccube/Service/Composer/ComposerProcessService.php @@ -81,7 +81,7 @@ public function execRemove($packageName, $output = null) * * @throws PluginException * - * @param string $command + * @param array $commands */ public function runCommand($commands, $output = null, $init = true) { diff --git a/src/Eccube/Service/CsvExportService.php b/src/Eccube/Service/CsvExportService.php index dcc55b782ee..7e829d8bc9c 100644 --- a/src/Eccube/Service/CsvExportService.php +++ b/src/Eccube/Service/CsvExportService.php @@ -29,6 +29,7 @@ use Eccube\Repository\ProductRepository; use Eccube\Repository\ShippingRepository; use Eccube\Util\FormUtil; +use Knp\Component\Pager\Pagination\AbstractPagination; use Knp\Component\Pager\PaginatorInterface; use Symfony\Component\Form\FormFactoryInterface; use Symfony\Component\HttpFoundation\Request; @@ -291,6 +292,7 @@ public function exportData(\Closure $closure) $page = 1; $limit = 100; while ($results = $this->paginator->paginate($this->qb, $page, $limit)) { + /** @var AbstractPagination $results */ if (!$results->valid()) { break; } diff --git a/src/Eccube/Service/OrderHelper.php b/src/Eccube/Service/OrderHelper.php index 8c6b6675612..0925ca31657 100644 --- a/src/Eccube/Service/OrderHelper.php +++ b/src/Eccube/Service/OrderHelper.php @@ -110,7 +110,7 @@ class OrderHelper protected $deviceTypeRepository; /** - * @var MobileDetector + * @var MobileDetect */ protected $mobileDetector; diff --git a/src/Eccube/Service/OrderStateMachine.php b/src/Eccube/Service/OrderStateMachine.php index dec1b931310..0de18c55f50 100644 --- a/src/Eccube/Service/OrderStateMachine.php +++ b/src/Eccube/Service/OrderStateMachine.php @@ -216,7 +216,7 @@ public function rollbackAddPoint(Event $event) */ public function onCompleted(Event $event) { - /** @var $context OrderStateMachineContext */ + /** @var OrderStateMachineContext $context */ $context = $event->getSubject(); $Order = $context->getOrder(); $CompletedOrderStatus = $this->orderStatusRepository->find($context->getStatus()); diff --git a/src/Eccube/Service/Payment/Method/Cash.php b/src/Eccube/Service/Payment/Method/Cash.php index 6c1f5389c36..e134cd9366b 100644 --- a/src/Eccube/Service/Payment/Method/Cash.php +++ b/src/Eccube/Service/Payment/Method/Cash.php @@ -31,7 +31,7 @@ class Cash implements PaymentMethodInterface /** @var FormInterface */ private $form; - /** @var */ + /** @var PurchaseFlow */ private $purchaseFlow; /** diff --git a/src/Eccube/Service/Payment/PaymentDispatcher.php b/src/Eccube/Service/Payment/PaymentDispatcher.php index 034f511c902..8d1bff31030 100644 --- a/src/Eccube/Service/Payment/PaymentDispatcher.php +++ b/src/Eccube/Service/Payment/PaymentDispatcher.php @@ -108,7 +108,7 @@ public function getQueryParameters() /** * クエリパラメータの配列を設定します. * - * @param array + * @param array $queryParameters * * @return PaymentDispatcher */ @@ -132,7 +132,7 @@ public function getPathParameters() /** * パスパラメータの配列を設定します. * - * @param array + * @param array $pathParameters * * @return PaymentDispatcher */ diff --git a/src/Eccube/Service/Payment/PaymentMethodInterface.php b/src/Eccube/Service/Payment/PaymentMethodInterface.php index 5a8cde08f43..205289626c6 100644 --- a/src/Eccube/Service/Payment/PaymentMethodInterface.php +++ b/src/Eccube/Service/Payment/PaymentMethodInterface.php @@ -53,7 +53,7 @@ public function apply(); /** * PaymentMethod の処理に必要な FormInterface を設定します. * - * @param FormInterface + * @param FormInterface $form * * @return PaymentMethod */ @@ -62,7 +62,7 @@ public function setFormType(FormInterface $form); /** * この決済を使用する Order を設定します. * - * @param Order + * @param Order $Order * * @return PaymentMethod */ diff --git a/src/Eccube/Service/PointHelper.php b/src/Eccube/Service/PointHelper.php index 6bc0cb8c988..5445501d618 100644 --- a/src/Eccube/Service/PointHelper.php +++ b/src/Eccube/Service/PointHelper.php @@ -18,6 +18,7 @@ use Eccube\Entity\Master\OrderItemType; use Eccube\Entity\Master\TaxDisplayType; use Eccube\Entity\Master\TaxType; +use Eccube\Entity\Order; use Eccube\Entity\OrderItem; use Eccube\Repository\BaseInfoRepository; use Eccube\Service\PurchaseFlow\Processor\PointProcessor; diff --git a/src/Eccube/Service/PurchaseFlow/ItemCollection.php b/src/Eccube/Service/PurchaseFlow/ItemCollection.php index 7ae25143e05..fe9eec0663f 100644 --- a/src/Eccube/Service/PurchaseFlow/ItemCollection.php +++ b/src/Eccube/Service/PurchaseFlow/ItemCollection.php @@ -18,6 +18,7 @@ use Eccube\Entity\ItemInterface; use Eccube\Entity\Master\OrderItemType; use Eccube\Entity\Order; +use Eccube\Entity\OrderItem; class ItemCollection extends ArrayCollection { @@ -80,7 +81,7 @@ public function hasProductByName($productName) { $OrderItems = $this->filter( function (ItemInterface $OrderItem) use ($productName) { - /* @var OrderItem $OrderItem */ + /** @var OrderItem $OrderItem */ return $OrderItem->getProductName() == $productName; }); @@ -97,7 +98,7 @@ function (ItemInterface $OrderItem) use ($productName) { public function hasItemByOrderItemType($OrderItemType) { $filteredItems = $this->filter(function (ItemInterface $OrderItem) use ($OrderItemType) { - /* @var OrderItem $OrderItem */ + /** @var OrderItem $OrderItem */ return $OrderItem->getOrderItemType() && $OrderItem->getOrderItemType()->getId() == $OrderItemType->getId(); }); diff --git a/src/Eccube/Service/PurchaseFlow/Processor/CustomerPurchaseInfoProcessor.php b/src/Eccube/Service/PurchaseFlow/Processor/CustomerPurchaseInfoProcessor.php index 799c018c5db..cd093a3f057 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/CustomerPurchaseInfoProcessor.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/CustomerPurchaseInfoProcessor.php @@ -22,6 +22,11 @@ */ class CustomerPurchaseInfoProcessor extends AbstractPurchaseProcessor { + /** + * @param ItemHolderInterface $target + * @param PurchaseContext $context + * @return void + */ public function commit(ItemHolderInterface $target, PurchaseContext $context) { if (!$target instanceof Order) { diff --git a/src/Eccube/Service/PurchaseFlow/Processor/StockMultipleValidator.php b/src/Eccube/Service/PurchaseFlow/Processor/StockMultipleValidator.php index 66e9e006da1..6d05d9fb86a 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/StockMultipleValidator.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/StockMultipleValidator.php @@ -14,6 +14,7 @@ namespace Eccube\Service\PurchaseFlow\Processor; use Eccube\Entity\ItemHolderInterface; +use Eccube\Entity\ProductClass; use Eccube\Entity\Shipping; use Eccube\Repository\ProductClassRepository; use Eccube\Service\PurchaseFlow\ItemHolderValidator; diff --git a/src/Eccube/Service/SchemaService.php b/src/Eccube/Service/SchemaService.php index 69d32f1ef49..083caa6595b 100644 --- a/src/Eccube/Service/SchemaService.php +++ b/src/Eccube/Service/SchemaService.php @@ -52,10 +52,11 @@ public function __construct(EntityManagerInterface $entityManager, PluginContext * Metadata を出力する一時ディレクトリを指定しない場合は内部で生成し, コールバック関数実行後に削除されます. * * @param callable $callback Metadata を生成した後に実行されるコールバック関数 - * @param array $generatedFiles Proxy ファイルパスの配列 + * @param array $generatedFiles Proxy ファイルパスの配列 * @param string $proxiesDirectory Proxy ファイルを格納したディレクトリ - * @param bool $saveMode UpdateSchema を即時実行する場合 true * @param string $outputDir Metadata の出力先ディレクトリ + * + * @return void */ public function executeCallback(callable $callback, $generatedFiles, $proxiesDirectory, $outputDir = null) { @@ -111,9 +112,11 @@ public function executeCallback(callable $callback, $generatedFiles, $proxiesDir /** * Doctrine Metadata を生成して UpdateSchema を実行する. * - * @param array $generatedFiles Proxy ファイルパスの配列 + * @param array $generatedFiles Proxy ファイルパスの配列 * @param string $proxiesDirectory Proxy ファイルを格納したディレクトリ * @param bool $saveMode UpdateSchema を即時実行する場合 true + * + * @return void */ public function updateSchema($generatedFiles, $proxiesDirectory, $saveMode = false) { @@ -125,7 +128,9 @@ public function updateSchema($generatedFiles, $proxiesDirectory, $saveMode = fal /** * ネームスペースに含まれるEntityのテーブルを削除する * - * @param $targetNamespace string 削除対象のネームスペース + * @param string $targetNamespace 削除対象のネームスペース + * + * @return void */ public function dropTable($targetNamespace) { diff --git a/src/Eccube/Service/TwoFactorAuthService.php b/src/Eccube/Service/TwoFactorAuthService.php index fdb7db5c168..a014cd76d5c 100644 --- a/src/Eccube/Service/TwoFactorAuthService.php +++ b/src/Eccube/Service/TwoFactorAuthService.php @@ -14,6 +14,8 @@ namespace Eccube\Service; use Eccube\Common\EccubeConfig; +use Eccube\Entity\Member; +use Eccube\Security\Core\Encoder\PasswordEncoder; use RobThree\Auth\TwoFactorAuth; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\Cookie; @@ -110,7 +112,7 @@ public function __construct( } /** - * @param Eccube\Entity\Member + * @param Member $Member * * @return boolean */ @@ -118,7 +120,9 @@ public function isAuth($Member) { if (($json = $this->request->cookies->get($this->cookieName))) { $configs = json_decode($json); - $encodedString = $this->encoder->encodePassword($Member->getId().$Member->getTwoFactorAuthKey(), $Member->getSalt()); + /** @var PasswordEncoder $encoder */ + $encoder = $this->encoder; + $encodedString = $encoder->encodePassword($Member->getId().$Member->getTwoFactorAuthKey(), $Member->getSalt()); if ( $configs && isset($configs->{$Member->getId()}) @@ -138,13 +142,15 @@ public function isAuth($Member) } /** - * @param Eccube\Entity\Member + * @param Member $Member * * @return Cookie */ public function createAuthedCookie($Member) { - $encodedString = $this->encoder->encodePassword($Member->getId().$Member->getTwoFactorAuthKey(), $Member->getSalt()); + /** @var PasswordEncoder $encoder */ + $encoder = $this->encoder; + $encodedString = $encoder->encodePassword($Member->getId().$Member->getTwoFactorAuthKey(), $Member->getSalt()); $configs = json_decode('{}'); if (($json = $this->request->cookies->get($this->cookieName))) { @@ -171,8 +177,8 @@ public function createAuthedCookie($Member) } /** - * @param Eccube\Entity\Member - * @param string + * @param string $authKey + * @param string $token * * @return boolean */ diff --git a/src/Eccube/Twig/Extension/SafeTextmailEscaperExtension.php b/src/Eccube/Twig/Extension/SafeTextmailEscaperExtension.php index d62b63bb752..7453d110ac2 100644 --- a/src/Eccube/Twig/Extension/SafeTextmailEscaperExtension.php +++ b/src/Eccube/Twig/Extension/SafeTextmailEscaperExtension.php @@ -20,7 +20,9 @@ class SafeTextmailEscaperExtension extends AbstractExtension { public function __construct(\Twig\Environment $twig) { - $twig->getExtension(EscaperExtension::class)->setEscaper( + /** @var EscaperExtension $escaper */ + $escaper = $twig->getExtension(EscaperExtension::class); + $escaper->setEscaper( 'safe_textmail', function ($twig, $string, $charset) { return str_replace(['<', '>'], ['＜', '＞'], $string); } From a5f5c9b72e97ec85a936aaa036da208b87b44591 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Mon, 6 Nov 2023 12:19:36 +0900 Subject: [PATCH 09/90] =?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 10/90] =?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 11/90] =?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 12/90] =?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 13/90] =?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 14/90] =?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 15/90] =?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 16/90] =?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 17/90] =?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 18/90] =?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 e07e05bdb3c3185c04d8dda9e64651cabfb6ec6c 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 19/90] =?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 | 6 +- .../Admin/Store/TemplateController.php | 2 +- 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 | 14 ++-- 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 +++ 45 files changed, 252 insertions(+), 222 deletions(-) create mode 100644 tests/object-manager.php diff --git a/Dockerfile b/Dockerfile index 6a1a0d2ded7..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,8 +32,8 @@ RUN apt update \ && echo "en_US.UTF-8 UTF-8" >/etc/locale.gen \ && locale-gen \ ; -RUN pecl search xdebug-2.9.8 \ - && pecl install xdebug-2.9.8 +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 \ diff --git a/src/Eccube/Controller/Admin/Store/TemplateController.php b/src/Eccube/Controller/Admin/Store/TemplateController.php index bf64579a411..00327ed994d 100644 --- a/src/Eccube/Controller/Admin/Store/TemplateController.php +++ b/src/Eccube/Controller/Admin/Store/TemplateController.php @@ -230,7 +230,7 @@ public function install(Request $request) /** @var \Eccube\Entity\Template $Template */ $Template = $form->getData(); - $TemplateExists = $this->templateRepository->findBy(['code' => $Template->getCode()]); + $TemplateExists = $this->templateRepository->findByCode($Template->getCode()); // テンプレートコードの重複チェック. if ($TemplateExists) { 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 e3162f0b7b1..27f51b0fe41 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 d97bb75222b..dd1fef5ad33 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() { @@ -258,7 +260,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 634bdd9ce7a..054fcd97653 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 71c51420a69..965ea809e5c 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 5b457c20793..46f2900c71e 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 3abfa2559be..8658e1e40fb 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 a4f2553d814..fb6dfefa6a6 100644 --- a/src/Eccube/Entity/Order.php +++ b/src/Eccube/Entity/Order.php @@ -353,14 +353,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) */ @@ -430,35 +430,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 float + * @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}) * @@ -467,14 +467,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}) */ @@ -555,21 +555,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({ @@ -579,7 +579,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({ @@ -589,7 +589,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({ @@ -599,7 +599,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({ @@ -609,7 +609,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({ @@ -619,7 +619,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({ @@ -629,7 +629,7 @@ public function getTotalPrice() private $Job; /** - * @var \Eccube\Entity\Payment + * @var \Eccube\Entity\Payment|null * * @ORM\ManyToOne(targetEntity="Eccube\Entity\Payment") * @ORM\JoinColumns({ @@ -639,7 +639,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({ @@ -651,7 +651,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({ @@ -663,7 +663,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({ @@ -673,7 +673,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({ @@ -1080,7 +1080,7 @@ public function getBirth() /** * Set subtotal. * - * @param string $subtotal + * @param float|int|string $subtotal * * @return Order */ @@ -1130,7 +1130,7 @@ public function getDiscount() /** * Set deliveryFeeTotal. * - * @param string $deliveryFeeTotal + * @param float|int|string $deliveryFeeTotal * * @return Order */ @@ -1144,7 +1144,7 @@ public function setDeliveryFeeTotal($deliveryFeeTotal) /** * Get deliveryFeeTotal. * - * @return string + * @return float|int|string */ public function getDeliveryFeeTotal() { @@ -1154,7 +1154,7 @@ public function getDeliveryFeeTotal() /** * Set charge. * - * @param string $charge + * @param float|int|string $charge * * @return Order */ @@ -1178,7 +1178,7 @@ public function getCharge() /** * Set tax. * - * @param string $tax + * @param float|int|string $tax * * @return Order * @@ -1206,7 +1206,7 @@ public function getTax() /** * Set total. * - * @param string $total + * @param float|int|string $total * * @return Order */ @@ -1220,7 +1220,7 @@ public function setTotal($total) /** * Get total. * - * @return string + * @return float|int|string */ public function getTotal() { @@ -1230,7 +1230,7 @@ public function getTotal() /** * Set paymentTotal. * - * @param string $paymentTotal + * @param float|int|string $paymentTotal * * @return Order */ @@ -1462,7 +1462,7 @@ public function getCompleteMailMessage() /** * @param string|null $complete_mail_message * - * @return + * @return $this */ public function setCompleteMailMessage($complete_mail_message = null) { @@ -1474,7 +1474,7 @@ public function setCompleteMailMessage($complete_mail_message = null) /** * @param string|null $complete_mail_message * - * @return + * @return $this */ public function appendCompleteMailMessage($complete_mail_message = null) { @@ -1524,7 +1524,7 @@ public function removeOrderItem(OrderItem $OrderItem) /** * Get orderItems. * - * @return \Doctrine\Common\Collections\Collection|OrderItem[] + * @return \Doctrine\Common\Collections\Collection */ public function getOrderItems() { @@ -1570,7 +1570,7 @@ public function removeShipping(Shipping $Shipping) /** * Get shippings. * - * @return \Doctrine\Common\Collections\Collection|\Eccube\Entity\Shipping[] + * @return \Doctrine\Common\Collections\Collection */ public function getShippings() { @@ -1858,6 +1858,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 76f11577ae1..92db49c5b71 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 3920bea3f63..565c5a2b90d 100644 --- a/src/Eccube/Entity/Payment.php +++ b/src/Eccube/Entity/Payment.php @@ -52,14 +52,14 @@ public function __toString() private $method; /** - * @var float|null + * @var float|string|null * * @ORM\Column(name="charge", type="decimal", precision=12, scale=2, nullable=true, options={"unsigned":true,"default":0}) */ private $charge = 0; /** - * @var float|null + * @var float|string|null * * @ORM\Column(name="rule_max", type="decimal", precision=12, scale=2, nullable=true, options={"unsigned":true}) */ @@ -87,7 +87,7 @@ public function __toString() private $payment_image; /** - * @var float|null + * @var float|string|null * * @ORM\Column(name="rule_min", type="decimal", precision=12, scale=2, nullable=true, options={"unsigned":true}) */ @@ -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 e8fd3240fa4..3209c6af845 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 2894944bdb3..1dc28cdf2f7 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 float|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 ff1b7ebaf96d3cdd125d8338823098bbf0786b61 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Mon, 6 Nov 2023 16:30:45 +0900 Subject: [PATCH 20/90] =?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 21/90] =?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 22/90] =?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 23/90] =?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 24/90] =?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 25/90] =?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 26/90] =?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 27/90] =?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 28/90] =?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) From 471bce0f4a31bf17fbec7805795121a412549d49 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: Mon, 6 Nov 2023 19:17:05 +0900 Subject: [PATCH 29/90] =?UTF-8?q?PHPStanLevel2=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dist | 8 +- Dockerfile | 15 +- app/config/eccube/packages/doctrine.yaml | 1 + app/template/admin/.gitkeep | 0 app/template/default/.gitkeep | 0 app/template/plugin/.gitkeep | 0 app/template/smartphone/.gitkeep | 0 app/template/user_data/.gitkeep | 0 composer.json | 20 +- composer.lock | 2593 +++++++---------- docker-compose.yml | 2 + dockerbuild/php.ini | 6 + phpdoc_result_script.sh | 8 + phpstan.neon.dist | 12 +- ...rRequireAlreadyInstalledPluginsCommand.php | 2 +- .../Command/GenerateDummyDataCommand.php | 2 +- src/Eccube/Command/InstallerCommand.php | 3 - .../Command/LoadDataFixturesEccubeCommand.php | 2 +- src/Eccube/Controller/AbstractController.php | 2 +- .../Controller/Admin/AdminController.php | 2 +- .../Admin/Order/CsvImportController.php | 7 +- .../Controller/Admin/Order/EditController.php | 2 +- .../Controller/Admin/Order/MailController.php | 2 +- .../Admin/Order/ShippingController.php | 2 +- .../Admin/Product/CsvImportController.php | 4 +- .../Admin/Product/ProductController.php | 10 +- .../Controller/Install/InstallController.php | 2 +- src/Eccube/Controller/ShoppingController.php | 2 +- .../TaxRuleEventSubscriber.php | 2 +- src/Eccube/Doctrine/Query/Queries.php | 2 +- src/Eccube/Entity/BaseInfo.php | 2 +- src/Eccube/Entity/ItemHolderInterface.php | 11 + src/Eccube/Entity/ItemInterface.php | 8 + src/Eccube/Entity/News.php | 2 +- src/Eccube/Entity/OrderItem.php | 2 +- .../Form/Extension/DoctrineOrmExtension.php | 2 +- src/Eccube/Form/Type/AddCartType.php | 3 +- src/Eccube/Form/Type/Admin/OrderType.php | 2 +- src/Eccube/Repository/AbstractRepository.php | 7 +- .../CustomerFavoriteProductRepository.php | 5 +- src/Eccube/Repository/CustomerRepository.php | 36 +- .../Repository/LoginHistoryRepository.php | 8 +- src/Eccube/Repository/MemberRepository.php | 2 +- src/Eccube/Repository/OrderRepository.php | 44 +- src/Eccube/Repository/ProductRepository.php | 26 +- src/Eccube/Repository/ShippingRepository.php | 16 +- src/Eccube/Service/CsvImportService.php | 2 +- .../Payment/PaymentMethodInterface.php | 8 +- src/Eccube/Service/PluginService.php | 7 +- src/Eccube/Service/PointHelper.php | 12 +- .../Processor/AddPointProcessor.php | 2 +- .../Processor/DeliveryFeePreprocessor.php | 8 +- .../Processor/EmptyItemsValidator.php | 3 + .../PurchaseFlow/Processor/PointProcessor.php | 3 + .../Processor/StockDiffProcessor.php | 5 +- .../Processor/StockMultipleValidator.php | 5 +- src/Eccube/Service/TwoFactorAuthService.php | 12 +- .../IgnoreTwigSandboxErrorExtension.php | 1 + tests/object-manager.php | 3 +- tests/results/convert.php | 37 + tests/results/error_csv.csv | 66 + 61 files changed, 1341 insertions(+), 1722 deletions(-) delete mode 100644 app/template/admin/.gitkeep delete mode 100644 app/template/default/.gitkeep delete mode 100644 app/template/plugin/.gitkeep delete mode 100644 app/template/smartphone/.gitkeep delete mode 100644 app/template/user_data/.gitkeep create mode 100644 phpdoc_result_script.sh create mode 100644 tests/results/convert.php create mode 100644 tests/results/error_csv.csv diff --git a/.env.dist b/.env.dist index 53543f64112..07559a8370f 100644 --- a/.env.dist +++ b/.env.dist @@ -5,8 +5,8 @@ ###> symfony/framework-bundle ### # For production servers, use: "APP_ENV=prod" and "APP_DEBUG=0" # For local development, use: "APP_ENV=dev" and "APP_DEBUG=1" -APP_ENV=prod -APP_DEBUG=0 +APP_ENV=dev +APP_DEBUG=1 #TRUSTED_PROXIES=127.0.0.1,127.0.0.2 #TRUSTED_HOSTS=^localhost$,^example\.com$ ###< symfony/framework-bundle ### @@ -15,8 +15,8 @@ APP_DEBUG=0 # Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url # For a sqlite database, use: "sqlite:///%kernel.project_dir%/var/data.db" # Set "serverVersion" to your server version to avoid edge-case exceptions and extra database calls -DATABASE_URL=sqlite:///var/eccube.db -# DATABASE_URL=mysql://dbuser:secret@mysql/eccubedb +# DATABASE_URL=sqlite:///var/eccube.db +DATABASE_URL=mysql://dbuser:secret@mysql/eccubedb # DATABASE_URL=postgresql://postgres/eccubedb?user=dbuser&password=secret # The version of your database engine diff --git a/Dockerfile b/Dockerfile index b3895e73733..e63a63527fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,13 +32,12 @@ 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 pecl search xdebug-3.2.1 \ + && pecl install xdebug-3.2.1 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 @@ -76,10 +75,10 @@ RUN composer config -g repos.packagist composer https://packagist.jp COPY . ${APACHE_DOCUMENT_ROOT} WORKDIR ${APACHE_DOCUMENT_ROOT} -RUN find ${APACHE_DOCUMENT_ROOT} \( -path ${APACHE_DOCUMENT_ROOT}/vendor -prune \) -or -print0 \ - | xargs -0 chown www-data:www-data \ - && find ${APACHE_DOCUMENT_ROOT} \( -path ${APACHE_DOCUMENT_ROOT}/vendor -prune \) -or \( -type d -print0 \) \ - | xargs -0 chmod g+s \ - ; +#RUN find ${APACHE_DOCUMENT_ROOT} \( -path ${APACHE_DOCUMENT_ROOT}/vendor -prune \) -or -print0 \ +# | xargs -0 chown www-data:www-data \ +# && find ${APACHE_DOCUMENT_ROOT} \( -path ${APACHE_DOCUMENT_ROOT}/vendor -prune \) -or \( -type d -print0 \) \ +# | xargs -0 chmod g+s \ +# ; HEALTHCHECK --interval=10s --timeout=5s --retries=30 CMD pgrep apache diff --git a/app/config/eccube/packages/doctrine.yaml b/app/config/eccube/packages/doctrine.yaml index fd2e627acac..61932270035 100644 --- a/app/config/eccube/packages/doctrine.yaml +++ b/app/config/eccube/packages/doctrine.yaml @@ -25,6 +25,7 @@ doctrine: types: datetime: 'Eccube\Doctrine\DBAL\Types\UTCDateTimeType' datetimetz: 'Eccube\Doctrine\DBAL\Types\UTCDateTimeTzType' + default_connection: 'default' orm: auto_generate_proxy_classes: '%kernel.debug%' naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware diff --git a/app/template/admin/.gitkeep b/app/template/admin/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/app/template/default/.gitkeep b/app/template/default/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/app/template/plugin/.gitkeep b/app/template/plugin/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/app/template/smartphone/.gitkeep b/app/template/smartphone/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/app/template/user_data/.gitkeep b/app/template/user_data/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/composer.json b/composer.json index ca8d8dcc670..715e4f1e3ea 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: abcxyzABCXYZ123098"] + } + } } } } diff --git a/composer.lock b/composer.lock index 3a602ea2f7a..8a076a21782 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b05fb2f10279b2e65fbb66f5e802c8cb", + "content-hash": "f841f7f5c18bd3b3cf0f8acced05f5e2", "packages": [ { "name": "composer/ca-bundle", - "version": "1.3.4", + "version": "1.3.7", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "69098eca243998b53eed7a48d82dedd28b447cd5" + "reference": "76e46335014860eec1aa5a724799a00a2e47cc85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/69098eca243998b53eed7a48d82dedd28b447cd5", - "reference": "69098eca243998b53eed7a48d82dedd28b447cd5", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/76e46335014860eec1aa5a724799a00a2e47cc85", + "reference": "76e46335014860eec1aa5a724799a00a2e47cc85", "shasum": "" }, "require": { @@ -61,11 +61,6 @@ "ssl", "tls" ], - "support": { - "irc": "irc://irc.freenode.org/composer", - "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.3.4" - }, "funding": [ { "url": "https://packagist.com", @@ -80,26 +75,26 @@ "type": "tidelift" } ], - "time": "2022-10-12T12:08:29+00:00" + "time": "2023-08-30T09:31:38+00:00" }, { "name": "composer/class-map-generator", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/composer/class-map-generator.git", - "reference": "1e1cb2b791facb2dfe32932a7718cf2571187513" + "reference": "953cc4ea32e0c31f2185549c7d216d7921f03da9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/class-map-generator/zipball/1e1cb2b791facb2dfe32932a7718cf2571187513", - "reference": "1e1cb2b791facb2dfe32932a7718cf2571187513", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/953cc4ea32e0c31f2185549c7d216d7921f03da9", + "reference": "953cc4ea32e0c31f2185549c7d216d7921f03da9", "shasum": "" }, "require": { - "composer/pcre": "^2 || ^3", + "composer/pcre": "^2.1 || ^3.1", "php": "^7.2 || ^8.0", - "symfony/finder": "^4.4 || ^5.3 || ^6" + "symfony/finder": "^4.4 || ^5.3 || ^6 || ^7" }, "require-dev": { "phpstan/phpstan": "^1.6", @@ -135,10 +130,6 @@ "keywords": [ "classmap" ], - "support": { - "issues": "https://github.com/composer/class-map-generator/issues", - "source": "https://github.com/composer/class-map-generator/tree/1.0.0" - }, "funding": [ { "url": "https://packagist.com", @@ -153,20 +144,20 @@ "type": "tidelift" } ], - "time": "2022-06-19T11:31:27+00:00" + "time": "2023-06-30T13:58:57+00:00" }, { "name": "composer/composer", - "version": "2.5.1", + "version": "2.6.5", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "923278ad13e1621946eb76ab2882655d2cc396a4" + "reference": "4b0fe89db9e65b1e64df633a992e70a7a215ab33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/923278ad13e1621946eb76ab2882655d2cc396a4", - "reference": "923278ad13e1621946eb76ab2882655d2cc396a4", + "url": "https://api.github.com/repos/composer/composer/zipball/4b0fe89db9e65b1e64df633a992e70a7a215ab33", + "reference": "4b0fe89db9e65b1e64df633a992e70a7a215ab33", "shasum": "" }, "require": { @@ -174,23 +165,23 @@ "composer/class-map-generator": "^1.0", "composer/metadata-minifier": "^1.0", "composer/pcre": "^2.1 || ^3.1", - "composer/semver": "^3.0", + "composer/semver": "^3.2.5", "composer/spdx-licenses": "^1.5.7", "composer/xdebug-handler": "^2.0.2 || ^3.0.3", "justinrainbow/json-schema": "^5.2.11", "php": "^7.2.5 || ^8.0", "psr/log": "^1.0 || ^2.0 || ^3.0", - "react/promise": "^2.8", + "react/promise": "^2.8 || ^3", "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.2", "seld/signal-handler": "^2.0", - "symfony/console": "^5.4.11 || ^6.0.11", - "symfony/filesystem": "^5.4 || ^6.0", - "symfony/finder": "^5.4 || ^6.0", + "symfony/console": "^5.4.11 || ^6.0.11 || ^7", + "symfony/filesystem": "^5.4 || ^6.0 || ^7", + "symfony/finder": "^5.4 || ^6.0 || ^7", "symfony/polyfill-php73": "^1.24", "symfony/polyfill-php80": "^1.24", "symfony/polyfill-php81": "^1.24", - "symfony/process": "^5.4 || ^6.0" + "symfony/process": "^5.4 || ^6.0 || ^7" }, "require-dev": { "phpstan/phpstan": "^1.9.3", @@ -198,7 +189,7 @@ "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-strict-rules": "^1", "phpstan/phpstan-symfony": "^1.2.10", - "symfony/phpunit-bridge": "^6.0" + "symfony/phpunit-bridge": "^6.0 || ^7" }, "suggest": { "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -211,7 +202,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "2.6-dev" }, "phpstan": { "includes": [ @@ -221,7 +212,7 @@ }, "autoload": { "psr-4": { - "Composer\\": "src/Composer" + "Composer\\": "src/Composer/" } }, "notification-url": "https://packagist.org/downloads/", @@ -247,11 +238,6 @@ "dependency", "package" ], - "support": { - "irc": "ircs://irc.libera.chat:6697/composer", - "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/2.5.1" - }, "funding": [ { "url": "https://packagist.com", @@ -266,7 +252,7 @@ "type": "tidelift" } ], - "time": "2022-12-22T14:33:54+00:00" + "time": "2023-10-06T08:11:52+00:00" }, { "name": "composer/metadata-minifier", @@ -317,10 +303,6 @@ "composer", "compression" ], - "support": { - "issues": "https://github.com/composer/metadata-minifier/issues", - "source": "https://github.com/composer/metadata-minifier/tree/1.0.0" - }, "funding": [ { "url": "https://packagist.com", @@ -339,16 +321,16 @@ }, { "name": "composer/pcre", - "version": "3.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2" + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", + "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", "shasum": "" }, "require": { @@ -388,10 +370,6 @@ "regex", "regular expression" ], - "support": { - "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.0" - }, "funding": [ { "url": "https://packagist.com", @@ -406,20 +384,20 @@ "type": "tidelift" } ], - "time": "2022-11-17T09:50:14+00:00" + "time": "2023-10-11T07:11:09+00:00" }, { "name": "composer/semver", - "version": "3.3.2", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9" + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", + "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", "shasum": "" }, "require": { @@ -468,11 +446,6 @@ "validation", "versioning" ], - "support": { - "irc": "irc://irc.freenode.org/composer", - "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.3.2" - }, "funding": [ { "url": "https://packagist.com", @@ -487,7 +460,7 @@ "type": "tidelift" } ], - "time": "2022-04-01T19:23:25+00:00" + "time": "2023-08-31T09:50:34+00:00" }, { "name": "composer/spdx-licenses", @@ -548,11 +521,6 @@ "spdx", "validator" ], - "support": { - "irc": "irc://irc.freenode.org/composer", - "issues": "https://github.com/composer/spdx-licenses/issues", - "source": "https://github.com/composer/spdx-licenses/tree/1.5.7" - }, "funding": [ { "url": "https://packagist.com", @@ -614,11 +582,6 @@ "Xdebug", "performance" ], - "support": { - "irc": "irc://irc.freenode.org/composer", - "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" - }, "funding": [ { "url": "https://packagist.com", @@ -637,16 +600,16 @@ }, { "name": "doctrine/annotations", - "version": "1.14.2", + "version": "1.14.3", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "ad785217c1e9555a7d6c6c8c9f406395a5e2882b" + "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/ad785217c1e9555a7d6c6c8c9f406395a5e2882b", - "reference": "ad785217c1e9555a7d6c6c8c9f406395a5e2882b", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af", + "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af", "shasum": "" }, "require": { @@ -705,11 +668,7 @@ "docblock", "parser" ], - "support": { - "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.14.2" - }, - "time": "2022-12-15T06:48:22+00:00" + "time": "2023-02-01T09:20:38+00:00" }, { "name": "doctrine/cache", @@ -784,10 +743,6 @@ "redis", "xcache" ], - "support": { - "issues": "https://github.com/doctrine/cache/issues", - "source": "https://github.com/doctrine/cache/tree/2.2.0" - }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -868,10 +823,6 @@ "iterators", "php" ], - "support": { - "issues": "https://github.com/doctrine/collections/issues", - "source": "https://github.com/doctrine/collections/tree/1.8.0" - }, "time": "2022-09-01T20:12:10+00:00" }, { @@ -945,10 +896,6 @@ "doctrine", "php" ], - "support": { - "issues": "https://github.com/doctrine/common/issues", - "source": "https://github.com/doctrine/common/tree/3.4.3" - }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -967,38 +914,38 @@ }, { "name": "doctrine/data-fixtures", - "version": "1.6.3", + "version": "1.6.7", "source": { "type": "git", "url": "https://github.com/doctrine/data-fixtures.git", - "reference": "c27821d038e64f1bfc852a94064d65d2a75ad01f" + "reference": "ae4e845decbe177348fdbecd04331f4fb96aa301" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/c27821d038e64f1bfc852a94064d65d2a75ad01f", - "reference": "c27821d038e64f1bfc852a94064d65d2a75ad01f", + "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/ae4e845decbe177348fdbecd04331f4fb96aa301", + "reference": "ae4e845decbe177348fdbecd04331f4fb96aa301", "shasum": "" }, "require": { - "doctrine/persistence": "^1.3.3|^2.0|^3.0", + "doctrine/deprecations": "^0.5.3 || ^1.0", + "doctrine/persistence": "^1.3.3 || ^2.0 || ^3.0", "php": "^7.2 || ^8.0" }, "conflict": { "doctrine/dbal": "<2.13", - "doctrine/orm": "<2.12", + "doctrine/orm": "<2.14", "doctrine/phpcr-odm": "<1.3.0" }, "require-dev": { - "doctrine/coding-standard": "^10.0", + "doctrine/coding-standard": "^11.0", "doctrine/dbal": "^2.13 || ^3.0", - "doctrine/deprecations": "^1.0", "doctrine/mongodb-odm": "^1.3.0 || ^2.0.0", - "doctrine/orm": "^2.12", + "doctrine/orm": "^2.14", "ext-sqlite3": "*", "phpstan/phpstan": "^1.5", - "phpunit/phpunit": "^8.5 || ^9.5", + "phpunit/phpunit": "^8.5 || ^9.5 || ^10.0", "symfony/cache": "^5.0 || ^6.0", - "vimeo/psalm": "^4.10" + "vimeo/psalm": "^4.10 || ^5.9" }, "suggest": { "alcaeus/mongo-php-adapter": "For using MongoDB ODM 1.3 with PHP 7 (deprecated)", @@ -1009,7 +956,7 @@ "type": "library", "autoload": { "psr-4": { - "Doctrine\\Common\\DataFixtures\\": "lib/Doctrine/Common/DataFixtures" + "Doctrine\\Common\\DataFixtures\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1027,10 +974,6 @@ "keywords": [ "database" ], - "support": { - "issues": "https://github.com/doctrine/data-fixtures/issues", - "source": "https://github.com/doctrine/data-fixtures/tree/1.6.3" - }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -1045,20 +988,20 @@ "type": "tidelift" } ], - "time": "2023-01-07T15:10:22+00:00" + "time": "2023-08-17T21:15:33+00:00" }, { "name": "doctrine/dbal", - "version": "3.5.2", + "version": "3.7.1", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "63e513cebbbaf96a6795e5c5ee34d205831bfc85" + "reference": "5b7bd66c9ff58c04c5474ab85edce442f8081cb2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/63e513cebbbaf96a6795e5c5ee34d205831bfc85", - "reference": "63e513cebbbaf96a6795e5c5ee34d205831bfc85", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/5b7bd66c9ff58c04c5474ab85edce442f8081cb2", + "reference": "5b7bd66c9ff58c04c5474ab85edce442f8081cb2", "shasum": "" }, "require": { @@ -1071,13 +1014,15 @@ "psr/log": "^1|^2|^3" }, "require-dev": { - "doctrine/coding-standard": "11.0.0", - "jetbrains/phpstorm-stubs": "2022.3", - "phpstan/phpstan": "1.9.2", - "phpstan/phpstan-strict-rules": "^1.4", - "phpunit/phpunit": "9.5.27", + "doctrine/coding-standard": "12.0.0", + "fig/log-test": "^1", + "jetbrains/phpstorm-stubs": "2023.1", + "phpstan/phpstan": "1.10.35", + "phpstan/phpstan-strict-rules": "^1.5", + "phpunit/phpunit": "9.6.13", "psalm/plugin-phpunit": "0.18.4", - "squizlabs/php_codesniffer": "3.7.1", + "slevomat/coding-standard": "8.13.1", + "squizlabs/php_codesniffer": "3.7.2", "symfony/cache": "^5.4|^6.0", "symfony/console": "^4.4|^5.4|^6.0", "vimeo/psalm": "4.30.0" @@ -1138,10 +1083,6 @@ "sqlserver", "sqlsrv" ], - "support": { - "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.5.2" - }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -1156,29 +1097,33 @@ "type": "tidelift" } ], - "time": "2022-12-19T08:17:34+00:00" + "time": "2023-10-06T05:06:20+00:00" }, { "name": "doctrine/deprecations", - "version": "v1.0.0", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de" + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", - "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931", + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931", "shasum": "" }, "require": { - "php": "^7.1|^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^9", - "phpunit/phpunit": "^7.5|^8.5|^9.5", - "psr/log": "^1|^2|^3" + "phpstan/phpstan": "1.4.10 || 1.10.15", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "psalm/plugin-phpunit": "0.18.4", + "psr/log": "^1 || ^2 || ^3", + "vimeo/psalm": "4.30.0 || 5.12.0" }, "suggest": { "psr/log": "Allows logging deprecations via PSR-3 logger implementation" @@ -1195,29 +1140,25 @@ ], "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.", "homepage": "https://www.doctrine-project.org/", - "support": { - "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v1.0.0" - }, - "time": "2022-05-02T15:47:09+00:00" + "time": "2023-09-27T20:04:15+00:00" }, { "name": "doctrine/doctrine-bundle", - "version": "2.8.2", + "version": "2.10.2", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "251cd5aaea32bb92cdad4204840786b317dcdd4c" + "reference": "f28b1f78de3a2938ff05cfe751233097624cc756" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/251cd5aaea32bb92cdad4204840786b317dcdd4c", - "reference": "251cd5aaea32bb92cdad4204840786b317dcdd4c", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/f28b1f78de3a2938ff05cfe751233097624cc756", + "reference": "f28b1f78de3a2938ff05cfe751233097624cc756", "shasum": "" }, "require": { "doctrine/cache": "^1.11 || ^2.0", - "doctrine/dbal": "^3.4.0", + "doctrine/dbal": "^3.6.0", "doctrine/persistence": "^2.2 || ^3", "doctrine/sql-formatter": "^1.0.1", "php": "^7.4 || ^8.0", @@ -1226,18 +1167,19 @@ "symfony/console": "^5.4 || ^6.0", "symfony/dependency-injection": "^5.4 || ^6.0", "symfony/deprecation-contracts": "^2.1 || ^3", - "symfony/doctrine-bridge": "^5.4.7 || ^6.0.7", + "symfony/doctrine-bridge": "^5.4.19 || ^6.0.7", "symfony/framework-bundle": "^5.4 || ^6.0", "symfony/service-contracts": "^1.1.1 || ^2.0 || ^3" }, "conflict": { "doctrine/annotations": ">=3.0", "doctrine/orm": "<2.11 || >=3.0", - "twig/twig": "<1.34 || >=2.0,<2.4" + "twig/twig": "<1.34 || >=2.0 <2.4" }, "require-dev": { "doctrine/annotations": "^1 || ^2", "doctrine/coding-standard": "^9.0", + "doctrine/deprecations": "^1.0", "doctrine/orm": "^2.11 || ^3.0", "friendsofphp/proxy-manager-lts": "^1.0", "phpunit/phpunit": "^9.5.26 || ^10.0", @@ -1296,10 +1238,6 @@ "orm", "persistence" ], - "support": { - "issues": "https://github.com/doctrine/DoctrineBundle/issues", - "source": "https://github.com/doctrine/DoctrineBundle/tree/2.8.2" - }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -1314,20 +1252,20 @@ "type": "tidelift" } ], - "time": "2023-01-06T11:42:10+00:00" + "time": "2023-08-06T09:31:40+00:00" }, { "name": "doctrine/doctrine-fixtures-bundle", - "version": "3.4.2", + "version": "3.4.4", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", - "reference": "601988c5b46dbd20a0f886f967210aba378a6fd5" + "reference": "9ec3139c52a42e94c9fd1e95f8d2bca94326edfb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/601988c5b46dbd20a0f886f967210aba378a6fd5", - "reference": "601988c5b46dbd20a0f886f967210aba378a6fd5", + "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/9ec3139c52a42e94c9fd1e95f8d2bca94326edfb", + "reference": "9ec3139c52a42e94c9fd1e95f8d2bca94326edfb", "shasum": "" }, "require": { @@ -1379,10 +1317,6 @@ "Fixture", "persistence" ], - "support": { - "issues": "https://github.com/doctrine/DoctrineFixturesBundle/issues", - "source": "https://github.com/doctrine/DoctrineFixturesBundle/tree/3.4.2" - }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -1397,20 +1331,20 @@ "type": "tidelift" } ], - "time": "2022-04-28T17:58:29+00:00" + "time": "2023-05-02T15:12:16+00:00" }, { "name": "doctrine/doctrine-migrations-bundle", - "version": "3.2.2", + "version": "3.2.4", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineMigrationsBundle.git", - "reference": "3393f411ba25ade21969c33f2053220044854d01" + "reference": "94e6b0fe1a50901d52f59dbb9b4b0737718b2c1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/3393f411ba25ade21969c33f2053220044854d01", - "reference": "3393f411ba25ade21969c33f2053220044854d01", + "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/94e6b0fe1a50901d52f59dbb9b4b0737718b2c1e", + "reference": "94e6b0fe1a50901d52f59dbb9b4b0737718b2c1e", "shasum": "" }, "require": { @@ -1420,15 +1354,15 @@ "symfony/framework-bundle": "~3.4|~4.0|~5.0|~6.0" }, "require-dev": { - "doctrine/coding-standard": "^8.0", + "doctrine/coding-standard": "^9", "doctrine/orm": "^2.6", "doctrine/persistence": "^1.3||^2.0", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-deprecation-rules": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpstan/phpstan-strict-rules": "^0.12", - "phpunit/phpunit": "^8.0|^9.0", - "vimeo/psalm": "^4.11" + "phpstan/phpstan": "^1.4", + "phpstan/phpstan-deprecation-rules": "^1", + "phpstan/phpstan-phpunit": "^1", + "phpstan/phpstan-strict-rules": "^1.1", + "phpunit/phpunit": "^8.5|^9.5", + "vimeo/psalm": "^4.22" }, "type": "symfony-bundle", "autoload": { @@ -1464,10 +1398,6 @@ "migrations", "schema" ], - "support": { - "issues": "https://github.com/doctrine/DoctrineMigrationsBundle/issues", - "source": "https://github.com/doctrine/DoctrineMigrationsBundle/tree/3.2.2" - }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -1482,7 +1412,7 @@ "type": "tidelift" } ], - "time": "2022-02-01T18:08:07+00:00" + "time": "2023-06-02T08:19:26+00:00" }, { "name": "doctrine/event-manager", @@ -1556,10 +1486,6 @@ "event system", "events" ], - "support": { - "issues": "https://github.com/doctrine/event-manager/issues", - "source": "https://github.com/doctrine/event-manager/tree/1.2.0" - }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -1578,28 +1504,28 @@ }, { "name": "doctrine/inflector", - "version": "2.0.6", + "version": "2.0.8", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024" + "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/d9d313a36c872fd6ee06d9a6cbcf713eaa40f024", - "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/f9301a5b2fb1216b2b08f02ba04dc45423db6bff", + "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^10", + "doctrine/coding-standard": "^11.0", "phpstan/phpstan": "^1.8", "phpstan/phpstan-phpunit": "^1.1", "phpstan/phpstan-strict-rules": "^1.3", "phpunit/phpunit": "^8.5 || ^9.5", - "vimeo/psalm": "^4.25" + "vimeo/psalm": "^4.25 || ^5.4" }, "type": "library", "autoload": { @@ -1647,10 +1573,6 @@ "uppercase", "words" ], - "support": { - "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.0.6" - }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -1665,7 +1587,7 @@ "type": "tidelift" } ], - "time": "2022-10-20T09:10:12+00:00" + "time": "2023-06-16T13:40:37+00:00" }, { "name": "doctrine/instantiator", @@ -1717,10 +1639,6 @@ "constructor", "instantiate" ], - "support": { - "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.5.0" - }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -1793,10 +1711,6 @@ "parser", "php" ], - "support": { - "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/1.2.3" - }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -1815,45 +1729,44 @@ }, { "name": "doctrine/migrations", - "version": "3.5.2", + "version": "3.6.0", "source": { "type": "git", "url": "https://github.com/doctrine/migrations.git", - "reference": "61c6ef3a10b7df43c3b6388a184754f26e58700a" + "reference": "e542ad8bcd606d7a18d0875babb8a6d963c9c059" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/migrations/zipball/61c6ef3a10b7df43c3b6388a184754f26e58700a", - "reference": "61c6ef3a10b7df43c3b6388a184754f26e58700a", + "url": "https://api.github.com/repos/doctrine/migrations/zipball/e542ad8bcd606d7a18d0875babb8a6d963c9c059", + "reference": "e542ad8bcd606d7a18d0875babb8a6d963c9c059", "shasum": "" }, "require": { "composer-runtime-api": "^2", - "doctrine/dbal": "^3.3", + "doctrine/dbal": "^3.5.1", "doctrine/deprecations": "^0.5.3 || ^1", - "doctrine/event-manager": "^1.0", - "friendsofphp/proxy-manager-lts": "^1.0", - "php": "^7.4 || ^8.0", + "doctrine/event-manager": "^1.2 || ^2.0", + "php": "^8.1", "psr/log": "^1.1.3 || ^2 || ^3", "symfony/console": "^4.4.16 || ^5.4 || ^6.0", - "symfony/stopwatch": "^4.4 || ^5.4 || ^6.0" + "symfony/stopwatch": "^4.4 || ^5.4 || ^6.0", + "symfony/var-exporter": "^6.2" }, "conflict": { "doctrine/orm": "<2.12" }, "require-dev": { "doctrine/coding-standard": "^9", - "doctrine/orm": "^2.12", + "doctrine/orm": "^2.13", "doctrine/persistence": "^2 || ^3", "doctrine/sql-formatter": "^1.0", - "ergebnis/composer-normalize": "^2.9", "ext-pdo_sqlite": "*", "phpstan/phpstan": "^1.5", "phpstan/phpstan-deprecation-rules": "^1", "phpstan/phpstan-phpunit": "^1.1", "phpstan/phpstan-strict-rules": "^1.1", "phpstan/phpstan-symfony": "^1.1", - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^9.5.24", "symfony/cache": "^4.4 || ^5.4 || ^6.0", "symfony/process": "^4.4 || ^5.4 || ^6.0", "symfony/yaml": "^4.4 || ^5.4 || ^6.0" @@ -1866,12 +1779,6 @@ "bin/doctrine-migrations" ], "type": "library", - "extra": { - "composer-normalize": { - "indent-size": 4, - "indent-style": "space" - } - }, "autoload": { "psr-4": { "Doctrine\\Migrations\\": "lib/Doctrine/Migrations" @@ -1902,10 +1809,6 @@ "dbal", "migrations" ], - "support": { - "issues": "https://github.com/doctrine/migrations/issues", - "source": "https://github.com/doctrine/migrations/tree/3.5.2" - }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -1920,20 +1823,20 @@ "type": "tidelift" } ], - "time": "2022-08-04T14:29:49+00:00" + "time": "2023-02-15T18:49:46+00:00" }, { "name": "doctrine/orm", - "version": "2.14.0", + "version": "2.14.3", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "f82485e651763fbd1b34879726f4d3b91c358bd9" + "reference": "a64f315dfeae5e50b17f132626fd9e9b4ec8985d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/f82485e651763fbd1b34879726f4d3b91c358bd9", - "reference": "f82485e651763fbd1b34879726f4d3b91c358bd9", + "url": "https://api.github.com/repos/doctrine/orm/zipball/a64f315dfeae5e50b17f132626fd9e9b4ec8985d", + "reference": "a64f315dfeae5e50b17f132626fd9e9b4ec8985d", "shasum": "" }, "require": { @@ -1962,14 +1865,14 @@ "doctrine/annotations": "^1.13 || ^2", "doctrine/coding-standard": "^9.0.2 || ^11.0", "phpbench/phpbench": "^0.16.10 || ^1.0", - "phpstan/phpstan": "~1.4.10 || 1.9.4", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "phpstan/phpstan": "~1.4.10 || 1.10.6", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6", "psr/log": "^1 || ^2 || ^3", - "squizlabs/php_codesniffer": "3.7.1", + "squizlabs/php_codesniffer": "3.7.2", "symfony/cache": "^4.4 || ^5.4 || ^6.0", "symfony/var-exporter": "^4.4 || ^5.4 || ^6.2", "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0", - "vimeo/psalm": "4.30.0 || 5.3.0" + "vimeo/psalm": "4.30.0 || 5.9.0" }, "suggest": { "ext-dom": "Provides support for XSD validation for XML mapping files", @@ -2017,24 +1920,20 @@ "database", "orm" ], - "support": { - "issues": "https://github.com/doctrine/orm/issues", - "source": "https://github.com/doctrine/orm/tree/2.14.0" - }, - "time": "2022-12-19T21:51:58+00:00" + "time": "2023-04-20T09:46:32+00:00" }, { "name": "doctrine/persistence", - "version": "2.5.6", + "version": "2.5.7", "source": { "type": "git", "url": "https://github.com/doctrine/persistence.git", - "reference": "7729fc2a7e5efc8bbfa408a3b8adeb8f5b84f5d1" + "reference": "e36f22765f4d10a7748228babbf73da5edfeed3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/persistence/zipball/7729fc2a7e5efc8bbfa408a3b8adeb8f5b84f5d1", - "reference": "7729fc2a7e5efc8bbfa408a3b8adeb8f5b84f5d1", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/e36f22765f4d10a7748228babbf73da5edfeed3c", + "reference": "e36f22765f4d10a7748228babbf73da5edfeed3c", "shasum": "" }, "require": { @@ -2105,10 +2004,6 @@ "orm", "persistence" ], - "support": { - "issues": "https://github.com/doctrine/persistence/issues", - "source": "https://github.com/doctrine/persistence/tree/2.5.6" - }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -2123,7 +2018,7 @@ "type": "tidelift" } ], - "time": "2023-01-01T18:11:10+00:00" + "time": "2023-02-03T15:51:16+00:00" }, { "name": "doctrine/sql-formatter", @@ -2171,10 +2066,6 @@ "highlight", "sql" ], - "support": { - "issues": "https://github.com/doctrine/sql-formatter/issues", - "source": "https://github.com/doctrine/sql-formatter/tree/1.1.3" - }, "time": "2022-05-23T21:33:49+00:00" }, { @@ -2225,10 +2116,6 @@ "monolog", "productivity" ], - "support": { - "issues": "https://github.com/EasyCorp/easy-log-handler/issues", - "source": "https://github.com/EasyCorp/easy-log-handler/tree/master" - }, "abandoned": true, "time": "2019-10-24T07:13:31+00:00" }, @@ -2263,9 +2150,6 @@ "MIT" ], "description": "EC-CUBE plugin installer.", - "support": { - "source": "https://github.com/EC-CUBE/eccube-plugin-installer/tree/2.0.1" - }, "time": "2021-07-20T01:13:11+00:00" }, { @@ -2324,10 +2208,6 @@ "validation", "validator" ], - "support": { - "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/2.1.25" - }, "funding": [ { "url": "https://github.com/egulias", @@ -2392,10 +2272,6 @@ "htmlpurifier", "symfony" ], - "support": { - "issues": "https://github.com/Exercise/HTMLPurifierBundle/issues", - "source": "https://github.com/Exercise/HTMLPurifierBundle/tree/v3.1.0" - }, "time": "2020-12-28T19:57:39+00:00" }, { @@ -2453,59 +2329,53 @@ "keywords": [ "html" ], - "support": { - "issues": "https://github.com/ezyang/htmlpurifier/issues", - "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0" - }, "time": "2022-09-18T07:06:19+00:00" }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.13.2", + "version": "v3.37.1", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "3952f08a81bd3b1b15e11c3de0b6bf037faa8496" + "reference": "c3fe76976081ab871aa654e872da588077e19679" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/3952f08a81bd3b1b15e11c3de0b6bf037faa8496", - "reference": "3952f08a81bd3b1b15e11c3de0b6bf037faa8496", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/c3fe76976081ab871aa654e872da588077e19679", + "reference": "c3fe76976081ab871aa654e872da588077e19679", "shasum": "" }, "require": { - "composer/semver": "^3.2", + "composer/semver": "^3.3", "composer/xdebug-handler": "^3.0.3", - "doctrine/annotations": "^1.13", "ext-json": "*", "ext-tokenizer": "*", "php": "^7.4 || ^8.0", - "sebastian/diff": "^4.0", + "sebastian/diff": "^4.0 || ^5.0", "symfony/console": "^5.4 || ^6.0", "symfony/event-dispatcher": "^5.4 || ^6.0", "symfony/filesystem": "^5.4 || ^6.0", "symfony/finder": "^5.4 || ^6.0", "symfony/options-resolver": "^5.4 || ^6.0", - "symfony/polyfill-mbstring": "^1.23", - "symfony/polyfill-php80": "^1.25", - "symfony/polyfill-php81": "^1.25", + "symfony/polyfill-mbstring": "^1.27", + "symfony/polyfill-php80": "^1.27", + "symfony/polyfill-php81": "^1.27", "symfony/process": "^5.4 || ^6.0", "symfony/stopwatch": "^5.4 || ^6.0" }, "require-dev": { + "facile-it/paraunit": "^1.3 || ^2.0", "justinrainbow/json-schema": "^5.2", "keradus/cli-executor": "^2.0", - "mikey179/vfsstream": "^1.6.10", - "php-coveralls/php-coveralls": "^2.5.2", + "mikey179/vfsstream": "^1.6.11", + "php-coveralls/php-coveralls": "^2.5.3", "php-cs-fixer/accessible-object": "^1.1", "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", - "phpspec/prophecy": "^1.15", + "phpspec/prophecy": "^1.16", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.5", - "phpunitgoodpractices/polyfill": "^1.6", - "phpunitgoodpractices/traits": "^1.9.2", - "symfony/phpunit-bridge": "^6.0", + "symfony/phpunit-bridge": "^6.2.3", "symfony/yaml": "^5.4 || ^6.0" }, "suggest": { @@ -2536,36 +2406,38 @@ } ], "description": "A tool to automatically fix PHP code style", - "support": { - "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.13.2" - }, + "keywords": [ + "Static code analysis", + "fixer", + "standards", + "static analysis" + ], "funding": [ { "url": "https://github.com/keradus", "type": "github" } ], - "time": "2023-01-02T23:53:50+00:00" + "time": "2023-10-29T20:51:23+00:00" }, { "name": "friendsofphp/proxy-manager-lts", - "version": "v1.0.13", + "version": "v1.0.16", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/proxy-manager-lts.git", - "reference": "88354616f4cf4f6620910fd035e282173ba453e8" + "reference": "ecadbdc9052e4ad08c60c8a02268712e50427f7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/proxy-manager-lts/zipball/88354616f4cf4f6620910fd035e282173ba453e8", - "reference": "88354616f4cf4f6620910fd035e282173ba453e8", + "url": "https://api.github.com/repos/FriendsOfPHP/proxy-manager-lts/zipball/ecadbdc9052e4ad08c60c8a02268712e50427f7c", + "reference": "ecadbdc9052e4ad08c60c8a02268712e50427f7c", "shasum": "" }, "require": { "laminas/laminas-code": "~3.4.1|^4.0", "php": ">=7.1", - "symfony/filesystem": "^4.4.17|^5.0|^6.0" + "symfony/filesystem": "^4.4.17|^5.0|^6.0|^7.0" }, "conflict": { "laminas/laminas-stdlib": "<3.2.1", @@ -2576,7 +2448,7 @@ }, "require-dev": { "ext-phar": "*", - "symfony/phpunit-bridge": "^5.4|^6.0" + "symfony/phpunit-bridge": "^5.4|^6.0|^7.0" }, "type": "library", "extra": { @@ -2614,10 +2486,6 @@ "proxy pattern", "service proxies" ], - "support": { - "issues": "https://github.com/FriendsOfPHP/proxy-manager-lts/issues", - "source": "https://github.com/FriendsOfPHP/proxy-manager-lts/tree/v1.0.13" - }, "funding": [ { "url": "https://github.com/Ocramius", @@ -2628,28 +2496,28 @@ "type": "tidelift" } ], - "time": "2022-10-17T19:48:16+00:00" + "time": "2023-05-24T07:17:17+00:00" }, { "name": "graham-campbell/result-type", - "version": "v1.1.0", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Result-Type.git", - "reference": "a878d45c1914464426dc94da61c9e1d36ae262a8" + "reference": "672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/a878d45c1914464426dc94da61c9e1d36ae262a8", - "reference": "a878d45c1914464426dc94da61c9e1d36ae262a8", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831", + "reference": "672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", - "phpoption/phpoption": "^1.9" + "phpoption/phpoption": "^1.9.1" }, "require-dev": { - "phpunit/phpunit": "^8.5.28 || ^9.5.21" + "phpunit/phpunit": "^8.5.32 || ^9.6.3 || ^10.0.12" }, "type": "library", "autoload": { @@ -2676,10 +2544,6 @@ "Result-Type", "result" ], - "support": { - "issues": "https://github.com/GrahamCampbell/Result-Type/issues", - "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.0" - }, "funding": [ { "url": "https://github.com/GrahamCampbell", @@ -2690,26 +2554,26 @@ "type": "tidelift" } ], - "time": "2022-07-30T15:56:11+00:00" + "time": "2023-02-25T20:23:15+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "7.5.0", + "version": "7.8.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba" + "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba", - "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1110f66a6530a40fe7aea0378fe608ee2b2248f9", + "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5", - "guzzlehttp/psr7": "^1.9 || ^2.4", + "guzzlehttp/promises": "^1.5.3 || ^2.0.1", + "guzzlehttp/psr7": "^1.9.1 || ^2.5.1", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -2720,7 +2584,8 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.1", "ext-curl": "*", - "php-http/client-integration-tests": "^3.0", + "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", + "php-http/message-factory": "^1.1", "phpunit/phpunit": "^8.5.29 || ^9.5.23", "psr/log": "^1.1 || ^2.0 || ^3.0" }, @@ -2734,9 +2599,6 @@ "bamarni-bin": { "bin-links": true, "forward-command": false - }, - "branch-alias": { - "dev-master": "7.5-dev" } }, "autoload": { @@ -2800,10 +2662,6 @@ "rest", "web service" ], - "support": { - "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.5.0" - }, "funding": [ { "url": "https://github.com/GrahamCampbell", @@ -2818,38 +2676,37 @@ "type": "tidelift" } ], - "time": "2022-08-28T15:39:27+00:00" + "time": "2023-08-27T10:20:53+00:00" }, { "name": "guzzlehttp/promises", - "version": "1.5.2", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "b94b2807d85443f9719887892882d0329d1e2598" + "reference": "111166291a0f8130081195ac4556a5587d7f1b5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598", - "reference": "b94b2807d85443f9719887892882d0329d1e2598", + "url": "https://api.github.com/repos/guzzle/promises/zipball/111166291a0f8130081195ac4556a5587d7f1b5d", + "reference": "111166291a0f8130081195ac4556a5587d7f1b5d", "shasum": "" }, "require": { - "php": ">=5.5" + "php": "^7.2.5 || ^8.0" }, "require-dev": { - "symfony/phpunit-bridge": "^4.4 || ^5.1" + "bamarni/composer-bin-plugin": "^1.8.1", + "phpunit/phpunit": "^8.5.29 || ^9.5.23" }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "1.5-dev" + "bamarni-bin": { + "bin-links": true, + "forward-command": false } }, "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { "GuzzleHttp\\Promise\\": "src/" } @@ -2884,10 +2741,6 @@ "keywords": [ "promise" ], - "support": { - "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.2" - }, "funding": [ { "url": "https://github.com/GrahamCampbell", @@ -2902,26 +2755,26 @@ "type": "tidelift" } ], - "time": "2022-08-28T14:55:35+00:00" + "time": "2023-08-03T15:11:55+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.4.3", + "version": "2.6.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "67c26b443f348a51926030c83481b85718457d3d" + "reference": "be45764272e8873c72dbe3d2edcfdfcc3bc9f727" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d", - "reference": "67c26b443f348a51926030c83481b85718457d3d", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/be45764272e8873c72dbe3d2edcfdfcc3bc9f727", + "reference": "be45764272e8873c72dbe3d2edcfdfcc3bc9f727", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.1 || ^2.0", "ralouphie/getallheaders": "^3.0" }, "provide": { @@ -2941,9 +2794,6 @@ "bamarni-bin": { "bin-links": true, "forward-command": false - }, - "branch-alias": { - "dev-master": "2.4-dev" } }, "autoload": { @@ -3003,10 +2853,6 @@ "uri", "url" ], - "support": { - "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.4.3" - }, "funding": [ { "url": "https://github.com/GrahamCampbell", @@ -3021,20 +2867,20 @@ "type": "tidelift" } ], - "time": "2022-10-26T14:07:24+00:00" + "time": "2023-08-27T10:13:57+00:00" }, { "name": "justinrainbow/json-schema", - "version": "5.2.12", + "version": "v5.2.13", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60" + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", - "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", "shasum": "" }, "require": { @@ -3087,11 +2933,7 @@ "json", "schema" ], - "support": { - "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12" - }, - "time": "2022-04-13T08:02:27+00:00" + "time": "2023-09-26T02:20:38+00:00" }, { "name": "knplabs/knp-components", @@ -3172,10 +3014,6 @@ "pager", "paginator" ], - "support": { - "issues": "https://github.com/KnpLabs/knp-components/issues", - "source": "https://github.com/KnpLabs/knp-components/tree/v3.6.0" - }, "time": "2022-08-18T06:36:14+00:00" }, { @@ -3246,37 +3084,33 @@ "paginator", "symfony" ], - "support": { - "issues": "https://github.com/KnpLabs/KnpPaginatorBundle/issues", - "source": "https://github.com/KnpLabs/KnpPaginatorBundle/tree/v5.9.0" - }, "time": "2022-08-28T14:42:14+00:00" }, { "name": "laminas/laminas-code", - "version": "4.7.1", + "version": "4.13.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-code.git", - "reference": "91aabc066d5620428120800c0eafc0411e441a62" + "reference": "7353d4099ad5388e84737dd16994316a04f48dbf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-code/zipball/91aabc066d5620428120800c0eafc0411e441a62", - "reference": "91aabc066d5620428120800c0eafc0411e441a62", + "url": "https://api.github.com/repos/laminas/laminas-code/zipball/7353d4099ad5388e84737dd16994316a04f48dbf", + "reference": "7353d4099ad5388e84737dd16994316a04f48dbf", "shasum": "" }, "require": { - "php": ">=7.4, <8.2" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "require-dev": { - "doctrine/annotations": "^1.13.2", + "doctrine/annotations": "^2.0.1", "ext-phar": "*", - "laminas/laminas-coding-standard": "^2.3.0", - "laminas/laminas-stdlib": "^3.6.1", - "phpunit/phpunit": "^9.5.10", - "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.13.1" + "laminas/laminas-coding-standard": "^2.5.0", + "laminas/laminas-stdlib": "^3.17.0", + "phpunit/phpunit": "^10.3.3", + "psalm/plugin-phpunit": "^0.18.4", + "vimeo/psalm": "^5.15.0" }, "suggest": { "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features", @@ -3284,9 +3118,6 @@ }, "type": "library", "autoload": { - "files": [ - "polyfill/ReflectionEnumPolyfill.php" - ], "psr-4": { "Laminas\\Code\\": "src/" } @@ -3302,41 +3133,33 @@ "laminas", "laminasframework" ], - "support": { - "chat": "https://laminas.dev/chat", - "docs": "https://docs.laminas.dev/laminas-code/", - "forum": "https://discourse.laminas.dev", - "issues": "https://github.com/laminas/laminas-code/issues", - "rss": "https://github.com/laminas/laminas-code/releases.atom", - "source": "https://github.com/laminas/laminas-code" - }, "funding": [ { "url": "https://funding.communitybridge.org/projects/laminas-project", "type": "community_bridge" } ], - "time": "2022-11-21T01:32:31+00:00" + "time": "2023-10-18T10:00:55+00:00" }, { "name": "mobiledetect/mobiledetectlib", - "version": "2.8.41", + "version": "2.8.43", "source": { "type": "git", "url": "https://github.com/serbanghita/Mobile-Detect.git", - "reference": "fc9cccd4d3706d5a7537b562b59cc18f9e4c0cb1" + "reference": "fa96dd52859f03ee2dea002ddd75f8e4e7e9c9da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/fc9cccd4d3706d5a7537b562b59cc18f9e4c0cb1", - "reference": "fc9cccd4d3706d5a7537b562b59cc18f9e4c0cb1", + "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/fa96dd52859f03ee2dea002ddd75f8e4e7e9c9da", + "reference": "fa96dd52859f03ee2dea002ddd75f8e4e7e9c9da", "shasum": "" }, "require": { "php": ">=5.0.0" }, "require-dev": { - "phpunit/phpunit": "~4.8.35||~5.7" + "phpunit/phpunit": "~4.8.36" }, "type": "library", "autoload": { @@ -3368,24 +3191,26 @@ "mobile detector", "php mobile detect" ], - "support": { - "issues": "https://github.com/serbanghita/Mobile-Detect/issues", - "source": "https://github.com/serbanghita/Mobile-Detect/tree/2.8.41" - }, - "time": "2022-11-08T18:31:26+00:00" + "funding": [ + { + "url": "https://github.com/serbanghita", + "type": "github" + } + ], + "time": "2023-11-01T13:40:08+00:00" }, { "name": "monolog/monolog", - "version": "2.8.0", + "version": "2.9.2", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "720488632c590286b88b80e62aa3d3d551ad4a50" + "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/720488632c590286b88b80e62aa3d3d551ad4a50", - "reference": "720488632c590286b88b80e62aa3d3d551ad4a50", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", + "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", "shasum": "" }, "require": { @@ -3400,7 +3225,7 @@ "doctrine/couchdb": "~1.0@dev", "elasticsearch/elasticsearch": "^7 || ^8", "ext-json": "*", - "graylog2/gelf-php": "^1.4.2", + "graylog2/gelf-php": "^1.4.2 || ^2@dev", "guzzlehttp/guzzle": "^7.4", "guzzlehttp/psr7": "^2.2", "mongodb/mongodb": "^1.8", @@ -3460,10 +3285,6 @@ "logging", "psr-3" ], - "support": { - "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.8.0" - }, "funding": [ { "url": "https://github.com/Seldaek", @@ -3474,29 +3295,33 @@ "type": "tidelift" } ], - "time": "2022-07-24T11:55:47+00:00" + "time": "2023-10-27T15:25:26+00:00" }, { "name": "nesbot/carbon", - "version": "2.65.0", + "version": "2.71.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "09acf64155c16dc6f580f36569ae89344e9734a3" + "reference": "98276233188583f2ff845a0f992a235472d9466a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/09acf64155c16dc6f580f36569ae89344e9734a3", - "reference": "09acf64155c16dc6f580f36569ae89344e9734a3", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/98276233188583f2ff845a0f992a235472d9466a", + "reference": "98276233188583f2ff845a0f992a235472d9466a", "shasum": "" }, "require": { "ext-json": "*", "php": "^7.1.8 || ^8.0", + "psr/clock": "^1.0", "symfony/polyfill-mbstring": "^1.0", "symfony/polyfill-php80": "^1.16", "symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0" }, + "provide": { + "psr/clock-implementation": "1.0" + }, "require-dev": { "doctrine/dbal": "^2.0 || ^3.1.4", "doctrine/orm": "^2.7", @@ -3557,11 +3382,6 @@ "datetime", "time" ], - "support": { - "docs": "https://carbon.nesbot.com/docs", - "issues": "https://github.com/briannesbitt/Carbon/issues", - "source": "https://github.com/briannesbitt/Carbon" - }, "funding": [ { "url": "https://github.com/sponsors/kylekatarnls", @@ -3576,20 +3396,20 @@ "type": "tidelift" } ], - "time": "2023-01-06T15:55:01+00:00" + "time": "2023-09-25T11:31:05+00:00" }, { "name": "nikic/php-parser", - "version": "v4.15.2", + "version": "v4.17.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc" + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", - "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", "shasum": "" }, "require": { @@ -3628,32 +3448,28 @@ "parser", "php" ], - "support": { - "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2" - }, - "time": "2022-11-12T15:38:23+00:00" + "time": "2023-08-13T19:53:39+00:00" }, { "name": "phpoption/phpoption", - "version": "1.9.0", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab" + "reference": "dd3a383e599f49777d8b628dadbb90cae435b87e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/dc5ff11e274a90cc1c743f66c9ad700ce50db9ab", - "reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/dd3a383e599f49777d8b628dadbb90cae435b87e", + "reference": "dd3a383e599f49777d8b628dadbb90cae435b87e", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8", - "phpunit/phpunit": "^8.5.28 || ^9.5.21" + "bamarni/composer-bin-plugin": "^1.8.2", + "phpunit/phpunit": "^8.5.32 || ^9.6.3 || ^10.0.12" }, "type": "library", "extra": { @@ -3693,10 +3509,6 @@ "php", "type" ], - "support": { - "issues": "https://github.com/schmittjoh/php-option/issues", - "source": "https://github.com/schmittjoh/php-option/tree/1.9.0" - }, "funding": [ { "url": "https://github.com/GrahamCampbell", @@ -3707,7 +3519,7 @@ "type": "tidelift" } ], - "time": "2022-07-30T15:51:26+00:00" + "time": "2023-02-25T19:38:58+00:00" }, { "name": "psr/cache", @@ -3753,11 +3565,52 @@ "psr", "psr-6" ], - "support": { - "source": "https://github.com/php-fig/cache/tree/master" - }, "time": "2016-08-06T20:24:11+00:00" }, + { + "name": "psr/clock", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/clock.git", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Psr\\Clock\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for reading the clock.", + "homepage": "https://github.com/php-fig/clock", + "keywords": [ + "clock", + "now", + "psr", + "psr-20", + "time" + ], + "time": "2022-11-25T14:36:26+00:00" + }, { "name": "psr/container", "version": "1.1.2", @@ -3800,10 +3653,6 @@ "container-interop", "psr" ], - "support": { - "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.2" - }, "time": "2021-11-05T16:50:12+00:00" }, { @@ -3850,29 +3699,25 @@ "psr", "psr-14" ], - "support": { - "issues": "https://github.com/php-fig/event-dispatcher/issues", - "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" - }, "time": "2019-01-08T18:20:26+00:00" }, { "name": "psr/http-client", - "version": "1.0.1", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/php-fig/http-client.git", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90", "shasum": "" }, "require": { "php": "^7.0 || ^8.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -3892,7 +3737,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP clients", @@ -3903,28 +3748,25 @@ "psr", "psr-18" ], - "support": { - "source": "https://github.com/php-fig/http-client/tree/master" - }, - "time": "2020-06-29T06:28:15+00:00" + "time": "2023-09-23T14:17:50+00:00" }, { "name": "psr/http-factory", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/http-factory.git", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" + "reference": "e616d01114759c4c489f93b099585439f795fe35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35", + "reference": "e616d01114759c4c489f93b099585439f795fe35", "shasum": "" }, "require": { "php": ">=7.0.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -3944,7 +3786,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interfaces for PSR-7 HTTP message factories", @@ -3958,32 +3800,29 @@ "request", "response" ], - "support": { - "source": "https://github.com/php-fig/http-factory/tree/master" - }, - "time": "2019-04-30T12:38:16+00:00" + "time": "2023-04-10T20:10:41+00:00" }, { "name": "psr/http-message", - "version": "1.0.1", + "version": "1.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -4011,10 +3850,7 @@ "request", "response" ], - "support": { - "source": "https://github.com/php-fig/http-message/tree/master" - }, - "time": "2016-08-06T14:39:51+00:00" + "time": "2023-04-04T09:50:52+00:00" }, { "name": "psr/log", @@ -4061,9 +3897,6 @@ "psr", "psr-3" ], - "support": { - "source": "https://github.com/php-fig/log/tree/1.1.4" - }, "time": "2021-05-03T11:20:27+00:00" }, { @@ -4112,9 +3945,6 @@ "psr-16", "simple-cache" ], - "support": { - "source": "https://github.com/php-fig/simple-cache/tree/master" - }, "time": "2017-10-23T01:57:42+00:00" }, { @@ -4155,31 +3985,28 @@ } ], "description": "A polyfill for getallheaders.", - "support": { - "issues": "https://github.com/ralouphie/getallheaders/issues", - "source": "https://github.com/ralouphie/getallheaders/tree/develop" - }, "time": "2019-03-08T08:55:37+00:00" }, { "name": "react/promise", - "version": "v2.9.0", + "version": "v3.0.0", "source": { "type": "git", "url": "https://github.com/reactphp/promise.git", - "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910" + "reference": "c86753c76fd3be465d93b308f18d189f01a22be4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise/zipball/234f8fd1023c9158e2314fa9d7d0e6a83db42910", - "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910", + "url": "https://api.github.com/repos/reactphp/promise/zipball/c86753c76fd3be465d93b308f18d189f01a22be4", + "reference": "c86753c76fd3be465d93b308f18d189f01a22be4", "shasum": "" }, "require": { - "php": ">=5.4.0" + "php": ">=7.1.0" }, "require-dev": { - "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36" + "phpstan/phpstan": "1.10.20 || 1.4.10", + "phpunit/phpunit": "^9.5 || ^7.5" }, "type": "library", "autoload": { @@ -4221,21 +4048,13 @@ "promise", "promises" ], - "support": { - "issues": "https://github.com/reactphp/promise/issues", - "source": "https://github.com/reactphp/promise/tree/v2.9.0" - }, "funding": [ { - "url": "https://github.com/WyriHaximus", - "type": "github" - }, - { - "url": "https://github.com/clue", - "type": "github" + "url": "https://opencollective.com/reactphp", + "type": "open_collective" } ], - "time": "2022-02-11T10:27:51+00:00" + "time": "2023-07-11T16:12:49+00:00" }, { "name": "robthree/twofactorauth", @@ -4291,10 +4110,6 @@ "php", "tfa" ], - "support": { - "issues": "https://github.com/RobThree/TwoFactorAuth/issues", - "source": "https://github.com/RobThree/TwoFactorAuth" - }, "funding": [ { "url": "https://paypal.me/robiii", @@ -4309,16 +4124,16 @@ }, { "name": "sebastian/diff", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d" + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", "shasum": "" }, "require": { @@ -4361,30 +4176,26 @@ "unidiff", "unified diff" ], - "support": { - "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" } ], - "time": "2020-10-26T13:10:38+00:00" + "time": "2023-05-07T05:35:17+00:00" }, { "name": "seld/jsonlint", - "version": "1.9.0", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "4211420d25eba80712bff236a98960ef68b866b7" + "reference": "594fd6462aad8ecee0b45ca5045acea4776667f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/4211420d25eba80712bff236a98960ef68b866b7", - "reference": "4211420d25eba80712bff236a98960ef68b866b7", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/594fd6462aad8ecee0b45ca5045acea4776667f1", + "reference": "594fd6462aad8ecee0b45ca5045acea4776667f1", "shasum": "" }, "require": { @@ -4421,10 +4232,6 @@ "parser", "validator" ], - "support": { - "issues": "https://github.com/Seldaek/jsonlint/issues", - "source": "https://github.com/Seldaek/jsonlint/tree/1.9.0" - }, "funding": [ { "url": "https://github.com/Seldaek", @@ -4435,7 +4242,7 @@ "type": "tidelift" } ], - "time": "2022-04-01T13:37:23+00:00" + "time": "2023-05-11T13:16:46+00:00" }, { "name": "seld/phar-utils", @@ -4479,24 +4286,20 @@ "keywords": [ "phar" ], - "support": { - "issues": "https://github.com/Seldaek/phar-utils/issues", - "source": "https://github.com/Seldaek/phar-utils/tree/1.2.1" - }, "time": "2022-08-31T10:31:18+00:00" }, { "name": "seld/signal-handler", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/Seldaek/signal-handler.git", - "reference": "f69d119511dc0360440cdbdaa71829c149b7be75" + "reference": "04a6112e883ad76c0ada8e4a9f7520bbfdb6bb98" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/signal-handler/zipball/f69d119511dc0360440cdbdaa71829c149b7be75", - "reference": "f69d119511dc0360440cdbdaa71829c149b7be75", + "url": "https://api.github.com/repos/Seldaek/signal-handler/zipball/04a6112e883ad76c0ada8e4a9f7520bbfdb6bb98", + "reference": "04a6112e883ad76c0ada8e4a9f7520bbfdb6bb98", "shasum": "" }, "require": { @@ -4540,28 +4343,24 @@ "sigterm", "unix" ], - "support": { - "issues": "https://github.com/Seldaek/signal-handler/issues", - "source": "https://github.com/Seldaek/signal-handler/tree/2.0.1" - }, - "time": "2022-07-20T18:31:45+00:00" + "time": "2023-09-03T09:24:00+00:00" }, { "name": "sensio/framework-extra-bundle", - "version": "v6.2.9", + "version": "v6.2.10", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "dcfac94d6bdcf95c126e8ccac2104917c7c8f135" + "reference": "2f886f4b31f23c76496901acaedfedb6936ba61f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/dcfac94d6bdcf95c126e8ccac2104917c7c8f135", - "reference": "dcfac94d6bdcf95c126e8ccac2104917c7c8f135", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/2f886f4b31f23c76496901acaedfedb6936ba61f", + "reference": "2f886f4b31f23c76496901acaedfedb6936ba61f", "shasum": "" }, "require": { - "doctrine/annotations": "^1.0", + "doctrine/annotations": "^1.0|^2.0", "php": ">=7.2.5", "symfony/config": "^4.4|^5.0|^6.0", "symfony/dependency-injection": "^4.4|^5.0|^6.0", @@ -4618,25 +4417,21 @@ "annotations", "controllers" ], - "support": { - "issues": "https://github.com/sensiolabs/SensioFrameworkExtraBundle/issues", - "source": "https://github.com/sensiolabs/SensioFrameworkExtraBundle/tree/v6.2.9" - }, "abandoned": "Symfony", - "time": "2022-11-01T17:17:13+00:00" + "time": "2023-02-24T14:57:12+00:00" }, { "name": "setasign/fpdi", - "version": "v2.3.6", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/Setasign/FPDI.git", - "reference": "6231e315f73e4f62d72b73f3d6d78ff0eed93c31" + "reference": "ecf0459643ec963febfb9a5d529dcd93656006a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Setasign/FPDI/zipball/6231e315f73e4f62d72b73f3d6d78ff0eed93c31", - "reference": "6231e315f73e4f62d72b73f3d6d78ff0eed93c31", + "url": "https://api.github.com/repos/Setasign/FPDI/zipball/ecf0459643ec963febfb9a5d529dcd93656006a4", + "reference": "ecf0459643ec963febfb9a5d529dcd93656006a4", "shasum": "" }, "require": { @@ -4649,7 +4444,7 @@ "require-dev": { "phpunit/phpunit": "~5.7", "setasign/fpdf": "~1.8", - "setasign/tfpdf": "1.31", + "setasign/tfpdf": "~1.31", "squizlabs/php_codesniffer": "^3.5", "tecnickcom/tcpdf": "~6.2" }, @@ -4685,17 +4480,13 @@ "fpdi", "pdf" ], - "support": { - "issues": "https://github.com/Setasign/FPDI/issues", - "source": "https://github.com/Setasign/FPDI/tree/v2.3.6" - }, "funding": [ { "url": "https://tidelift.com/funding/github/packagist/setasign/fpdi", "type": "tidelift" } ], - "time": "2021-02-11T11:37:01+00:00" + "time": "2023-09-28T10:46:27+00:00" }, { "name": "skorp/detect-incompatible-samesite-useragents", @@ -4739,10 +4530,6 @@ "samesite", "samesite cookie" ], - "support": { - "issues": "https://github.com/skorp/detect-incompatible-samesite-useragents/issues", - "source": "https://github.com/skorp/detect-incompatible-samesite-useragents/tree/1.0.1" - }, "time": "2021-06-25T07:29:16+00:00" }, { @@ -4796,12 +4583,6 @@ } ], "description": "JSONPath implementation for parsing, searching and flattening arrays", - "support": { - "email": "hello@1-2.dev", - "forum": "https://github.com/SoftCreatR/JSONPath/discussions", - "issues": "https://github.com/SoftCreatR/JSONPath/issues", - "source": "https://github.com/SoftCreatR/JSONPath" - }, "funding": [ { "url": "https://github.com/softcreatr", @@ -4812,16 +4593,16 @@ }, { "name": "symfony/asset", - "version": "v5.4.13", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/asset.git", - "reference": "9aa867206711cb6fcca51ef127ba52a018170be9" + "reference": "1504b6773c6b90118f9871e90a67833b5d1dca3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/asset/zipball/9aa867206711cb6fcca51ef127ba52a018170be9", - "reference": "9aa867206711cb6fcca51ef127ba52a018170be9", + "url": "https://api.github.com/repos/symfony/asset/zipball/1504b6773c6b90118f9871e90a67833b5d1dca3c", + "reference": "1504b6773c6b90118f9871e90a67833b5d1dca3c", "shasum": "" }, "require": { @@ -4865,9 +4646,6 @@ ], "description": "Manages URL generation and versioning of web assets such as CSS stylesheets, JavaScript files and image files", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/asset/tree/v5.4.13" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -4882,20 +4660,20 @@ "type": "tidelift" } ], - "time": "2022-08-31T08:17:19+00:00" + "time": "2023-02-14T08:03:56+00:00" }, { "name": "symfony/cache", - "version": "v5.4.18", + "version": "v5.4.30", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "a33fa08a3f37bb44b90e60b9028796d6b811f9ef" + "reference": "2742d1b595927210546bb7a0887094cf1494de21" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/a33fa08a3f37bb44b90e60b9028796d6b811f9ef", - "reference": "a33fa08a3f37bb44b90e60b9028796d6b811f9ef", + "url": "https://api.github.com/repos/symfony/cache/zipball/2742d1b595927210546bb7a0887094cf1494de21", + "reference": "2742d1b595927210546bb7a0887094cf1494de21", "shasum": "" }, "require": { @@ -4923,7 +4701,7 @@ "require-dev": { "cache/integration-tests": "dev-master", "doctrine/cache": "^1.6|^2.0", - "doctrine/dbal": "^2.13.1|^3.0", + "doctrine/dbal": "^2.13.1|^3|^4", "predis/predis": "^1.1", "psr/simple-cache": "^1.0|^2.0", "symfony/config": "^4.4|^5.0|^6.0", @@ -4962,9 +4740,6 @@ "caching", "psr6" ], - "support": { - "source": "https://github.com/symfony/cache/tree/v5.4.18" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -4979,7 +4754,7 @@ "type": "tidelift" } ], - "time": "2022-12-29T16:06:09+00:00" + "time": "2023-10-17T14:17:25+00:00" }, { "name": "symfony/cache-contracts", @@ -5041,9 +4816,6 @@ "interoperability", "standards" ], - "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v2.5.2" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -5062,16 +4834,16 @@ }, { "name": "symfony/config", - "version": "v5.4.19", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "9bd60843443cda9638efdca7c41eb82ed0026179" + "reference": "8109892f27beed9252bd1f1c1880aeb4ad842650" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/9bd60843443cda9638efdca7c41eb82ed0026179", - "reference": "9bd60843443cda9638efdca7c41eb82ed0026179", + "url": "https://api.github.com/repos/symfony/config/zipball/8109892f27beed9252bd1f1c1880aeb4ad842650", + "reference": "8109892f27beed9252bd1f1c1880aeb4ad842650", "shasum": "" }, "require": { @@ -5120,9 +4892,6 @@ ], "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/config/tree/v5.4.19" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -5137,20 +4906,20 @@ "type": "tidelift" } ], - "time": "2023-01-08T13:23:55+00:00" + "time": "2023-07-19T20:21:11+00:00" }, { "name": "symfony/console", - "version": "v5.4.17", + "version": "v5.4.28", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f" + "reference": "f4f71842f24c2023b91237c72a365306f3c58827" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f", - "reference": "58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f", + "url": "https://api.github.com/repos/symfony/console/zipball/f4f71842f24c2023b91237c72a365306f3c58827", + "reference": "f4f71842f24c2023b91237c72a365306f3c58827", "shasum": "" }, "require": { @@ -5215,13 +4984,10 @@ "homepage": "https://symfony.com", "keywords": [ "cli", - "command line", + "command-line", "console", "terminal" ], - "support": { - "source": "https://github.com/symfony/console/tree/v5.4.17" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -5236,20 +5002,20 @@ "type": "tidelift" } ], - "time": "2022-12-28T14:15:31+00:00" + "time": "2023-08-07T06:12:30+00:00" }, { "name": "symfony/css-selector", - "version": "v5.4.17", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "052ef49b660f9ad2a3adb311c555c9bc11ba61f4" + "reference": "0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/052ef49b660f9ad2a3adb311c555c9bc11ba61f4", - "reference": "052ef49b660f9ad2a3adb311c555c9bc11ba61f4", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a", + "reference": "0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a", "shasum": "" }, "require": { @@ -5285,9 +5051,6 @@ ], "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/css-selector/tree/v5.4.17" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -5302,20 +5065,20 @@ "type": "tidelift" } ], - "time": "2022-12-23T11:40:44+00:00" + "time": "2023-07-07T06:10:25+00:00" }, { "name": "symfony/debug-bundle", - "version": "v5.4.11", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/debug-bundle.git", - "reference": "ec73a8bb7b966ccbe9e76be3c7dc413d8ae84f47" + "reference": "17c372891d4554d5d2f5cf602aef02c859ad52d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/ec73a8bb7b966ccbe9e76be3c7dc413d8ae84f47", - "reference": "ec73a8bb7b966ccbe9e76be3c7dc413d8ae84f47", + "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/17c372891d4554d5d2f5cf602aef02c859ad52d8", + "reference": "17c372891d4554d5d2f5cf602aef02c859ad52d8", "shasum": "" }, "require": { @@ -5364,9 +5127,6 @@ ], "description": "Provides a tight integration of the Symfony VarDumper component and the ServerLogCommand from MonologBridge into the Symfony full-stack framework", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/debug-bundle/tree/v5.4.11" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -5381,20 +5141,20 @@ "type": "tidelift" } ], - "time": "2022-07-20T13:00:38+00:00" + "time": "2023-07-11T21:42:03+00:00" }, { "name": "symfony/dependency-injection", - "version": "v5.4.20", + "version": "v5.4.29", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "8185ed0df129005a26715902f1a53bad0fe67102" + "reference": "338638ed8c9d5c7fcb136a73f5c7043465ae2f05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/8185ed0df129005a26715902f1a53bad0fe67102", - "reference": "8185ed0df129005a26715902f1a53bad0fe67102", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/338638ed8c9d5c7fcb136a73f5c7043465ae2f05", + "reference": "338638ed8c9d5c7fcb136a73f5c7043465ae2f05", "shasum": "" }, "require": { @@ -5453,9 +5213,6 @@ ], "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v5.4.20" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -5470,29 +5227,29 @@ "type": "tidelift" } ], - "time": "2023-01-27T11:08:11+00:00" + "time": "2023-09-20T06:23:43+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.2", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=8.1" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -5520,9 +5277,6 @@ ], "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -5537,20 +5291,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2023-05-23T14:45:45+00:00" }, { "name": "symfony/doctrine-bridge", - "version": "v5.4.17", + "version": "v5.4.30", "source": { "type": "git", "url": "https://github.com/symfony/doctrine-bridge.git", - "reference": "e9fce4a5568337402b2b1106907140d56a9d2454" + "reference": "b7cb6a9121181c725aa626fc0d5ea964fc004a3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/e9fce4a5568337402b2b1106907140d56a9d2454", - "reference": "e9fce4a5568337402b2b1106907140d56a9d2454", + "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/b7cb6a9121181c725aa626fc0d5ea964fc004a3c", + "reference": "b7cb6a9121181c725aa626fc0d5ea964fc004a3c", "shasum": "" }, "require": { @@ -5567,31 +5321,30 @@ "doctrine/dbal": "<2.13.1", "doctrine/lexer": "<1.1", "doctrine/orm": "<2.7.4", - "phpunit/phpunit": "<5.4.3", "symfony/cache": "<5.4", "symfony/dependency-injection": "<4.4", - "symfony/form": "<5.1", + "symfony/form": "<5.4.21|>=6,<6.2.7", "symfony/http-kernel": "<5", "symfony/messenger": "<4.4", "symfony/property-info": "<5", "symfony/proxy-manager-bridge": "<4.4.19", "symfony/security-bundle": "<5", "symfony/security-core": "<5.3", - "symfony/validator": "<5.2" + "symfony/validator": "<5.4.25|>=6,<6.2.12|>=6.3,<6.3.1" }, "require-dev": { "doctrine/annotations": "^1.10.4|^2", "doctrine/collections": "^1.0|^2.0", "doctrine/data-fixtures": "^1.1", - "doctrine/dbal": "^2.13.1|^3.0", - "doctrine/orm": "^2.7.4", + "doctrine/dbal": "^2.13.1|^3|^4", + "doctrine/orm": "^2.7.4|^3", "psr/log": "^1|^2|^3", "symfony/cache": "^5.4|^6.0", "symfony/config": "^4.4|^5.0|^6.0", "symfony/dependency-injection": "^4.4|^5.0|^6.0", "symfony/doctrine-messenger": "^5.1|^6.0", "symfony/expression-language": "^4.4|^5.0|^6.0", - "symfony/form": "^5.4.9|^6.0.9", + "symfony/form": "^5.4.21|^6.2.7", "symfony/http-kernel": "^5.0|^6.0", "symfony/messenger": "^4.4|^5.0|^6.0", "symfony/property-access": "^4.4|^5.0|^6.0", @@ -5601,7 +5354,7 @@ "symfony/stopwatch": "^4.4|^5.0|^6.0", "symfony/translation": "^4.4|^5.0|^6.0", "symfony/uid": "^5.1|^6.0", - "symfony/validator": "^5.2|^6.0", + "symfony/validator": "^5.4.25|~6.2.12|^6.3.1", "symfony/var-dumper": "^4.4|^5.0|^6.0" }, "suggest": { @@ -5637,9 +5390,6 @@ ], "description": "Provides integration for Doctrine with various Symfony components", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/doctrine-bridge/tree/v5.4.17" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -5654,20 +5404,20 @@ "type": "tidelift" } ], - "time": "2022-12-20T11:10:57+00:00" + "time": "2023-10-27T12:07:07+00:00" }, { "name": "symfony/dom-crawler", - "version": "v5.4.17", + "version": "v5.4.25", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "32a07d910edc138a1dd5508c17c6b9bc1eb27a1b" + "reference": "d2aefa5a7acc5511422792931d14d1be96fe9fea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/32a07d910edc138a1dd5508c17c6b9bc1eb27a1b", - "reference": "32a07d910edc138a1dd5508c17c6b9bc1eb27a1b", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/d2aefa5a7acc5511422792931d14d1be96fe9fea", + "reference": "d2aefa5a7acc5511422792931d14d1be96fe9fea", "shasum": "" }, "require": { @@ -5712,9 +5462,6 @@ ], "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v5.4.17" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -5729,20 +5476,20 @@ "type": "tidelift" } ], - "time": "2022-12-22T10:31:03+00:00" + "time": "2023-06-05T08:05:41+00:00" }, { "name": "symfony/dotenv", - "version": "v5.4.5", + "version": "v5.4.30", "source": { "type": "git", "url": "https://github.com/symfony/dotenv.git", - "reference": "83a2310904a4f5d4f42526227b5a578ac82232a9" + "reference": "ceed2cd28442adcf3679a9a82dacd45baeefc458" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dotenv/zipball/83a2310904a4f5d4f42526227b5a578ac82232a9", - "reference": "83a2310904a4f5d4f42526227b5a578ac82232a9", + "url": "https://api.github.com/repos/symfony/dotenv/zipball/ceed2cd28442adcf3679a9a82dacd45baeefc458", + "reference": "ceed2cd28442adcf3679a9a82dacd45baeefc458", "shasum": "" }, "require": { @@ -5783,9 +5530,6 @@ "env", "environment" ], - "support": { - "source": "https://github.com/symfony/dotenv/tree/v5.4.5" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -5800,31 +5544,34 @@ "type": "tidelift" } ], - "time": "2022-02-15T17:04:12+00:00" + "time": "2023-10-26T16:37:39+00:00" }, { "name": "symfony/error-handler", - "version": "v5.4.19", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "438ef3e5e6481244785da3ce8cf8f4e74e7f2822" + "reference": "1f69476b64fb47105c06beef757766c376b548c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/438ef3e5e6481244785da3ce8cf8f4e74e7f2822", - "reference": "438ef3e5e6481244785da3ce8cf8f4e74e7f2822", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/1f69476b64fb47105c06beef757766c376b548c4", + "reference": "1f69476b64fb47105c06beef757766c376b548c4", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=8.1", "psr/log": "^1|^2|^3", - "symfony/var-dumper": "^4.4|^5.0|^6.0" + "symfony/var-dumper": "^5.4|^6.0" + }, + "conflict": { + "symfony/deprecation-contracts": "<2.5" }, "require-dev": { - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/http-kernel": "^4.4|^5.0|^6.0", - "symfony/serializer": "^4.4|^5.0|^6.0" + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/http-kernel": "^5.4|^6.0", + "symfony/serializer": "^5.4|^6.0" }, "bin": [ "Resources/bin/patch-type-declarations" @@ -5854,9 +5601,6 @@ ], "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/error-handler/tree/v5.4.19" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -5871,20 +5615,20 @@ "type": "tidelift" } ], - "time": "2023-01-01T08:32:19+00:00" + "time": "2023-09-12T06:57:20+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.4.19", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "abf49cc084c087d94b4cb939c3f3672971784e0c" + "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/abf49cc084c087d94b4cb939c3f3672971784e0c", - "reference": "abf49cc084c087d94b4cb939c3f3672971784e0c", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/5dcc00e03413f05c1e7900090927bb7247cb0aac", + "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac", "shasum": "" }, "require": { @@ -5939,9 +5683,6 @@ ], "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.19" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -5956,33 +5697,30 @@ "type": "tidelift" } ], - "time": "2023-01-01T08:32:19+00:00" + "time": "2023-07-06T06:34:20+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v2.5.2", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1" + "reference": "a76aed96a42d2b521153fb382d418e30d18b59df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1", - "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df", + "reference": "a76aed96a42d2b521153fb382d418e30d18b59df", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=8.1", "psr/event-dispatcher": "^1" }, - "suggest": { - "symfony/event-dispatcher-implementation": "" - }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -6018,9 +5756,6 @@ "interoperability", "standards" ], - "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6035,20 +5770,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2023-05-23T14:45:45+00:00" }, { "name": "symfony/expression-language", - "version": "v5.4.14", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/expression-language.git", - "reference": "2f27d5b1e7926bba18e87719af75f696977cd58b" + "reference": "501589522b844b8eecf012c133f0404f0eef77ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/expression-language/zipball/2f27d5b1e7926bba18e87719af75f696977cd58b", - "reference": "2f27d5b1e7926bba18e87719af75f696977cd58b", + "url": "https://api.github.com/repos/symfony/expression-language/zipball/501589522b844b8eecf012c133f0404f0eef77ac", + "reference": "501589522b844b8eecf012c133f0404f0eef77ac", "shasum": "" }, "require": { @@ -6081,9 +5816,6 @@ ], "description": "Provides an engine that can compile and evaluate expressions", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/expression-language/tree/v5.4.14" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6098,20 +5830,20 @@ "type": "tidelift" } ], - "time": "2022-10-07T08:01:20+00:00" + "time": "2023-02-14T08:03:56+00:00" }, { "name": "symfony/filesystem", - "version": "v5.4.19", + "version": "v5.4.25", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "648bfaca6a494f3e22378123bcee2894045dc9d8" + "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/648bfaca6a494f3e22378123bcee2894045dc9d8", - "reference": "648bfaca6a494f3e22378123bcee2894045dc9d8", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", + "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", "shasum": "" }, "require": { @@ -6145,9 +5877,6 @@ ], "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.19" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6162,20 +5891,20 @@ "type": "tidelift" } ], - "time": "2023-01-14T19:14:44+00:00" + "time": "2023-05-31T13:04:02+00:00" }, { "name": "symfony/finder", - "version": "v5.4.17", + "version": "v5.4.27", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "40c08632019838dfb3350f18cf5563b8080055fc" + "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/40c08632019838dfb3350f18cf5563b8080055fc", - "reference": "40c08632019838dfb3350f18cf5563b8080055fc", + "url": "https://api.github.com/repos/symfony/finder/zipball/ff4bce3c33451e7ec778070e45bd23f74214cd5d", + "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d", "shasum": "" }, "require": { @@ -6208,9 +5937,6 @@ ], "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.17" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6225,20 +5951,20 @@ "type": "tidelift" } ], - "time": "2022-12-22T10:31:03+00:00" + "time": "2023-07-31T08:02:31+00:00" }, { "name": "symfony/flex", - "version": "v1.19.4", + "version": "v1.21.2", "source": { "type": "git", "url": "https://github.com/symfony/flex.git", - "reference": "c82477240111bfe41a1067c9f0ab91d40bafa5b6" + "reference": "f1cf4014ffac79e0c031cc40d6d66354e7de5da5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/flex/zipball/c82477240111bfe41a1067c9f0ab91d40bafa5b6", - "reference": "c82477240111bfe41a1067c9f0ab91d40bafa5b6", + "url": "https://api.github.com/repos/symfony/flex/zipball/f1cf4014ffac79e0c031cc40d6d66354e7de5da5", + "reference": "f1cf4014ffac79e0c031cc40d6d66354e7de5da5", "shasum": "" }, "require": { @@ -6272,10 +5998,6 @@ } ], "description": "Composer plugin for Symfony", - "support": { - "issues": "https://github.com/symfony/flex/issues", - "source": "https://github.com/symfony/flex/tree/v1.19.4" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6290,20 +6012,20 @@ "type": "tidelift" } ], - "time": "2022-12-20T07:19:24+00:00" + "time": "2023-10-30T18:34:59+00:00" }, { "name": "symfony/form", - "version": "v5.4.17", + "version": "v5.4.30", "source": { "type": "git", "url": "https://github.com/symfony/form.git", - "reference": "6150f66dc921375a62e5da1cce3684aee657ddca" + "reference": "8768ad112f28278c8386bb7fcbb261e0078a9a13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/form/zipball/6150f66dc921375a62e5da1cce3684aee657ddca", - "reference": "6150f66dc921375a62e5da1cce3684aee657ddca", + "url": "https://api.github.com/repos/symfony/form/zipball/8768ad112f28278c8386bb7fcbb261e0078a9a13", + "reference": "8768ad112f28278c8386bb7fcbb261e0078a9a13", "shasum": "" }, "require": { @@ -6320,16 +6042,15 @@ "symfony/service-contracts": "^1.1|^2|^3" }, "conflict": { - "phpunit/phpunit": "<5.4.3", "symfony/console": "<4.4", "symfony/dependency-injection": "<4.4", - "symfony/doctrine-bridge": "<4.4", + "symfony/doctrine-bridge": "<5.4.21|>=6,<6.2.7", "symfony/error-handler": "<4.4.5", "symfony/framework-bundle": "<4.4", "symfony/http-kernel": "<4.4", "symfony/translation": "<4.4", "symfony/translation-contracts": "<1.1.7", - "symfony/twig-bridge": "<4.4" + "symfony/twig-bridge": "<5.4.21|>=6,<6.2.7" }, "require-dev": { "doctrine/collections": "^1.0|^2.0", @@ -6376,9 +6097,6 @@ ], "description": "Allows to easily create, process and reuse HTML forms", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/form/tree/v5.4.17" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6393,20 +6111,20 @@ "type": "tidelift" } ], - "time": "2022-12-28T08:39:55+00:00" + "time": "2023-10-28T16:24:15+00:00" }, { "name": "symfony/framework-bundle", - "version": "v5.4.17", + "version": "v5.4.30", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "79dba90bd8a440488b63282ea27d2b30166e8841" + "reference": "896ce662696a89e44ea38972df5e6263ddd02c74" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/79dba90bd8a440488b63282ea27d2b30166e8841", - "reference": "79dba90bd8a440488b63282ea27d2b30166e8841", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/896ce662696a89e44ea38972df5e6263ddd02c74", + "reference": "896ce662696a89e44ea38972df5e6263ddd02c74", "shasum": "" }, "require": { @@ -6420,7 +6138,7 @@ "symfony/event-dispatcher": "^5.1|^6.0", "symfony/filesystem": "^4.4|^5.0|^6.0", "symfony/finder": "^4.4|^5.0|^6.0", - "symfony/http-foundation": "^5.3|^6.0", + "symfony/http-foundation": "^5.4.24|^6.2.11", "symfony/http-kernel": "^5.4|^6.0", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php80": "^1.16", @@ -6433,7 +6151,6 @@ "doctrine/persistence": "<1.3", "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", - "phpunit/phpunit": "<5.4.3", "symfony/asset": "<5.3", "symfony/console": "<5.2.5", "symfony/dom-crawler": "<4.4", @@ -6453,7 +6170,7 @@ "symfony/translation": "<5.3", "symfony/twig-bridge": "<4.4", "symfony/twig-bundle": "<4.4", - "symfony/validator": "<5.2", + "symfony/validator": "<5.3.11", "symfony/web-profiler-bundle": "<4.4", "symfony/workflow": "<5.2" }, @@ -6486,7 +6203,7 @@ "symfony/string": "^5.0|^6.0", "symfony/translation": "^5.3|^6.0", "symfony/twig-bundle": "^4.4|^5.0|^6.0", - "symfony/validator": "^5.2|^6.0", + "symfony/validator": "^5.3.11|^6.0", "symfony/web-link": "^4.4|^5.0|^6.0", "symfony/workflow": "^5.2|^6.0", "symfony/yaml": "^4.4|^5.0|^6.0", @@ -6527,9 +6244,6 @@ ], "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/framework-bundle/tree/v5.4.17" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6544,20 +6258,20 @@ "type": "tidelift" } ], - "time": "2022-12-20T11:10:57+00:00" + "time": "2023-10-26T16:43:35+00:00" }, { "name": "symfony/http-foundation", - "version": "v5.4.20", + "version": "v5.4.30", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "d0435363362a47c14e9cf50663cb8ffbf491875a" + "reference": "671769f79de0532da1478c60968b42506e185d2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d0435363362a47c14e9cf50663cb8ffbf491875a", - "reference": "d0435363362a47c14e9cf50663cb8ffbf491875a", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/671769f79de0532da1478c60968b42506e185d2e", + "reference": "671769f79de0532da1478c60968b42506e185d2e", "shasum": "" }, "require": { @@ -6603,9 +6317,6 @@ ], "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/http-foundation/tree/v5.4.20" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6620,20 +6331,20 @@ "type": "tidelift" } ], - "time": "2023-01-29T11:11:52+00:00" + "time": "2023-10-28T23:35:12+00:00" }, { "name": "symfony/http-kernel", - "version": "v5.4.20", + "version": "v5.4.30", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "aaeec341582d3c160cc9ecfa8b2419ba6c69954e" + "reference": "16b9b36f81631155546d9f05271dd027c83c3dd4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/aaeec341582d3c160cc9ecfa8b2419ba6c69954e", - "reference": "aaeec341582d3c160cc9ecfa8b2419ba6c69954e", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/16b9b36f81631155546d9f05271dd027c83c3dd4", + "reference": "16b9b36f81631155546d9f05271dd027c83c3dd4", "shasum": "" }, "require": { @@ -6642,7 +6353,7 @@ "symfony/deprecation-contracts": "^2.1|^3", "symfony/error-handler": "^4.4|^5.0|^6.0", "symfony/event-dispatcher": "^5.0|^6.0", - "symfony/http-foundation": "^5.3.7|^6.0", + "symfony/http-foundation": "^5.4.21|^6.2.7", "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-php73": "^1.9", "symfony/polyfill-php80": "^1.16" @@ -6715,9 +6426,6 @@ ], "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/http-kernel/tree/v5.4.20" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6732,20 +6440,20 @@ "type": "tidelift" } ], - "time": "2023-02-01T08:18:48+00:00" + "time": "2023-10-29T00:07:40+00:00" }, { "name": "symfony/inflector", - "version": "v5.4.11", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/inflector.git", - "reference": "4cb14dfb9cf782a1c743aaf4dac101003583d377" + "reference": "d56964e2b19253ba331a829c20d911dd27aa61b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/inflector/zipball/4cb14dfb9cf782a1c743aaf4dac101003583d377", - "reference": "4cb14dfb9cf782a1c743aaf4dac101003583d377", + "url": "https://api.github.com/repos/symfony/inflector/zipball/d56964e2b19253ba331a829c20d911dd27aa61b6", + "reference": "d56964e2b19253ba331a829c20d911dd27aa61b6", "shasum": "" }, "require": { @@ -6787,9 +6495,6 @@ "symfony", "words" ], - "support": { - "source": "https://github.com/symfony/inflector/tree/v5.4.11" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6805,20 +6510,20 @@ } ], "abandoned": "EnglishInflector from the String component", - "time": "2022-07-20T11:34:24+00:00" + "time": "2023-02-14T08:03:56+00:00" }, { "name": "symfony/intl", - "version": "v5.4.15", + "version": "v5.4.30", "source": { "type": "git", "url": "https://github.com/symfony/intl.git", - "reference": "2cb39da7f6e7b7344d7d5317dbee8db9d12cc714" + "reference": "cd6cce16151ac871071a3495e7a325460b952b5a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/intl/zipball/2cb39da7f6e7b7344d7d5317dbee8db9d12cc714", - "reference": "2cb39da7f6e7b7344d7d5317dbee8db9d12cc714", + "url": "https://api.github.com/repos/symfony/intl/zipball/cd6cce16151ac871071a3495e7a325460b952b5a", + "reference": "cd6cce16151ac871071a3495e7a325460b952b5a", "shasum": "" }, "require": { @@ -6827,7 +6532,8 @@ "symfony/polyfill-php80": "^1.16" }, "require-dev": { - "symfony/filesystem": "^4.4|^5.0|^6.0" + "symfony/filesystem": "^4.4|^5.0|^6.0", + "symfony/var-exporter": "^5.4|^6.0" }, "type": "library", "autoload": { @@ -6876,9 +6582,6 @@ "l10n", "localization" ], - "support": { - "source": "https://github.com/symfony/intl/tree/v5.4.15" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6893,27 +6596,25 @@ "type": "tidelift" } ], - "time": "2022-10-19T14:28:49+00:00" + "time": "2023-10-28T09:19:54+00:00" }, { "name": "symfony/lock", - "version": "v5.4.15", + "version": "v6.1.11", "source": { "type": "git", "url": "https://github.com/symfony/lock.git", - "reference": "109a20faa6119578b46457ef8cffb9389e20e5ca" + "reference": "cbc3366559a568ed56d9e7ed6d8e29a083eebb5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/lock/zipball/109a20faa6119578b46457ef8cffb9389e20e5ca", - "reference": "109a20faa6119578b46457ef8cffb9389e20e5ca", + "url": "https://api.github.com/repos/symfony/lock/zipball/cbc3366559a568ed56d9e7ed6d8e29a083eebb5b", + "reference": "cbc3366559a568ed56d9e7ed6d8e29a083eebb5b", "shasum": "" }, "require": { - "php": ">=7.2.5", - "psr/log": "^1|^2|^3", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.1", + "psr/log": "^1|^2|^3" }, "conflict": { "doctrine/dbal": "<2.13" @@ -6955,9 +6656,6 @@ "redlock", "semaphore" ], - "support": { - "source": "https://github.com/symfony/lock/tree/v5.4.15" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6972,24 +6670,24 @@ "type": "tidelift" } ], - "time": "2022-10-27T07:55:40+00:00" + "time": "2023-01-01T08:36:55+00:00" }, { "name": "symfony/mailer", - "version": "v5.4.17", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "fd816412b76447890efedaf9ddfe8632589ce10c" + "reference": "6330cd465dfd8b7a07515757a1c37069075f7b0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/fd816412b76447890efedaf9ddfe8632589ce10c", - "reference": "fd816412b76447890efedaf9ddfe8632589ce10c", + "url": "https://api.github.com/repos/symfony/mailer/zipball/6330cd465dfd8b7a07515757a1c37069075f7b0b", + "reference": "6330cd465dfd8b7a07515757a1c37069075f7b0b", "shasum": "" }, "require": { - "egulias/email-validator": "^2.1.10|^3", + "egulias/email-validator": "^2.1.10|^3|^4", "php": ">=7.2.5", "psr/event-dispatcher": "^1", "psr/log": "^1|^2|^3", @@ -7003,7 +6701,7 @@ "symfony/http-kernel": "<4.4" }, "require-dev": { - "symfony/http-client-contracts": "^1.1|^2|^3", + "symfony/http-client": "^4.4|^5.0|^6.0", "symfony/messenger": "^4.4|^5.0|^6.0" }, "type": "library", @@ -7031,9 +6729,6 @@ ], "description": "Helps sending emails", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/mailer/tree/v5.4.17" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7048,26 +6743,26 @@ "type": "tidelift" } ], - "time": "2022-12-14T15:45:23+00:00" + "time": "2023-03-10T10:15:32+00:00" }, { "name": "symfony/maker-bundle", - "version": "v1.43.0", + "version": "v1.50.0", "source": { "type": "git", "url": "https://github.com/symfony/maker-bundle.git", - "reference": "e3f9a1d9e0f4968f68454403e820dffc7db38a59" + "reference": "a1733f849b999460c308e66f6392fb09b621fa86" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/e3f9a1d9e0f4968f68454403e820dffc7db38a59", - "reference": "e3f9a1d9e0f4968f68454403e820dffc7db38a59", + "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/a1733f849b999460c308e66f6392fb09b621fa86", + "reference": "a1733f849b999460c308e66f6392fb09b621fa86", "shasum": "" }, "require": { "doctrine/inflector": "^2.0", "nikic/php-parser": "^4.11", - "php": ">=7.2.5", + "php": ">=8.0", "symfony/config": "^5.4.7|^6.0", "symfony/console": "^5.4.7|^6.0", "symfony/dependency-injection": "^5.4.7|^6.0", @@ -7075,19 +6770,21 @@ "symfony/filesystem": "^5.4.7|^6.0", "symfony/finder": "^5.4.3|^6.0", "symfony/framework-bundle": "^5.4.7|^6.0", - "symfony/http-kernel": "^5.4.7|^6.0" + "symfony/http-kernel": "^5.4.7|^6.0", + "symfony/process": "^5.4.7|^6.0" }, "conflict": { - "doctrine/orm": "<2.10" + "doctrine/doctrine-bundle": "<2.4", + "doctrine/orm": "<2.10", + "symfony/doctrine-bridge": "<5.4" }, "require-dev": { "composer/semver": "^3.0", "doctrine/doctrine-bundle": "^2.4", "doctrine/orm": "^2.10.0", "symfony/http-client": "^5.4.7|^6.0", - "symfony/phpunit-bridge": "^5.4.7|^6.0", + "symfony/phpunit-bridge": "^5.4.17|^6.0", "symfony/polyfill-php80": "^1.16.0", - "symfony/process": "^5.4.7|^6.0", "symfony/security-core": "^5.4.7|^6.0", "symfony/yaml": "^5.4.3|^6.0", "twig/twig": "^2.0|^3.0" @@ -7117,14 +6814,11 @@ "homepage": "https://symfony.com/doc/current/bundles/SymfonyMakerBundle/index.html", "keywords": [ "code generator", + "dev", "generator", "scaffold", "scaffolding" ], - "support": { - "issues": "https://github.com/symfony/maker-bundle/issues", - "source": "https://github.com/symfony/maker-bundle/tree/v1.43.0" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7139,43 +6833,40 @@ "type": "tidelift" } ], - "time": "2022-05-17T15:46:50+00:00" + "time": "2023-07-10T18:21:57+00:00" }, { "name": "symfony/mime", - "version": "v5.4.17", + "version": "v6.1.11", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "2a83d82efc91c3f03a23c8b47a896df168aa5c63" + "reference": "2bff58573e81a1df51bf99ad01725428beda1cbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/2a83d82efc91c3f03a23c8b47a896df168aa5c63", - "reference": "2a83d82efc91c3f03a23c8b47a896df168aa5c63", + "url": "https://api.github.com/repos/symfony/mime/zipball/2bff58573e81a1df51bf99ad01725428beda1cbc", + "reference": "2bff58573e81a1df51bf99ad01725428beda1cbc", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", + "php": ">=8.1", "symfony/polyfill-intl-idn": "^1.10", - "symfony/polyfill-mbstring": "^1.0", - "symfony/polyfill-php80": "^1.16" + "symfony/polyfill-mbstring": "^1.0" }, "conflict": { "egulias/email-validator": "~3.0.0", "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", - "symfony/mailer": "<4.4", - "symfony/serializer": "<5.4.14|>=6.0,<6.0.14|>=6.1,<6.1.6" + "symfony/mailer": "<5.4" }, "require-dev": { - "egulias/email-validator": "^2.1.10|^3.1", + "egulias/email-validator": "^2.1.10|^3.1|^4", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", - "symfony/dependency-injection": "^4.4|^5.0|^6.0", - "symfony/property-access": "^4.4|^5.1|^6.0", - "symfony/property-info": "^4.4|^5.1|^6.0", - "symfony/serializer": "^5.4.14|~6.0.14|^6.1.6" + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/property-access": "^5.4|^6.0", + "symfony/property-info": "^5.4|^6.0", + "symfony/serializer": "^5.2|^6.0" }, "type": "library", "autoload": { @@ -7206,9 +6897,6 @@ "mime", "mime-type" ], - "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.17" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7223,20 +6911,20 @@ "type": "tidelift" } ], - "time": "2022-12-13T09:59:55+00:00" + "time": "2023-01-10T18:53:01+00:00" }, { "name": "symfony/monolog-bridge", - "version": "v5.4.17", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bridge.git", - "reference": "0280390d8232a5668b02e0d87e9fce0a535c4af9" + "reference": "34be6f0695e4187dbb832a05905fb4c6581ac39a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bridge/zipball/0280390d8232a5668b02e0d87e9fce0a535c4af9", - "reference": "0280390d8232a5668b02e0d87e9fce0a535c4af9", + "url": "https://api.github.com/repos/symfony/monolog-bridge/zipball/34be6f0695e4187dbb832a05905fb4c6581ac39a", + "reference": "34be6f0695e4187dbb832a05905fb4c6581ac39a", "shasum": "" }, "require": { @@ -7290,9 +6978,6 @@ ], "description": "Provides integration for Monolog with various Symfony components", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/monolog-bridge/tree/v5.4.17" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7307,7 +6992,7 @@ "type": "tidelift" } ], - "time": "2022-12-13T10:55:04+00:00" + "time": "2023-03-06T21:29:33+00:00" }, { "name": "symfony/monolog-bundle", @@ -7370,10 +7055,6 @@ "log", "logging" ], - "support": { - "issues": "https://github.com/symfony/monolog-bundle/issues", - "source": "https://github.com/symfony/monolog-bundle/tree/v3.8.0" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7392,16 +7073,16 @@ }, { "name": "symfony/options-resolver", - "version": "v5.4.11", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "54f14e36aa73cb8f7261d7686691fd4d75ea2690" + "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/54f14e36aa73cb8f7261d7686691fd4d75ea2690", - "reference": "54f14e36aa73cb8f7261d7686691fd4d75ea2690", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", + "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", "shasum": "" }, "require": { @@ -7440,9 +7121,6 @@ "configuration", "options" ], - "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.4.11" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7457,24 +7135,25 @@ "type": "tidelift" } ], - "time": "2022-07-20T13:00:38+00:00" + "time": "2023-02-14T08:03:56+00:00" }, { "name": "symfony/password-hasher", - "version": "v5.4.19", + "version": "v5.4.29", "source": { "type": "git", "url": "https://github.com/symfony/password-hasher.git", - "reference": "51b4b4d9e368fa6e31daa24866499781848c77d3" + "reference": "57cd0369af1a92b87c1e960251ebdf9457225bfd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/password-hasher/zipball/51b4b4d9e368fa6e31daa24866499781848c77d3", - "reference": "51b4b4d9e368fa6e31daa24866499781848c77d3", + "url": "https://api.github.com/repos/symfony/password-hasher/zipball/57cd0369af1a92b87c1e960251ebdf9457225bfd", + "reference": "57cd0369af1a92b87c1e960251ebdf9457225bfd", "shasum": "" }, "require": { "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/polyfill-php80": "^1.15" }, "conflict": { @@ -7513,9 +7192,6 @@ "hashing", "password" ], - "support": { - "source": "https://github.com/symfony/password-hasher/tree/v5.4.19" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7530,20 +7206,20 @@ "type": "tidelift" } ], - "time": "2023-01-01T08:32:19+00:00" + "time": "2023-09-19T07:33:45+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", "shasum": "" }, "require": { @@ -7558,7 +7234,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7595,9 +7271,6 @@ "polyfill", "portable" ], - "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7612,20 +7285,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354" + "reference": "875e90aeea2777b6f135677f618529449334a612" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", + "reference": "875e90aeea2777b6f135677f618529449334a612", "shasum": "" }, "require": { @@ -7637,7 +7310,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7676,9 +7349,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7693,20 +7363,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "a3d9148e2c363588e05abbdd4ee4f971f0a5330c" + "reference": "e46b4da57951a16053cd751f63f4a24292788157" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/a3d9148e2c363588e05abbdd4ee4f971f0a5330c", - "reference": "a3d9148e2c363588e05abbdd4ee4f971f0a5330c", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/e46b4da57951a16053cd751f63f4a24292788157", + "reference": "e46b4da57951a16053cd751f63f4a24292788157", "shasum": "" }, "require": { @@ -7718,7 +7388,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7763,9 +7433,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-icu/tree/v1.27.0" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7780,20 +7447,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-03-21T17:27:24+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "639084e360537a19f9ee352433b84ce831f3d2da" + "reference": "ecaafce9f77234a6a449d29e49267ba10499116d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da", - "reference": "639084e360537a19f9ee352433b84ce831f3d2da", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d", + "reference": "ecaafce9f77234a6a449d29e49267ba10499116d", "shasum": "" }, "require": { @@ -7807,7 +7474,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7850,9 +7517,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.27.0" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7867,20 +7531,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:30:37+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", "shasum": "" }, "require": { @@ -7892,7 +7556,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7934,9 +7598,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7951,20 +7612,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" + "reference": "42292d99c55abe617799667f454222c54c60e229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", + "reference": "42292d99c55abe617799667f454222c54c60e229", "shasum": "" }, "require": { @@ -7979,7 +7640,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -8017,9 +7678,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8034,20 +7692,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-07-28T09:04:16+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" + "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179", + "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179", "shasum": "" }, "require": { @@ -8056,7 +7714,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -8093,9 +7751,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8110,20 +7765,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5", + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5", "shasum": "" }, "require": { @@ -8132,7 +7787,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -8172,9 +7827,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8189,20 +7841,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", "shasum": "" }, "require": { @@ -8211,7 +7863,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -8255,9 +7907,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8272,20 +7921,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b", + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b", "shasum": "" }, "require": { @@ -8294,7 +7943,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -8334,9 +7983,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8351,20 +7997,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/process", - "version": "v5.4.11", + "version": "v5.4.28", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "6e75fe6874cbc7e4773d049616ab450eff537bf1" + "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/6e75fe6874cbc7e4773d049616ab450eff537bf1", - "reference": "6e75fe6874cbc7e4773d049616ab450eff537bf1", + "url": "https://api.github.com/repos/symfony/process/zipball/45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b", + "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b", "shasum": "" }, "require": { @@ -8396,9 +8042,6 @@ ], "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/process/tree/v5.4.11" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8413,20 +8056,20 @@ "type": "tidelift" } ], - "time": "2022-06-27T16:58:25+00:00" + "time": "2023-08-07T10:36:04+00:00" }, { "name": "symfony/property-access", - "version": "v5.4.19", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", - "reference": "20fcf370aed6b2b4a2d8170fa23d2d07250e94ab" + "reference": "0249e46f69e92049a488f39fcf531cb42c50caaa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-access/zipball/20fcf370aed6b2b4a2d8170fa23d2d07250e94ab", - "reference": "20fcf370aed6b2b4a2d8170fa23d2d07250e94ab", + "url": "https://api.github.com/repos/symfony/property-access/zipball/0249e46f69e92049a488f39fcf531cb42c50caaa", + "reference": "0249e46f69e92049a488f39fcf531cb42c50caaa", "shasum": "" }, "require": { @@ -8474,12 +8117,9 @@ "injection", "object", "property", - "property path", + "property-path", "reflection" ], - "support": { - "source": "https://github.com/symfony/property-access/tree/v5.4.19" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8494,46 +8134,38 @@ "type": "tidelift" } ], - "time": "2023-01-01T08:32:19+00:00" + "time": "2023-07-13T15:20:41+00:00" }, { "name": "symfony/property-info", - "version": "v5.4.19", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/symfony/property-info.git", - "reference": "8ccf54bce2e2edbface1e99cb5a2560a290c9e2d" + "reference": "7f3a03716112269741fe2a809f8f791a371d1fcd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-info/zipball/8ccf54bce2e2edbface1e99cb5a2560a290c9e2d", - "reference": "8ccf54bce2e2edbface1e99cb5a2560a290c9e2d", + "url": "https://api.github.com/repos/symfony/property-info/zipball/7f3a03716112269741fe2a809f8f791a371d1fcd", + "reference": "7f3a03716112269741fe2a809f8f791a371d1fcd", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-php80": "^1.16", - "symfony/string": "^5.1|^6.0" + "php": ">=8.1", + "symfony/string": "^5.4|^6.0" }, "conflict": { - "phpdocumentor/reflection-docblock": "<3.2.2", - "phpdocumentor/type-resolver": "<1.4.0", - "symfony/dependency-injection": "<4.4" + "phpdocumentor/reflection-docblock": "<5.2", + "phpdocumentor/type-resolver": "<1.5.1", + "symfony/dependency-injection": "<5.4" }, "require-dev": { "doctrine/annotations": "^1.10.4|^2", - "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", + "phpdocumentor/reflection-docblock": "^5.2", "phpstan/phpdoc-parser": "^1.0", - "symfony/cache": "^4.4|^5.0|^6.0", - "symfony/dependency-injection": "^4.4|^5.0|^6.0", - "symfony/serializer": "^4.4|^5.0|^6.0" - }, - "suggest": { - "phpdocumentor/reflection-docblock": "To use the PHPDoc", - "psr/cache-implementation": "To cache results", - "symfony/doctrine-bridge": "To use Doctrine metadata", - "symfony/serializer": "To use Serializer metadata" + "symfony/cache": "^5.4|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/serializer": "^5.4|^6.0" }, "type": "library", "autoload": { @@ -8568,9 +8200,6 @@ "type", "validator" ], - "support": { - "source": "https://github.com/symfony/property-info/tree/v5.4.19" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8585,20 +8214,20 @@ "type": "tidelift" } ], - "time": "2023-01-14T11:26:56+00:00" + "time": "2023-05-19T08:06:44+00:00" }, { "name": "symfony/proxy-manager-bridge", - "version": "v5.4.6", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/proxy-manager-bridge.git", - "reference": "e6936de1cc8f4e6e3b2264aef186ca21695aee8e" + "reference": "a4cf96f3acfa252503a216bea877478f9621c7c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/e6936de1cc8f4e6e3b2264aef186ca21695aee8e", - "reference": "e6936de1cc8f4e6e3b2264aef186ca21695aee8e", + "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/a4cf96f3acfa252503a216bea877478f9621c7c0", + "reference": "a4cf96f3acfa252503a216bea877478f9621c7c0", "shasum": "" }, "require": { @@ -8635,9 +8264,6 @@ ], "description": "Provides integration for ProxyManager with various Symfony components", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/proxy-manager-bridge/tree/v5.4.6" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8652,20 +8278,20 @@ "type": "tidelift" } ], - "time": "2022-03-02T12:42:23+00:00" + "time": "2023-02-16T09:33:00+00:00" }, { "name": "symfony/rate-limiter", - "version": "v5.4.17", + "version": "v5.4.30", "source": { "type": "git", "url": "https://github.com/symfony/rate-limiter.git", - "reference": "a79d4fe5a330f95ca85a87b1321911bdeadb4db9" + "reference": "10c8064e57ae1bb6dee152d44d737a1a799f8386" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/rate-limiter/zipball/a79d4fe5a330f95ca85a87b1321911bdeadb4db9", - "reference": "a79d4fe5a330f95ca85a87b1321911bdeadb4db9", + "url": "https://api.github.com/repos/symfony/rate-limiter/zipball/10c8064e57ae1bb6dee152d44d737a1a799f8386", + "reference": "10c8064e57ae1bb6dee152d44d737a1a799f8386", "shasum": "" }, "require": { @@ -8705,9 +8331,6 @@ "limiter", "rate-limiter" ], - "support": { - "source": "https://github.com/symfony/rate-limiter/tree/v5.4.17" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8722,20 +8345,20 @@ "type": "tidelift" } ], - "time": "2022-12-09T07:37:05+00:00" + "time": "2023-10-10T05:34:18+00:00" }, { "name": "symfony/routing", - "version": "v5.4.17", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "4ce2df9a469c19ba45ca6aca04fec1c358a6e791" + "reference": "853fc7df96befc468692de0a48831b38f04d2cb2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/4ce2df9a469c19ba45ca6aca04fec1c358a6e791", - "reference": "4ce2df9a469c19ba45ca6aca04fec1c358a6e791", + "url": "https://api.github.com/repos/symfony/routing/zipball/853fc7df96befc468692de0a48831b38f04d2cb2", + "reference": "853fc7df96befc468692de0a48831b38f04d2cb2", "shasum": "" }, "require": { @@ -8795,9 +8418,6 @@ "uri", "url" ], - "support": { - "source": "https://github.com/symfony/routing/tree/v5.4.17" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8812,20 +8432,20 @@ "type": "tidelift" } ], - "time": "2022-12-20T11:10:57+00:00" + "time": "2023-07-24T13:28:37+00:00" }, { "name": "symfony/security-bundle", - "version": "v5.4.20", + "version": "v5.4.30", "source": { "type": "git", "url": "https://github.com/symfony/security-bundle.git", - "reference": "1a049b77e70e890c5d5d2105d96ce8b35890197e" + "reference": "773515c801601265af970d2e7f7b0af1ef0d79b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-bundle/zipball/1a049b77e70e890c5d5d2105d96ce8b35890197e", - "reference": "1a049b77e70e890c5d5d2105d96ce8b35890197e", + "url": "https://api.github.com/repos/symfony/security-bundle/zipball/773515c801601265af970d2e7f7b0af1ef0d79b9", + "reference": "773515c801601265af970d2e7f7b0af1ef0d79b9", "shasum": "" }, "require": { @@ -8842,7 +8462,8 @@ "symfony/security-core": "^5.4|^6.0", "symfony/security-csrf": "^4.4|^5.0|^6.0", "symfony/security-guard": "^5.3", - "symfony/security-http": "^5.4.20|~6.0.20|~6.1.12|^6.2.6" + "symfony/security-http": "^5.4.30|^6.3.6", + "symfony/service-contracts": "^1.10|^2|^3" }, "conflict": { "symfony/browser-kit": "<4.4", @@ -8897,9 +8518,6 @@ ], "description": "Provides a tight integration of the Security component into the Symfony full-stack framework", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/security-bundle/tree/v5.4.20" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8914,20 +8532,20 @@ "type": "tidelift" } ], - "time": "2023-01-30T09:35:58+00:00" + "time": "2023-10-26T15:45:09+00:00" }, { "name": "symfony/security-core", - "version": "v5.4.19", + "version": "v5.4.30", "source": { "type": "git", "url": "https://github.com/symfony/security-core.git", - "reference": "76fe5a7c62a3f23a5d7b72a55529e94ae2c1ae07" + "reference": "3908c54da30dd68c2fe31915d82a1c81809d1928" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-core/zipball/76fe5a7c62a3f23a5d7b72a55529e94ae2c1ae07", - "reference": "76fe5a7c62a3f23a5d7b72a55529e94ae2c1ae07", + "url": "https://api.github.com/repos/symfony/security-core/zipball/3908c54da30dd68c2fe31915d82a1c81809d1928", + "reference": "3908c54da30dd68c2fe31915d82a1c81809d1928", "shasum": "" }, "require": { @@ -8990,9 +8608,6 @@ ], "description": "Symfony Security Component - Core Library", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/security-core/tree/v5.4.19" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -9007,35 +8622,31 @@ "type": "tidelift" } ], - "time": "2023-01-24T10:56:59+00:00" + "time": "2023-10-27T07:38:28+00:00" }, { "name": "symfony/security-csrf", - "version": "v5.4.19", + "version": "v6.3.2", "source": { "type": "git", "url": "https://github.com/symfony/security-csrf.git", - "reference": "892dc11b003c0d3da377264bb3d5f178cb894944" + "reference": "63d7b098c448cbddb46ea5eda33b68c1ece6eb5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-csrf/zipball/892dc11b003c0d3da377264bb3d5f178cb894944", - "reference": "892dc11b003c0d3da377264bb3d5f178cb894944", + "url": "https://api.github.com/repos/symfony/security-csrf/zipball/63d7b098c448cbddb46ea5eda33b68c1ece6eb5b", + "reference": "63d7b098c448cbddb46ea5eda33b68c1ece6eb5b", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/polyfill-php80": "^1.16", - "symfony/security-core": "^4.4|^5.0|^6.0" + "php": ">=8.1", + "symfony/security-core": "^5.4|^6.0" }, "conflict": { - "symfony/http-foundation": "<5.3" + "symfony/http-foundation": "<5.4" }, "require-dev": { - "symfony/http-foundation": "^5.3|^6.0" - }, - "suggest": { - "symfony/http-foundation": "For using the class SessionTokenStorage." + "symfony/http-foundation": "^5.4|^6.0" }, "type": "library", "autoload": { @@ -9062,9 +8673,6 @@ ], "description": "Symfony Security Component - CSRF Library", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/security-csrf/tree/v5.4.19" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -9079,24 +8687,25 @@ "type": "tidelift" } ], - "time": "2023-01-01T08:32:19+00:00" + "time": "2023-07-05T08:41:27+00:00" }, { "name": "symfony/security-guard", - "version": "v5.4.19", + "version": "v5.4.27", "source": { "type": "git", "url": "https://github.com/symfony/security-guard.git", - "reference": "6f9d69b1ef4adaae02ac99af09bbe5de151e824c" + "reference": "72c53142533462fc6fda4a429c2a21c2b944a8cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-guard/zipball/6f9d69b1ef4adaae02ac99af09bbe5de151e824c", - "reference": "6f9d69b1ef4adaae02ac99af09bbe5de151e824c", + "url": "https://api.github.com/repos/symfony/security-guard/zipball/72c53142533462fc6fda4a429c2a21c2b944a8cc", + "reference": "72c53142533462fc6fda4a429c2a21c2b944a8cc", "shasum": "" }, "require": { "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/polyfill-php80": "^1.15", "symfony/security-core": "^5.0", "symfony/security-http": "^5.3" @@ -9129,9 +8738,6 @@ ], "description": "Symfony Security Component - Guard", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/security-guard/tree/v5.4.19" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -9146,20 +8752,20 @@ "type": "tidelift" } ], - "time": "2023-01-01T08:32:19+00:00" + "time": "2023-07-28T14:44:35+00:00" }, { "name": "symfony/security-http", - "version": "v5.4.20", + "version": "v5.4.30", "source": { "type": "git", "url": "https://github.com/symfony/security-http.git", - "reference": "0236efe37462df3204e758e3a55661a43285d948" + "reference": "a86dc993b41cdd84d871817b511ef99781405714" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-http/zipball/0236efe37462df3204e758e3a55661a43285d948", - "reference": "0236efe37462df3204e758e3a55661a43285d948", + "url": "https://api.github.com/repos/symfony/security-http/zipball/a86dc993b41cdd84d871817b511ef99781405714", + "reference": "a86dc993b41cdd84d871817b511ef99781405714", "shasum": "" }, "require": { @@ -9170,7 +8776,8 @@ "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php80": "^1.16", "symfony/property-access": "^4.4|^5.0|^6.0", - "symfony/security-core": "^5.4.19|~6.0.19|~6.1.11|^6.2.5" + "symfony/security-core": "^5.4.19|~6.0.19|~6.1.11|^6.2.5", + "symfony/service-contracts": "^1.10|^2|^3" }, "conflict": { "symfony/event-dispatcher": "<4.3", @@ -9214,9 +8821,6 @@ ], "description": "Symfony Security Component - HTTP Integration", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/security-http/tree/v5.4.20" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -9231,20 +8835,20 @@ "type": "tidelift" } ], - "time": "2023-01-30T09:35:58+00:00" + "time": "2023-10-11T08:54:26+00:00" }, { "name": "symfony/serializer", - "version": "v5.4.17", + "version": "v5.4.30", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "4ac4fae1cbad2655a0b05f327e7ce8ef310239fb" + "reference": "ceadb4e08830e69738d313b667cfb426269f67f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/4ac4fae1cbad2655a0b05f327e7ce8ef310239fb", - "reference": "4ac4fae1cbad2655a0b05f327e7ce8ef310239fb", + "url": "https://api.github.com/repos/symfony/serializer/zipball/ceadb4e08830e69738d313b667cfb426269f67f6", + "reference": "ceadb4e08830e69738d313b667cfb426269f67f6", "shasum": "" }, "require": { @@ -9256,10 +8860,10 @@ "conflict": { "doctrine/annotations": "<1.12", "phpdocumentor/reflection-docblock": "<3.2.2", - "phpdocumentor/type-resolver": "<1.4.0|>=1.7.0", + "phpdocumentor/type-resolver": "<1.4.0", "symfony/dependency-injection": "<4.4", "symfony/property-access": "<5.4", - "symfony/property-info": "<5.3.13", + "symfony/property-info": "<5.4.24|>=6,<6.2.11", "symfony/uid": "<5.3", "symfony/yaml": "<4.4" }, @@ -9276,7 +8880,7 @@ "symfony/http-kernel": "^4.4|^5.0|^6.0", "symfony/mime": "^4.4|^5.0|^6.0", "symfony/property-access": "^5.4|^6.0", - "symfony/property-info": "^5.3.13|^6.0", + "symfony/property-info": "^5.4.24|^6.2.11", "symfony/uid": "^5.3|^6.0", "symfony/validator": "^4.4|^5.0|^6.0", "symfony/var-dumper": "^4.4|^5.0|^6.0", @@ -9317,9 +8921,6 @@ ], "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/serializer/tree/v5.4.17" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -9334,7 +8935,7 @@ "type": "tidelift" } ], - "time": "2022-12-20T11:10:57+00:00" + "time": "2023-10-25T18:53:19+00:00" }, { "name": "symfony/service-contracts", @@ -9400,9 +9001,6 @@ "interoperability", "standards" ], - "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -9421,16 +9019,16 @@ }, { "name": "symfony/stopwatch", - "version": "v5.4.13", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "6df7a3effde34d81717bbef4591e5ffe32226d69" + "reference": "f83692cd869a6f2391691d40a01e8acb89e76fee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6df7a3effde34d81717bbef4591e5ffe32226d69", - "reference": "6df7a3effde34d81717bbef4591e5ffe32226d69", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/f83692cd869a6f2391691d40a01e8acb89e76fee", + "reference": "f83692cd869a6f2391691d40a01e8acb89e76fee", "shasum": "" }, "require": { @@ -9462,9 +9060,6 @@ ], "description": "Provides a way to profile code", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.4.13" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -9479,38 +9074,38 @@ "type": "tidelift" } ], - "time": "2022-09-28T13:19:49+00:00" + "time": "2023-02-14T08:03:56+00:00" }, { "name": "symfony/string", - "version": "v5.4.19", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "0a01071610fd861cc160dfb7e2682ceec66064cb" + "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/0a01071610fd861cc160dfb7e2682ceec66064cb", - "reference": "0a01071610fd861cc160dfb7e2682ceec66064cb", + "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339", + "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=8.1", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "~1.15" + "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/translation-contracts": ">=3.0" + "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^4.4|^5.0|^6.0", - "symfony/http-client": "^4.4|^5.0|^6.0", - "symfony/translation-contracts": "^1.1|^2", - "symfony/var-exporter": "^4.4|^5.0|^6.0" + "symfony/error-handler": "^5.4|^6.0", + "symfony/http-client": "^5.4|^6.0", + "symfony/intl": "^6.2", + "symfony/translation-contracts": "^2.5|^3.0", + "symfony/var-exporter": "^5.4|^6.0" }, "type": "library", "autoload": { @@ -9548,9 +9143,6 @@ "utf-8", "utf8" ], - "support": { - "source": "https://github.com/symfony/string/tree/v5.4.19" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -9565,20 +9157,20 @@ "type": "tidelift" } ], - "time": "2023-01-01T08:32:19+00:00" + "time": "2023-09-18T10:38:32+00:00" }, { "name": "symfony/templating", - "version": "v5.4.11", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/templating.git", - "reference": "3933eaad08c7f83672c53f635d7c3988252a658a" + "reference": "a47d5f1c8f7a636d27f8918d9cfd508242714e70" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/templating/zipball/3933eaad08c7f83672c53f635d7c3988252a658a", - "reference": "3933eaad08c7f83672c53f635d7c3988252a658a", + "url": "https://api.github.com/repos/symfony/templating/zipball/a47d5f1c8f7a636d27f8918d9cfd508242714e70", + "reference": "a47d5f1c8f7a636d27f8918d9cfd508242714e70", "shasum": "" }, "require": { @@ -9616,9 +9208,6 @@ ], "description": "Provides all the tools needed to build any kind of template system", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/templating/tree/v5.4.11" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -9633,20 +9222,20 @@ "type": "tidelift" } ], - "time": "2022-06-27T16:58:25+00:00" + "time": "2023-02-14T08:03:56+00:00" }, { "name": "symfony/translation", - "version": "v5.4.14", + "version": "v5.4.30", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "f0ed07675863aa6e3939df8b1bc879450b585cab" + "reference": "8560dc532e4e48d331937532a7cbfd2a9f9f53ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/f0ed07675863aa6e3939df8b1bc879450b585cab", - "reference": "f0ed07675863aa6e3939df8b1bc879450b585cab", + "url": "https://api.github.com/repos/symfony/translation/zipball/8560dc532e4e48d331937532a7cbfd2a9f9f53ce", + "reference": "8560dc532e4e48d331937532a7cbfd2a9f9f53ce", "shasum": "" }, "require": { @@ -9713,9 +9302,6 @@ ], "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/translation/tree/v5.4.14" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -9730,7 +9316,7 @@ "type": "tidelift" } ], - "time": "2022-10-07T08:01:20+00:00" + "time": "2023-10-28T09:19:54+00:00" }, { "name": "symfony/translation-contracts", @@ -9791,9 +9377,6 @@ "interoperability", "standards" ], - "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v2.5.2" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -9812,16 +9395,16 @@ }, { "name": "symfony/twig-bridge", - "version": "v5.4.17", + "version": "v5.4.29", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "5a35a669639ac25e4cb3d6d9c968924d96a7eae6" + "reference": "8e94856da373b63e7ba69e51a6c4f834d991cd58" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/5a35a669639ac25e4cb3d6d9c968924d96a7eae6", - "reference": "5a35a669639ac25e4cb3d6d9c968924d96a7eae6", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/8e94856da373b63e7ba69e51a6c4f834d991cd58", + "reference": "8e94856da373b63e7ba69e51a6c4f834d991cd58", "shasum": "" }, "require": { @@ -9834,7 +9417,7 @@ "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", "symfony/console": "<5.3", - "symfony/form": "<5.3", + "symfony/form": "<5.4.21|>=6,<6.2.7", "symfony/http-foundation": "<5.3", "symfony/http-kernel": "<4.4", "symfony/translation": "<5.2", @@ -9842,14 +9425,14 @@ }, "require-dev": { "doctrine/annotations": "^1.12|^2", - "egulias/email-validator": "^2.1.10|^3", + "egulias/email-validator": "^2.1.10|^3|^4", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "symfony/asset": "^4.4|^5.0|^6.0", "symfony/console": "^5.3|^6.0", "symfony/dependency-injection": "^4.4|^5.0|^6.0", "symfony/expression-language": "^4.4|^5.0|^6.0", "symfony/finder": "^4.4|^5.0|^6.0", - "symfony/form": "^5.3|^6.0", + "symfony/form": "^5.4.21|^6.2.7", "symfony/http-foundation": "^5.3|^6.0", "symfony/http-kernel": "^4.4|^5.0|^6.0", "symfony/intl": "^4.4|^5.0|^6.0", @@ -9912,9 +9495,6 @@ ], "description": "Provides integration for Twig with various Symfony components", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/twig-bridge/tree/v5.4.17" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -9929,25 +9509,26 @@ "type": "tidelift" } ], - "time": "2022-12-20T11:10:57+00:00" + "time": "2023-09-06T21:54:06+00:00" }, { "name": "symfony/twig-bundle", - "version": "v5.4.17", + "version": "v5.4.27", "source": { "type": "git", "url": "https://github.com/symfony/twig-bundle.git", - "reference": "ac21af4eff72ecd65680d2f3d163b5794ce82fc4" + "reference": "a16996ad54d75e220e91a0c7517437ad592eccca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bundle/zipball/ac21af4eff72ecd65680d2f3d163b5794ce82fc4", - "reference": "ac21af4eff72ecd65680d2f3d163b5794ce82fc4", + "url": "https://api.github.com/repos/symfony/twig-bundle/zipball/a16996ad54d75e220e91a0c7517437ad592eccca", + "reference": "a16996ad54d75e220e91a0c7517437ad592eccca", "shasum": "" }, "require": { "php": ">=7.2.5", "symfony/config": "^4.4|^5.0|^6.0", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/http-foundation": "^4.4|^5.0|^6.0", "symfony/http-kernel": "^5.0|^6.0", "symfony/polyfill-ctype": "~1.8", @@ -10001,9 +9582,6 @@ ], "description": "Provides a tight integration of Twig into the Symfony full-stack framework", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/twig-bundle/tree/v5.4.17" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -10018,20 +9596,20 @@ "type": "tidelift" } ], - "time": "2022-12-20T11:10:57+00:00" + "time": "2023-07-28T14:44:35+00:00" }, { "name": "symfony/validator", - "version": "v5.4.17", + "version": "v5.4.30", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "621b820204a238d754f7f60241fcbdb1687641ea" + "reference": "ce65d7802d78e43d46669bfa08521bf6104880f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/621b820204a238d754f7f60241fcbdb1687641ea", - "reference": "621b820204a238d754f7f60241fcbdb1687641ea", + "url": "https://api.github.com/repos/symfony/validator/zipball/ce65d7802d78e43d46669bfa08521bf6104880f0", + "reference": "ce65d7802d78e43d46669bfa08521bf6104880f0", "shasum": "" }, "require": { @@ -10048,7 +9626,6 @@ "doctrine/annotations": "<1.13", "doctrine/cache": "<1.11", "doctrine/lexer": "<1.1", - "phpunit/phpunit": "<5.4.3", "symfony/dependency-injection": "<4.4", "symfony/expression-language": "<5.1", "symfony/http-kernel": "<4.4", @@ -10060,7 +9637,7 @@ "require-dev": { "doctrine/annotations": "^1.13|^2", "doctrine/cache": "^1.11|^2.0", - "egulias/email-validator": "^2.1.10|^3", + "egulias/email-validator": "^2.1.10|^3|^4", "symfony/cache": "^4.4|^5.0|^6.0", "symfony/config": "^4.4|^5.0|^6.0", "symfony/console": "^4.4|^5.0|^6.0", @@ -10114,9 +9691,6 @@ ], "description": "Provides tools to validate values", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/validator/tree/v5.4.17" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -10131,20 +9705,20 @@ "type": "tidelift" } ], - "time": "2022-12-21T19:20:17+00:00" + "time": "2023-10-27T07:38:31+00:00" }, { "name": "symfony/var-dumper", - "version": "v5.4.19", + "version": "v5.4.29", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "2944bbc23f5f8da2b962fbcbf7c4a6109b2f4b7b" + "reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2944bbc23f5f8da2b962fbcbf7c4a6109b2f4b7b", - "reference": "2944bbc23f5f8da2b962fbcbf7c4a6109b2f4b7b", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6172e4ae3534d25ee9e07eb487c20be7760fcc65", + "reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65", "shasum": "" }, "require": { @@ -10153,12 +9727,12 @@ "symfony/polyfill-php80": "^1.16" }, "conflict": { - "phpunit/phpunit": "<5.4.3", "symfony/console": "<4.4" }, "require-dev": { "ext-iconv": "*", "symfony/console": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^4.4|^5.0|^6.0", "symfony/process": "^4.4|^5.0|^6.0", "symfony/uid": "^5.1|^6.0", "twig/twig": "^2.13|^3.0.4" @@ -10203,9 +9777,6 @@ "debug", "dump" ], - "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.19" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -10220,28 +9791,27 @@ "type": "tidelift" } ], - "time": "2023-01-16T10:52:33+00:00" + "time": "2023-09-12T10:09:58+00:00" }, { "name": "symfony/var-exporter", - "version": "v5.4.17", + "version": "v6.3.6", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "2adac0a9b55f9fb40b983b790509581dc3db0fff" + "reference": "374d289c13cb989027274c86206ddc63b16a2441" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/2adac0a9b55f9fb40b983b790509581dc3db0fff", - "reference": "2adac0a9b55f9fb40b983b790509581dc3db0fff", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/374d289c13cb989027274c86206ddc63b16a2441", + "reference": "374d289c13cb989027274c86206ddc63b16a2441", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.1" }, "require-dev": { - "symfony/var-dumper": "^4.4.9|^5.0.9|^6.0" + "symfony/var-dumper": "^5.4|^6.0" }, "type": "library", "autoload": { @@ -10274,11 +9844,10 @@ "export", "hydrate", "instantiate", + "lazy-loading", + "proxy", "serialize" ], - "support": { - "source": "https://github.com/symfony/var-exporter/tree/v5.4.17" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -10293,20 +9862,20 @@ "type": "tidelift" } ], - "time": "2022-12-22T10:10:04+00:00" + "time": "2023-10-13T09:16:49+00:00" }, { "name": "symfony/web-profiler-bundle", - "version": "v5.4.17", + "version": "v5.4.30", "source": { "type": "git", "url": "https://github.com/symfony/web-profiler-bundle.git", - "reference": "6c7635fb150af892f6a79f016b6c5386ab112922" + "reference": "3ad75bc82e91d33cc3aff6639e62da765bfbe346" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/6c7635fb150af892f6a79f016b6c5386ab112922", - "reference": "6c7635fb150af892f6a79f016b6c5386ab112922", + "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/3ad75bc82e91d33cc3aff6639e62da765bfbe346", + "reference": "3ad75bc82e91d33cc3aff6639e62da765bfbe346", "shasum": "" }, "require": { @@ -10356,9 +9925,6 @@ ], "description": "Provides a development tool that gives detailed information about the execution of any request", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/web-profiler-bundle/tree/v5.4.17" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -10373,24 +9939,25 @@ "type": "tidelift" } ], - "time": "2022-12-13T13:09:23+00:00" + "time": "2023-10-11T08:22:16+00:00" }, { "name": "symfony/workflow", - "version": "v5.4.17", + "version": "v5.4.28", "source": { "type": "git", "url": "https://github.com/symfony/workflow.git", - "reference": "245065b70912c1a4ffe78db8987b33d73586331a" + "reference": "824480ed211164a31fc42e6cea912273699a52a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/workflow/zipball/245065b70912c1a4ffe78db8987b33d73586331a", - "reference": "245065b70912c1a4ffe78db8987b33d73586331a", + "url": "https://api.github.com/repos/symfony/workflow/zipball/824480ed211164a31fc42e6cea912273699a52a6", + "reference": "824480ed211164a31fc42e6cea912273699a52a6", "shasum": "" }, "require": { "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/polyfill-php80": "^1.15" }, "conflict": { @@ -10438,9 +10005,6 @@ "transition", "workflow" ], - "support": { - "source": "https://github.com/symfony/workflow/tree/v5.4.17" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -10455,20 +10019,20 @@ "type": "tidelift" } ], - "time": "2022-12-21T17:19:25+00:00" + "time": "2023-08-01T08:27:53+00:00" }, { "name": "symfony/yaml", - "version": "v5.4.17", + "version": "v5.4.30", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "edcdc11498108f8967fe95118a7ec8624b94760e" + "reference": "c6980e82a6656f6ebfabfd82f7585794cb122554" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/edcdc11498108f8967fe95118a7ec8624b94760e", - "reference": "edcdc11498108f8967fe95118a7ec8624b94760e", + "url": "https://api.github.com/repos/symfony/yaml/zipball/c6980e82a6656f6ebfabfd82f7585794cb122554", + "reference": "c6980e82a6656f6ebfabfd82f7585794cb122554", "shasum": "" }, "require": { @@ -10513,9 +10077,6 @@ ], "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/yaml/tree/v5.4.17" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -10530,20 +10091,20 @@ "type": "tidelift" } ], - "time": "2022-12-13T09:57:04+00:00" + "time": "2023-10-27T18:36:14+00:00" }, { "name": "tecnickcom/tcpdf", - "version": "6.6.2", + "version": "6.6.5", "source": { "type": "git", "url": "https://github.com/tecnickcom/TCPDF.git", - "reference": "e3cffc9bcbc76e89e167e9eb0bbda0cab7518459" + "reference": "5fce932fcee4371865314ab7f6c0d85423c5c7ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/e3cffc9bcbc76e89e167e9eb0bbda0cab7518459", - "reference": "e3cffc9bcbc76e89e167e9eb0bbda0cab7518459", + "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/5fce932fcee4371865314ab7f6c0d85423c5c7ce", + "reference": "5fce932fcee4371865314ab7f6c0d85423c5c7ce", "shasum": "" }, "require": { @@ -10572,7 +10133,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL-3.0-only" + "LGPL-3.0-or-later" ], "authors": [ { @@ -10592,41 +10153,37 @@ "pdf417", "qrcode" ], - "support": { - "issues": "https://github.com/tecnickcom/TCPDF/issues", - "source": "https://github.com/tecnickcom/TCPDF/tree/6.6.2" - }, "funding": [ { "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_donations¤cy_code=GBP&business=paypal@tecnick.com&item_name=donation%20for%20tcpdf%20project", "type": "custom" } ], - "time": "2022-12-17T10:28:59+00:00" + "time": "2023-09-06T15:09:26+00:00" }, { "name": "twig/extra-bundle", - "version": "v3.5.0", + "version": "v3.7.1", "source": { "type": "git", "url": "https://github.com/twigphp/twig-extra-bundle.git", - "reference": "edfcdbdc943b52101011d57ec546af393dc56537" + "reference": "f10baafe6eb0ecd615d52d5cbfb713a39f68e8f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/twig-extra-bundle/zipball/edfcdbdc943b52101011d57ec546af393dc56537", - "reference": "edfcdbdc943b52101011d57ec546af393dc56537", + "url": "https://api.github.com/repos/twigphp/twig-extra-bundle/zipball/f10baafe6eb0ecd615d52d5cbfb713a39f68e8f3", + "reference": "f10baafe6eb0ecd615d52d5cbfb713a39f68e8f3", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/framework-bundle": "^4.4|^5.0|^6.0", - "symfony/twig-bundle": "^4.4|^5.0|^6.0", + "symfony/framework-bundle": "^5.4|^6.0", + "symfony/twig-bundle": "^5.4|^6.0", "twig/twig": "^2.7|^3.0" }, "require-dev": { "league/commonmark": "^1.0|^2.0", - "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0", + "symfony/phpunit-bridge": "^5.4|^6.3", "twig/cache-extra": "^3.0", "twig/cssinliner-extra": "^2.12|^3.0", "twig/html-extra": "^2.12|^3.0", @@ -10636,11 +10193,6 @@ "twig/string-extra": "^2.12|^3.0" }, "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "3.5-dev" - } - }, "autoload": { "psr-4": { "Twig\\Extra\\TwigExtraBundle\\": "" @@ -10668,9 +10220,6 @@ "extra", "twig" ], - "support": { - "source": "https://github.com/twigphp/twig-extra-bundle/tree/v3.5.0" - }, "funding": [ { "url": "https://github.com/fabpot", @@ -10681,36 +10230,31 @@ "type": "tidelift" } ], - "time": "2022-12-27T12:23:36+00:00" + "time": "2023-07-29T15:34:56+00:00" }, { "name": "twig/intl-extra", - "version": "v3.5.0", + "version": "v3.7.1", "source": { "type": "git", "url": "https://github.com/twigphp/intl-extra.git", - "reference": "92f2c73471e077d0f72195a331c9a245da2010cd" + "reference": "4f4fe572f635534649cc069e1dafe4a8ad63774d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/intl-extra/zipball/92f2c73471e077d0f72195a331c9a245da2010cd", - "reference": "92f2c73471e077d0f72195a331c9a245da2010cd", + "url": "https://api.github.com/repos/twigphp/intl-extra/zipball/4f4fe572f635534649cc069e1dafe4a8ad63774d", + "reference": "4f4fe572f635534649cc069e1dafe4a8ad63774d", "shasum": "" }, "require": { "php": ">=7.1.3", - "symfony/intl": "^4.4|^5.0|^6.0", + "symfony/intl": "^5.4|^6.0", "twig/twig": "^2.7|^3.0" }, "require-dev": { - "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0" + "symfony/phpunit-bridge": "^5.4|^6.3" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.5-dev" - } - }, "autoload": { "psr-4": { "Twig\\Extra\\Intl\\": "" @@ -10737,9 +10281,6 @@ "intl", "twig" ], - "support": { - "source": "https://github.com/twigphp/intl-extra/tree/v3.5.0" - }, "funding": [ { "url": "https://github.com/fabpot", @@ -10750,20 +10291,20 @@ "type": "tidelift" } ], - "time": "2022-12-27T12:23:36+00:00" + "time": "2023-07-29T15:34:56+00:00" }, { "name": "twig/twig", - "version": "v2.15.4", + "version": "v2.15.5", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "3e059001d6d597dd50ea7c74dd2464b4adea48d3" + "reference": "fc02a6af3eeb97c4bf5650debc76c2eda85ac22e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/3e059001d6d597dd50ea7c74dd2464b4adea48d3", - "reference": "3e059001d6d597dd50ea7c74dd2464b4adea48d3", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/fc02a6af3eeb97c4bf5650debc76c2eda85ac22e", + "reference": "fc02a6af3eeb97c4bf5650debc76c2eda85ac22e", "shasum": "" }, "require": { @@ -10816,10 +10357,6 @@ "keywords": [ "templating" ], - "support": { - "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v2.15.4" - }, "funding": [ { "url": "https://github.com/fabpot", @@ -10830,7 +10367,7 @@ "type": "tidelift" } ], - "time": "2022-12-27T12:26:20+00:00" + "time": "2023-05-03T17:49:41+00:00" }, { "name": "vlucas/phpdotenv", @@ -10894,10 +10431,6 @@ "env", "environment" ], - "support": { - "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v5.4.0" - }, "funding": [ { "url": "https://github.com/GrahamCampbell", @@ -10969,31 +10502,27 @@ "gherkin", "parser" ], - "support": { - "issues": "https://github.com/Behat/Gherkin/issues", - "source": "https://github.com/Behat/Gherkin/tree/v4.9.0" - }, "time": "2021-10-12T13:05:09+00:00" }, { "name": "captbaritone/mailcatcher-codeception-module", - "version": "2.4.1", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/captbaritone/codeception-mailcatcher-module.git", - "reference": "cb9e5ca1423505a4bfa72a5f00c9f570be89f07c" + "reference": "295104e2b9714a58662673a9f02ec14d7dc15f6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/captbaritone/codeception-mailcatcher-module/zipball/cb9e5ca1423505a4bfa72a5f00c9f570be89f07c", - "reference": "cb9e5ca1423505a4bfa72a5f00c9f570be89f07c", + "url": "https://api.github.com/repos/captbaritone/codeception-mailcatcher-module/zipball/295104e2b9714a58662673a9f02ec14d7dc15f6e", + "reference": "295104e2b9714a58662673a9f02ec14d7dc15f6e", "shasum": "" }, "require": { - "codeception/codeception": "^2.2 || ^3.0 || ^4.0", + "codeception/codeception": "^3.0 || ^4.0", "ext-json": "*", "guzzlehttp/guzzle": "^6.0 || ^7.0", - "php": "^7.3 || ^8.0", + "php": "^7.4 || ^8.0", "zbateson/mail-mime-parser": "^1.2" }, "require-dev": { @@ -11024,11 +10553,7 @@ } ], "description": "Test emails in your Codeception acceptance tests", - "support": { - "issues": "https://github.com/captbaritone/codeception-mailcatcher-module/issues", - "source": "https://github.com/captbaritone/codeception-mailcatcher-module/tree/2.4.1" - }, - "time": "2022-06-08T17:21:08+00:00" + "time": "2023-06-30T06:50:10+00:00" }, { "name": "codeception/codeception", @@ -11116,10 +10641,6 @@ "functional testing", "unit testing" ], - "support": { - "issues": "https://github.com/Codeception/Codeception/issues", - "source": "https://github.com/Codeception/Codeception/tree/4.2.2" - }, "funding": [ { "url": "https://opencollective.com/codeception", @@ -11176,10 +10697,6 @@ "keywords": [ "codeception" ], - "support": { - "issues": "https://github.com/Codeception/lib-asserts/issues", - "source": "https://github.com/Codeception/lib-asserts/tree/1.13.2" - }, "time": "2020-10-21T16:26:20+00:00" }, { @@ -11236,10 +10753,6 @@ "keywords": [ "codeception" ], - "support": { - "issues": "https://github.com/Codeception/lib-innerbrowser/issues", - "source": "https://github.com/Codeception/lib-innerbrowser/tree/1.5.1" - }, "time": "2021-08-30T15:21:42+00:00" }, { @@ -11293,10 +10806,6 @@ "asserts", "codeception" ], - "support": { - "issues": "https://github.com/Codeception/module-asserts/issues", - "source": "https://github.com/Codeception/module-asserts/tree/1.3.1" - }, "time": "2020-10-21T16:48:15+00:00" }, { @@ -11353,10 +10862,6 @@ "functional-testing", "http" ], - "support": { - "issues": "https://github.com/Codeception/module-phpbrowser/issues", - "source": "https://github.com/Codeception/module-phpbrowser/tree/1.0.3" - }, "time": "2022-05-21T13:50:41+00:00" }, { @@ -11407,10 +10912,6 @@ "codeception", "rest" ], - "support": { - "issues": "https://github.com/Codeception/module-rest/issues", - "source": "https://github.com/Codeception/module-rest/tree/1.4.2" - }, "time": "2021-11-18T18:58:15+00:00" }, { @@ -11463,10 +10964,6 @@ "browser-testing", "codeception" ], - "support": { - "issues": "https://github.com/Codeception/module-webdriver/issues", - "source": "https://github.com/Codeception/module-webdriver/tree/1.4.1" - }, "time": "2022-09-12T05:09:51+00:00" }, { @@ -11512,10 +11009,6 @@ } ], "description": "PHPUnit classes used by Codeception", - "support": { - "issues": "https://github.com/Codeception/phpunit-wrapper/issues", - "source": "https://github.com/Codeception/phpunit-wrapper/tree/9.0.9" - }, "time": "2022-05-23T06:24:11+00:00" }, { @@ -11550,10 +11043,6 @@ "MIT" ], "description": "Flexible Stub wrapper for PHPUnit's Mock Builder", - "support": { - "issues": "https://github.com/Codeception/Stub/issues", - "source": "https://github.com/Codeception/Stub/tree/4.0.2" - }, "time": "2022-01-31T19:25:15+00:00" }, { @@ -11617,24 +11106,20 @@ "symfony", "tests" ], - "support": { - "issues": "https://github.com/dmaicher/doctrine-test-bundle/issues", - "source": "https://github.com/dmaicher/doctrine-test-bundle/tree/v6.7.5" - }, "time": "2022-02-08T16:00:51+00:00" }, { "name": "fakerphp/faker", - "version": "v1.21.0", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/FakerPHP/Faker.git", - "reference": "92efad6a967f0b79c499705c69b662f738cc9e4d" + "reference": "e3daa170d00fde61ea7719ef47bb09bb8f1d9b01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/92efad6a967f0b79c499705c69b662f738cc9e4d", - "reference": "92efad6a967f0b79c499705c69b662f738cc9e4d", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/e3daa170d00fde61ea7719ef47bb09bb8f1d9b01", + "reference": "e3daa170d00fde61ea7719ef47bb09bb8f1d9b01", "shasum": "" }, "require": { @@ -11685,11 +11170,7 @@ "faker", "fixtures" ], - "support": { - "issues": "https://github.com/FakerPHP/Faker/issues", - "source": "https://github.com/FakerPHP/Faker/tree/v1.21.0" - }, - "time": "2022-12-13T13:54:32+00:00" + "time": "2023-06-12T08:44:38+00:00" }, { "name": "mikey179/vfsstream", @@ -11735,25 +11216,20 @@ ], "description": "Virtual file system to mock the real file system in unit tests.", "homepage": "http://vfs.bovigo.org/", - "support": { - "issues": "https://github.com/bovigo/vfsStream/issues", - "source": "https://github.com/bovigo/vfsStream/tree/master", - "wiki": "https://github.com/bovigo/vfsStream/wiki" - }, "time": "2022-02-23T02:02:42+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.11.0", + "version": "1.11.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614" + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", "shasum": "" }, "require": { @@ -11789,17 +11265,13 @@ "object", "object graph" ], - "support": { - "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0" - }, "funding": [ { "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", "type": "tidelift" } ], - "time": "2022-03-03T13:19:32+00:00" + "time": "2023-03-08T13:26:56+00:00" }, { "name": "phar-io/manifest", @@ -11855,10 +11327,6 @@ } ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "support": { - "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/2.0.3" - }, "time": "2021-07-20T11:28:43+00:00" }, { @@ -11906,45 +11374,42 @@ } ], "description": "Library for handling version information and constraints", - "support": { - "issues": "https://github.com/phar-io/version/issues", - "source": "https://github.com/phar-io/version/tree/3.2.1" - }, "time": "2022-02-21T01:04:05+00:00" }, { "name": "php-webdriver/webdriver", - "version": "1.13.1", + "version": "1.15.1", "source": { "type": "git", "url": "https://github.com/php-webdriver/php-webdriver.git", - "reference": "6dfe5f814b796c1b5748850aa19f781b9274c36c" + "reference": "cd52d9342c5aa738c2e75a67e47a1b6df97154e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/6dfe5f814b796c1b5748850aa19f781b9274c36c", - "reference": "6dfe5f814b796c1b5748850aa19f781b9274c36c", + "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/cd52d9342c5aa738c2e75a67e47a1b6df97154e8", + "reference": "cd52d9342c5aa738c2e75a67e47a1b6df97154e8", "shasum": "" }, "require": { "ext-curl": "*", "ext-json": "*", "ext-zip": "*", - "php": "^5.6 || ~7.0 || ^8.0", + "php": "^7.3 || ^8.0", "symfony/polyfill-mbstring": "^1.12", - "symfony/process": "^2.8 || ^3.1 || ^4.0 || ^5.0 || ^6.0" + "symfony/process": "^5.0 || ^6.0 || ^7.0" }, "replace": { "facebook/webdriver": "*" }, "require-dev": { - "ondram/ci-detector": "^2.1 || ^3.5 || ^4.0", + "ergebnis/composer-normalize": "^2.20.0", + "ondram/ci-detector": "^4.0", "php-coveralls/php-coveralls": "^2.4", - "php-mock/php-mock-phpunit": "^1.1 || ^2.0", + "php-mock/php-mock-phpunit": "^2.0", "php-parallel-lint/php-parallel-lint": "^1.2", - "phpunit/phpunit": "^5.7 || ^7 || ^8 || ^9", + "phpunit/phpunit": "^9.3", "squizlabs/php_codesniffer": "^3.5", - "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0 || ^6.0" + "symfony/var-dumper": "^5.0 || ^6.0" }, "suggest": { "ext-SimpleXML": "For Firefox profile creation" @@ -11971,24 +11436,60 @@ "selenium", "webdriver" ], - "support": { - "issues": "https://github.com/php-webdriver/php-webdriver/issues", - "source": "https://github.com/php-webdriver/php-webdriver/tree/1.13.1" + "time": "2023-10-20T12:21:20+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/" + } }, - "time": "2022-10-11T11:49:44+00:00" + "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", + "version": "1.10.41", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "45411d15bf85a33b4a8ee9b75a6e82998c9adb97" + "reference": "c6174523c2a69231df55bdc65b61655e72876d76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/45411d15bf85a33b4a8ee9b75a6e82998c9adb97", - "reference": "45411d15bf85a33b4a8ee9b75a6e82998c9adb97", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c6174523c2a69231df55bdc65b61655e72876d76", + "reference": "c6174523c2a69231df55bdc65b61655e72876d76", "shasum": "" }, "require": { @@ -12016,10 +11517,6 @@ "dev", "static analysis" ], - "support": { - "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.9.8" - }, "funding": [ { "url": "https://github.com/ondrejmirtes", @@ -12034,27 +11531,93 @@ "type": "tidelift" } ], - "time": "2023-01-08T21:26:18+00:00" + "time": "2023-11-05T12:57:57+00:00" + }, + { + "name": "phpstan/phpstan-doctrine", + "version": "1.3.45", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan-doctrine.git", + "reference": "90e60ba9dbea4b29c7b87026a29e91ac0a02674e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/90e60ba9dbea4b29c7b87026a29e91ac0a02674e", + "reference": "90e60ba9dbea4b29c7b87026a29e91ac0a02674e", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0", + "phpstan/phpstan": "^1.10.12" + }, + "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.3.13", + "phpstan/phpstan-strict-rules": "^1.5.1", + "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-10-29T08:18:22+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.23", + "version": "9.2.29", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c" + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", - "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76", + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.14", + "nikic/php-parser": "^4.15", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -12069,8 +11632,8 @@ "phpunit/phpunit": "^9.3" }, "suggest": { - "ext-pcov": "*", - "ext-xdebug": "*" + "ext-pcov": "PHP extension that provides line coverage", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "type": "library", "extra": { @@ -12101,17 +11664,13 @@ "testing", "xunit" ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.23" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" } ], - "time": "2022-12-28T12:41:10+00:00" + "time": "2023-09-19T04:57:46+00:00" }, { "name": "phpunit/php-file-iterator", @@ -12161,10 +11720,6 @@ "filesystem", "iterator" ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -12224,10 +11779,6 @@ "keywords": [ "process" ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-invoker/issues", - "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -12283,10 +11834,6 @@ "keywords": [ "template" ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-text-template/issues", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -12342,10 +11889,6 @@ "keywords": [ "timer" ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -12356,20 +11899,20 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.27", + "version": "9.6.13", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38" + "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38", - "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f3d767f7f9e191eab4189abe41ab37797e30b1be", + "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1", + "doctrine/instantiator": "^1.3.1 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", @@ -12380,7 +11923,7 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.13", + "phpunit/php-code-coverage": "^9.2.28", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -12398,8 +11941,8 @@ "sebastian/version": "^3.0.2" }, "suggest": { - "ext-soap": "*", - "ext-xdebug": "*" + "ext-soap": "To be able to generate mocks based on WSDL files", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "bin": [ "phpunit" @@ -12407,7 +11950,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.5-dev" + "dev-master": "9.6-dev" } }, "autoload": { @@ -12436,10 +11979,6 @@ "testing", "xunit" ], - "support": { - "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27" - }, "funding": [ { "url": "https://phpunit.de/sponsors.html", @@ -12454,7 +11993,7 @@ "type": "tidelift" } ], - "time": "2022-12-09T07:31:23+00:00" + "time": "2023-09-19T05:39:22+00:00" }, { "name": "sebastian/cli-parser", @@ -12500,10 +12039,6 @@ ], "description": "Library for parsing CLI options", "homepage": "https://github.com/sebastianbergmann/cli-parser", - "support": { - "issues": "https://github.com/sebastianbergmann/cli-parser/issues", - "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -12556,10 +12091,6 @@ ], "description": "Collection of value objects that represent the PHP code units", "homepage": "https://github.com/sebastianbergmann/code-unit", - "support": { - "issues": "https://github.com/sebastianbergmann/code-unit/issues", - "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -12611,10 +12142,6 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "support": { - "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -12685,10 +12212,6 @@ "compare", "equality" ], - "support": { - "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -12742,10 +12265,6 @@ ], "description": "Library for calculating the complexity of PHP code units", "homepage": "https://github.com/sebastianbergmann/complexity", - "support": { - "issues": "https://github.com/sebastianbergmann/complexity/issues", - "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -12756,16 +12275,16 @@ }, { "name": "sebastian/environment", - "version": "5.1.4", + "version": "5.1.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7" + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", "shasum": "" }, "require": { @@ -12805,17 +12324,13 @@ "environment", "hhvm" ], - "support": { - "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" } ], - "time": "2022-04-03T09:37:03+00:00" + "time": "2023-02-03T06:03:51+00:00" }, { "name": "sebastian/exporter", @@ -12882,10 +12397,6 @@ "export", "exporter" ], - "support": { - "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -12896,16 +12407,16 @@ }, { "name": "sebastian/global-state", - "version": "5.0.5", + "version": "5.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2" + "reference": "bde739e7565280bda77be70044ac1047bc007e34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", + "reference": "bde739e7565280bda77be70044ac1047bc007e34", "shasum": "" }, "require": { @@ -12946,17 +12457,13 @@ "keywords": [ "global state" ], - "support": { - "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" } ], - "time": "2022-02-14T08:28:10+00:00" + "time": "2023-08-02T09:26:13+00:00" }, { "name": "sebastian/lines-of-code", @@ -13003,10 +12510,6 @@ ], "description": "Library for counting the lines of code in PHP source code", "homepage": "https://github.com/sebastianbergmann/lines-of-code", - "support": { - "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -13060,10 +12563,6 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "support": { - "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -13115,10 +12614,6 @@ ], "description": "Allows reflection of object attributes, including inherited and non-public ones", "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "support": { - "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -13129,16 +12624,16 @@ }, { "name": "sebastian/recursion-context", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172" + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", "shasum": "" }, "require": { @@ -13177,18 +12672,14 @@ } ], "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "support": { - "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4" - }, + "homepage": "https://github.com/sebastianbergmann/recursion-context", "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" } ], - "time": "2020-10-26T13:17:30+00:00" + "time": "2023-02-03T06:07:39+00:00" }, { "name": "sebastian/resource-operations", @@ -13233,10 +12724,6 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -13247,16 +12734,16 @@ }, { "name": "sebastian/type", - "version": "3.2.0", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e" + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", - "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", "shasum": "" }, "require": { @@ -13289,17 +12776,13 @@ ], "description": "Collection of value objects that represent the types of the PHP type system", "homepage": "https://github.com/sebastianbergmann/type", - "support": { - "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.2.0" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" } ], - "time": "2022-09-12T14:47:03+00:00" + "time": "2023-02-03T06:13:03+00:00" }, { "name": "sebastian/version", @@ -13342,10 +12825,6 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "support": { - "issues": "https://github.com/sebastianbergmann/version/issues", - "source": "https://github.com/sebastianbergmann/version/tree/3.0.2" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -13356,16 +12835,16 @@ }, { "name": "symfony/browser-kit", - "version": "v5.4.11", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "081fe28a26b6bd671dea85ef3a4b5003f3c88027" + "reference": "a866ca7e396f15d7efb6d74a8a7d364d4e05b704" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/081fe28a26b6bd671dea85ef3a4b5003f3c88027", - "reference": "081fe28a26b6bd671dea85ef3a4b5003f3c88027", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/a866ca7e396f15d7efb6d74a8a7d364d4e05b704", + "reference": "a866ca7e396f15d7efb6d74a8a7d364d4e05b704", "shasum": "" }, "require": { @@ -13407,9 +12886,6 @@ ], "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/browser-kit/tree/v5.4.11" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -13424,20 +12900,20 @@ "type": "tidelift" } ], - "time": "2022-07-27T15:50:05+00:00" + "time": "2023-02-14T08:03:56+00:00" }, { "name": "symfony/phpunit-bridge", - "version": "v5.4.17", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "2232d32115383602fd7702dfd51e81178364b679" + "reference": "d04639b395e25efa4260fc5b12a9fa1eafb38a64" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/2232d32115383602fd7702dfd51e81178364b679", - "reference": "2232d32115383602fd7702dfd51e81178364b679", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/d04639b395e25efa4260fc5b12a9fa1eafb38a64", + "reference": "d04639b395e25efa4260fc5b12a9fa1eafb38a64", "shasum": "" }, "require": { @@ -13490,9 +12966,6 @@ ], "description": "Provides utilities for PHPUnit, especially user deprecation notices management", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.17" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -13507,20 +12980,20 @@ "type": "tidelift" } ], - "time": "2022-12-27T08:11:33+00:00" + "time": "2023-07-12T15:44:31+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "927013f3aac555983a5059aada98e1907d842695" + "reference": "6de50471469b8c9afc38164452ab2b6170ee71c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/927013f3aac555983a5059aada98e1907d842695", - "reference": "927013f3aac555983a5059aada98e1907d842695", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/6de50471469b8c9afc38164452ab2b6170ee71c1", + "reference": "6de50471469b8c9afc38164452ab2b6170ee71c1", "shasum": "" }, "require": { @@ -13535,7 +13008,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -13573,9 +13046,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.27.0" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -13590,7 +13060,7 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "theseer/tokenizer", @@ -13630,10 +13100,6 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "support": { - "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" - }, "funding": [ { "url": "https://github.com/theseer", @@ -13701,11 +13167,6 @@ "parser", "php-imap" ], - "support": { - "docs": "https://mail-mime-parser.org/#usage-guide", - "issues": "https://github.com/zbateson/mail-mime-parser/issues", - "source": "https://github.com/zbateson/mail-mime-parser" - }, "funding": [ { "url": "https://github.com/zbateson", @@ -13716,25 +13177,27 @@ }, { "name": "zbateson/mb-wrapper", - "version": "1.1.2", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/zbateson/mb-wrapper.git", - "reference": "5d9d190ef18ce6d424e3ac6f5ebe13901f92b74a" + "reference": "faf35dddfacfc5d4d5f9210143eafd7a7fe74334" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zbateson/mb-wrapper/zipball/5d9d190ef18ce6d424e3ac6f5ebe13901f92b74a", - "reference": "5d9d190ef18ce6d424e3ac6f5ebe13901f92b74a", + "url": "https://api.github.com/repos/zbateson/mb-wrapper/zipball/faf35dddfacfc5d4d5f9210143eafd7a7fe74334", + "reference": "faf35dddfacfc5d4d5f9210143eafd7a7fe74334", "shasum": "" }, "require": { - "php": ">=5.4", + "php": ">=7.1", "symfony/polyfill-iconv": "^1.9", "symfony/polyfill-mbstring": "^1.9" }, "require-dev": { - "sanmai/phpunit-legacy-adapter": "^6.3 || ^8" + "friendsofphp/php-cs-fixer": "*", + "phpstan/phpstan": "*", + "phpunit/phpunit": "<=9.0" }, "suggest": { "ext-iconv": "For best support/performance", @@ -13769,39 +13232,37 @@ "multibyte", "string" ], - "support": { - "issues": "https://github.com/zbateson/mb-wrapper/issues", - "source": "https://github.com/zbateson/mb-wrapper/tree/1.1.2" - }, "funding": [ { "url": "https://github.com/zbateson", "type": "github" } ], - "time": "2022-05-26T15:55:05+00:00" + "time": "2023-01-11T23:05:44+00:00" }, { "name": "zbateson/stream-decorators", - "version": "1.0.7", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/zbateson/stream-decorators.git", - "reference": "8f8ca208572963258b7e6d91106181706deacd10" + "reference": "783b034024fda8eafa19675fb2552f8654d3a3e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zbateson/stream-decorators/zipball/8f8ca208572963258b7e6d91106181706deacd10", - "reference": "8f8ca208572963258b7e6d91106181706deacd10", + "url": "https://api.github.com/repos/zbateson/stream-decorators/zipball/783b034024fda8eafa19675fb2552f8654d3a3e9", + "reference": "783b034024fda8eafa19675fb2552f8654d3a3e9", "shasum": "" }, "require": { - "guzzlehttp/psr7": "^1.7.0|^2.0", - "php": ">=5.4", + "guzzlehttp/psr7": "^1.9 | ^2.0", + "php": ">=7.2", "zbateson/mb-wrapper": "^1.0.0" }, "require-dev": { - "sanmai/phpunit-legacy-adapter": "^6.3 || ^8" + "friendsofphp/php-cs-fixer": "*", + "phpstan/phpstan": "*", + "phpunit/phpunit": "<10.0" }, "type": "library", "autoload": { @@ -13830,17 +13291,13 @@ "stream", "uuencode" ], - "support": { - "issues": "https://github.com/zbateson/stream-decorators/issues", - "source": "https://github.com/zbateson/stream-decorators/tree/1.0.7" - }, "funding": [ { "url": "https://github.com/zbateson", "type": "github" } ], - "time": "2022-09-08T15:44:55+00:00" + "time": "2023-05-30T22:51:52+00:00" } ], "aliases": [], @@ -13849,7 +13306,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.4 || ^8.0", + "php": "^8.1", "ext-curl": "*", "ext-intl": "*", "ext-json": "*", @@ -13859,7 +13316,7 @@ }, "platform-dev": [], "platform-overrides": { - "php": "7.4.0" + "php": "8.1.18" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/docker-compose.yml b/docker-compose.yml index 8aa43c835e2..cbcf9cfb035 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -58,6 +58,8 @@ services: # ECCUBE_ADMIN_PASS: "password" networks: - backend + extra_hosts: + - host.docker.internal:host-gateway ### Mailcatcher ################################## mailcatcher: diff --git a/dockerbuild/php.ini b/dockerbuild/php.ini index 6491889bd9a..188cd29e558 100644 --- a/dockerbuild/php.ini +++ b/dockerbuild/php.ini @@ -4,3 +4,9 @@ opcache.memory_consumption=256 realpath_cache_size = 4096K realpath_cache_ttl = 600 memory_limit = 786M + +[xdebug] +zend_extension=xdebug.so +xdebug.log =/var/www/html/var/log/xdebug.log +xdebug.mode=debug +xdebug.client_host=host.docker.internal diff --git a/phpdoc_result_script.sh b/phpdoc_result_script.sh new file mode 100644 index 00000000000..a60105f113f --- /dev/null +++ b/phpdoc_result_script.sh @@ -0,0 +1,8 @@ +#bin/bash + +for level in {0..2} +do + docker exec ec-cube-ec-cube-1 bash -c "vendor/bin/phpstan analyse src --level ${level} --error-format=json > tests/results/level_${level}.json" +done + +php tests/results/convert.php diff --git a/phpstan.neon.dist b/phpstan.neon.dist index b44c21c8885..4c9a9a46292 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -1,6 +1,8 @@ parameters: - level: 1 - ignoreErrors: - - - message: "#^Function twig_include not found\\.$#" - path: src/Eccube/Twig/Extension/IgnoreTwigSandboxErrorExtension.php \ No newline at end of file + level: 6 + doctrine: + objectManagerLoader: tests/object-manager.php + ignoreErrors: + - + message: "#^Function twig_include not found\\.$#" + path: src/Eccube/Twig/Extension/IgnoreTwigSandboxErrorExtension.php diff --git a/src/Eccube/Command/ComposerRequireAlreadyInstalledPluginsCommand.php b/src/Eccube/Command/ComposerRequireAlreadyInstalledPluginsCommand.php index cbf33756b1b..f2bf5cfda9a 100644 --- a/src/Eccube/Command/ComposerRequireAlreadyInstalledPluginsCommand.php +++ b/src/Eccube/Command/ComposerRequireAlreadyInstalledPluginsCommand.php @@ -90,7 +90,7 @@ protected function execute(InputInterface $input, OutputInterface $output) ]); $question = new ConfirmationQuestion($message); if (!$this->io->askQuestion($question)) { - return $message; + return; } } diff --git a/src/Eccube/Command/GenerateDummyDataCommand.php b/src/Eccube/Command/GenerateDummyDataCommand.php index aed05eab130..fbd35b27246 100644 --- a/src/Eccube/Command/GenerateDummyDataCommand.php +++ b/src/Eccube/Command/GenerateDummyDataCommand.php @@ -183,7 +183,7 @@ protected function execute(InputInterface $input, OutputInterface $output) } $this->entityManager->flush(); $j++; - if ($output->getVerbosity() >= OutputInterface::VERBOSITY_NORMAL && ($j % 100) === 0) { + if ($output->getVerbosity() >= OutputInterface::VERBOSITY_NORMAL && ($j % 100) === 0 && $j > 0) { $output->writeln(' ...'.$j); } } diff --git a/src/Eccube/Command/InstallerCommand.php b/src/Eccube/Command/InstallerCommand.php index 0bd49b138b8..3a4d921eebf 100644 --- a/src/Eccube/Command/InstallerCommand.php +++ b/src/Eccube/Command/InstallerCommand.php @@ -54,9 +54,6 @@ public function __construct(ContainerInterface $container) /* env更新処理無名クラス */ $this->envFileUpdater = new class() { - /** - * @var mixed $appEnv - */ public $appEnv; public $appDebug; public $databaseUrl; diff --git a/src/Eccube/Command/LoadDataFixturesEccubeCommand.php b/src/Eccube/Command/LoadDataFixturesEccubeCommand.php index 9e07bdc4432..aa694761f1b 100644 --- a/src/Eccube/Command/LoadDataFixturesEccubeCommand.php +++ b/src/Eccube/Command/LoadDataFixturesEccubeCommand.php @@ -56,7 +56,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $locale = env('ECCUBE_LOCALE', 'ja_JP'); $locale = str_replace('_', '-', $locale); $locales = \Locale::parseLocale($locale); - $localeDir = empty($locales) ? 'ja' : $locales['language']; + $localeDir = is_null($locales) ? 'ja' : $locales['language']; $loader = new \Eccube\Doctrine\Common\CsvDataFixtures\Loader(); $loader->loadFromDirectory(__DIR__.'/../Resource/doctrine/import_csv/'.$localeDir); diff --git a/src/Eccube/Controller/AbstractController.php b/src/Eccube/Controller/AbstractController.php index f7e93fccc13..f0b4c3b1b19 100644 --- a/src/Eccube/Controller/AbstractController.php +++ b/src/Eccube/Controller/AbstractController.php @@ -54,7 +54,7 @@ class AbstractController extends Controller protected $eventDispatcher; /** - * @var SessionInterface + * @var Session */ protected $session; diff --git a/src/Eccube/Controller/Admin/AdminController.php b/src/Eccube/Controller/Admin/AdminController.php index 7c7bf838f78..add186284fe 100644 --- a/src/Eccube/Controller/Admin/AdminController.php +++ b/src/Eccube/Controller/Admin/AdminController.php @@ -428,7 +428,7 @@ public function searchCustomer(Request $request) /** * @param array $excludes * - * @return array|Request|null + * @return Request|null */ protected function getOrderEachStatus(array $excludes) { diff --git a/src/Eccube/Controller/Admin/Order/CsvImportController.php b/src/Eccube/Controller/Admin/Order/CsvImportController.php index 12fa87d9ef4..d48ca23dd50 100644 --- a/src/Eccube/Controller/Admin/Order/CsvImportController.php +++ b/src/Eccube/Controller/Admin/Order/CsvImportController.php @@ -94,12 +94,7 @@ public function csvShipping(Request $request) ]; } - /** - * @param CsvImportService|boolean $csv - * @param &$errors - * @return void - */ - protected function loadCsv($csv, &$errors) + protected function loadCsv(CsvImportService $csv, &$errors) { $columnConfig = $this->getColumnConfig(); diff --git a/src/Eccube/Controller/Admin/Order/EditController.php b/src/Eccube/Controller/Admin/Order/EditController.php index b9bf14f7afa..75696f0070e 100644 --- a/src/Eccube/Controller/Admin/Order/EditController.php +++ b/src/Eccube/Controller/Admin/Order/EditController.php @@ -81,7 +81,7 @@ class EditController extends AbstractController protected $customerRepository; /** - * @var SerializerInterface + * @var Serializer */ protected $serializer; diff --git a/src/Eccube/Controller/Admin/Order/MailController.php b/src/Eccube/Controller/Admin/Order/MailController.php index fa6de733e55..122afa13a4c 100644 --- a/src/Eccube/Controller/Admin/Order/MailController.php +++ b/src/Eccube/Controller/Admin/Order/MailController.php @@ -100,7 +100,7 @@ public function index(Request $request, Order $Order) switch ($mode) { case 'change': if ($form->get('template')->isValid()) { - /** @var \Eccube\Entity\MailTemplate $data */ + /* @var \Eccube\Entity\MailTemplate $data */ $MailTemplate = $form->get('template')->getData(); if ($MailTemplate) { diff --git a/src/Eccube/Controller/Admin/Order/ShippingController.php b/src/Eccube/Controller/Admin/Order/ShippingController.php index 38001054142..2700057c2d2 100644 --- a/src/Eccube/Controller/Admin/Order/ShippingController.php +++ b/src/Eccube/Controller/Admin/Order/ShippingController.php @@ -263,7 +263,7 @@ public function index(Request $request, Order $Order) log_error('出荷登録エラー', [$Order->getId(), $e]); $this->addError('admin.flash.register_failed', 'admin'); } - } elseif ($request->get('mode') == 'register' && $form->getErrors(true)->count() > 0) { + } elseif ($request->get('mode') == 'register' && $form->getErrors(true)) { $this->addError('admin.common.save_error', 'admin'); } } diff --git a/src/Eccube/Controller/Admin/Product/CsvImportController.php b/src/Eccube/Controller/Admin/Product/CsvImportController.php index b012361a287..28a6d4e3458 100644 --- a/src/Eccube/Controller/Admin/Product/CsvImportController.php +++ b/src/Eccube/Controller/Admin/Product/CsvImportController.php @@ -876,7 +876,7 @@ public function csvTemplate(Request $request, $type) * @param array $headers * @param bool $rollback * - * @return JsonResponse | array + * @return array * * @throws \Doctrine\DBAL\ConnectionException */ @@ -1696,7 +1696,7 @@ public function splitCsv(Request $request) * * @param Request $request * - * @return \Symfony\Component\HttpFoundation\Response + * @return \Symfony\Component\HttpFoundation\JsonResponse */ public function importCsv(Request $request, CsrfTokenManagerInterface $tokenManager) { diff --git a/src/Eccube/Controller/Admin/Product/ProductController.php b/src/Eccube/Controller/Admin/Product/ProductController.php index f6254c61b3f..813046e5b58 100644 --- a/src/Eccube/Controller/Admin/Product/ProductController.php +++ b/src/Eccube/Controller/Admin/Product/ProductController.php @@ -630,15 +630,9 @@ public function edit(Request $request, RouterInterface $router, CacheUtil $cache } $this->entityManager->flush(); - /** - * @var array|Product[] $admin_product - */ $admin_product = $request->request->get('admin_product'); - if (array_key_exists('product_image', $admin_product)) { - /** - * @var array|ProductImage[] $product_image - */ - $product_image = $admin_product['product_image']; + if (array_key_exists('product_image', $request->request->get('admin_product'))) { + $product_image = $request->request->get('admin_product')['product_image']; foreach ($product_image as $sortNo => $filename) { $ProductImage = $this->productImageRepository ->findOneBy([ diff --git a/src/Eccube/Controller/Install/InstallController.php b/src/Eccube/Controller/Install/InstallController.php index e4a2e305100..0807c24e398 100644 --- a/src/Eccube/Controller/Install/InstallController.php +++ b/src/Eccube/Controller/Install/InstallController.php @@ -809,7 +809,7 @@ protected function importCsv(EntityManager $em) $locale = env('ECCUBE_LOCALE', 'ja_JP'); $locale = str_replace('_', '-', $locale); $locales = \Locale::parseLocale($locale); - $localeDir = empty($locales) ? 'ja' : $locales['language']; + $localeDir = is_null($locales) ? 'ja' : $locales['language']; $loader = new \Eccube\Doctrine\Common\CsvDataFixtures\Loader(); $loader->loadFromDirectory($this->getParameter('kernel.project_dir').'/src/Eccube/Resource/doctrine/import_csv/'.$localeDir); diff --git a/src/Eccube/Controller/ShoppingController.php b/src/Eccube/Controller/ShoppingController.php index b6ee45cb9da..887eba4b01c 100644 --- a/src/Eccube/Controller/ShoppingController.php +++ b/src/Eccube/Controller/ShoppingController.php @@ -837,7 +837,7 @@ private function createPaymentMethod(Order $Order, FormInterface $form) * * @param PaymentMethodInterface $paymentMethod * - * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response|null + * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response */ protected function executeApply(PaymentMethodInterface $paymentMethod) { diff --git a/src/Eccube/Doctrine/EventSubscriber/TaxRuleEventSubscriber.php b/src/Eccube/Doctrine/EventSubscriber/TaxRuleEventSubscriber.php index a967d4e5c89..5c279cb9885 100644 --- a/src/Eccube/Doctrine/EventSubscriber/TaxRuleEventSubscriber.php +++ b/src/Eccube/Doctrine/EventSubscriber/TaxRuleEventSubscriber.php @@ -23,7 +23,7 @@ class TaxRuleEventSubscriber implements EventSubscriber { /** - * @var TaxRuleService + * @var ContainerInterface */ protected $container; diff --git a/src/Eccube/Doctrine/Query/Queries.php b/src/Eccube/Doctrine/Query/Queries.php index e1bbdf5bb0d..a2582dad974 100644 --- a/src/Eccube/Doctrine/Query/Queries.php +++ b/src/Eccube/Doctrine/Query/Queries.php @@ -32,7 +32,7 @@ public function customize($queryKey, QueryBuilder $builder, $params) { if (isset($this->customizers[$queryKey])) { /* @var QueryCustomizer $customizer */ - foreach ((array)$this->customizers[$queryKey] as $customizer) { + foreach ($this->customizers[$queryKey] as $customizer) { $customizer->customize($builder, $params, $queryKey); } } diff --git a/src/Eccube/Entity/BaseInfo.php b/src/Eccube/Entity/BaseInfo.php index 27f51b0fe41..94ba54f82f1 100644 --- a/src/Eccube/Entity/BaseInfo.php +++ b/src/Eccube/Entity/BaseInfo.php @@ -785,7 +785,7 @@ public function isOptionMypageOrderStatusDisplay() /** * Set optionNostockHidden. * - * @param boolean $optionNostockHidden + * @param integer $optionNostockHidden * * @return BaseInfo */ diff --git a/src/Eccube/Entity/ItemHolderInterface.php b/src/Eccube/Entity/ItemHolderInterface.php index b19a4489790..2254fc47d26 100644 --- a/src/Eccube/Entity/ItemHolderInterface.php +++ b/src/Eccube/Entity/ItemHolderInterface.php @@ -110,4 +110,15 @@ public function getUsePoint(); * @param ItemInterface $item */ public function addItem(ItemInterface $item); + + /** + * @param ItemInterface $item + */ + public function removeItem(ItemInterface $item); + /** + * Get customer. + * + * @return Customer|null + */ + public function getCustomer(); } diff --git a/src/Eccube/Entity/ItemInterface.php b/src/Eccube/Entity/ItemInterface.php index 90db5f9e10d..fe7e7cb814d 100644 --- a/src/Eccube/Entity/ItemInterface.php +++ b/src/Eccube/Entity/ItemInterface.php @@ -69,4 +69,12 @@ public function getPrice(); public function getQuantity(); public function setQuantity($quantity); + public function getId(); + public function getPointRate(); + /** + * @param float|int|string $price + * + * @return $this + */ + public function setPrice($price); } diff --git a/src/Eccube/Entity/News.php b/src/Eccube/Entity/News.php index 8658e1e40fb..3f5cab3eab5 100644 --- a/src/Eccube/Entity/News.php +++ b/src/Eccube/Entity/News.php @@ -290,7 +290,7 @@ public function getUpdateDate() } /** - * @return boolean + * @return integer */ public function isVisible() { diff --git a/src/Eccube/Entity/OrderItem.php b/src/Eccube/Entity/OrderItem.php index 92db49c5b71..ff54b71a41e 100644 --- a/src/Eccube/Entity/OrderItem.php +++ b/src/Eccube/Entity/OrderItem.php @@ -517,7 +517,7 @@ public function getQuantity() } /** - * @return string + * @return float|int|string */ public function getTax() { diff --git a/src/Eccube/Form/Extension/DoctrineOrmExtension.php b/src/Eccube/Form/Extension/DoctrineOrmExtension.php index 064454d1c04..1669d9fb4ae 100644 --- a/src/Eccube/Form/Extension/DoctrineOrmExtension.php +++ b/src/Eccube/Form/Extension/DoctrineOrmExtension.php @@ -76,7 +76,7 @@ function (FormEvent $event) { foreach ($props as $prop) { $anno = $this->reader->getPropertyAnnotation($prop, FormAppend::class); if ($anno) { - $options = empty($anno->options) ? [] : $anno->options; + $options = is_null($anno->options) ? [] : $anno->options; $options['eccube_form_options'] = [ 'auto_render' => (true === $anno->auto_render), 'form_theme' => $anno->form_theme, diff --git a/src/Eccube/Form/Type/AddCartType.php b/src/Eccube/Form/Type/AddCartType.php index 9373ed7d078..7a4c32b343e 100644 --- a/src/Eccube/Form/Type/AddCartType.php +++ b/src/Eccube/Form/Type/AddCartType.php @@ -202,7 +202,8 @@ public function validate($data, ExecutionContext $context) new Assert\NotBlank(), ], '[product_class_id]'); if ($this->Product->getClassName1()) { - $context->validateValue($data['classcategory_id1'], [ + $validator = $context->getValidator(); + $validator->validate($data['classcategory_id1'], [ new Assert\NotBlank(), new Assert\NotEqualTo([ 'value' => '__unselected', diff --git a/src/Eccube/Form/Type/Admin/OrderType.php b/src/Eccube/Form/Type/Admin/OrderType.php index f1e3e498e6b..d98a637be29 100644 --- a/src/Eccube/Form/Type/Admin/OrderType.php +++ b/src/Eccube/Form/Type/Admin/OrderType.php @@ -275,7 +275,7 @@ public function getBlockPrefix() */ public function sortOrderItems(FormEvent $event) { - /** @var Order|null $Order */ + /** @var Order $Order */ $Order = $event->getData(); if (null === $Order) { return; diff --git a/src/Eccube/Repository/AbstractRepository.php b/src/Eccube/Repository/AbstractRepository.php index 29c42befcee..acee250e4d5 100644 --- a/src/Eccube/Repository/AbstractRepository.php +++ b/src/Eccube/Repository/AbstractRepository.php @@ -15,13 +15,14 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\DBAL\DBALException; +use Doctrine\DBAL\Exception; use Eccube\Entity\AbstractEntity; use Eccube\Common\EccubeConfig; abstract class AbstractRepository extends ServiceEntityRepository { /** - * @var EccubeConfig + * @var array */ protected $eccubeConfig; @@ -59,7 +60,7 @@ protected function getCacheLifetime() * * @return bool * - * @throws DBALException + * @throws Exception */ protected function isPostgreSQL() { @@ -71,7 +72,7 @@ protected function isPostgreSQL() * * @return bool * - * @throws DBALException + * @throws Exception */ protected function isMySQL() { diff --git a/src/Eccube/Repository/CustomerFavoriteProductRepository.php b/src/Eccube/Repository/CustomerFavoriteProductRepository.php index 7a17e62fe25..7c18e5b06ba 100644 --- a/src/Eccube/Repository/CustomerFavoriteProductRepository.php +++ b/src/Eccube/Repository/CustomerFavoriteProductRepository.php @@ -16,7 +16,6 @@ use Doctrine\ORM\QueryBuilder; use Doctrine\Persistence\ManagerRegistry as RegistryInterface; use Eccube\Entity\CustomerFavoriteProduct; -use Symfony\Component\Security\Core\User\UserInterface; /** * CustomerFavoriteProductRepository @@ -32,10 +31,10 @@ public function __construct(RegistryInterface $registry) } /** - * @param \Eccube\Entity\Customer|UserInterface $Customer + * @param \Eccube\Entity\Customer $Customer * @param \Eccube\Entity\Product $Product */ - public function addFavorite(UserInterface $Customer, \Eccube\Entity\Product $Product) + public function addFavorite(\Eccube\Entity\Customer $Customer, \Eccube\Entity\Product $Product) { if ($this->isFavorite($Customer, $Product)) { return; diff --git a/src/Eccube/Repository/CustomerRepository.php b/src/Eccube/Repository/CustomerRepository.php index 57d0eca864c..222b6992090 100644 --- a/src/Eccube/Repository/CustomerRepository.php +++ b/src/Eccube/Repository/CustomerRepository.php @@ -107,7 +107,7 @@ public function newCustomer() * @param array{ * multi?:string, * pref?:Pref, - * sex?:Sex[]|ArrayCollection, + * sex?:Sex[], * birth_month?:string|int, * birth_start?:\DateTime, * birth_end?:\DateTime, @@ -128,7 +128,7 @@ public function newCustomer() * last_buy_datetime_end?:\DateTime, * last_buy_start?:\DateTime, * last_buy_end?:\DateTime, - * customer_status?:CustomerStatus[]|ArrayCollection, + * customer_status?:CustomerStatus[], * buy_product_name?:string, * sortkey?:string, * sorttype?:string @@ -156,7 +156,7 @@ public function getQueryBuilderBySearchData($searchData) } // Pref - if (!empty($searchData['pref'])) { + if (!empty($searchData['pref']) && $searchData['pref']) { $qb ->andWhere('c.Pref = :pref') ->setParameter('pref', $searchData['pref']->getId()); @@ -174,19 +174,19 @@ public function getQueryBuilderBySearchData($searchData) ->setParameter('sexs', $sexs); } - if (!empty($searchData['birth_month'])) { + if (!empty($searchData['birth_month']) && $searchData['birth_month']) { $qb ->andWhere('EXTRACT(MONTH FROM c.birth) = :birth_month') ->setParameter('birth_month', $searchData['birth_month']); } // birth - if (!empty($searchData['birth_start'])) { + if (!empty($searchData['birth_start']) && $searchData['birth_start']) { $qb ->andWhere('c.birth >= :birth_start') ->setParameter('birth_start', $searchData['birth_start']); } - if (!empty($searchData['birth_end'])) { + if (!empty($searchData['birth_end']) && $searchData['birth_end']) { $date = clone $searchData['birth_end']; $date->modify('+1 days'); $qb @@ -227,23 +227,23 @@ public function getQueryBuilderBySearchData($searchData) } // create_date - if (!empty($searchData['create_datetime_start'])) { + if (!empty($searchData['create_datetime_start']) && $searchData['create_datetime_start']) { $date = $searchData['create_datetime_start']; $qb ->andWhere('c.create_date >= :create_date_start') ->setParameter('create_date_start', $date); - } elseif (!empty($searchData['create_date_start'])) { + } elseif (!empty($searchData['create_date_start']) && $searchData['create_date_start']) { $qb ->andWhere('c.create_date >= :create_date_start') ->setParameter('create_date_start', $searchData['create_date_start']); } - if (!empty($searchData['create_datetime_end'])) { + if (!empty($searchData['create_datetime_end']) && $searchData['create_datetime_end']) { $date = $searchData['create_datetime_end']; $qb ->andWhere('c.create_date < :create_date_end') ->setParameter('create_date_end', $date); - } elseif (!empty($searchData['create_date_end'])) { + } elseif (!empty($searchData['create_date_end']) && $searchData['create_date_end']) { $date = clone $searchData['create_date_end']; $date->modify('+1 days'); $qb @@ -252,23 +252,23 @@ public function getQueryBuilderBySearchData($searchData) } // update_date - if (!empty($searchData['update_datetime_start'])) { + if (!empty($searchData['update_datetime_start']) && $searchData['update_datetime_start']) { $date = $searchData['update_datetime_start']; $qb ->andWhere('c.update_date >= :update_date_start') ->setParameter('update_date_start', $date); - } elseif (!empty($searchData['update_date_start'])) { + } elseif (!empty($searchData['update_date_start']) && $searchData['update_date_start']) { $qb ->andWhere('c.update_date >= :update_date_start') ->setParameter('update_date_start', $searchData['update_date_start']); } - if (!empty($searchData['update_datetime_end'])) { + if (!empty($searchData['update_datetime_end']) && $searchData['update_datetime_end']) { $date = $searchData['update_datetime_end']; $qb ->andWhere('c.update_date < :update_date_end') ->setParameter('update_date_end', $date); - } elseif (!empty($searchData['update_date_end'])) { + } elseif (!empty($searchData['update_date_end']) && $searchData['update_date_end']) { $date = clone $searchData['update_date_end']; $date->modify('+1 days'); $qb @@ -277,23 +277,23 @@ public function getQueryBuilderBySearchData($searchData) } // last_buy - if (!empty($searchData['last_buy_datetime_start'])) { + if (!empty($searchData['last_buy_datetime_start']) && $searchData['last_buy_datetime_start']) { $date = $searchData['last_buy_datetime_start']; $qb ->andWhere('c.last_buy_date >= :last_buy_start') ->setParameter('last_buy_start', $date); - } elseif (!empty($searchData['last_buy_start'])) { + } elseif (!empty($searchData['last_buy_start']) && $searchData['last_buy_start']) { $qb ->andWhere('c.last_buy_date >= :last_buy_start') ->setParameter('last_buy_start', $searchData['last_buy_start']); } - if (!empty($searchData['last_buy_datetime_end'])) { + if (!empty($searchData['last_buy_datetime_end']) && $searchData['last_buy_datetime_end']) { $date = $searchData['last_buy_datetime_end']; $qb ->andWhere('c.last_buy_date < :last_buy_end') ->setParameter('last_buy_end', $date); - } elseif (!empty($searchData['last_buy_end'])) { + } elseif (!empty($searchData['last_buy_end']) && $searchData['last_buy_end']) { $date = clone $searchData['last_buy_end']; $date->modify('+1 days'); $qb diff --git a/src/Eccube/Repository/LoginHistoryRepository.php b/src/Eccube/Repository/LoginHistoryRepository.php index 077da2fd28c..2817e98dc9e 100644 --- a/src/Eccube/Repository/LoginHistoryRepository.php +++ b/src/Eccube/Repository/LoginHistoryRepository.php @@ -74,13 +74,13 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // create_datetime - if (!empty($searchData['create_datetime_start'])) { + if (!empty($searchData['create_datetime_start']) && $searchData['create_datetime_start']) { $qb ->andWhere('lh.create_date >= :create_datetime_start') ->setParameter('create_datetime_start', $searchData['create_datetime_start']); } - if (!empty($searchData['create_datetime_end'])) { + if (!empty($searchData['create_datetime_end']) && $searchData['create_datetime_end']) { $date = clone $searchData['create_datetime_end']; $qb ->andWhere('lh.create_date < :create_datetime_end') @@ -88,13 +88,13 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // create_date 時間までは要らない人のために残しておきたい - if (!empty($searchData['create_date_start'])) { + if (!empty($searchData['create_date_start']) && $searchData['create_date_start']) { $qb ->andWhere('lh.create_date >= :create_date_start') ->setParameter('create_date_start', $searchData['create_date_start']); } - if (!empty($searchData['create_date_end'])) { + if (!empty($searchData['create_date_end']) && $searchData['create_date_end']) { $date = clone $searchData['create_date_end']; $date->modify('+1 days'); $qb diff --git a/src/Eccube/Repository/MemberRepository.php b/src/Eccube/Repository/MemberRepository.php index c435e878f71..4c105048714 100644 --- a/src/Eccube/Repository/MemberRepository.php +++ b/src/Eccube/Repository/MemberRepository.php @@ -85,7 +85,7 @@ public function down(Member $Member) /** * 管理ユーザを登録します. * - * @param Member|UserInterface $Member + * @param Member $Member */ public function save($Member) { diff --git a/src/Eccube/Repository/OrderRepository.php b/src/Eccube/Repository/OrderRepository.php index f1c34cb4871..95ebb2727e8 100644 --- a/src/Eccube/Repository/OrderRepository.php +++ b/src/Eccube/Repository/OrderRepository.php @@ -107,15 +107,14 @@ public function changeStatus($orderId, OrderStatus $Status) * payment_total_start?:string|int, * payment_total_end?:string|int, * payment_product_name?:string, - * shipping_mail?:Shipping::SHIPPING_MAIL_UNSENT|Shipping::SHIPPING_MAIL_SENT|ArrayCollection, + * shipping_mail?:Shipping::SHIPPING_MAIL_UNSENT|Shipping::SHIPPING_MAIL_SENT, * tracking_number?:string, * shipping_delivery_datetime_start?:\DateTime, * shipping_delivery_datetime_end?:\DateTime, * shipping_delivery_date_start?:\DateTime, * shipping_delivery_date_end?:\DateTime, * sortkey?:string, - * sorttype?:string, - * buy_product_name?:string + * sorttype?:string * } $searchData * * @return QueryBuilder @@ -175,7 +174,7 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) // status $filterStatus = false; - if (!empty($searchData['status']) && count($searchData['status']) > 0) { + if (!empty($searchData['status']) && count($searchData['status'])) { $qb ->andWhere($qb->expr()->in('o.OrderStatus', ':status')) ->setParameter('status', $searchData['status']); @@ -234,7 +233,7 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // payment - if (!empty($searchData['payment']) && count($searchData['payment']) > 0) { + if (!empty($searchData['payment']) && count($searchData['payment'])) { $payments = []; foreach ($searchData['payment'] as $payment) { $payments[] = $payment->getId(); @@ -246,24 +245,24 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // oreder_date - if (!empty($searchData['order_datetime_start'])) { + if (!empty($searchData['order_datetime_start']) && $searchData['order_datetime_start']) { $date = $searchData['order_datetime_start']; $qb ->andWhere('o.order_date >= :order_date_start') ->setParameter('order_date_start', $date); - } elseif (!empty($searchData['order_date_start'])) { + } elseif (!empty($searchData['order_date_start']) && $searchData['order_date_start']) { $date = $searchData['order_date_start']; $qb ->andWhere('o.order_date >= :order_date_start') ->setParameter('order_date_start', $date); } - if (!empty($searchData['order_datetime_end'])) { + if (!empty($searchData['order_datetime_end']) && $searchData['order_datetime_end']) { $date = $searchData['order_datetime_end']; $qb ->andWhere('o.order_date < :order_date_end') ->setParameter('order_date_end', $date); - } elseif (!empty($searchData['order_date_end'])) { + } elseif (!empty($searchData['order_date_end']) && $searchData['order_date_end']) { $date = clone $searchData['order_date_end']; $date = $date ->modify('+1 days'); @@ -273,24 +272,24 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // payment_date - if (!empty($searchData['payment_datetime_start'])) { + if (!empty($searchData['payment_datetime_start']) && $searchData['payment_datetime_start']) { $date = $searchData['payment_datetime_start']; $qb ->andWhere('o.payment_date >= :payment_date_start') ->setParameter('payment_date_start', $date); - } elseif (!empty($searchData['payment_date_start'])) { + } elseif (!empty($searchData['payment_date_start']) && $searchData['payment_date_start']) { $date = $searchData['payment_date_start']; $qb ->andWhere('o.payment_date >= :payment_date_start') ->setParameter('payment_date_start', $date); } - if (!empty($searchData['payment_datetime_end'])) { + if (!empty($searchData['payment_datetime_end']) && $searchData['payment_datetime_end']) { $date = $searchData['payment_datetime_end']; $qb ->andWhere('o.payment_date < :payment_date_end') ->setParameter('payment_date_end', $date); - } elseif (!empty($searchData['payment_date_end'])) { + } elseif (!empty($searchData['payment_date_end']) && $searchData['payment_date_end']) { $date = clone $searchData['payment_date_end']; $date = $date ->modify('+1 days'); @@ -300,24 +299,24 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // update_date - if (!empty($searchData['update_datetime_start'])) { + if (!empty($searchData['update_datetime_start']) && $searchData['update_datetime_start']) { $date = $searchData['update_datetime_start']; $qb ->andWhere('o.update_date >= :update_date_start') ->setParameter('update_date_start', $date); - } elseif (!empty($searchData['update_date_start'])) { + } elseif (!empty($searchData['update_date_start']) && $searchData['update_date_start']) { $date = $searchData['update_date_start']; $qb ->andWhere('o.update_date >= :update_date_start') ->setParameter('update_date_start', $date); } - if (!empty($searchData['update_datetime_end'])) { + if (!empty($searchData['update_datetime_end']) && $searchData['update_datetime_end']) { $date = $searchData['update_datetime_end']; $qb ->andWhere('o.update_date < :update_date_end') ->setParameter('update_date_end', $date); - } elseif (!empty($searchData['update_date_end'])) { + } elseif (!empty($searchData['update_date_end']) && $searchData['update_date_end']) { $date = clone $searchData['update_date_end']; $date = $date ->modify('+1 days'); @@ -346,9 +345,8 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // 発送メール送信/未送信. - if (isset($searchData['shipping_mail']) && count($searchData['shipping_mail']) > 0) { + if (isset($searchData['shipping_mail']) && $count = count($searchData['shipping_mail'])) { // 送信済/未送信両方にチェックされている場合は検索条件に追加しない - $count = count($searchData['shipping_mail']); if ($count < 2) { $checked = current($searchData['shipping_mail']); if ($checked == Shipping::SHIPPING_MAIL_UNSENT) { @@ -371,24 +369,24 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // お届け予定日(Shipping.delivery_date) - if (!empty($searchData['shipping_delivery_datetime_start'])) { + if (!empty($searchData['shipping_delivery_datetime_start']) && $searchData['shipping_delivery_datetime_start']) { $date = $searchData['shipping_delivery_datetime_start']; $qb ->andWhere('s.shipping_delivery_date >= :shipping_delivery_date_start') ->setParameter('shipping_delivery_date_start', $date); - } elseif (!empty($searchData['shipping_delivery_date_start'])) { + } elseif (!empty($searchData['shipping_delivery_date_start']) && $searchData['shipping_delivery_date_start']) { $date = $searchData['shipping_delivery_date_start']; $qb ->andWhere('s.shipping_delivery_date >= :shipping_delivery_date_start') ->setParameter('shipping_delivery_date_start', $date); } - if (!empty($searchData['shipping_delivery_datetime_end'])) { + if (!empty($searchData['shipping_delivery_datetime_end']) && $searchData['shipping_delivery_datetime_end']) { $date = $searchData['shipping_delivery_datetime_end']; $qb ->andWhere('s.shipping_delivery_date < :shipping_delivery_date_end') ->setParameter('shipping_delivery_date_end', $date); - } elseif (!empty($searchData['shipping_delivery_date_end'])) { + } elseif (!empty($searchData['shipping_delivery_date_end']) && $searchData['shipping_delivery_date_end']) { $date = clone $searchData['shipping_delivery_date_end']; $date = $date ->modify('+1 days'); diff --git a/src/Eccube/Repository/ProductRepository.php b/src/Eccube/Repository/ProductRepository.php index f6c05d48ed9..26cff19cbeb 100644 --- a/src/Eccube/Repository/ProductRepository.php +++ b/src/Eccube/Repository/ProductRepository.php @@ -152,7 +152,7 @@ public function getQueryBuilderBySearchData($searchData) // category $categoryJoin = false; - if (!empty($searchData['category_id'])) { + if (!empty($searchData['category_id']) && $searchData['category_id']) { $Categories = $searchData['category_id']->getSelfAndDescendants(); if ($Categories) { $qb @@ -290,7 +290,7 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) */ // category - if (!empty($searchData['category_id'])) { + if (!empty($searchData['category_id']) && $searchData['category_id']) { $Categories = $searchData['category_id']->getSelfAndDescendants(); if ($Categories) { $qb @@ -302,7 +302,7 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // status - if (!empty($searchData['status'])) { + if (!empty($searchData['status']) && $searchData['status']) { $qb ->andWhere($qb->expr()->in('p.Status', ':Status')) ->setParameter('Status', $searchData['status']); @@ -323,7 +323,7 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // stock status - if (isset($searchData['stock'])) { + if (isset($searchData['stock']) && !empty($searchData['stock'])) { switch ($searchData['stock']) { case [ProductStock::IN_STOCK]: $qb->andWhere('pc.stock_unlimited = true OR pc.stock > 0'); @@ -337,7 +337,7 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // tag - if (!empty($searchData['tag_id'])) { + if (!empty($searchData['tag_id']) && $searchData['tag_id']) { $qb ->innerJoin('p.ProductTag', 'pt') ->andWhere('pt.Tag = :tag_id') @@ -345,24 +345,24 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // crate_date - if (!empty($searchData['create_datetime_start'])) { + if (!empty($searchData['create_datetime_start']) && $searchData['create_datetime_start']) { $date = $searchData['create_datetime_start']; $qb ->andWhere('p.create_date >= :create_date_start') ->setParameter('create_date_start', $date); - } elseif (!empty($searchData['create_date_start'])) { + } elseif (!empty($searchData['create_date_start']) && $searchData['create_date_start']) { $date = $searchData['create_date_start']; $qb ->andWhere('p.create_date >= :create_date_start') ->setParameter('create_date_start', $date); } - if (!empty($searchData['create_datetime_end'])) { + if (!empty($searchData['create_datetime_end']) && $searchData['create_datetime_end']) { $date = $searchData['create_datetime_end']; $qb ->andWhere('p.create_date < :create_date_end') ->setParameter('create_date_end', $date); - } elseif (!empty($searchData['create_date_end'])) { + } elseif (!empty($searchData['create_date_end']) && $searchData['create_date_end']) { $date = clone $searchData['create_date_end']; $date = $date ->modify('+1 days'); @@ -372,24 +372,24 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // update_date - if (!empty($searchData['update_datetime_start'])) { + if (!empty($searchData['update_datetime_start']) && $searchData['update_datetime_start']) { $date = $searchData['update_datetime_start']; $qb ->andWhere('p.update_date >= :update_date_start') ->setParameter('update_date_start', $date); - } elseif (!empty($searchData['update_date_start'])) { + } elseif (!empty($searchData['update_date_start']) && $searchData['update_date_start']) { $date = $searchData['update_date_start']; $qb ->andWhere('p.update_date >= :update_date_start') ->setParameter('update_date_start', $date); } - if (!empty($searchData['update_datetime_end'])) { + if (!empty($searchData['update_datetime_end']) && $searchData['update_datetime_end']) { $date = $searchData['update_datetime_end']; $qb ->andWhere('p.update_date < :update_date_end') ->setParameter('update_date_end', $date); - } elseif (!empty($searchData['update_date_end'])) { + } elseif (!empty($searchData['update_date_end']) && $searchData['update_date_end']) { $date = clone $searchData['update_date_end']; $date = $date ->modify('+1 days'); diff --git a/src/Eccube/Repository/ShippingRepository.php b/src/Eccube/Repository/ShippingRepository.php index ad4d7992a87..5cb9951042e 100644 --- a/src/Eccube/Repository/ShippingRepository.php +++ b/src/Eccube/Repository/ShippingRepository.php @@ -145,13 +145,13 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // oreder_date - if (!empty($searchData['order_date_start'])) { + if (!empty($searchData['order_date_start']) && $searchData['order_date_start']) { $date = $searchData['order_date_start']; $qb ->andWhere('o.order_date >= :order_date_start') ->setParameter('order_date_start', $date); } - if (!empty($searchData['order_date_end'])) { + if (!empty($searchData['order_date_end']) && $searchData['order_date_end']) { $date = clone $searchData['order_date_end']; $date = $date ->modify('+1 days'); @@ -161,13 +161,13 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // shipping_delivery_date - if (!empty($searchData['shipping_delivery_date_start'])) { + if (!empty($searchData['shipping_delivery_date_start']) && $searchData['shipping_delivery_date_start']) { $date = $searchData['shipping_delivery_date_start']; $qb ->andWhere('s.shipping_delivery_date >= :shipping_delivery_date_start') ->setParameter('shipping_delivery_date_start', $date); } - if (!empty($searchData['shipping_delivery_date_end'])) { + if (!empty($searchData['shipping_delivery_date_end']) && $searchData['shipping_delivery_date_end']) { $date = clone $searchData['shipping_delivery_date_end']; $date = $date ->modify('+1 days'); @@ -177,13 +177,13 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // shipping_date - if (!empty($searchData['shipping_date_start'])) { + if (!empty($searchData['shipping_date_start']) && $searchData['shipping_date_start']) { $date = $searchData['shipping_date_start']; $qb ->andWhere('s.shipping_date >= :shipping_date_start') ->setParameter('shipping_date_start', $date); } - if (!empty($searchData['shipping_date_end'])) { + if (!empty($searchData['shipping_date_end']) && $searchData['shipping_date_end']) { $date = clone $searchData['shipping_date_end']; $date = $date ->modify('+1 days'); @@ -193,13 +193,13 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // update_date - if (!empty($searchData['update_date_start'])) { + if (!empty($searchData['update_date_start']) && $searchData['update_date_start']) { $date = $searchData['update_date_start']; $qb ->andWhere('s.update_date >= :update_date_start') ->setParameter('update_date_start', $date); } - if (!empty($searchData['update_date_end'])) { + if (!empty($searchData['update_date_end']) && $searchData['update_date_end']) { $date = clone $searchData['update_date_end']; $date = $date ->modify('+1 days'); diff --git a/src/Eccube/Service/CsvImportService.php b/src/Eccube/Service/CsvImportService.php index fee2a35af85..9af26f26a49 100644 --- a/src/Eccube/Service/CsvImportService.php +++ b/src/Eccube/Service/CsvImportService.php @@ -326,7 +326,7 @@ public function hasErrors() * Stream filter を適用し, 新たな SplFileObject を返す. * * @param \SplFileObject $file Stream filter を適用する SplFileObject - * @param \php_user_filter $filters 適用する stream filter のクラス名 + * @param string ...$filters 適用する stream filter のクラス名 * * @return \SplFileObject 適用後の SplFileObject */ diff --git a/src/Eccube/Service/Payment/PaymentMethodInterface.php b/src/Eccube/Service/Payment/PaymentMethodInterface.php index 205289626c6..0cd3265efd4 100644 --- a/src/Eccube/Service/Payment/PaymentMethodInterface.php +++ b/src/Eccube/Service/Payment/PaymentMethodInterface.php @@ -28,7 +28,7 @@ interface PaymentMethodInterface * * 主にクレジットカードの有効性チェック等を実装します. * - * @return PaymentResult + * @return PaymentResult|false */ public function verify(); @@ -46,7 +46,7 @@ public function checkout(); * * PaymentDispatcher に遷移先の情報を設定することで, 他のコントローラに処理を移譲できます. * - * @return PaymentDispatcher + * @return PaymentDispatcher|false */ public function apply(); @@ -55,7 +55,7 @@ public function apply(); * * @param FormInterface $form * - * @return PaymentMethod + * @return $this */ public function setFormType(FormInterface $form); @@ -64,7 +64,7 @@ public function setFormType(FormInterface $form); * * @param Order $Order * - * @return PaymentMethod + * @return $this */ public function setOrder(Order $Order); } diff --git a/src/Eccube/Service/PluginService.php b/src/Eccube/Service/PluginService.php index f44c4688165..a6a13628177 100644 --- a/src/Eccube/Service/PluginService.php +++ b/src/Eccube/Service/PluginService.php @@ -13,10 +13,12 @@ namespace Eccube\Service; +use Doctrine\Bundle\DoctrineBundle\Mapping\MappingDriver; use Doctrine\Common\Collections\Criteria; use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Mapping\MappingException as ORMMappingException; +use Doctrine\Persistence\Mapping\Driver\MappingDriverChain; use Doctrine\Persistence\Mapping\MappingException as PersistenceMappingException; use Eccube\Common\Constant; use Eccube\Common\EccubeConfig; @@ -342,7 +344,10 @@ public function generateProxyAndCallback(callable $callback, Plugin $plugin, $co $entityDir = $this->eccubeConfig['plugin_realdir'].'/'.$plugin->getCode().'/Entity'; if (file_exists($entityDir)) { $ormConfig = $this->entityManager->getConfiguration(); - $chain = $ormConfig->getMetadataDriverImpl()->getDriver(); + /** @var MappingDriver $mapping */ + $mapping = $ormConfig->getMetadataDriverImpl(); + /** @var MappingDriverChain $chain */ + $chain = $mapping->getDriver(); $driver = $ormConfig->newDefaultAnnotationDriver([$entityDir], false); $namespace = 'Plugin\\'.$config['code'].'\\Entity'; $chain->addDriver($driver, $namespace); diff --git a/src/Eccube/Service/PointHelper.php b/src/Eccube/Service/PointHelper.php index 5445501d618..0a699cee8b1 100644 --- a/src/Eccube/Service/PointHelper.php +++ b/src/Eccube/Service/PointHelper.php @@ -114,10 +114,10 @@ public function priceToPoint($price) /** * 明細追加処理. * - * @param ItemHolderInterface $itemHolder + * @param Order $itemHolder * @param integer $discount */ - public function addPointDiscountItem(ItemHolderInterface $itemHolder, $discount) + public function addPointDiscountItem(Order $itemHolder, $discount) { $DiscountType = $this->entityManager->find(OrderItemType::class, OrderItemType::POINT); $TaxInclude = $this->entityManager->find(TaxDisplayType::class, TaxDisplayType::INCLUDED); @@ -152,9 +152,9 @@ public function addPointDiscountItem(ItemHolderInterface $itemHolder, $discount) /** * 既存のポイント明細を削除する. * - * @param ItemHolderInterface $itemHolder + * @param Order $itemHolder */ - public function removePointDiscountItem(ItemHolderInterface $itemHolder) + public function removePointDiscountItem(Order $itemHolder) { foreach ($itemHolder->getItems() as $item) { if ($item->getProcessorName() == PointProcessor::class) { @@ -164,14 +164,14 @@ public function removePointDiscountItem(ItemHolderInterface $itemHolder) } } - public function prepare(ItemHolderInterface $itemHolder, $point) + public function prepare(Order $itemHolder, $point) { // ユーザの保有ポイントを減算 $Customer = $itemHolder->getCustomer(); $Customer->setPoint($Customer->getPoint() - $point); } - public function rollback(ItemHolderInterface $itemHolder, $point) + public function rollback(Order $itemHolder, $point) { // 利用したポイントをユーザに戻す. $Customer = $itemHolder->getCustomer(); diff --git a/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php b/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php index 7943ff662b3..d5d303f0521 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php @@ -69,7 +69,7 @@ private function calculateAddPoint(ItemHolderInterface $itemHolder) $basicPointRate = $this->BaseInfo->getBasicPointRate(); // 明細ごとのポイントを集計 - $totalPoint = array_reduce($itemHolder->getItems()->toArray(), + $totalPoint = array_reduce($itemHolder->getItems(), function ($carry, ItemInterface $item) use ($basicPointRate) { $pointRate = $item->getPointRate() ? $item->getPointRate() : null; diff --git a/src/Eccube/Service/PurchaseFlow/Processor/DeliveryFeePreprocessor.php b/src/Eccube/Service/PurchaseFlow/Processor/DeliveryFeePreprocessor.php index 8cd01d2fd84..79a6c8f3600 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/DeliveryFeePreprocessor.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/DeliveryFeePreprocessor.php @@ -80,11 +80,13 @@ public function __construct( */ public function process(ItemHolderInterface $itemHolder, PurchaseContext $context) { - $this->removeDeliveryFeeItem($itemHolder); - $this->saveDeliveryFeeItem($itemHolder); + if($itemHolder instanceof Order){ + $this->removeDeliveryFeeItem($itemHolder); + $this->saveDeliveryFeeItem($itemHolder); + } } - private function removeDeliveryFeeItem(ItemHolderInterface $itemHolder) + private function removeDeliveryFeeItem(Order $itemHolder) { foreach ($itemHolder->getShippings() as $Shipping) { foreach ($Shipping->getOrderItems() as $item) { diff --git a/src/Eccube/Service/PurchaseFlow/Processor/EmptyItemsValidator.php b/src/Eccube/Service/PurchaseFlow/Processor/EmptyItemsValidator.php index dc01bc44ef6..4ae36b380f1 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/EmptyItemsValidator.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/EmptyItemsValidator.php @@ -16,6 +16,7 @@ use Doctrine\ORM\EntityManagerInterface; use Eccube\Entity\ItemHolderInterface; use Eccube\Entity\Order; +use Eccube\Entity\OrderItem; use Eccube\Service\PurchaseFlow\InvalidItemException; use Eccube\Service\PurchaseFlow\ItemHolderValidator; use Eccube\Service\PurchaseFlow\PurchaseContext; @@ -49,8 +50,10 @@ protected function validate(ItemHolderInterface $itemHolder, PurchaseContext $co if ($item->isProduct() && $item->getQuantity() <= 0) { if ($itemHolder instanceof Order) { foreach ($itemHolder->getShippings() as $Shipping) { + /** @var OrderItem $item */ $Shipping->removeOrderItem($item); } + /** @var OrderItem $item */ $itemHolder->removeOrderItem($item); } else { $itemHolder->removeItem($item); diff --git a/src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php b/src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php index 8239bd10395..ce2d345be69 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php @@ -110,12 +110,15 @@ public function addDiscountItem(ItemHolderInterface $itemHolder, PurchaseContext } $itemHolder->setUsePoint($usePoint); + /** @var Order $itemHolder */ $this->pointHelper->addPointDiscountItem($itemHolder, $discount); if ($result) { return $result; } } + + return null; } /* diff --git a/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php b/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php index a5886dc784a..6750f02c91e 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php @@ -15,6 +15,8 @@ use Eccube\Entity\ItemHolderInterface; use Eccube\Entity\Master\OrderStatus; +use Eccube\Entity\Order; +use Eccube\Entity\OrderItem; use Eccube\Entity\ProductClass; use Eccube\Entity\ProductStock; use Eccube\Repository\ProductClassRepository; @@ -54,8 +56,9 @@ public function validate(ItemHolderInterface $itemHolder, PurchaseContext $conte if (is_null($context->getOriginHolder())) { return; } - + /** @var Order $From */ $From = $context->getOriginHolder(); + /** @var Order $To */ $To = $itemHolder; $diff = $this->getDiffOfQuantities($From, $To); diff --git a/src/Eccube/Service/PurchaseFlow/Processor/StockMultipleValidator.php b/src/Eccube/Service/PurchaseFlow/Processor/StockMultipleValidator.php index 6d05d9fb86a..385b4281684 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/StockMultipleValidator.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/StockMultipleValidator.php @@ -14,6 +14,7 @@ namespace Eccube\Service\PurchaseFlow\Processor; use Eccube\Entity\ItemHolderInterface; +use Eccube\Entity\Order; use Eccube\Entity\ProductClass; use Eccube\Entity\Shipping; use Eccube\Repository\ProductClassRepository; @@ -46,8 +47,10 @@ public function __construct(ProductClassRepository $productClassRepository) public function validate(ItemHolderInterface $itemHolder, PurchaseContext $context) { $OrderItemsByProductClass = []; + /** @var Order $Order */ + $Order = $itemHolder; /** @var Shipping $Shipping */ - foreach ($itemHolder->getShippings() as $Shipping) { + foreach ($Order->getShippings() as $Shipping) { foreach ($Shipping->getOrderItems() as $Item) { if ($Item->isProduct()) { $id = $Item->getProductClass()->getId(); diff --git a/src/Eccube/Service/TwoFactorAuthService.php b/src/Eccube/Service/TwoFactorAuthService.php index a014cd76d5c..fa0988eac66 100644 --- a/src/Eccube/Service/TwoFactorAuthService.php +++ b/src/Eccube/Service/TwoFactorAuthService.php @@ -21,6 +21,8 @@ use Symfony\Component\HttpFoundation\Cookie; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack; +use Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactoryInterface; +use Symfony\Component\PasswordHasher\PasswordHasherInterface; use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; class TwoFactorAuthService @@ -46,7 +48,7 @@ class TwoFactorAuthService protected $eccubeConfig; /** - * @var EncoderFactoryInterface + * @var PasswordHasherFactoryInterface */ protected $encoderFactory; @@ -61,7 +63,7 @@ class TwoFactorAuthService protected $request; /** - * @var Encoder + * @var PasswordHasherInterface */ protected $encoder; @@ -85,12 +87,12 @@ class TwoFactorAuthService * * @param ContainerInterface $container * @param EccubeConfig $eccubeConfig - * @param EncoderFactoryInterface $encoderFactory + * @param PasswordHasherFactoryInterface $encoderFactory */ public function __construct( ContainerInterface $container, EccubeConfig $eccubeConfig, - EncoderFactoryInterface $encoderFactory, + PasswordHasherFactoryInterface $encoderFactory, RequestStack $requestStack ) { $this->container = $container; @@ -98,7 +100,7 @@ public function __construct( $this->encoderFactory = $encoderFactory; $this->requestStack = $requestStack; $this->request = $requestStack->getCurrentRequest(); - $this->encoder = $this->encoderFactory->getEncoder('Eccube\\Entity\\Member'); + $this->encoder = $this->encoderFactory->getPasswordHasher('Eccube\\Entity\\Member'); $this->tfa = new TwoFactorAuth(); if ($this->eccubeConfig->get('eccube_2fa_cookie_name')) { diff --git a/src/Eccube/Twig/Extension/IgnoreTwigSandboxErrorExtension.php b/src/Eccube/Twig/Extension/IgnoreTwigSandboxErrorExtension.php index 32b928c5857..04ac1e77489 100644 --- a/src/Eccube/Twig/Extension/IgnoreTwigSandboxErrorExtension.php +++ b/src/Eccube/Twig/Extension/IgnoreTwigSandboxErrorExtension.php @@ -68,6 +68,7 @@ public function twig_include(Environment $env, $context, $template, $variables = log_warning($e->getMessage(), ['exception' => $e]); // 例外がスローされた場合、sandboxが効いた状態になってしまうため追加 + /** @var SandboxExtension $sandbox */ $sandbox = $env->getExtension(SandboxExtension::class); if (!$sandbox->isSandboxedGlobally()) { $sandbox->disableSandbox(); diff --git a/tests/object-manager.php b/tests/object-manager.php index 43c5bedeeec..37ea4d7b661 100644 --- a/tests/object-manager.php +++ b/tests/object-manager.php @@ -1,4 +1,5 @@ bootEnv(__DIR__ . '/../.env'); -$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']); +$kernel = new Kernel($_SERVER['APP_ENV'], (bool)$_SERVER['APP_DEBUG']); $kernel->boot(); return $kernel->getContainer()->get('doctrine')->getManager(); diff --git a/tests/results/convert.php b/tests/results/convert.php new file mode 100644 index 00000000000..8ea30da6ef1 --- /dev/null +++ b/tests/results/convert.php @@ -0,0 +1,37 @@ + $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){ + fputcsv($fp, $line_data); + $line_data["ignorable"] = $message["ignorable"]; + $existence_check[] = $line_data; + } + } + } +} + +fclose($fp); diff --git a/tests/results/error_csv.csv b/tests/results/error_csv.csv new file mode 100644 index 00000000000..645152c38b1 --- /dev/null +++ b/tests/results/error_csv.csv @@ -0,0 +1,66 @@ +/var/www/html/src/Eccube/Controller/ShoppingController.php,0,847,"Method Eccube\Controller\ShoppingController::executeApply() should return Symfony\Component\HttpFoundation\Response but return statement is missing." +/var/www/html/src/Eccube/Service/CsvImportService.php,0,137,"Return type mixed of method Eccube\Service\CsvImportService::current() is not covariant with tentative return type mixed of method Iterator::current()." +/var/www/html/src/Eccube/Service/CsvImportService.php,0,221,"Return type mixed of method Eccube\Service\CsvImportService::rewind() is not covariant with tentative return type void of method Iterator::rewind()." +/var/www/html/src/Eccube/Service/CsvImportService.php,0,232,"Return type mixed of method Eccube\Service\CsvImportService::count() is not covariant with tentative return type int of method Countable::count()." +/var/www/html/src/Eccube/Service/CsvImportService.php,0,248,"Return type mixed of method Eccube\Service\CsvImportService::next() is not covariant with tentative return type void of method Iterator::next()." +/var/www/html/src/Eccube/Service/CsvImportService.php,0,256,"Return type mixed of method Eccube\Service\CsvImportService::valid() is not covariant with tentative return type bool of method Iterator::valid()." +/var/www/html/src/Eccube/Service/CsvImportService.php,0,264,"Return type mixed of method Eccube\Service\CsvImportService::key() is not covariant with tentative return type mixed of method Iterator::key()." +/var/www/html/src/Eccube/Service/CsvImportService.php,0,272,"Return type mixed of method Eccube\Service\CsvImportService::seek() is not covariant with tentative return type void of method SeekableIterator::seek()." +/var/www/html/src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php,0,49,"Return type mixed of method Eccube\Session\Storage\Handler\SameSiteNoneCompatSessionHandler::open() is not covariant with tentative return type bool of method SessionHandlerInterface::open()." +/var/www/html/src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php,0,71,"Return type mixed of method Eccube\Session\Storage\Handler\SameSiteNoneCompatSessionHandler::updateTimestamp() is not covariant with tentative return type bool of method SessionUpdateTimestampHandlerInterface::updateTimestamp()." +/var/www/html/src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php,0,89,"Return type mixed of method Eccube\Session\Storage\Handler\SameSiteNoneCompatSessionHandler::destroy() is not covariant with tentative return type bool of method SessionHandlerInterface::destroy()." +/var/www/html/src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php,0,155,"Return type mixed of method Eccube\Session\Storage\Handler\SameSiteNoneCompatSessionHandler::close() is not covariant with tentative return type bool of method SessionHandlerInterface::close()." +/var/www/html/src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php,0,163,"Return type mixed of method Eccube\Session\Storage\Handler\SameSiteNoneCompatSessionHandler::gc() is not covariant with tentative return type int|false of method SessionHandlerInterface::gc()." +/var/www/html/src/Eccube/Twig/Extension/IgnoreTwigSandboxErrorExtension.php,0,,"Ignored error pattern #^Function twig_include not found\.$# in path /var/www/html/src/Eccube/Twig/Extension/IgnoreTwigSandboxErrorExtension.php was not matched in reported errors." +/var/www/html/src/Eccube/Controller/Admin/Store/TemplateController.php,2,233,"Call to an undefined method Eccube\Repository\TemplateRepository::findByCode()." +/var/www/html/src/Eccube/DependencyInjection/Configuration.php,2,34,"Call to an undefined method Symfony\Component\Config\Definition\Builder\NodeDefinition::children()." +/var/www/html/src/Eccube/Doctrine/Common/CsvDataFixtures/CsvFixture.php,2,64,"Call to an undefined method Doctrine\Persistence\ObjectManager::getConnection()." +/var/www/html/src/Eccube/Doctrine/EventSubscriber/TaxRuleEventSubscriber.php,2,40,"Call to an undefined method Eccube\Service\TaxRuleService::get()." +/var/www/html/src/Eccube/EventListener/LoginHistoryListener.php,2,127,"Call to an undefined method Symfony\Component\Security\Http\Authenticator\Passport\Badge\BadgeInterface::getUserIdentifier()." +/var/www/html/src/Eccube/EventListener/TransactionListener.php,2,108,"Cannot call method inTransaction() on object|resource." +/var/www/html/src/Eccube/EventListener/TransactionListener.php,2,132,"Cannot call method inTransaction() on object|resource." +/var/www/html/src/Eccube/Form/Type/AddCartType.php,2,205,"Call to an undefined method Symfony\Component\Validator\Context\ExecutionContext::validateValue()." +/var/www/html/src/Eccube/Repository/AbstractRepository.php,2,64,"PHPDoc tag @throws with type Doctrine\DBAL\DBALException is not subtype of Throwable" +/var/www/html/src/Eccube/Repository/AbstractRepository.php,2,76,"PHPDoc tag @throws with type Doctrine\DBAL\DBALException is not subtype of Throwable" +/var/www/html/src/Eccube/Resource/functions/trans.php,2,27,"Call to an undefined method Symfony\Contracts\Translation\TranslatorInterface::transChoice()." +/var/www/html/src/Eccube/Service/CsvImportService.php,2,333,"PHPDoc tag @param for parameter $filters with type php_user_filter is incompatible with native type string." +/var/www/html/src/Eccube/Service/PluginService.php,2,279,"Cannot call method inTransaction() on object|resource." +/var/www/html/src/Eccube/Service/PluginService.php,2,283,"Cannot call method inTransaction() on object|resource." +/var/www/html/src/Eccube/Service/PluginService.php,2,345,"Call to an undefined method Doctrine\Persistence\Mapping\Driver\MappingDriver::getDriver()." +/var/www/html/src/Eccube/Service/PluginService.php,2,781,"Cannot call method inTransaction() on object|resource." +/var/www/html/src/Eccube/Service/PluginService.php,2,785,"Cannot call method inTransaction() on object|resource." +/var/www/html/src/Eccube/Service/PointHelper.php,2,131,"Cannot call method getProductClasses() on array." +/var/www/html/src/Eccube/Service/PointHelper.php,2,160,"Call to an undefined method Eccube\Entity\ItemInterface::getProcessorName()." +/var/www/html/src/Eccube/Service/PointHelper.php,2,161,"Call to an undefined method Eccube\Entity\ItemHolderInterface::removeOrderItem()." +/var/www/html/src/Eccube/Service/PointHelper.php,2,170,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getCustomer()." +/var/www/html/src/Eccube/Service/PointHelper.php,2,177,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getCustomer()." +/var/www/html/src/Eccube/Service/PurchaseFlow/ItemCollection.php,2,118,"Call to an undefined method Eccube\Entity\ItemInterface::getId()." +/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php,2,72,"Cannot call method toArray() on array." +/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php,2,75,"Call to an undefined method Eccube\Entity\ItemInterface::getPointRate()." +/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/DeliveryFeePreprocessor.php,2,89,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getShippings()." +/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/DeliveryFeePreprocessor.php,2,93,"Call to an undefined method Eccube\Entity\ItemHolderInterface::removeOrderItem()." +/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/EmptyItemsValidator.php,2,56,"Call to an undefined method Eccube\Entity\ItemHolderInterface::removeItem()." +/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/PointDiffProcessor.php,2,68,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getCustomer()." +/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php,2,81,"Method Eccube\Service\PurchaseFlow\Processor\PointProcessor::addDiscountItem() should return Eccube\Service\PurchaseFlow\ProcessResult|null but return statement is missing." +/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php,2,97,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getCustomer()." +/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/PriceChangeValidator.php,2,48,"Call to an undefined method Eccube\Entity\ItemInterface::setPrice()." +/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php,2,70,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getProductOrderItems()." +/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php,2,79,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getOrderStatus()." +/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php,2,80,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getOrderStatus()." +/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php,2,85,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getOrderStatus()." +/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php,2,86,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getOrderStatus()." +/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/StockMultipleValidator.php,2,50,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getShippings()." +/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,269,"Cannot call method toArray() on array." +/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,270,"Call to an undefined method Eccube\Entity\ItemInterface::getPriceIncTax()." +/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,284,"Cannot call method getProductClasses() on array." +/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,287,"Call to an undefined method Eccube\Entity\ItemInterface::getPriceIncTax()." +/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,303,"Cannot call method getDeliveryFees() on array." +/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,306,"Call to an undefined method Eccube\Entity\ItemInterface::getPriceIncTax()." +/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,318,"Cannot call method getDiscounts() on array." +/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,321,"Call to an undefined method Eccube\Entity\ItemInterface::getPriceIncTax()." +/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,334,"Cannot call method getCharges() on array." +/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,337,"Call to an undefined method Eccube\Entity\ItemInterface::getPriceIncTax()." +/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,349,"Cannot call method reduce() on array." +/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,354,"Call to an undefined method Eccube\Entity\ItemInterface::getPriceIncTax()." +/var/www/html/src/Eccube/Service/SchemaService.php,2,71,"Call to an undefined method Doctrine\Persistence\Mapping\Driver\MappingDriver::getDriver()." +/var/www/html/src/Eccube/Service/SchemaService.php,2,137,"Call to an undefined method Doctrine\Persistence\Mapping\Driver\MappingDriver::getDriver()." From 7f881e5b1e51aebf34bb101ede02556962b155dc Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Tue, 7 Nov 2023 12:06:00 +0900 Subject: [PATCH 30/90] =?UTF-8?q?PHPStan=20=E3=83=AC=E3=83=99=E3=83=AB?= =?UTF-8?q?=EF=BC=92=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- phpstan.neon.dist | 18 ++++-- src/Eccube/Entity/ItemHolderInterface.php | 9 +-- src/Eccube/Entity/ItemInterface.php | 1 + src/Eccube/Service/PointHelper.php | 27 +++++--- .../Processor/DeliveryFeePreprocessor.php | 27 ++++---- .../Processor/EmptyItemsValidator.php | 5 +- .../PurchaseFlow/Processor/PointProcessor.php | 2 +- .../Processor/StockDiffProcessor.php | 3 +- .../Processor/StockMultipleValidator.php | 64 +++++++++---------- 9 files changed, 85 insertions(+), 71 deletions(-) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 4c9a9a46292..4aaecec922d 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -1,8 +1,12 @@ parameters: - level: 6 - doctrine: - objectManagerLoader: tests/object-manager.php - ignoreErrors: - - - message: "#^Function twig_include not found\\.$#" - path: src/Eccube/Twig/Extension/IgnoreTwigSandboxErrorExtension.php + level: 0 + excludePaths: + - 'var/*' + - 'vendor/*' + doctrine: + objectManagerLoader: tests/object-manager.php + ormRepositoryClass: Eccube\Repository\AbstractRepository +# errorFormat: json +#services: +# errorFormatter.csv: +# class: Eccube\Service\Command\CsvErrorFormatter diff --git a/src/Eccube/Entity/ItemHolderInterface.php b/src/Eccube/Entity/ItemHolderInterface.php index 2254fc47d26..b39c7ce46ab 100644 --- a/src/Eccube/Entity/ItemHolderInterface.php +++ b/src/Eccube/Entity/ItemHolderInterface.php @@ -13,10 +13,12 @@ namespace Eccube\Entity; +use Eccube\Service\PurchaseFlow\ItemCollection; + interface ItemHolderInterface { /** - * @return ItemInterface[] + * @return ItemCollection|ItemCollection */ public function getItems(); @@ -110,11 +112,6 @@ public function getUsePoint(); * @param ItemInterface $item */ public function addItem(ItemInterface $item); - - /** - * @param ItemInterface $item - */ - public function removeItem(ItemInterface $item); /** * Get customer. * diff --git a/src/Eccube/Entity/ItemInterface.php b/src/Eccube/Entity/ItemInterface.php index fe7e7cb814d..908c6bf944d 100644 --- a/src/Eccube/Entity/ItemInterface.php +++ b/src/Eccube/Entity/ItemInterface.php @@ -71,6 +71,7 @@ public function getQuantity(); public function setQuantity($quantity); public function getId(); public function getPointRate(); + /** * @param float|int|string $price * diff --git a/src/Eccube/Service/PointHelper.php b/src/Eccube/Service/PointHelper.php index 0a699cee8b1..1944e1d6801 100644 --- a/src/Eccube/Service/PointHelper.php +++ b/src/Eccube/Service/PointHelper.php @@ -114,11 +114,16 @@ public function priceToPoint($price) /** * 明細追加処理. * - * @param Order $itemHolder + * @param ItemHolderInterface $itemHolder * @param integer $discount */ - public function addPointDiscountItem(Order $itemHolder, $discount) + public function addPointDiscountItem(ItemHolderInterface $itemHolder, $discount) { + // 注文明細以外は処理しない. + if ($itemHolder instanceof Order === false) { + return; + } + $DiscountType = $this->entityManager->find(OrderItemType::class, OrderItemType::POINT); $TaxInclude = $this->entityManager->find(TaxDisplayType::class, TaxDisplayType::INCLUDED); $Taxation = $this->entityManager->find(TaxType::class, TaxType::NON_TAXABLE); @@ -152,26 +157,28 @@ public function addPointDiscountItem(Order $itemHolder, $discount) /** * 既存のポイント明細を削除する. * - * @param Order $itemHolder + * @param ItemHolderInterface $itemHolder */ - public function removePointDiscountItem(Order $itemHolder) + public function removePointDiscountItem(ItemHolderInterface $itemHolder) { - foreach ($itemHolder->getItems() as $item) { - if ($item->getProcessorName() == PointProcessor::class) { - $itemHolder->removeOrderItem($item); - $this->entityManager->remove($item); + if ($itemHolder instanceof Order) { + foreach ($itemHolder->getItems() as $item) { + if ($item instanceof OrderItem && $item->getProcessorName() == PointProcessor::class) { + $itemHolder->removeOrderItem($item); + $this->entityManager->remove($item); + } } } } - public function prepare(Order $itemHolder, $point) + public function prepare(ItemHolderInterface $itemHolder, $point) { // ユーザの保有ポイントを減算 $Customer = $itemHolder->getCustomer(); $Customer->setPoint($Customer->getPoint() - $point); } - public function rollback(Order $itemHolder, $point) + public function rollback(ItemHolderInterface $itemHolder, $point) { // 利用したポイントをユーザに戻す. $Customer = $itemHolder->getCustomer(); diff --git a/src/Eccube/Service/PurchaseFlow/Processor/DeliveryFeePreprocessor.php b/src/Eccube/Service/PurchaseFlow/Processor/DeliveryFeePreprocessor.php index 79a6c8f3600..daaff2be72f 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/DeliveryFeePreprocessor.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/DeliveryFeePreprocessor.php @@ -61,11 +61,12 @@ class DeliveryFeePreprocessor implements ItemHolderPreprocessor * @param DeliveryFeeRepository $deliveryFeeRepository */ public function __construct( - BaseInfoRepository $baseInfoRepository, + BaseInfoRepository $baseInfoRepository, EntityManagerInterface $entityManager, - TaxRuleRepository $taxRuleRepository, - DeliveryFeeRepository $deliveryFeeRepository - ) { + TaxRuleRepository $taxRuleRepository, + DeliveryFeeRepository $deliveryFeeRepository + ) + { $this->BaseInfo = $baseInfoRepository->get(); $this->entityManager = $entityManager; $this->taxRuleRepository = $taxRuleRepository; @@ -80,20 +81,22 @@ public function __construct( */ public function process(ItemHolderInterface $itemHolder, PurchaseContext $context) { - if($itemHolder instanceof Order){ + if ($itemHolder instanceof Order) { $this->removeDeliveryFeeItem($itemHolder); $this->saveDeliveryFeeItem($itemHolder); } } - private function removeDeliveryFeeItem(Order $itemHolder) + private function removeDeliveryFeeItem(ItemHolderInterface $itemHolder) { - foreach ($itemHolder->getShippings() as $Shipping) { - foreach ($Shipping->getOrderItems() as $item) { - if ($item->getProcessorName() == DeliveryFeePreprocessor::class) { - $Shipping->removeOrderItem($item); - $itemHolder->removeOrderItem($item); - $this->entityManager->remove($item); + if ($itemHolder instanceof Order) { + foreach ($itemHolder->getShippings() as $Shipping) { + foreach ($Shipping->getOrderItems() as $item) { + if ($item->getProcessorName() == DeliveryFeePreprocessor::class) { + $Shipping->removeOrderItem($item); + $itemHolder->removeOrderItem($item); + $this->entityManager->remove($item); + } } } } diff --git a/src/Eccube/Service/PurchaseFlow/Processor/EmptyItemsValidator.php b/src/Eccube/Service/PurchaseFlow/Processor/EmptyItemsValidator.php index 4ae36b380f1..6f56537c65f 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/EmptyItemsValidator.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/EmptyItemsValidator.php @@ -14,6 +14,7 @@ namespace Eccube\Service\PurchaseFlow\Processor; use Doctrine\ORM\EntityManagerInterface; +use Eccube\Entity\Cart; use Eccube\Entity\ItemHolderInterface; use Eccube\Entity\Order; use Eccube\Entity\OrderItem; @@ -56,7 +57,9 @@ protected function validate(ItemHolderInterface $itemHolder, PurchaseContext $co /** @var OrderItem $item */ $itemHolder->removeOrderItem($item); } else { - $itemHolder->removeItem($item); + if ($itemHolder instanceof Cart) { + $itemHolder->removeItem($item); + } } $this->entityManager->remove($item); } diff --git a/src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php b/src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php index ce2d345be69..6c558351ed4 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php @@ -74,6 +74,7 @@ public function addDiscountItem(ItemHolderInterface $itemHolder, PurchaseContext return; } + /** @var Order $itemHolder */ $usePoint = $itemHolder->getUsePoint(); $discount = $this->pointHelper->pointToDiscount($usePoint); @@ -110,7 +111,6 @@ public function addDiscountItem(ItemHolderInterface $itemHolder, PurchaseContext } $itemHolder->setUsePoint($usePoint); - /** @var Order $itemHolder */ $this->pointHelper->addPointDiscountItem($itemHolder, $discount); if ($result) { diff --git a/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php b/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php index 6750f02c91e..e1d7748320f 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php @@ -16,7 +16,6 @@ use Eccube\Entity\ItemHolderInterface; use Eccube\Entity\Master\OrderStatus; use Eccube\Entity\Order; -use Eccube\Entity\OrderItem; use Eccube\Entity\ProductClass; use Eccube\Entity\ProductStock; use Eccube\Repository\ProductClassRepository; @@ -84,7 +83,7 @@ public function validate(ItemHolderInterface $itemHolder, PurchaseContext $conte if ($stock + $toQuantity < 0) { $this->throwInvalidItemException(trans('purchase_flow.over_stock', ['%name%' => $ProductClass->formattedProductName()])); } - // ステータスをキャンセルから対応中に変更した場合 + // ステータスをキャンセルから対応中に変更した場合 } elseif ($To->getOrderStatus() && $To->getOrderStatus()->getId() == OrderStatus::IN_PROGRESS && $From->getOrderStatus() && $From->getOrderStatus()->getId() == OrderStatus::CANCEL) { if ($stock - $toQuantity < 0) { diff --git a/src/Eccube/Service/PurchaseFlow/Processor/StockMultipleValidator.php b/src/Eccube/Service/PurchaseFlow/Processor/StockMultipleValidator.php index 385b4281684..f3d50a2e0ac 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/StockMultipleValidator.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/StockMultipleValidator.php @@ -46,46 +46,46 @@ public function __construct(ProductClassRepository $productClassRepository) */ public function validate(ItemHolderInterface $itemHolder, PurchaseContext $context) { - $OrderItemsByProductClass = []; - /** @var Order $Order */ - $Order = $itemHolder; - /** @var Shipping $Shipping */ - foreach ($Order->getShippings() as $Shipping) { - foreach ($Shipping->getOrderItems() as $Item) { - if ($Item->isProduct()) { - $id = $Item->getProductClass()->getId(); - $OrderItemsByProductClass[$id][] = $Item; + if ($itemHolder instanceof Order) { + $OrderItemsByProductClass = []; + /** @var Shipping $Shipping */ + foreach ($itemHolder->getShippings() as $Shipping) { + foreach ($Shipping->getOrderItems() as $Item) { + if ($Item->isProduct()) { + $id = $Item->getProductClass()->getId(); + $OrderItemsByProductClass[$id][] = $Item; + } } } - } - foreach ($OrderItemsByProductClass as $id => $Items) { - /** @var ProductClass $ProductClass */ - $ProductClass = $this->productClassRepository->find($id); - if ($ProductClass->isStockUnlimited()) { - continue; - } - $stock = $ProductClass->getStock(); + foreach ($OrderItemsByProductClass as $id => $Items) { + /** @var ProductClass $ProductClass */ + $ProductClass = $this->productClassRepository->find($id); + if ($ProductClass->isStockUnlimited()) { + continue; + } + $stock = $ProductClass->getStock(); - if ($stock == 0) { + if ($stock == 0) { + foreach ($Items as $Item) { + $Item->setQuantity(0); + } + $this->throwInvalidItemException('front.shopping.out_of_stock_zero', $ProductClass, true); + } + $isOver = false; foreach ($Items as $Item) { - $Item->setQuantity(0); + if ($stock - $Item->getQuantity() >= 0) { + $stock = $stock - $Item->getQuantity(); + } else { + $Item->setQuantity($stock); + $stock = 0; + $isOver = true; + } } - $this->throwInvalidItemException('front.shopping.out_of_stock_zero', $ProductClass, true); - } - $isOver = false; - foreach ($Items as $Item) { - if ($stock - $Item->getQuantity() >= 0) { - $stock = $stock - $Item->getQuantity(); - } else { - $Item->setQuantity($stock); - $stock = 0; - $isOver = true; + if ($isOver) { + $this->throwInvalidItemException('front.shopping.out_of_stock', $ProductClass, true); } } - if ($isOver) { - $this->throwInvalidItemException('front.shopping.out_of_stock', $ProductClass, true); - } } } } From 5b143245dd84f4245c0a8cdc2a7b0544578454d3 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Tue, 7 Nov 2023 18:58:05 +0900 Subject: [PATCH 31/90] =?UTF-8?q?PHPStan=20=E3=83=AC=E3=83=99=E3=83=AB?= =?UTF-8?q?=EF=BC=92=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Store/TemplateController.php | 4 +-- src/Eccube/Controller/ShoppingController.php | 2 +- .../Common/CsvDataFixtures/CsvFixture.php | 8 ++++-- src/Eccube/Entity/ItemInterface.php | 5 ++++ src/Eccube/Entity/PointTrait.php | 6 ++--- .../EventListener/LoginHistoryListener.php | 2 +- .../EventListener/TransactionListener.php | 10 ++++++-- src/Eccube/Repository/TemplateRepository.php | 3 +++ src/Eccube/Resource/functions/trans.php | 7 +++--- src/Eccube/Service/PluginService.php | 18 ++++++++++--- src/Eccube/Service/SchemaService.php | 25 ++++++++++++++----- 11 files changed, 65 insertions(+), 25 deletions(-) diff --git a/src/Eccube/Controller/Admin/Store/TemplateController.php b/src/Eccube/Controller/Admin/Store/TemplateController.php index 00327ed994d..5dc554f9f07 100644 --- a/src/Eccube/Controller/Admin/Store/TemplateController.php +++ b/src/Eccube/Controller/Admin/Store/TemplateController.php @@ -229,10 +229,8 @@ public function install(Request $request) if ($form->isSubmitted() && $form->isValid()) { /** @var \Eccube\Entity\Template $Template */ $Template = $form->getData(); - $TemplateExists = $this->templateRepository->findByCode($Template->getCode()); - - // テンプレートコードの重複チェック. + // テンプレートコードの重複チェック.s if ($TemplateExists) { $form['code']->addError(new FormError(trans('admin.store.template.template_code_already_exists'))); diff --git a/src/Eccube/Controller/ShoppingController.php b/src/Eccube/Controller/ShoppingController.php index 887eba4b01c..f36cc10a982 100644 --- a/src/Eccube/Controller/ShoppingController.php +++ b/src/Eccube/Controller/ShoppingController.php @@ -837,7 +837,7 @@ private function createPaymentMethod(Order $Order, FormInterface $form) * * @param PaymentMethodInterface $paymentMethod * - * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response + * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response|void */ protected function executeApply(PaymentMethodInterface $paymentMethod) { diff --git a/src/Eccube/Doctrine/Common/CsvDataFixtures/CsvFixture.php b/src/Eccube/Doctrine/Common/CsvDataFixtures/CsvFixture.php index d614b501b2b..98dc772e57f 100644 --- a/src/Eccube/Doctrine/Common/CsvDataFixtures/CsvFixture.php +++ b/src/Eccube/Doctrine/Common/CsvDataFixtures/CsvFixture.php @@ -15,6 +15,7 @@ use Doctrine\Common\DataFixtures\FixtureInterface; use Doctrine\DBAL\Connection; +use Doctrine\ORM\EntityManagerInterface; use Doctrine\Persistence\ObjectManager; /** @@ -44,6 +45,10 @@ public function __construct(\SplFileObject $file = null) */ public function load(ObjectManager $manager) { + if($manager instanceof EntityManagerInterface === false) { + return; + } + // 日本語windowsの場合はインストール時にエラーとなるので英語のロケールをセット // ロケールがミスマッチしてSplFileObject::READ_CSVができないのを回避 if ('\\' === DIRECTORY_SEPARATOR) { @@ -56,11 +61,10 @@ public function load(ObjectManager $manager) // ヘッダ行を取得 $headers = $this->file->current(); $this->file->next(); - // ファイル名からテーブル名を取得 $table_name = str_replace('.'.$this->file->getExtension(), '', $this->file->getFilename()); $sql = $this->getSql($table_name, $headers); - /** @var Connection $Connection */ + /** @var \Doctrine\DBAL\Connection $Connection */ $Connection = $manager->getConnection(); $Connection->beginTransaction(); diff --git a/src/Eccube/Entity/ItemInterface.php b/src/Eccube/Entity/ItemInterface.php index 908c6bf944d..c56b666441b 100644 --- a/src/Eccube/Entity/ItemInterface.php +++ b/src/Eccube/Entity/ItemInterface.php @@ -78,4 +78,9 @@ public function getPointRate(); * @return $this */ public function setPrice($price); + + /** + * @return mixed + */ + public function getPriceIncTax(); } diff --git a/src/Eccube/Entity/PointTrait.php b/src/Eccube/Entity/PointTrait.php index 05b693a7f95..8ded58bb551 100644 --- a/src/Eccube/Entity/PointTrait.php +++ b/src/Eccube/Entity/PointTrait.php @@ -18,14 +18,14 @@ trait PointTrait { /** - * @var string + * @var string|int|float * * @ORM\Column(name="add_point", type="decimal", precision=12, scale=0, options={"unsigned":true,"default":0}) */ private $add_point = '0'; /** - * @var string + * @var string|int|float * * @ORM\Column(name="use_point", type="decimal", precision=12, scale=0, options={"unsigned":true,"default":0}) */ @@ -72,7 +72,7 @@ public function setUsePoint($usePoint) /** * Get usePoint * - * @return string + * @return string|int|float */ public function getUsePoint() { diff --git a/src/Eccube/EventListener/LoginHistoryListener.php b/src/Eccube/EventListener/LoginHistoryListener.php index 73b4fefe0e8..74663ede83d 100644 --- a/src/Eccube/EventListener/LoginHistoryListener.php +++ b/src/Eccube/EventListener/LoginHistoryListener.php @@ -123,7 +123,7 @@ public function onAuthenticationFailure(LoginFailureEvent $event) $Member = null; $userName = null; $passport = $event->getPassport(); - if ($passport->hasBadge(UserBadge::class)) { + if ($passport->hasBadge(UserBadge::class) && $passport->getBadge(UserBadge::class) instanceof UserBadge) { $userName = $passport->getBadge(UserBadge::class) ->getUserIdentifier(); $Member = $this->memberRepository->findOneBy(['login_id' => $userName]); diff --git a/src/Eccube/EventListener/TransactionListener.php b/src/Eccube/EventListener/TransactionListener.php index fe79dcd5498..b5e83b929c8 100644 --- a/src/Eccube/EventListener/TransactionListener.php +++ b/src/Eccube/EventListener/TransactionListener.php @@ -105,7 +105,9 @@ public function onKernelException(ExceptionEvent $event) return; } - if ($this->em->getConnection()->getNativeConnection()->inTransaction()) { + /** @var \PDO $nativeConnection */ + $nativeConnection = $this->em->getConnection()->getNativeConnection(); + if ($nativeConnection->inTransaction()) { if ($this->em->getConnection()->isRollbackOnly()) { $this->em->rollback(); } @@ -129,7 +131,11 @@ public function onKernelTerminate(TerminateEvent $event) return; } - if ($this->em->getConnection()->getNativeConnection()->inTransaction()) { + + /** @var \PDO $nativeConnection */ + $nativeConnection = $this->em->getConnection()->getNativeConnection(); + + if ($nativeConnection->inTransaction()) { if ($this->em->getConnection()->isRollbackOnly()) { $this->em->rollback(); log_debug('Rollback executed.'); diff --git a/src/Eccube/Repository/TemplateRepository.php b/src/Eccube/Repository/TemplateRepository.php index 6bdf6bdef54..58c0fe23671 100644 --- a/src/Eccube/Repository/TemplateRepository.php +++ b/src/Eccube/Repository/TemplateRepository.php @@ -21,6 +21,9 @@ * * This class was generated by the Doctrine ORM. Add your own custom * repository methods below. + * + * @method array findByCode(string $code) + * @method Template|null findOneByCode(string $code) */ class TemplateRepository extends AbstractRepository { diff --git a/src/Eccube/Resource/functions/trans.php b/src/Eccube/Resource/functions/trans.php index 69e6ef4ffe9..bed2baf9ddb 100644 --- a/src/Eccube/Resource/functions/trans.php +++ b/src/Eccube/Resource/functions/trans.php @@ -20,9 +20,10 @@ function trans($id, array $parameters = [], $domain = null, $locale = null) return $Translator->trans($id, $parameters, $domain, $locale); } +/** + * @deprecated transを使用してください。 + */ function transChoice($id, $number, array $parameters = [], $domain = null, $locale = null) { - $Translator = TranslatorFacade::create(); - - return $Translator->transChoice($id, $number, $parameters, $domain, $locale); + return trans($id, $parameters, $domain, $locale); } diff --git a/src/Eccube/Service/PluginService.php b/src/Eccube/Service/PluginService.php index a6a13628177..91b7012f456 100644 --- a/src/Eccube/Service/PluginService.php +++ b/src/Eccube/Service/PluginService.php @@ -278,11 +278,16 @@ public function postInstall($config, $source) $this->entityManager->persist($Plugin); $this->entityManager->flush(); - if ($this->entityManager->getConnection()->getNativeConnection()->inTransaction()) { + /** @var \PDO $nativeConnection */ + $nativeConnection = $this->entityManager->getConnection()->getNativeConnection(); + + if ($nativeConnection->inTransaction()) { $this->entityManager->getConnection()->commit(); } } catch (\Exception $e) { - if ($this->entityManager->getConnection()->getNativeConnection()->inTransaction()) { + /** @var \PDO $nativeConnection */ + $nativeConnection = $this->entityManager->getConnection()->getNativeConnection(); + if ($nativeConnection->inTransaction()) { if ($this->entityManager->getConnection()->isRollbackOnly()) { $this->entityManager->getConnection()->rollback(); } @@ -783,11 +788,16 @@ public function updatePlugin(Plugin $plugin, $meta) } $this->copyAssets($plugin->getCode()); $em->flush(); - if ($em->getConnection()->getNativeConnection()->inTransaction()) { + + /** @var \PDO $nativeConnection */ + $nativeConnection = $em->getConnection()->getNativeConnection(); + if ($nativeConnection->inTransaction()) { $em->getConnection()->commit(); } } catch (\Exception $e) { - if ($em->getConnection()->getNativeConnection()->inTransaction()) { + /** @var \PDO $nativeConnection */ + $nativeConnection = $em->getConnection()->getNativeConnection(); + if ($nativeConnection->inTransaction()) { if ($em->getConnection()->isRollbackOnly()) { $em->getConnection()->rollback(); } diff --git a/src/Eccube/Service/SchemaService.php b/src/Eccube/Service/SchemaService.php index 083caa6595b..ac6af0d8375 100644 --- a/src/Eccube/Service/SchemaService.php +++ b/src/Eccube/Service/SchemaService.php @@ -16,11 +16,14 @@ use Doctrine\Common\Annotations\AnnotationReader; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Tools\SchemaTool; +use Doctrine\Persistence\Mapping\Driver\MappingDriverChain; use Eccube\Doctrine\ORM\Mapping\Driver\NopAnnotationDriver; use Eccube\Doctrine\ORM\Mapping\Driver\ReloadSafeAnnotationDriver; use Eccube\Util\StringUtil; +use Doctrine\DBAL; use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\Finder\Finder; +use Doctrine\Bundle\DoctrineBundle\Mapping\MappingDriver; class SchemaService { @@ -68,8 +71,15 @@ public function executeCallback(callable $callback, $generatedFiles, $proxiesDir } try { - $chain = $this->entityManager->getConfiguration()->getMetadataDriverImpl()->getDriver(); - $drivers = $chain->getDrivers(); + /** @var MappingDriver $mappingDriver */ + $mappingDriver = $this->entityManager->getConfiguration()->getMetadataDriverImpl(); + /** @var MappingDriverChain $driverChain */ + $driverChain = $mappingDriver->getDriver(); + $drivers = $driverChain->getDrivers(); + /** + * @var string $namespace + * @var ReloadSafeAnnotationDriver $oldDriver + */ foreach ($drivers as $namespace => $oldDriver) { if ('Eccube\Entity' === $namespace || preg_match('/^Plugin\\\\.*\\\\Entity$/', $namespace)) { // Setup to AnnotationDriver @@ -82,13 +92,13 @@ public function executeCallback(callable $callback, $generatedFiles, $proxiesDir $newDriver->setTraitProxiesDirectory($proxiesDirectory); $newDriver->setNewProxyFiles($generatedFiles); $newDriver->setOutputDir($outputDir); - $chain->addDriver($newDriver, $namespace); + $driverChain->addDriver($newDriver, $namespace); } if ($this->pluginContext->isUninstall()) { foreach ($this->pluginContext->getExtraEntityNamespaces() as $extraEntityNamespace) { if ($extraEntityNamespace === $namespace) { - $chain->addDriver(new NopAnnotationDriver(new AnnotationReader()), $namespace); + $driverChain->addDriver(new NopAnnotationDriver(new AnnotationReader()), $namespace); } } } @@ -134,8 +144,11 @@ public function updateSchema($generatedFiles, $proxiesDirectory, $saveMode = fal */ public function dropTable($targetNamespace) { - $chain = $this->entityManager->getConfiguration()->getMetadataDriverImpl()->getDriver(); - $drivers = $chain->getDrivers(); + /** @var MappingDriver $mappingDriver */ + $mappingDriver = $this->entityManager->getConfiguration()->getMetadataDriverImpl(); + /** @var MappingDriverChain $driverChain */ + $driverChain = $mappingDriver->getDriver(); + $drivers = $driverChain->getDrivers(); $dropMetas = []; foreach ($drivers as $namespace => $driver) { From cb6a3e8e14bfed71452f29b0de3dd231a18240d2 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: Mon, 30 Oct 2023 19:12:35 +0900 Subject: [PATCH 32/90] =?UTF-8?q?PHPStan=20LEVEL=203=20=E5=95=8F=E9=A1=8C?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ComposerRequireAlreadyInstalledPluginsCommand.php | 2 +- src/Eccube/Controller/AbstractController.php | 4 ++-- .../Controller/Admin/Setting/Shop/DeliveryController.php | 2 +- .../Controller/Admin/Setting/System/LogController.php | 2 +- src/Eccube/Controller/Admin/Store/OwnerStoreController.php | 7 ++++--- src/Eccube/Controller/Admin/Store/PluginController.php | 2 +- src/Eccube/Controller/Install/InstallController.php | 2 +- src/Eccube/Controller/Mypage/ChangeController.php | 2 +- src/Eccube/Controller/Mypage/WithdrawController.php | 2 +- src/Eccube/Controller/ShoppingController.php | 2 ++ src/Eccube/Doctrine/Common/CsvDataFixtures/Loader.php | 2 +- src/Eccube/Entity/Cart.php | 6 +++--- src/Eccube/Entity/Layout.php | 3 ++- src/Eccube/Entity/OrderPdf.php | 4 ++-- src/Eccube/Entity/PointRateTrait.php | 2 +- src/Eccube/Entity/PointTrait.php | 6 +++--- src/Eccube/Entity/Product.php | 6 +++--- src/Eccube/Entity/ProductClass.php | 2 +- src/Eccube/Entity/ProductTag.php | 2 +- src/Eccube/EventListener/RateLimiterListener.php | 1 + src/Eccube/Form/Extension/DoctrineOrmExtension.php | 4 ++-- src/Eccube/Form/Type/AddressType.php | 2 +- src/Eccube/Form/Type/ShippingMultipleItemType.php | 2 +- src/Eccube/Repository/OrderPdfRepository.php | 5 +++-- src/Eccube/Request/Context.php | 3 ++- src/Eccube/Service/Composer/ComposerApiService.php | 2 +- src/Eccube/Service/MailService.php | 2 +- src/Eccube/Service/Payment/PaymentDispatcher.php | 2 +- src/Eccube/Service/PluginApiService.php | 4 ++-- src/Eccube/Service/PluginService.php | 2 +- src/Eccube/Service/TwoFactorAuthService.php | 1 + src/Eccube/Util/CacheUtil.php | 2 +- src/Eccube/Util/StringUtil.php | 4 ++-- 33 files changed, 52 insertions(+), 44 deletions(-) diff --git a/src/Eccube/Command/ComposerRequireAlreadyInstalledPluginsCommand.php b/src/Eccube/Command/ComposerRequireAlreadyInstalledPluginsCommand.php index f2bf5cfda9a..f040b9cd693 100644 --- a/src/Eccube/Command/ComposerRequireAlreadyInstalledPluginsCommand.php +++ b/src/Eccube/Command/ComposerRequireAlreadyInstalledPluginsCommand.php @@ -90,7 +90,7 @@ protected function execute(InputInterface $input, OutputInterface $output) ]); $question = new ConfirmationQuestion($message); if (!$this->io->askQuestion($question)) { - return; + return 0; } } diff --git a/src/Eccube/Controller/AbstractController.php b/src/Eccube/Controller/AbstractController.php index f0b4c3b1b19..c491050e307 100644 --- a/src/Eccube/Controller/AbstractController.php +++ b/src/Eccube/Controller/AbstractController.php @@ -86,10 +86,10 @@ public function setTranslator(TranslatorInterface $translator) } /** - * @param SessionInterface $session + * @param Session $session * @required */ - public function setSession(SessionInterface $session) + public function setSession(Session $session) { $this->session = $session; } diff --git a/src/Eccube/Controller/Admin/Setting/Shop/DeliveryController.php b/src/Eccube/Controller/Admin/Setting/Shop/DeliveryController.php index 8861e8f1f8f..9885501eec1 100644 --- a/src/Eccube/Controller/Admin/Setting/Shop/DeliveryController.php +++ b/src/Eccube/Controller/Admin/Setting/Shop/DeliveryController.php @@ -68,7 +68,7 @@ class DeliveryController extends AbstractController protected $deliveryTimeRepository; /** - * @var DeliveryTimeRepository + * @var SaleTypeRepository */ protected $saleTypeRepository; diff --git a/src/Eccube/Controller/Admin/Setting/System/LogController.php b/src/Eccube/Controller/Admin/Setting/System/LogController.php index 0488919cf6d..26038efb205 100644 --- a/src/Eccube/Controller/Admin/Setting/System/LogController.php +++ b/src/Eccube/Controller/Admin/Setting/System/LogController.php @@ -72,7 +72,7 @@ public function index(Request $request) if ($form->getClickedButton() && $form->getClickedButton()->getName() === 'download' && $form->isValid()) { $bufferSize = 1024 * 50; $response = new StreamedResponse(); - $response->headers->set('Content-Length', filesize($logFile)); + $response->headers->set('Content-Length', (string)filesize($logFile)); $response->headers->set('Content-Disposition', 'attachment; filename='.basename($logFile)); $response->headers->set('Content-Type', 'application/octet-stream'); $response->setCallback(function () use ($logFile, $bufferSize) { diff --git a/src/Eccube/Controller/Admin/Store/OwnerStoreController.php b/src/Eccube/Controller/Admin/Store/OwnerStoreController.php index 9fe068412ab..b9c62ad8047 100644 --- a/src/Eccube/Controller/Admin/Store/OwnerStoreController.php +++ b/src/Eccube/Controller/Admin/Store/OwnerStoreController.php @@ -29,6 +29,7 @@ use Eccube\Util\FormUtil; use Knp\Component\Pager\PaginatorInterface; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; +use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\Routing\Annotation\Route; @@ -116,7 +117,7 @@ public function __construct( * @param int $page_no * @param PaginatorInterface $paginator * - * @return array + * @return array|RedirectResponse */ public function search(Request $request, PaginatorInterface $paginator, $page_no = null) { @@ -220,7 +221,7 @@ public function search(Request $request, PaginatorInterface $paginator, $page_no * * @param Request $request * - * @return array + * @return array|RedirectResponse * * @throws \Eccube\Exception\PluginException */ @@ -454,7 +455,7 @@ public function apiUpdate(Request $request) * * @param Plugin $Plugin * - * @return array + * @return array|RedirectResponse */ public function doUpdateConfirm(Plugin $Plugin) { diff --git a/src/Eccube/Controller/Admin/Store/PluginController.php b/src/Eccube/Controller/Admin/Store/PluginController.php index 7ef6718bcfe..a4706b94188 100644 --- a/src/Eccube/Controller/Admin/Store/PluginController.php +++ b/src/Eccube/Controller/Admin/Store/PluginController.php @@ -545,7 +545,7 @@ public function install(Request $request, CacheUtil $cacheUtil) * * @param Request $request * - * @return array + * @return array|RedirectResponse */ public function authenticationSetting(Request $request, CacheUtil $cacheUtil) { diff --git a/src/Eccube/Controller/Install/InstallController.php b/src/Eccube/Controller/Install/InstallController.php index 0807c24e398..1681cf0b39f 100644 --- a/src/Eccube/Controller/Install/InstallController.php +++ b/src/Eccube/Controller/Install/InstallController.php @@ -599,7 +599,7 @@ protected function createEntityManager(Connection $conn) } /** - * @return string + * @return string|null */ public function createDatabaseUrl(array $params) { diff --git a/src/Eccube/Controller/Mypage/ChangeController.php b/src/Eccube/Controller/Mypage/ChangeController.php index ef32ba694bd..47a7dafc068 100644 --- a/src/Eccube/Controller/Mypage/ChangeController.php +++ b/src/Eccube/Controller/Mypage/ChangeController.php @@ -32,7 +32,7 @@ class ChangeController extends AbstractController { /** - * @var TokenStorage + * @var TokenStorageInterface */ protected $tokenStorage; diff --git a/src/Eccube/Controller/Mypage/WithdrawController.php b/src/Eccube/Controller/Mypage/WithdrawController.php index 54aa0c43ff4..45cfe7432a7 100644 --- a/src/Eccube/Controller/Mypage/WithdrawController.php +++ b/src/Eccube/Controller/Mypage/WithdrawController.php @@ -43,7 +43,7 @@ class WithdrawController extends AbstractController protected $customerStatusRepository; /** - * @var TokenStorage + * @var TokenStorageInterface */ protected $tokenStorage; diff --git a/src/Eccube/Controller/ShoppingController.php b/src/Eccube/Controller/ShoppingController.php index f36cc10a982..fc8e206ec92 100644 --- a/src/Eccube/Controller/ShoppingController.php +++ b/src/Eccube/Controller/ShoppingController.php @@ -870,6 +870,8 @@ protected function executeApply(PaymentMethodInterface $paymentMethod) array_merge($dispatcher->getPathParameters(), $dispatcher->getQueryParameters())); } } + + return null; } /** diff --git a/src/Eccube/Doctrine/Common/CsvDataFixtures/Loader.php b/src/Eccube/Doctrine/Common/CsvDataFixtures/Loader.php index 015ead2d8d4..534e7f3d23b 100644 --- a/src/Eccube/Doctrine/Common/CsvDataFixtures/Loader.php +++ b/src/Eccube/Doctrine/Common/CsvDataFixtures/Loader.php @@ -25,7 +25,7 @@ class Loader { /** - * @var CsvFixture[] + * @var CsvFixture[]|FixtureInterface[] */ protected $fixtures; diff --git a/src/Eccube/Entity/Cart.php b/src/Eccube/Entity/Cart.php index 396418288c2..c5b57bcbe86 100644 --- a/src/Eccube/Entity/Cart.php +++ b/src/Eccube/Entity/Cart.php @@ -91,7 +91,7 @@ class Cart extends AbstractEntity implements PurchaseInterface, ItemHolderInterf private $total_price; /** - * @var string + * @var float|int|string * * @ORM\Column(name="delivery_fee_total", type="decimal", precision=12, scale=2, options={"unsigned":true,"default":0}) */ @@ -246,7 +246,7 @@ public function getItems() } /** - * @param CartItem[] $CartItems + * @param \Doctrine\Common\Collections\Collection $CartItems * * @return \Eccube\Entity\Cart */ @@ -272,7 +272,7 @@ public function setTotalPrice($total_price) } /** - * @return float|string + * @return float|int|string */ public function getTotalPrice() { diff --git a/src/Eccube/Entity/Layout.php b/src/Eccube/Entity/Layout.php index a44ef455d5c..8ba90be088a 100644 --- a/src/Eccube/Entity/Layout.php +++ b/src/Eccube/Entity/Layout.php @@ -13,6 +13,7 @@ namespace Eccube\Entity; +use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; if (!class_exists('\Eccube\Entity\Layout')) { @@ -122,7 +123,7 @@ public function getBlocks($targetId = null) /** * @param integer $targetId * - * @return BlockPosition[] + * @return BlockPosition[]|Collection */ public function getBlockPositionsByTargetId($targetId) { diff --git a/src/Eccube/Entity/OrderPdf.php b/src/Eccube/Entity/OrderPdf.php index f7ab14c31fe..9d1b55f1e9f 100644 --- a/src/Eccube/Entity/OrderPdf.php +++ b/src/Eccube/Entity/OrderPdf.php @@ -111,7 +111,7 @@ class OrderPdf extends AbstractEntity private $visible = true; /** - * @return string + * @return int */ public function getMemberId() { @@ -315,7 +315,7 @@ public function setUpdateDate($update_date) * * @param boolean $visible * - * @return Delivery + * @return OrderPdf */ public function setVisible($visible) { diff --git a/src/Eccube/Entity/PointRateTrait.php b/src/Eccube/Entity/PointRateTrait.php index c03cd581ba7..f5f4a3ee54d 100644 --- a/src/Eccube/Entity/PointRateTrait.php +++ b/src/Eccube/Entity/PointRateTrait.php @@ -29,7 +29,7 @@ trait PointRateTrait * * @param string|null $pointRate * - * @return OrderItem + * @return $this */ public function setPointRate($pointRate) { diff --git a/src/Eccube/Entity/PointTrait.php b/src/Eccube/Entity/PointTrait.php index 8ded58bb551..d0650e80a77 100644 --- a/src/Eccube/Entity/PointTrait.php +++ b/src/Eccube/Entity/PointTrait.php @@ -36,7 +36,7 @@ trait PointTrait * * @param string $addPoint * - * @return Order + * @return $this */ public function setAddPoint($addPoint) { @@ -48,7 +48,7 @@ public function setAddPoint($addPoint) /** * Get addPoint * - * @return string + * @return int|string */ public function getAddPoint() { @@ -60,7 +60,7 @@ public function getAddPoint() * * @param string $usePoint * - * @return Order + * @return $this */ public function setUsePoint($usePoint) { diff --git a/src/Eccube/Entity/Product.php b/src/Eccube/Entity/Product.php index 3209c6af845..00998f946d1 100644 --- a/src/Eccube/Entity/Product.php +++ b/src/Eccube/Entity/Product.php @@ -262,7 +262,7 @@ public function getStockUnlimitedMax() /** * Get Price01 min * - * @return integer + * @return integer|null */ public function getPrice01Min() { @@ -278,7 +278,7 @@ public function getPrice01Min() /** * Get Price01 max * - * @return integer + * @return integer|null */ public function getPrice01Max() { @@ -444,7 +444,7 @@ public function hasProductClass() } /** - * @var integer + * @var integer|null * * @ORM\Column(name="id", type="integer", options={"unsigned":true}) * @ORM\Id diff --git a/src/Eccube/Entity/ProductClass.php b/src/Eccube/Entity/ProductClass.php index c22017636cd..8fb010ef2e1 100644 --- a/src/Eccube/Entity/ProductClass.php +++ b/src/Eccube/Entity/ProductClass.php @@ -166,7 +166,7 @@ public function hasClassCategory2() } /** - * @var int + * @var int|null * * @ORM\Column(name="id", type="integer", options={"unsigned":true}) * @ORM\Id diff --git a/src/Eccube/Entity/ProductTag.php b/src/Eccube/Entity/ProductTag.php index 17a21bff4c9..ef541576e5d 100644 --- a/src/Eccube/Entity/ProductTag.php +++ b/src/Eccube/Entity/ProductTag.php @@ -31,7 +31,7 @@ class ProductTag extends \Eccube\Entity\AbstractEntity * Get tag_id * use csv export * - * @return integer + * @return integer|null */ public function getTagId() { diff --git a/src/Eccube/EventListener/RateLimiterListener.php b/src/Eccube/EventListener/RateLimiterListener.php index a15a0ea39f2..713e92d02e6 100644 --- a/src/Eccube/EventListener/RateLimiterListener.php +++ b/src/Eccube/EventListener/RateLimiterListener.php @@ -78,6 +78,7 @@ public function onController(ControllerEvent $event) /** @var RateLimiterFactory $factory */ $factory = $this->locator->get($limiterId); if (in_array('customer', $config['type']) || in_array('user', $config['type'])) { + /** @var Customer|Member $User */ $User = $this->requestContext->getCurrentUser(); if ($User instanceof UserInterface) { $limiter = $factory->create($User->getId()); diff --git a/src/Eccube/Form/Extension/DoctrineOrmExtension.php b/src/Eccube/Form/Extension/DoctrineOrmExtension.php index 1669d9fb4ae..2448b8cdb5d 100644 --- a/src/Eccube/Form/Extension/DoctrineOrmExtension.php +++ b/src/Eccube/Form/Extension/DoctrineOrmExtension.php @@ -34,12 +34,12 @@ class DoctrineOrmExtension extends AbstractTypeExtension { /** - * @var EntityManager + * @var EntityManagerInterface */ protected $em; /** - * @var AnnotationReader + * @var Reader */ protected $reader; diff --git a/src/Eccube/Form/Type/AddressType.php b/src/Eccube/Form/Type/AddressType.php index 68d19cf1e80..30a6dcc71f4 100644 --- a/src/Eccube/Form/Type/AddressType.php +++ b/src/Eccube/Form/Type/AddressType.php @@ -26,7 +26,7 @@ class AddressType extends AbstractType { /** - * @var array + * @var EccubeConfig */ protected $config; diff --git a/src/Eccube/Form/Type/ShippingMultipleItemType.php b/src/Eccube/Form/Type/ShippingMultipleItemType.php index 36acf2d217d..2137e4a5778 100644 --- a/src/Eccube/Form/Type/ShippingMultipleItemType.php +++ b/src/Eccube/Form/Type/ShippingMultipleItemType.php @@ -33,7 +33,7 @@ class ShippingMultipleItemType extends AbstractType { /** - * @var array + * @var EccubeConfig */ protected $eccubeConfig; diff --git a/src/Eccube/Repository/OrderPdfRepository.php b/src/Eccube/Repository/OrderPdfRepository.php index 2acef526645..5fea00749fa 100644 --- a/src/Eccube/Repository/OrderPdfRepository.php +++ b/src/Eccube/Repository/OrderPdfRepository.php @@ -14,6 +14,7 @@ namespace Eccube\Repository; use Doctrine\Persistence\ManagerRegistry as RegistryInterface; +use Eccube\Entity\AbstractEntity; use Eccube\Entity\Member; use Eccube\Entity\OrderPdf; @@ -33,14 +34,14 @@ public function __construct(RegistryInterface $registry) /** * Save admin history. * - * @param array $arrData + * @param AbstractEntity|array $arrData * * @return bool */ public function save($arrData) { /** - * @var Member + * @var Member $Member */ $Member = $arrData['admin']; diff --git a/src/Eccube/Request/Context.php b/src/Eccube/Request/Context.php index db713221885..7bbf5b6b023 100644 --- a/src/Eccube/Request/Context.php +++ b/src/Eccube/Request/Context.php @@ -18,6 +18,7 @@ use Eccube\Entity\Member; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; +use Symfony\Component\Security\Core\User\UserInterface; class Context { @@ -80,7 +81,7 @@ public function isFront() } /** - * @return Member|Customer|null + * @return UserInterface|null */ public function getCurrentUser() { diff --git a/src/Eccube/Service/Composer/ComposerApiService.php b/src/Eccube/Service/Composer/ComposerApiService.php index ec86700d03c..809b522edd0 100644 --- a/src/Eccube/Service/Composer/ComposerApiService.php +++ b/src/Eccube/Service/Composer/ComposerApiService.php @@ -318,7 +318,7 @@ public function setWorkingDir($workingDir) * @param OutputInterface|null $output * @param bool $init * - * @return string + * @return string|null * * @throws PluginException * @throws \Doctrine\ORM\NoResultException diff --git a/src/Eccube/Service/MailService.php b/src/Eccube/Service/MailService.php index 0e34e76d04e..6c66f65c898 100644 --- a/src/Eccube/Service/MailService.php +++ b/src/Eccube/Service/MailService.php @@ -56,7 +56,7 @@ class MailService protected $mailHistoryRepository; /** - * @var EventDispatcher + * @var EventDispatcherInterface */ protected $eventDispatcher; diff --git a/src/Eccube/Service/Payment/PaymentDispatcher.php b/src/Eccube/Service/Payment/PaymentDispatcher.php index 8d1bff31030..d33898b28db 100644 --- a/src/Eccube/Service/Payment/PaymentDispatcher.php +++ b/src/Eccube/Service/Payment/PaymentDispatcher.php @@ -150,7 +150,7 @@ public function setPathParameters(array $pathParameters) * * @param Response $response * - * @return PaymentResult + * @return $this */ public function setResponse(Response $response) { diff --git a/src/Eccube/Service/PluginApiService.php b/src/Eccube/Service/PluginApiService.php index 90d9d62bc8a..a890ba5b9c3 100644 --- a/src/Eccube/Service/PluginApiService.php +++ b/src/Eccube/Service/PluginApiService.php @@ -92,7 +92,7 @@ public function setApiUrl($apiUrl) /** * Get master data: category * - * @return array + * @return array|bool */ public function getCategory() { @@ -265,7 +265,7 @@ private function updatePluginStatus($url, Plugin $Plugin) * @param string $url * @param array $data * - * @return array + * @return bool * * @throws PluginApiException */ diff --git a/src/Eccube/Service/PluginService.php b/src/Eccube/Service/PluginService.php index 91b7012f456..2ae48177ff7 100644 --- a/src/Eccube/Service/PluginService.php +++ b/src/Eccube/Service/PluginService.php @@ -40,7 +40,7 @@ class PluginService protected $eccubeConfig; /** - * @var EntityManager + * @var EntityManagerInterface */ protected $entityManager; diff --git a/src/Eccube/Service/TwoFactorAuthService.php b/src/Eccube/Service/TwoFactorAuthService.php index fa0988eac66..32e324249e1 100644 --- a/src/Eccube/Service/TwoFactorAuthService.php +++ b/src/Eccube/Service/TwoFactorAuthService.php @@ -24,6 +24,7 @@ use Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactoryInterface; use Symfony\Component\PasswordHasher\PasswordHasherInterface; use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; +use Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface; class TwoFactorAuthService { diff --git a/src/Eccube/Util/CacheUtil.php b/src/Eccube/Util/CacheUtil.php index a347e37fa76..5eb7c9e3e26 100644 --- a/src/Eccube/Util/CacheUtil.php +++ b/src/Eccube/Util/CacheUtil.php @@ -111,7 +111,7 @@ public function forceClearCache(TerminateEvent $event) /** * Doctrineのキャッシュを削除します. * - * @return string + * @return string|void * * @throws \Exception */ diff --git a/src/Eccube/Util/StringUtil.php b/src/Eccube/Util/StringUtil.php index 854276b29a2..f3b0ff6fd84 100644 --- a/src/Eccube/Util/StringUtil.php +++ b/src/Eccube/Util/StringUtil.php @@ -123,7 +123,7 @@ public static function convertLineFeed($value, $lf = "\n") * * @param string $value * - * @return string + * @return string|null */ public static function characterEncoding($value, $encoding = ['UTF-8', 'SJIS', 'EUC-JP', 'ASCII', 'JIS', 'sjis-win']) { @@ -293,7 +293,7 @@ public static function isNotBlank($value, $greedy = false) * * @param $value * - * @return string + * @return string|int|null */ public static function trimAll($value) { From db17b016ddef6dd92dc39350ac66fe58caae695f 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: Mon, 30 Oct 2023 19:14:09 +0900 Subject: [PATCH 33/90] =?UTF-8?q?PHPStan=20LEVEL=203=20=E5=95=8F=E9=A1=8C?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3(PointProcessor=E3=81=AE=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php b/src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php index 6c558351ed4..9db63d8e8f0 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php @@ -67,11 +67,12 @@ public function removeDiscountItem(ItemHolderInterface $itemHolder, PurchaseCont /** * {@inheritdoc} + * */ public function addDiscountItem(ItemHolderInterface $itemHolder, PurchaseContext $context) { if (!$this->supports($itemHolder)) { - return; + return null; } /** @var Order $itemHolder */ From 100af1acc5537efab9cb53c783aeea869c7e5a02 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 10:31:08 +0900 Subject: [PATCH 34/90] =?UTF-8?q?PHPStan=20=E3=83=AC=E3=83=99=E3=83=AB?= =?UTF-8?q?=EF=BC=92=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/Command/GenerateDummyDataCommand.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Eccube/Command/GenerateDummyDataCommand.php b/src/Eccube/Command/GenerateDummyDataCommand.php index fbd35b27246..8b4147e36aa 100644 --- a/src/Eccube/Command/GenerateDummyDataCommand.php +++ b/src/Eccube/Command/GenerateDummyDataCommand.php @@ -83,7 +83,6 @@ protected function configure() protected function execute(InputInterface $input, OutputInterface $output) { - $startTime = microtime(true); $locale = $input->getOption('with-locale'); $notImage = $input->getOption('without-image'); $numberOfProducts = $input->getOption('products'); @@ -94,7 +93,6 @@ protected function execute(InputInterface $input, OutputInterface $output) $Products = []; $faker = Faker::create($locale); - var_dump(microtime(true) - $startTime); for ($i = 0; $i < $numberOfCustomer; $i++) { $email = microtime(true).'.'.$faker->safeEmail; $Customer = $this->generator->createCustomer($email); From 2f25088c33e13ee7043265dfb8344e12af220988 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 11:32:16 +0900 Subject: [PATCH 35/90] =?UTF-8?q?PHPStan=20=E3=83=AC=E3=83=99=E3=83=AB?= =?UTF-8?q?=EF=BC=92=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- phpstan.neon.dist | 2 ++ src/Eccube/Controller/AbstractShoppingController.php | 4 ++-- src/Eccube/Entity/ItemHolderInterface.php | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 4902f24e267..171d5d2774e 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -1,5 +1,7 @@ parameters: level: 0 + ignoreErrors: + - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::children\(\).#' excludePaths: - 'var/*' - 'vendor/*' diff --git a/src/Eccube/Controller/AbstractShoppingController.php b/src/Eccube/Controller/AbstractShoppingController.php index 5f129676ac3..763668a6783 100644 --- a/src/Eccube/Controller/AbstractShoppingController.php +++ b/src/Eccube/Controller/AbstractShoppingController.php @@ -37,12 +37,12 @@ public function setPurchaseFlow(PurchaseFlow $shoppingPurchaseFlow) } /** - * @param Order $itemHolder + * @param ItemHolderInterface $itemHolder * @param bool $returnResponse レスポンスを返すかどうか. falseの場合はPurchaseFlowResultを返す. * * @return PurchaseFlowResult|RedirectResponse|null */ - protected function executePurchaseFlow(Order $itemHolder, $returnResponse = true) + protected function executePurchaseFlow(ItemHolderInterface $itemHolder, $returnResponse = true) { /** @var PurchaseFlowResult $flowResult */ $flowResult = $this->purchaseFlow->validate($itemHolder, new PurchaseContext(clone $itemHolder, $itemHolder->getCustomer())); diff --git a/src/Eccube/Entity/ItemHolderInterface.php b/src/Eccube/Entity/ItemHolderInterface.php index b39c7ce46ab..e91b0de4adb 100644 --- a/src/Eccube/Entity/ItemHolderInterface.php +++ b/src/Eccube/Entity/ItemHolderInterface.php @@ -113,9 +113,9 @@ public function getUsePoint(); */ public function addItem(ItemInterface $item); /** - * Get customer. + * お客様情報を取得 * * @return Customer|null - */ + */ public function getCustomer(); } From 023f6b0805ad131de929950ad1658aafb2f69fb4 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 11:34:15 +0900 Subject: [PATCH 36/90] =?UTF-8?q?PHPStan=20=E3=83=AC=E3=83=99=E3=83=AB?= =?UTF-8?q?=EF=BC=92=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/Controller/AbstractShoppingController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Eccube/Controller/AbstractShoppingController.php b/src/Eccube/Controller/AbstractShoppingController.php index 763668a6783..fd9a1316780 100644 --- a/src/Eccube/Controller/AbstractShoppingController.php +++ b/src/Eccube/Controller/AbstractShoppingController.php @@ -14,7 +14,6 @@ namespace Eccube\Controller; use Eccube\Entity\ItemHolderInterface; -use Eccube\Entity\Order; use Eccube\Service\PurchaseFlow\PurchaseContext; use Eccube\Service\PurchaseFlow\PurchaseFlow; use Eccube\Service\PurchaseFlow\PurchaseFlowResult; From a4ddc0389296f1da08c3b013ef24189cb869a1bf 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: Wed, 8 Nov 2023 11:34:33 +0900 Subject: [PATCH 37/90] =?UTF-8?q?PHPStan=20Level=203=20=E5=95=8F=E9=A1=8C?= =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- phpdoc_result_script.sh | 4 +- src/Eccube/Controller/AbstractController.php | 26 +++++--- .../Controller/Admin/AdminController.php | 2 +- .../Controller/Admin/Order/EditController.php | 2 +- .../Admin/Product/CsvImportController.php | 13 ++-- src/Eccube/Controller/ProductController.php | 9 ++- src/Eccube/Controller/ShoppingController.php | 9 ++- src/Eccube/Doctrine/Query/Queries.php | 2 +- src/Eccube/Entity/BaseInfo.php | 2 +- src/Eccube/Entity/News.php | 2 +- src/Eccube/Repository/AbstractRepository.php | 2 +- tests/results/convert.php | 2 +- tests/results/error_csv.csv | 65 ------------------- 14 files changed, 50 insertions(+), 92 deletions(-) diff --git a/Dockerfile b/Dockerfile index 85060b60924..c8ec4d6207f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,7 +38,7 @@ RUN pecl search 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 \ +# && docker-php-ext-enable xdebug \ ; RUN pecl install apcu && echo "extension=apcu.so" > /usr/local/etc/php/conf.d/apc.ini diff --git a/phpdoc_result_script.sh b/phpdoc_result_script.sh index 369f64b5824..05292d1cc37 100644 --- a/phpdoc_result_script.sh +++ b/phpdoc_result_script.sh @@ -1,8 +1,8 @@ #bin/bash -for level in {0..9} +for level in {0..3} do - docker exec my_eccube-ec-cube-1 bash -c "vendor/bin/phpstan analyse src --level ${level} > tests/results/level_${level}.json" + docker exec ec-cube-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/src/Eccube/Controller/AbstractController.php b/src/Eccube/Controller/AbstractController.php index c491050e307..ad68e010c1f 100644 --- a/src/Eccube/Controller/AbstractController.php +++ b/src/Eccube/Controller/AbstractController.php @@ -54,7 +54,7 @@ class AbstractController extends Controller protected $eventDispatcher; /** - * @var Session + * @var SessionInterface */ protected $session; @@ -86,10 +86,10 @@ public function setTranslator(TranslatorInterface $translator) } /** - * @param Session $session + * @param SessionInterface $session * @required */ - public function setSession(Session $session) + public function setSession(SessionInterface $session) { $this->session = $session; } @@ -174,7 +174,9 @@ public function addRequestErrorOnce($message, $namespace = 'front') public function clearMessage() { - $this->session->getFlashBag()->clear(); + /** @var Session $session */ + $session = $this->session; + $session->getFlashBag()->clear(); } public function deleteMessage() @@ -185,7 +187,9 @@ public function deleteMessage() public function hasMessage(string $type): bool { - return $this->session->getFlashBag()->has($type); + /** @var Session $session */ + $session = $this->session; + return $session->getFlashBag()->has($type); } public function addFlashOnce(string $type, $message): void @@ -204,7 +208,9 @@ protected function addFlash(string $type, $message): void parent::addFlash($type, $message); } catch (\LogicException $e) { // fallback session - $this->session->getFlashBag()->add($type, $message); + /** @var Session $session */ + $session = $this->session; + $session->getFlashBag()->add($type, $message); } } @@ -214,9 +220,13 @@ protected function addFlash(string $type, $message): void public function setLoginTargetPath($targetPath, $namespace = null) { if (is_null($namespace)) { - $this->session->getFlashBag()->set('eccube.login.target.path', $targetPath); + /** @var Session $session */ + $session = $this->session; + $session->getFlashBag()->set('eccube.login.target.path', $targetPath); } else { - $this->session->getFlashBag()->set('eccube.'.$namespace.'.login.target.path', $targetPath); + /** @var Session $session */ + $session = $this->session; + $session->getFlashBag()->set('eccube.'.$namespace.'.login.target.path', $targetPath); } } diff --git a/src/Eccube/Controller/Admin/AdminController.php b/src/Eccube/Controller/Admin/AdminController.php index add186284fe..cfc7f46a9db 100644 --- a/src/Eccube/Controller/Admin/AdminController.php +++ b/src/Eccube/Controller/Admin/AdminController.php @@ -428,7 +428,7 @@ public function searchCustomer(Request $request) /** * @param array $excludes * - * @return Request|null + * @return array|null */ protected function getOrderEachStatus(array $excludes) { diff --git a/src/Eccube/Controller/Admin/Order/EditController.php b/src/Eccube/Controller/Admin/Order/EditController.php index 75696f0070e..b9bf14f7afa 100644 --- a/src/Eccube/Controller/Admin/Order/EditController.php +++ b/src/Eccube/Controller/Admin/Order/EditController.php @@ -81,7 +81,7 @@ class EditController extends AbstractController protected $customerRepository; /** - * @var Serializer + * @var SerializerInterface */ protected $serializer; diff --git a/src/Eccube/Controller/Admin/Product/CsvImportController.php b/src/Eccube/Controller/Admin/Product/CsvImportController.php index 28a6d4e3458..e78e46ba7a3 100644 --- a/src/Eccube/Controller/Admin/Product/CsvImportController.php +++ b/src/Eccube/Controller/Admin/Product/CsvImportController.php @@ -48,6 +48,7 @@ use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpFoundation\StreamedResponse; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -674,7 +675,9 @@ public function csvProduct(Request $request, CacheUtil $cacheUtil) log_info('商品CSV登録完了'); if (!$this->isSplitCsv) { $message = 'admin.common.csv_upload_complete'; - $this->session->getFlashBag()->add('eccube.admin.success', $message); + /** @var Session $session */ + $session = $this->session; + $session->getFlashBag()->add('eccube.admin.success', $message); } $cacheUtil->clearDoctrineCache(); @@ -835,7 +838,9 @@ public function csvCategory(Request $request, CacheUtil $cacheUtil) $this->entityManager->getConnection()->commit(); log_info('カテゴリCSV登録完了'); $message = 'admin.common.csv_upload_complete'; - $this->session->getFlashBag()->add('eccube.admin.success', $message); + /** @var Session $session */ + $session = $this->session; + $session->getFlashBag()->add('eccube.admin.success', $message); $cacheUtil->clearDoctrineCache(); } @@ -876,7 +881,7 @@ public function csvTemplate(Request $request, $type) * @param array $headers * @param bool $rollback * - * @return array + * @return JsonResponse|array * * @throws \Doctrine\DBAL\ConnectionException */ @@ -1696,7 +1701,7 @@ public function splitCsv(Request $request) * * @param Request $request * - * @return \Symfony\Component\HttpFoundation\JsonResponse + * @return \Symfony\Component\HttpFoundation\Response */ public function importCsv(Request $request, CsrfTokenManagerInterface $tokenManager) { diff --git a/src/Eccube/Controller/ProductController.php b/src/Eccube/Controller/ProductController.php index 5bb55656a1e..1c7f9d28bce 100644 --- a/src/Eccube/Controller/ProductController.php +++ b/src/Eccube/Controller/ProductController.php @@ -33,6 +33,7 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; @@ -276,7 +277,9 @@ public function addFavorite(Request $request, Product $Product) if ($this->isGranted('ROLE_USER')) { $Customer = $this->getUser(); $this->customerFavoriteProductRepository->addFavorite($Customer, $Product); - $this->session->getFlashBag()->set('product_detail.just_added_favorite', $Product->getId()); + /** @var Session $session */ + $session = $this->session; + $session->getFlashBag()->set('product_detail.just_added_favorite', $Product->getId()); $event = new EventArgs( [ @@ -291,7 +294,9 @@ public function addFavorite(Request $request, Product $Product) // 非会員の場合、ログイン画面を表示 // ログイン後の画面遷移先を設定 $this->setLoginTargetPath($this->generateUrl('product_add_favorite', ['id' => $Product->getId()], UrlGeneratorInterface::ABSOLUTE_URL)); - $this->session->getFlashBag()->set('eccube.add.favorite', true); + /** @var Session $session */ + $session = $this->session; + $session->getFlashBag()->set('eccube.add.favorite', true); $event = new EventArgs( [ diff --git a/src/Eccube/Controller/ShoppingController.php b/src/Eccube/Controller/ShoppingController.php index fc8e206ec92..1128271be99 100644 --- a/src/Eccube/Controller/ShoppingController.php +++ b/src/Eccube/Controller/ShoppingController.php @@ -39,6 +39,7 @@ use Symfony\Component\Form\FormInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpKernel\Exception\TooManyRequestsHttpException; use Symfony\Component\RateLimiter\RateLimiterFactory; use Symfony\Component\Routing\Annotation\Route; @@ -798,8 +799,10 @@ public function error(Request $request, PurchaseFlow $cartPurchaseFlow) // 購入エラー画面についてはwarninメッセージを出力しない為、warningレベルのメッセージが存在する場合、削除する. // (warningが残っている場合、購入エラー画面以降のタイミングで誤って表示されてしまう為.) - if ($this->session->getFlashBag()->has('eccube.front.warning')) { - $this->session->getFlashBag()->get('eccube.front.warning'); + /** @var Session $session */ + $session = $this->session; + if ($session->getFlashBag()->has('eccube.front.warning')) { + $session->getFlashBag()->get('eccube.front.warning'); } $event = new EventArgs( @@ -837,7 +840,7 @@ private function createPaymentMethod(Order $Order, FormInterface $form) * * @param PaymentMethodInterface $paymentMethod * - * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response|void + * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response|void|null */ protected function executeApply(PaymentMethodInterface $paymentMethod) { diff --git a/src/Eccube/Doctrine/Query/Queries.php b/src/Eccube/Doctrine/Query/Queries.php index a2582dad974..e1bbdf5bb0d 100644 --- a/src/Eccube/Doctrine/Query/Queries.php +++ b/src/Eccube/Doctrine/Query/Queries.php @@ -32,7 +32,7 @@ public function customize($queryKey, QueryBuilder $builder, $params) { if (isset($this->customizers[$queryKey])) { /* @var QueryCustomizer $customizer */ - foreach ($this->customizers[$queryKey] as $customizer) { + foreach ((array)$this->customizers[$queryKey] as $customizer) { $customizer->customize($builder, $params, $queryKey); } } diff --git a/src/Eccube/Entity/BaseInfo.php b/src/Eccube/Entity/BaseInfo.php index 552c9907150..4be5440d920 100644 --- a/src/Eccube/Entity/BaseInfo.php +++ b/src/Eccube/Entity/BaseInfo.php @@ -785,7 +785,7 @@ public function isOptionMypageOrderStatusDisplay() /** * Set optionNostockHidden. * - * @param integer $optionNostockHidden + * @param boolean $optionNostockHidden * * @return BaseInfo */ diff --git a/src/Eccube/Entity/News.php b/src/Eccube/Entity/News.php index 3f5cab3eab5..8658e1e40fb 100644 --- a/src/Eccube/Entity/News.php +++ b/src/Eccube/Entity/News.php @@ -290,7 +290,7 @@ public function getUpdateDate() } /** - * @return integer + * @return boolean */ public function isVisible() { diff --git a/src/Eccube/Repository/AbstractRepository.php b/src/Eccube/Repository/AbstractRepository.php index acee250e4d5..d615dc282c4 100644 --- a/src/Eccube/Repository/AbstractRepository.php +++ b/src/Eccube/Repository/AbstractRepository.php @@ -22,7 +22,7 @@ abstract class AbstractRepository extends ServiceEntityRepository { /** - * @var array + * @var EccubeConfig */ protected $eccubeConfig; diff --git a/tests/results/convert.php b/tests/results/convert.php index 23207866e3e..2115da16834 100644 --- a/tests/results/convert.php +++ b/tests/results/convert.php @@ -26,7 +26,7 @@ 8 => 0, 9 => 0, ]; -for ($i = 0; $i <= 9; $i++) { +for ($i = 0; $i <= 3; $i++) { $str = file_get_contents(__DIR__.'/level_'.$i.'.json'); $json = json_decode($str, true); $files = $json['files']; diff --git a/tests/results/error_csv.csv b/tests/results/error_csv.csv index 645152c38b1..7309ba336a8 100644 --- a/tests/results/error_csv.csv +++ b/tests/results/error_csv.csv @@ -1,66 +1 @@ -/var/www/html/src/Eccube/Controller/ShoppingController.php,0,847,"Method Eccube\Controller\ShoppingController::executeApply() should return Symfony\Component\HttpFoundation\Response but return statement is missing." -/var/www/html/src/Eccube/Service/CsvImportService.php,0,137,"Return type mixed of method Eccube\Service\CsvImportService::current() is not covariant with tentative return type mixed of method Iterator::current()." -/var/www/html/src/Eccube/Service/CsvImportService.php,0,221,"Return type mixed of method Eccube\Service\CsvImportService::rewind() is not covariant with tentative return type void of method Iterator::rewind()." -/var/www/html/src/Eccube/Service/CsvImportService.php,0,232,"Return type mixed of method Eccube\Service\CsvImportService::count() is not covariant with tentative return type int of method Countable::count()." -/var/www/html/src/Eccube/Service/CsvImportService.php,0,248,"Return type mixed of method Eccube\Service\CsvImportService::next() is not covariant with tentative return type void of method Iterator::next()." -/var/www/html/src/Eccube/Service/CsvImportService.php,0,256,"Return type mixed of method Eccube\Service\CsvImportService::valid() is not covariant with tentative return type bool of method Iterator::valid()." -/var/www/html/src/Eccube/Service/CsvImportService.php,0,264,"Return type mixed of method Eccube\Service\CsvImportService::key() is not covariant with tentative return type mixed of method Iterator::key()." -/var/www/html/src/Eccube/Service/CsvImportService.php,0,272,"Return type mixed of method Eccube\Service\CsvImportService::seek() is not covariant with tentative return type void of method SeekableIterator::seek()." -/var/www/html/src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php,0,49,"Return type mixed of method Eccube\Session\Storage\Handler\SameSiteNoneCompatSessionHandler::open() is not covariant with tentative return type bool of method SessionHandlerInterface::open()." -/var/www/html/src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php,0,71,"Return type mixed of method Eccube\Session\Storage\Handler\SameSiteNoneCompatSessionHandler::updateTimestamp() is not covariant with tentative return type bool of method SessionUpdateTimestampHandlerInterface::updateTimestamp()." -/var/www/html/src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php,0,89,"Return type mixed of method Eccube\Session\Storage\Handler\SameSiteNoneCompatSessionHandler::destroy() is not covariant with tentative return type bool of method SessionHandlerInterface::destroy()." -/var/www/html/src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php,0,155,"Return type mixed of method Eccube\Session\Storage\Handler\SameSiteNoneCompatSessionHandler::close() is not covariant with tentative return type bool of method SessionHandlerInterface::close()." -/var/www/html/src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php,0,163,"Return type mixed of method Eccube\Session\Storage\Handler\SameSiteNoneCompatSessionHandler::gc() is not covariant with tentative return type int|false of method SessionHandlerInterface::gc()." -/var/www/html/src/Eccube/Twig/Extension/IgnoreTwigSandboxErrorExtension.php,0,,"Ignored error pattern #^Function twig_include not found\.$# in path /var/www/html/src/Eccube/Twig/Extension/IgnoreTwigSandboxErrorExtension.php was not matched in reported errors." -/var/www/html/src/Eccube/Controller/Admin/Store/TemplateController.php,2,233,"Call to an undefined method Eccube\Repository\TemplateRepository::findByCode()." /var/www/html/src/Eccube/DependencyInjection/Configuration.php,2,34,"Call to an undefined method Symfony\Component\Config\Definition\Builder\NodeDefinition::children()." -/var/www/html/src/Eccube/Doctrine/Common/CsvDataFixtures/CsvFixture.php,2,64,"Call to an undefined method Doctrine\Persistence\ObjectManager::getConnection()." -/var/www/html/src/Eccube/Doctrine/EventSubscriber/TaxRuleEventSubscriber.php,2,40,"Call to an undefined method Eccube\Service\TaxRuleService::get()." -/var/www/html/src/Eccube/EventListener/LoginHistoryListener.php,2,127,"Call to an undefined method Symfony\Component\Security\Http\Authenticator\Passport\Badge\BadgeInterface::getUserIdentifier()." -/var/www/html/src/Eccube/EventListener/TransactionListener.php,2,108,"Cannot call method inTransaction() on object|resource." -/var/www/html/src/Eccube/EventListener/TransactionListener.php,2,132,"Cannot call method inTransaction() on object|resource." -/var/www/html/src/Eccube/Form/Type/AddCartType.php,2,205,"Call to an undefined method Symfony\Component\Validator\Context\ExecutionContext::validateValue()." -/var/www/html/src/Eccube/Repository/AbstractRepository.php,2,64,"PHPDoc tag @throws with type Doctrine\DBAL\DBALException is not subtype of Throwable" -/var/www/html/src/Eccube/Repository/AbstractRepository.php,2,76,"PHPDoc tag @throws with type Doctrine\DBAL\DBALException is not subtype of Throwable" -/var/www/html/src/Eccube/Resource/functions/trans.php,2,27,"Call to an undefined method Symfony\Contracts\Translation\TranslatorInterface::transChoice()." -/var/www/html/src/Eccube/Service/CsvImportService.php,2,333,"PHPDoc tag @param for parameter $filters with type php_user_filter is incompatible with native type string." -/var/www/html/src/Eccube/Service/PluginService.php,2,279,"Cannot call method inTransaction() on object|resource." -/var/www/html/src/Eccube/Service/PluginService.php,2,283,"Cannot call method inTransaction() on object|resource." -/var/www/html/src/Eccube/Service/PluginService.php,2,345,"Call to an undefined method Doctrine\Persistence\Mapping\Driver\MappingDriver::getDriver()." -/var/www/html/src/Eccube/Service/PluginService.php,2,781,"Cannot call method inTransaction() on object|resource." -/var/www/html/src/Eccube/Service/PluginService.php,2,785,"Cannot call method inTransaction() on object|resource." -/var/www/html/src/Eccube/Service/PointHelper.php,2,131,"Cannot call method getProductClasses() on array." -/var/www/html/src/Eccube/Service/PointHelper.php,2,160,"Call to an undefined method Eccube\Entity\ItemInterface::getProcessorName()." -/var/www/html/src/Eccube/Service/PointHelper.php,2,161,"Call to an undefined method Eccube\Entity\ItemHolderInterface::removeOrderItem()." -/var/www/html/src/Eccube/Service/PointHelper.php,2,170,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getCustomer()." -/var/www/html/src/Eccube/Service/PointHelper.php,2,177,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getCustomer()." -/var/www/html/src/Eccube/Service/PurchaseFlow/ItemCollection.php,2,118,"Call to an undefined method Eccube\Entity\ItemInterface::getId()." -/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php,2,72,"Cannot call method toArray() on array." -/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php,2,75,"Call to an undefined method Eccube\Entity\ItemInterface::getPointRate()." -/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/DeliveryFeePreprocessor.php,2,89,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getShippings()." -/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/DeliveryFeePreprocessor.php,2,93,"Call to an undefined method Eccube\Entity\ItemHolderInterface::removeOrderItem()." -/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/EmptyItemsValidator.php,2,56,"Call to an undefined method Eccube\Entity\ItemHolderInterface::removeItem()." -/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/PointDiffProcessor.php,2,68,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getCustomer()." -/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php,2,81,"Method Eccube\Service\PurchaseFlow\Processor\PointProcessor::addDiscountItem() should return Eccube\Service\PurchaseFlow\ProcessResult|null but return statement is missing." -/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php,2,97,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getCustomer()." -/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/PriceChangeValidator.php,2,48,"Call to an undefined method Eccube\Entity\ItemInterface::setPrice()." -/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php,2,70,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getProductOrderItems()." -/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php,2,79,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getOrderStatus()." -/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php,2,80,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getOrderStatus()." -/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php,2,85,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getOrderStatus()." -/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php,2,86,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getOrderStatus()." -/var/www/html/src/Eccube/Service/PurchaseFlow/Processor/StockMultipleValidator.php,2,50,"Call to an undefined method Eccube\Entity\ItemHolderInterface::getShippings()." -/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,269,"Cannot call method toArray() on array." -/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,270,"Call to an undefined method Eccube\Entity\ItemInterface::getPriceIncTax()." -/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,284,"Cannot call method getProductClasses() on array." -/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,287,"Call to an undefined method Eccube\Entity\ItemInterface::getPriceIncTax()." -/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,303,"Cannot call method getDeliveryFees() on array." -/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,306,"Call to an undefined method Eccube\Entity\ItemInterface::getPriceIncTax()." -/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,318,"Cannot call method getDiscounts() on array." -/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,321,"Call to an undefined method Eccube\Entity\ItemInterface::getPriceIncTax()." -/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,334,"Cannot call method getCharges() on array." -/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,337,"Call to an undefined method Eccube\Entity\ItemInterface::getPriceIncTax()." -/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,349,"Cannot call method reduce() on array." -/var/www/html/src/Eccube/Service/PurchaseFlow/PurchaseFlow.php,2,354,"Call to an undefined method Eccube\Entity\ItemInterface::getPriceIncTax()." -/var/www/html/src/Eccube/Service/SchemaService.php,2,71,"Call to an undefined method Doctrine\Persistence\Mapping\Driver\MappingDriver::getDriver()." -/var/www/html/src/Eccube/Service/SchemaService.php,2,137,"Call to an undefined method Doctrine\Persistence\Mapping\Driver\MappingDriver::getDriver()." From 5c340180664de76ca3dcf7453cfad6f19a68f591 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 11:43:28 +0900 Subject: [PATCH 38/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=81=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Controller/Admin/AdminController.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Eccube/Controller/Admin/AdminController.php b/src/Eccube/Controller/Admin/AdminController.php index add186284fe..e314fe5aeab 100644 --- a/src/Eccube/Controller/Admin/AdminController.php +++ b/src/Eccube/Controller/Admin/AdminController.php @@ -40,8 +40,6 @@ use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; -use Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface; -use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Component\Security\Http\Authentication\AuthenticationUtils; class AdminController extends AbstractController From 9bd048e8a3fab7adf636bb6560c02d080b381b12 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 11:46:53 +0900 Subject: [PATCH 39/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=81=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Controller/Admin/Customer/CustomerController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Eccube/Controller/Admin/Customer/CustomerController.php b/src/Eccube/Controller/Admin/Customer/CustomerController.php index 1d45dff8420..9096845a432 100644 --- a/src/Eccube/Controller/Admin/Customer/CustomerController.php +++ b/src/Eccube/Controller/Admin/Customer/CustomerController.php @@ -17,7 +17,6 @@ use Doctrine\ORM\QueryBuilder; use Eccube\Common\Constant; use Eccube\Controller\AbstractController; -use Eccube\Entity\Customer; use Eccube\Entity\Master\CsvType; use Eccube\Event\EccubeEvents; use Eccube\Event\EventArgs; @@ -305,7 +304,7 @@ public function export(Request $request) $this->csvExportService->exportData(function ($entity, $csvService) use ($request) { $Csvs = $csvService->getCsvs(); - /** @var Customer $Customer */ + /** @var \Eccube\Entity\Customer $Customer */ $Customer = $entity; $ExportCsvRow = new \Eccube\Entity\ExportCsvRow(); From ce6d184c633ed2b4241b1421e6ead8464862b0dc Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 11:52:01 +0900 Subject: [PATCH 40/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=81=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/Admin/Customer/CustomerEditController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Eccube/Controller/Admin/Customer/CustomerEditController.php b/src/Eccube/Controller/Admin/Customer/CustomerEditController.php index 7cfa6308dfc..0dd27880048 100644 --- a/src/Eccube/Controller/Admin/Customer/CustomerEditController.php +++ b/src/Eccube/Controller/Admin/Customer/CustomerEditController.php @@ -22,7 +22,6 @@ use Eccube\Repository\CustomerRepository; use Eccube\Repository\Master\PageMaxRepository; use Eccube\Repository\OrderRepository; -use Eccube\Security\Core\Encoder\PasswordEncoder; use Eccube\Util\StringUtil; use Knp\Component\Pager\PaginatorInterface; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; @@ -141,7 +140,7 @@ public function index(Request $request, PaginatorInterface $paginator, $id = nul if ($Customer->getPlainPassword() !== $this->eccubeConfig['eccube_default_password']) { if ($Customer->getSalt() === null) { - /** @var PasswordEncoder $encoder */ + /** @var \Eccube\Security\Core\Encoder\PasswordEncoder $encoder */ $Customer->setSalt($encoder->createSalt()); $Customer->setSecretKey($this->customerRepository->getUniqueSecretKey()); } From ca8ca31dbbab26ac837118b4fc948bfee001127f Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 11:56:59 +0900 Subject: [PATCH 41/90] =?UTF-8?q?EditController=E3=81=AEPHPDoc=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Controller/Admin/Order/EditController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Eccube/Controller/Admin/Order/EditController.php b/src/Eccube/Controller/Admin/Order/EditController.php index 75696f0070e..f609c0935df 100644 --- a/src/Eccube/Controller/Admin/Order/EditController.php +++ b/src/Eccube/Controller/Admin/Order/EditController.php @@ -519,7 +519,7 @@ public function searchCustomerById(Request $request) if ($request->isXmlHttpRequest() && $this->isTokenValid()) { log_debug('search customer by id start.'); - /** @var \Eccube\Entity\Customer $Customer */ + /** @var \Eccube\Entity\Customer|null $Customer */ $Customer = $this->customerRepository ->find($request->get('id')); From 0275c9f160a5439cb45a2933abac7df2e44cb478 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 12:07:44 +0900 Subject: [PATCH 42/90] =?UTF-8?q?CsvImportController=E3=81=AEPHPDoc?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Controller/Admin/Product/CsvImportController.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Eccube/Controller/Admin/Product/CsvImportController.php b/src/Eccube/Controller/Admin/Product/CsvImportController.php index 28a6d4e3458..86b52e153e0 100644 --- a/src/Eccube/Controller/Admin/Product/CsvImportController.php +++ b/src/Eccube/Controller/Admin/Product/CsvImportController.php @@ -13,7 +13,6 @@ namespace Eccube\Controller\Admin\Product; -use Doctrine\Common\Collections\Collection; use Doctrine\DBAL\Exception\ForeignKeyConstraintViolationException; use Eccube\Common\Constant; use Eccube\Controller\Admin\AbstractCsvImportController; @@ -46,7 +45,6 @@ use Symfony\Component\Finder\Finder; use Symfony\Component\Form\FormInterface; use Symfony\Component\HttpFoundation\File\UploadedFile; -use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\StreamedResponse; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; @@ -363,7 +361,7 @@ public function csvProduct(Request $request, CacheUtil $cacheUtil) $this->createProductTag($row, $Product, $data, $headerByKey); // 商品規格が存在しなければ新規登録 - /** @var ProductClass[]|Collection $ProductClasses */ + /** @var ProductClass[]|\Doctrine\Common\Collections\Collection $ProductClasses */ $ProductClasses = $Product->getProductClasses(); if ($ProductClasses->count() < 1) { // 規格分類1(ID)がセットされていると規格なし商品、規格あり商品を作成 From 7e945ae79c81366412fa768ed4be74bd212bde2a Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 12:29:18 +0900 Subject: [PATCH 43/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=81=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/Admin/Product/ProductClassController.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Eccube/Controller/Admin/Product/ProductClassController.php b/src/Eccube/Controller/Admin/Product/ProductClassController.php index a61f4f4870f..aeae30fbb71 100644 --- a/src/Eccube/Controller/Admin/Product/ProductClassController.php +++ b/src/Eccube/Controller/Admin/Product/ProductClassController.php @@ -28,9 +28,7 @@ use Eccube\Repository\TaxRuleRepository; use Eccube\Util\CacheUtil; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; -use Symfony\Component\Form\ClickableInterface; use Symfony\Component\Form\Extension\Core\Type\FormType; -use Symfony\Component\Form\SubmitButton; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\Routing\Annotation\Route; @@ -147,7 +145,7 @@ public function index(Request $request, $id, CacheUtil $cacheUtil) $this->isTokenValid(); // 登録,更新ボタンが押下されたかどうか. - /** @var ClickableInterface $form['save'] */ + /** @var \Symfony\Component\Form\ClickableInterface $form['save'] */ $isSave = $form['save']->isClicked(); // 規格名1/2から商品規格の組み合わせを生成する. From 585839faf138d1578183e47570c3cd11323c6df6 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 12:33:49 +0900 Subject: [PATCH 44/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AE=E3=82=B3?= =?UTF-8?q?=E3=83=BC=E3=83=89=E3=82=92=E6=B6=88=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Controller/Admin/Product/ProductController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Eccube/Controller/Admin/Product/ProductController.php b/src/Eccube/Controller/Admin/Product/ProductController.php index 813046e5b58..648591e4630 100644 --- a/src/Eccube/Controller/Admin/Product/ProductController.php +++ b/src/Eccube/Controller/Admin/Product/ProductController.php @@ -630,7 +630,6 @@ public function edit(Request $request, RouterInterface $router, CacheUtil $cache } $this->entityManager->flush(); - $admin_product = $request->request->get('admin_product'); if (array_key_exists('product_image', $request->request->get('admin_product'))) { $product_image = $request->request->get('admin_product')['product_image']; foreach ($product_image as $sortNo => $filename) { From 6ff2106787edc1ab4c4adafb29e3ee001ab7ff0c Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 12:34:47 +0900 Subject: [PATCH 45/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AE=E3=82=B3?= =?UTF-8?q?=E3=83=BC=E3=83=89=E3=82=92=E6=B6=88=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Controller/Admin/Product/ProductController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Eccube/Controller/Admin/Product/ProductController.php b/src/Eccube/Controller/Admin/Product/ProductController.php index 648591e4630..1e352f055e2 100644 --- a/src/Eccube/Controller/Admin/Product/ProductController.php +++ b/src/Eccube/Controller/Admin/Product/ProductController.php @@ -630,6 +630,7 @@ public function edit(Request $request, RouterInterface $router, CacheUtil $cache } $this->entityManager->flush(); + if (array_key_exists('product_image', $request->request->get('admin_product'))) { $product_image = $request->request->get('admin_product')['product_image']; foreach ($product_image as $sortNo => $filename) { From b1cf074325ee7ad3719fe9785601eccb5ab7c509 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 12:39:24 +0900 Subject: [PATCH 46/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AE=E3=82=B3?= =?UTF-8?q?=E3=83=BC=E3=83=89=E3=82=92=E6=B6=88=E3=81=99=E3=80=82=20PHPDoc?= =?UTF-8?q?=E3=81=AE=E5=AE=9A=E7=BE=A9=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=83=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Controller/Admin/Setting/System/LogController.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Eccube/Controller/Admin/Setting/System/LogController.php b/src/Eccube/Controller/Admin/Setting/System/LogController.php index 0488919cf6d..c96c2dbbc9f 100644 --- a/src/Eccube/Controller/Admin/Setting/System/LogController.php +++ b/src/Eccube/Controller/Admin/Setting/System/LogController.php @@ -18,7 +18,6 @@ use Eccube\Event\EventArgs; use Eccube\Form\Type\Admin\LogType; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; -use Symfony\Component\Form\Form; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\StreamedResponse; use Symfony\Component\Routing\Annotation\Route; @@ -29,7 +28,7 @@ class LogController extends AbstractController * @Route("/%eccube_admin_route%/setting/system/log", name="admin_setting_system_log", methods={"GET", "POST"}) * @Template("@admin/Setting/System/log.twig") * - * @return array | StreamedResponse + * @return array | StreamedResponse */ public function index(Request $request) { @@ -68,7 +67,7 @@ public function index(Request $request) } $logDir = $this->getParameter('kernel.logs_dir').DIRECTORY_SEPARATOR.$this->getParameter('kernel.environment'); $logFile = $logDir.'/'.$formData['files']; - /** @var Form $form */ + /** @var \Symfony\Component\Form\Form $form */ if ($form->getClickedButton() && $form->getClickedButton()->getName() === 'download' && $form->isValid()) { $bufferSize = 1024 * 50; $response = new StreamedResponse(); From 8fe426362b6b93ea45f459a9e4e1777685086122 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 12:50:29 +0900 Subject: [PATCH 47/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=81=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/Admin/Setting/System/MemberController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Eccube/Controller/Admin/Setting/System/MemberController.php b/src/Eccube/Controller/Admin/Setting/System/MemberController.php index fe3afc3969b..318abe534dc 100644 --- a/src/Eccube/Controller/Admin/Setting/System/MemberController.php +++ b/src/Eccube/Controller/Admin/Setting/System/MemberController.php @@ -20,7 +20,6 @@ use Eccube\Event\EventArgs; use Eccube\Form\Type\Admin\MemberType; use Eccube\Repository\MemberRepository; -use Eccube\Security\Core\Encoder\PasswordEncoder; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Annotation\Route; @@ -108,7 +107,7 @@ public function create(Request $request) $form->handleRequest($request); if ($form->isSubmitted() && $form->isValid()) { - /** @var PasswordEncoder $encoder */ + /** @var \Eccube\Security\Core\Encoder\PasswordEncoder $encoder */ $encoder = $this->encoderFactory->getEncoder($Member); $salt = $encoder->createSalt(); $password = $Member->getPlainPassword(); From 0961f850a9b85fc2451ecfc86823432d68584a01 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 12:52:10 +0900 Subject: [PATCH 48/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=81=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Setting/System/TwoFactorAuthController.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Eccube/Controller/Admin/Setting/System/TwoFactorAuthController.php b/src/Eccube/Controller/Admin/Setting/System/TwoFactorAuthController.php index b2beb2c9442..d95c4508230 100644 --- a/src/Eccube/Controller/Admin/Setting/System/TwoFactorAuthController.php +++ b/src/Eccube/Controller/Admin/Setting/System/TwoFactorAuthController.php @@ -14,7 +14,6 @@ namespace Eccube\Controller\Admin\Setting\System; use Eccube\Controller\AbstractController; -use Eccube\Entity\Member; use Eccube\Form\Type\Admin\TwoFactorAuthType; use Eccube\Repository\MemberRepository; use Eccube\Service\TwoFactorAuthService; @@ -71,7 +70,7 @@ public function __construct( */ public function auth(Request $request) { - /** @var Member $Member */ + /** @var \Eccube\Entity\Member $Member */ $Member = $this->getUser(); if (!$this->twoFactorAuthService->isEnabled() || $this->twoFactorAuthService->isAuth($Member)) { @@ -145,7 +144,7 @@ public function edit(Request $request) private function createResponse(Request $request) { $error = null; - /** @var Member $Member */ + /** @var \Eccube\Entity\Member $Member */ $Member = $this->getUser(); $builder = $this->formFactory->createBuilder(TwoFactorAuthType::class); $form = null; From 05bbeeb21a32c09d06c1139a818688aed5279e1a Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 12:55:21 +0900 Subject: [PATCH 49/90] =?UTF-8?q?=E8=A6=81=E3=82=89=E3=81=AA=E3=81=84?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=82=92=E5=85=83=E3=81=AE=E7=8A=B6=E6=85=8B?= =?UTF-8?q?=E3=81=AB=E6=88=BB=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Controller/Admin/Store/TemplateController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Eccube/Controller/Admin/Store/TemplateController.php b/src/Eccube/Controller/Admin/Store/TemplateController.php index 5dc554f9f07..08e554bfe1e 100644 --- a/src/Eccube/Controller/Admin/Store/TemplateController.php +++ b/src/Eccube/Controller/Admin/Store/TemplateController.php @@ -229,7 +229,9 @@ public function install(Request $request) if ($form->isSubmitted() && $form->isValid()) { /** @var \Eccube\Entity\Template $Template */ $Template = $form->getData(); + $TemplateExists = $this->templateRepository->findByCode($Template->getCode()); + // テンプレートコードの重複チェック.s if ($TemplateExists) { $form['code']->addError(new FormError(trans('admin.store.template.template_code_already_exists'))); From c1691ff4493cb9b3a74c515693150257c13f9904 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 12:56:18 +0900 Subject: [PATCH 50/90] =?UTF-8?q?=E8=A6=81=E3=82=89=E3=81=AA=E3=81=84?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=82=92=E5=85=83=E3=81=AE=E7=8A=B6=E6=85=8B?= =?UTF-8?q?=E3=81=AB=E6=88=BB=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Controller/Admin/Store/TemplateController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Eccube/Controller/Admin/Store/TemplateController.php b/src/Eccube/Controller/Admin/Store/TemplateController.php index 08e554bfe1e..00327ed994d 100644 --- a/src/Eccube/Controller/Admin/Store/TemplateController.php +++ b/src/Eccube/Controller/Admin/Store/TemplateController.php @@ -232,7 +232,7 @@ public function install(Request $request) $TemplateExists = $this->templateRepository->findByCode($Template->getCode()); - // テンプレートコードの重複チェック.s + // テンプレートコードの重複チェック. if ($TemplateExists) { $form['code']->addError(new FormError(trans('admin.store.template.template_code_already_exists'))); From b3d245880344421e1817cf9aed63c54dd9b1e814 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 12:59:39 +0900 Subject: [PATCH 51/90] =?UTF-8?q?=E8=A6=81=E3=82=89=E3=81=AA=E3=81=84use?= =?UTF-8?q?=E3=82=92=E6=B6=88=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Controller/EntryController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Eccube/Controller/EntryController.php b/src/Eccube/Controller/EntryController.php index d7c907b1a18..df59cef5f4d 100644 --- a/src/Eccube/Controller/EntryController.php +++ b/src/Eccube/Controller/EntryController.php @@ -22,7 +22,6 @@ use Eccube\Repository\CustomerRepository; use Eccube\Repository\Master\CustomerStatusRepository; use Eccube\Repository\PageRepository; -use Eccube\Security\Core\Encoder\PasswordEncoder; use Eccube\Service\CartService; use Eccube\Service\MailService; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; @@ -168,7 +167,7 @@ public function index(Request $request) case 'complete': log_info('会員登録開始'); - /** @var PasswordEncoder $encoder */ + /** @var \Eccube\Security\Core\Encoder\PasswordEncoder $encoder */ $encoder = $this->encoderFactory->getEncoder($Customer); $salt = $encoder->createSalt(); $password = $encoder->encodePassword($Customer->getPlainPassword(), $salt); From c3ae7622b41747db455c05d5015422ce50313181 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 13:04:24 +0900 Subject: [PATCH 52/90] =?UTF-8?q?=E8=A6=81=E3=82=89=E3=81=AA=E3=81=84use?= =?UTF-8?q?=E3=82=92=E6=B6=88=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Controller/ForgotController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Eccube/Controller/ForgotController.php b/src/Eccube/Controller/ForgotController.php index 9091567d52a..1ea9d1aea25 100644 --- a/src/Eccube/Controller/ForgotController.php +++ b/src/Eccube/Controller/ForgotController.php @@ -18,7 +18,6 @@ use Eccube\Form\Type\Front\ForgotType; use Eccube\Form\Type\Front\PasswordResetType; use Eccube\Repository\CustomerRepository; -use Eccube\Security\Core\Encoder\PasswordEncoder; use Eccube\Service\MailService; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Component\HttpFoundation\Request; @@ -214,7 +213,7 @@ public function reset(Request $request, $reset_key) // 発行したパスワードの暗号化 if ($Customer->getSalt() === null) { - /** @var PasswordEncoder $encoder */ + /** @var \Eccube\Security\Core\Encoder\PasswordEncoder $encoder */ $encoder = $this->encoderFactory->getEncoder($Customer); $Customer->setSalt($encoder->createSalt()); } From ddaa057540e79e0165fe7b8734190a9ca36a2e1f Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 13:07:04 +0900 Subject: [PATCH 53/90] =?UTF-8?q?PHPDoc=E3=82=BF=E3=82=A4=E3=83=97?= =?UTF-8?q?=E3=83=92=E3=83=B3=E3=83=88=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/Controller/Install/InstallController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Eccube/Controller/Install/InstallController.php b/src/Eccube/Controller/Install/InstallController.php index 0807c24e398..4959ad06144 100644 --- a/src/Eccube/Controller/Install/InstallController.php +++ b/src/Eccube/Controller/Install/InstallController.php @@ -247,7 +247,7 @@ public function step2() * @Route("/install/step3", name="install_step3", methods={"GET", "POST"}) * @Template("step3.twig") * - * @return array|\Symfony\Component\HttpFoundation\RedirectResponse + * @return array|\Symfony\Component\HttpFoundation\RedirectResponse * * @throws \Exception */ From 44e6b17fdb08d4cb7494cac7cacc2320adeeca98 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 13:25:17 +0900 Subject: [PATCH 54/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=81=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Controller/Mypage/ChangeController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Eccube/Controller/Mypage/ChangeController.php b/src/Eccube/Controller/Mypage/ChangeController.php index ef32ba694bd..693a1f075fa 100644 --- a/src/Eccube/Controller/Mypage/ChangeController.php +++ b/src/Eccube/Controller/Mypage/ChangeController.php @@ -20,7 +20,6 @@ use Eccube\Form\Type\Front\EntryType; use Eccube\Repository\BaseInfoRepository; use Eccube\Repository\CustomerRepository; -use Eccube\Security\Core\Encoder\PasswordEncoder; use Eccube\Service\MailService; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Component\HttpFoundation\Request; @@ -104,7 +103,7 @@ public function index(Request $request) log_info('会員編集開始'); if ($Customer->getPlainPassword() !== $this->eccubeConfig['eccube_default_password']) { - /** @var PasswordEncoder $encoder */ + /** @var \Eccube\Security\Core\Encoder\PasswordEncoder $encoder */ $encoder = $this->encoderFactory->getEncoder($Customer); if ($Customer->getSalt() === null) { $Customer->setSalt($encoder->createSalt()); From 47533b6f3c593c6a94cc757cbb2962951527afe4 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 13:28:39 +0900 Subject: [PATCH 55/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=81=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Controller/Mypage/DeliveryController.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Eccube/Controller/Mypage/DeliveryController.php b/src/Eccube/Controller/Mypage/DeliveryController.php index 33fdf0d6e45..f369fbebc5c 100644 --- a/src/Eccube/Controller/Mypage/DeliveryController.php +++ b/src/Eccube/Controller/Mypage/DeliveryController.php @@ -15,7 +15,6 @@ use Eccube\Controller\AbstractController; use Eccube\Entity\BaseInfo; -use Eccube\Entity\Customer; use Eccube\Entity\CustomerAddress; use Eccube\Event\EccubeEvents; use Eccube\Event\EventArgs; @@ -81,7 +80,7 @@ public function index(Request $request) */ public function edit(Request $request, $id = null) { - /** @var Customer $Customer */ + /** @var \Eccube\Entity\Customer $Customer */ $Customer = $this->getUser(); // 配送先住所最大値判定 @@ -183,7 +182,7 @@ public function delete(Request $request, CustomerAddress $CustomerAddress) $this->isTokenValid(); log_info('お届け先削除開始', [$CustomerAddress->getId()]); - /** @var Customer $Customer */ + /** @var \Eccube\Entity\Customer $Customer */ $Customer = $this->getUser(); if ($Customer->getId() != $CustomerAddress->getCustomer()->getId()) { From 694997c0261869f572f02fb4873d8426824eb950 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 14:30:46 +0900 Subject: [PATCH 56/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=81=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Controller/Mypage/WithdrawController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Eccube/Controller/Mypage/WithdrawController.php b/src/Eccube/Controller/Mypage/WithdrawController.php index 54aa0c43ff4..861470f8d51 100644 --- a/src/Eccube/Controller/Mypage/WithdrawController.php +++ b/src/Eccube/Controller/Mypage/WithdrawController.php @@ -14,7 +14,6 @@ namespace Eccube\Controller\Mypage; use Eccube\Controller\AbstractController; -use Eccube\Entity\Customer; use Eccube\Entity\Master\CustomerStatus; use Eccube\Event\EccubeEvents; use Eccube\Event\EventArgs; @@ -127,7 +126,7 @@ public function index(Request $request) case 'complete': log_info('退会処理開始'); - /** @var Customer $Customer */ + /** @var \Eccube\Entity\Customer $Customer */ $Customer = $this->getUser(); $email = $Customer->getEmail(); From 871db600a7453e249e78cfe20188e9fa505bc463 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 14:33:51 +0900 Subject: [PATCH 57/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=81=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Controller/ProductController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Eccube/Controller/ProductController.php b/src/Eccube/Controller/ProductController.php index 5bb55656a1e..5233d03dce4 100644 --- a/src/Eccube/Controller/ProductController.php +++ b/src/Eccube/Controller/ProductController.php @@ -14,7 +14,6 @@ namespace Eccube\Controller; use Eccube\Entity\BaseInfo; -use Eccube\Entity\Customer; use Eccube\Entity\Master\ProductStatus; use Eccube\Entity\Product; use Eccube\Event\EccubeEvents; @@ -429,7 +428,7 @@ public function addCart(Request $request, Product $Product) /** * ページタイトルの設定 * - * @param array|null $searchData + * @param array|null $searchData * * @return string */ From 4cd07a0b18c9eaf0d330bc0aac1514e829999461 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 15:17:06 +0900 Subject: [PATCH 58/90] =?UTF-8?q?phpDoc=E3=81=AE=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/Doctrine/Common/CsvDataFixtures/CsvFixture.php | 1 + src/Eccube/Form/Type/AddCartType.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Eccube/Doctrine/Common/CsvDataFixtures/CsvFixture.php b/src/Eccube/Doctrine/Common/CsvDataFixtures/CsvFixture.php index 98dc772e57f..41fc0107a37 100644 --- a/src/Eccube/Doctrine/Common/CsvDataFixtures/CsvFixture.php +++ b/src/Eccube/Doctrine/Common/CsvDataFixtures/CsvFixture.php @@ -45,6 +45,7 @@ public function __construct(\SplFileObject $file = null) */ public function load(ObjectManager $manager) { + // EntityManagerInterface 以外はスキップ if($manager instanceof EntityManagerInterface === false) { return; } diff --git a/src/Eccube/Form/Type/AddCartType.php b/src/Eccube/Form/Type/AddCartType.php index 7a4c32b343e..4e7ccec534e 100644 --- a/src/Eccube/Form/Type/AddCartType.php +++ b/src/Eccube/Form/Type/AddCartType.php @@ -192,7 +192,7 @@ public function getBlockPrefix() /** * validate * - * @param mixed $data + * @param array $data * @param ExecutionContext $context * @return void */ From 7bbeb11359896f822c373b5a3b0ca44ae1272aa3 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 15:36:29 +0900 Subject: [PATCH 59/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=81=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Log/Processor/TokenProcessor.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Eccube/Log/Processor/TokenProcessor.php b/src/Eccube/Log/Processor/TokenProcessor.php index 2c94741d83e..9f665e8b0d3 100644 --- a/src/Eccube/Log/Processor/TokenProcessor.php +++ b/src/Eccube/Log/Processor/TokenProcessor.php @@ -13,8 +13,6 @@ namespace Eccube\Log\Processor; -use Eccube\Entity\Customer; -use Eccube\Entity\Member; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; class TokenProcessor @@ -34,7 +32,7 @@ public function __invoke(array $records) $records['extra']['user_id'] = 'N/A'; if (null !== $token = $this->tokenStorage->getToken()) { - /** @var Customer|Member|null $user */ + /** @var \Eccube\Entity\Customer|\Eccube\Entity\Member|null $user */ $user = $token->getUser(); $records['extra']['user_id'] = is_object($user) ? $user->getId() From bca5d06314c4c77ab2867f217926c7ba4da31d07 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 15:41:02 +0900 Subject: [PATCH 60/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=81=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Repository/AbstractRepository.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Eccube/Repository/AbstractRepository.php b/src/Eccube/Repository/AbstractRepository.php index acee250e4d5..bb0d004c3f5 100644 --- a/src/Eccube/Repository/AbstractRepository.php +++ b/src/Eccube/Repository/AbstractRepository.php @@ -14,10 +14,7 @@ namespace Eccube\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\DBAL\DBALException; -use Doctrine\DBAL\Exception; use Eccube\Entity\AbstractEntity; -use Eccube\Common\EccubeConfig; abstract class AbstractRepository extends ServiceEntityRepository { @@ -60,7 +57,7 @@ protected function getCacheLifetime() * * @return bool * - * @throws Exception + * @throws \Doctrine\DBAL\Exception */ protected function isPostgreSQL() { @@ -72,7 +69,7 @@ protected function isPostgreSQL() * * @return bool * - * @throws Exception + * @throws \Doctrine\DBAL\Exception */ protected function isMySQL() { From 47e7136cb4dbecea0f80c2d90cd3a476d17e4f77 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 15:47:26 +0900 Subject: [PATCH 61/90] =?UTF-8?q?phpdoc=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/Repository/BlockPositionRepository.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Eccube/Repository/BlockPositionRepository.php b/src/Eccube/Repository/BlockPositionRepository.php index 032040507e6..f6a5665bc7c 100644 --- a/src/Eccube/Repository/BlockPositionRepository.php +++ b/src/Eccube/Repository/BlockPositionRepository.php @@ -46,10 +46,10 @@ public function __construct(BlockRepository $blockRepository, RegistryInterface /** * レイアウトに紐づくブロックの個数分登録を行う * - * @param array|null $data - * @param Block[] $Blocks - * @param Block[]|null $UnusedBlocks - * @param Layout|null $Layout + * @param array $data + * @param array $Blocks + * @param array $UnusedBlocks + * @param Layout $Layout * * @return void */ From 646cd3d22072636da7765f502db475462c4a7552 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 15:50:49 +0900 Subject: [PATCH 62/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=82=92=E6=B6=88?= =?UTF-8?q?=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Repository/BlockPositionRepository.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Eccube/Repository/BlockPositionRepository.php b/src/Eccube/Repository/BlockPositionRepository.php index f6a5665bc7c..0c201520f66 100644 --- a/src/Eccube/Repository/BlockPositionRepository.php +++ b/src/Eccube/Repository/BlockPositionRepository.php @@ -14,9 +14,7 @@ namespace Eccube\Repository; use Doctrine\Persistence\ManagerRegistry as RegistryInterface; -use Eccube\Entity\Block; use Eccube\Entity\BlockPosition; -use Eccube\Entity\Layout; /** * BlockPositionRepository @@ -47,9 +45,9 @@ public function __construct(BlockRepository $blockRepository, RegistryInterface * レイアウトに紐づくブロックの個数分登録を行う * * @param array $data - * @param array $Blocks - * @param array $UnusedBlocks - * @param Layout $Layout + * @param array $Blocks + * @param array $UnusedBlocks + * @param \Eccube\Entity\Layout $Layout * * @return void */ From 566ab51610907f5542085d7852ef940be7dcced0 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 15:54:46 +0900 Subject: [PATCH 63/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=82=92=E6=B6=88?= =?UTF-8?q?=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Repository/CustomerRepository.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Eccube/Repository/CustomerRepository.php b/src/Eccube/Repository/CustomerRepository.php index 222b6992090..320ac5f5538 100644 --- a/src/Eccube/Repository/CustomerRepository.php +++ b/src/Eccube/Repository/CustomerRepository.php @@ -13,7 +13,6 @@ namespace Eccube\Repository; -use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\QueryBuilder; use Doctrine\Persistence\ManagerRegistry as RegistryInterface; From b2da2fe04bb2ddfeedd33b97eca3890d08b24cf6 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 15:56:52 +0900 Subject: [PATCH 64/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=82=92=E6=B6=88?= =?UTF-8?q?=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Repository/MailHistoryRepository.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Eccube/Repository/MailHistoryRepository.php b/src/Eccube/Repository/MailHistoryRepository.php index 4b6493b23d4..9c79fbd190c 100644 --- a/src/Eccube/Repository/MailHistoryRepository.php +++ b/src/Eccube/Repository/MailHistoryRepository.php @@ -16,7 +16,6 @@ use Doctrine\ORM\NonUniqueResultException; use Doctrine\ORM\NoResultException; use Doctrine\Persistence\ManagerRegistry as RegistryInterface; -use Eccube\Entity\Customer; use Eccube\Entity\MailHistory; /** @@ -38,8 +37,11 @@ public function __construct(RegistryInterface $registry) } /** - * @param Customer $Customer + * @param \Eccube\Entity\Customer $Customer * @param integer $id + * @return float|int|mixed|string + * @throws NoResultException + * @throws NonUniqueResultException * @expectedException \Exception|NoResultException|NonUniqueResultException */ public function getByCustomerAndId(\Eccube\Entity\Customer $Customer, $id) From 479ef8fef43126db3bc85a9f64dcad8b34304948 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 15:58:22 +0900 Subject: [PATCH 65/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=82=92=E6=B6=88?= =?UTF-8?q?=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Repository/MemberRepository.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Eccube/Repository/MemberRepository.php b/src/Eccube/Repository/MemberRepository.php index 4c105048714..fb0f9f56928 100644 --- a/src/Eccube/Repository/MemberRepository.php +++ b/src/Eccube/Repository/MemberRepository.php @@ -17,7 +17,6 @@ use Doctrine\DBAL\Exception\ForeignKeyConstraintViolationException; use Doctrine\Persistence\ManagerRegistry as RegistryInterface; use Eccube\Entity\Member; -use Symfony\Component\Security\Core\User\UserInterface; /** * MemberRepository From 4c056727174ae2bd675170d8b7c61a71e23d44ce Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 16:01:51 +0900 Subject: [PATCH 66/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=82=92=E6=B6=88?= =?UTF-8?q?=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Repository/OrderRepository.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Eccube/Repository/OrderRepository.php b/src/Eccube/Repository/OrderRepository.php index 95ebb2727e8..d769b701ea1 100644 --- a/src/Eccube/Repository/OrderRepository.php +++ b/src/Eccube/Repository/OrderRepository.php @@ -13,7 +13,6 @@ namespace Eccube\Repository; -use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\NoResultException; use Doctrine\ORM\QueryBuilder; use Doctrine\Persistence\ManagerRegistry as RegistryInterface; @@ -84,14 +83,14 @@ public function changeStatus($orderId, OrderStatus $Status) * order_id_start?:string|int, * order_id_end?:string|int, * multi?:string|int|null, - * status?:OrderStatus[]|int[]|ArrayCollection, + * status?:OrderStatus[]|int[]|\Doctrine\Common\Collections\ArrayCollection, * company_name?:string, * name?:string, * kana?:string, * email?:string, * phone_number?:string, - * sex?:Sex[]|ArrayCollection, - * payment?:Payment[]|ArrayCollection, + * sex?:Sex[]|\Doctrine\Common\Collections\ArrayCollection, + * payment?:Payment[]|\Doctrine\Common\Collections\ArrayCollection, * order_datetime_start?:\DateTime, * order_datetime_end?:\DateTime, * order_date_start?:\DateTime, From a617ad1ab3ce05b8370992be988f1b1c5ccf9def Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 16:07:11 +0900 Subject: [PATCH 67/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=82=92=E6=B6=88?= =?UTF-8?q?=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Http/Authentication/EccubeAuthenticationFailureHandler.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Eccube/Security/Http/Authentication/EccubeAuthenticationFailureHandler.php b/src/Eccube/Security/Http/Authentication/EccubeAuthenticationFailureHandler.php index 02263e4292c..2831405f35c 100644 --- a/src/Eccube/Security/Http/Authentication/EccubeAuthenticationFailureHandler.php +++ b/src/Eccube/Security/Http/Authentication/EccubeAuthenticationFailureHandler.php @@ -13,7 +13,6 @@ namespace Eccube\Security\Http\Authentication; -use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\Routing\Exception\RouteNotFoundException; @@ -28,7 +27,7 @@ class EccubeAuthenticationFailureHandler extends DefaultAuthenticationFailureHan public function onAuthenticationFailure(Request $request, AuthenticationException $exception) { try { - /** @var RedirectResponse $response */ + /** @var \Symfony\Component\HttpFoundation\RedirectResponse $response */ $response = parent::onAuthenticationFailure($request, $exception); } catch (RouteNotFoundException $e) { throw new BadRequestHttpException($e->getMessage(), $e, $e->getCode()); From 95f18ee7c433fd2e31993068ce7e2fdb71c16333 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 16:09:03 +0900 Subject: [PATCH 68/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=82=92=E6=B6=88?= =?UTF-8?q?=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Http/Authentication/EccubeAuthenticationSuccessHandler.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Eccube/Security/Http/Authentication/EccubeAuthenticationSuccessHandler.php b/src/Eccube/Security/Http/Authentication/EccubeAuthenticationSuccessHandler.php index 919f6a5b771..9b1a53a5852 100644 --- a/src/Eccube/Security/Http/Authentication/EccubeAuthenticationSuccessHandler.php +++ b/src/Eccube/Security/Http/Authentication/EccubeAuthenticationSuccessHandler.php @@ -13,7 +13,6 @@ namespace Eccube\Security\Http\Authentication; -use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\Routing\Exception\RouteNotFoundException; @@ -28,7 +27,7 @@ class EccubeAuthenticationSuccessHandler extends DefaultAuthenticationSuccessHan public function onAuthenticationSuccess(Request $request, TokenInterface $token) { try { - /** @var RedirectResponse $response */ + /** @var \Symfony\Component\HttpFoundation\RedirectResponse $response */ $response = parent::onAuthenticationSuccess($request, $token); } catch (RouteNotFoundException $e) { throw new BadRequestHttpException($e->getMessage(), $e, $e->getCode()); From 381bdab239ad1d35dda90aa7c6bd570c670096ac Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 16:12:06 +0900 Subject: [PATCH 69/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=82=92=E6=B6=88?= =?UTF-8?q?=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Service/Calculator/OrderItemCollection.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Eccube/Service/Calculator/OrderItemCollection.php b/src/Eccube/Service/Calculator/OrderItemCollection.php index c9f66dc9596..823cc4a61a5 100644 --- a/src/Eccube/Service/Calculator/OrderItemCollection.php +++ b/src/Eccube/Service/Calculator/OrderItemCollection.php @@ -16,7 +16,6 @@ use Eccube\Entity\ItemInterface; use Eccube\Entity\Master\OrderItemType; use Eccube\Entity\Order; -use Eccube\Entity\OrderItem; class OrderItemCollection extends \Doctrine\Common\Collections\ArrayCollection { @@ -76,7 +75,7 @@ public function hasProductByName($productName) { $OrderItems = $this->filter( function (ItemInterface $OrderItem) use ($productName) { - /** @var OrderItem $OrderItem */ + /** @var \Eccube\Entity\OrderItem $OrderItem */ return $OrderItem->getProductName() == $productName; }); @@ -93,7 +92,7 @@ function (ItemInterface $OrderItem) use ($productName) { public function hasItemByOrderItemType($OrderItemType) { $filteredItems = $this->filter(function (ItemInterface $OrderItem) use ($OrderItemType) { - /* @var OrderItem $OrderItem */ + /** @var \Eccube\Entity\OrderItem $OrderItem */ return $OrderItem->getOrderItemType() && $OrderItem->getOrderItemType()->getId() == $OrderItemType->getId(); }); From 460017acb208022b5fa78a839ebc0e8c4be49378 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 16:15:10 +0900 Subject: [PATCH 70/90] =?UTF-8?q?PHPDoc=20=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/Composer/ComposerProcessService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Eccube/Service/Composer/ComposerProcessService.php b/src/Eccube/Service/Composer/ComposerProcessService.php index 1ff1b504524..04893d85d04 100644 --- a/src/Eccube/Service/Composer/ComposerProcessService.php +++ b/src/Eccube/Service/Composer/ComposerProcessService.php @@ -81,7 +81,7 @@ public function execRemove($packageName, $output = null) * * @throws PluginException * - * @param array $commands + * @param array $commands */ public function runCommand($commands, $output = null, $init = true) { From 6cc5eec530848d446824a352f195baf6f7217d55 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 16:18:08 +0900 Subject: [PATCH 71/90] =?UTF-8?q?PHPDoc=20=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/CsvExportService.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Eccube/Service/CsvExportService.php b/src/Eccube/Service/CsvExportService.php index 7e829d8bc9c..5f96e10a789 100644 --- a/src/Eccube/Service/CsvExportService.php +++ b/src/Eccube/Service/CsvExportService.php @@ -29,7 +29,6 @@ use Eccube\Repository\ProductRepository; use Eccube\Repository\ShippingRepository; use Eccube\Util\FormUtil; -use Knp\Component\Pager\Pagination\AbstractPagination; use Knp\Component\Pager\PaginatorInterface; use Symfony\Component\Form\FormFactoryInterface; use Symfony\Component\HttpFoundation\Request; @@ -292,7 +291,7 @@ public function exportData(\Closure $closure) $page = 1; $limit = 100; while ($results = $this->paginator->paginate($this->qb, $page, $limit)) { - /** @var AbstractPagination $results */ + /** @var \Knp\Component\Pager\Pagination\AbstractPagination $results */ if (!$results->valid()) { break; } From 749cd8474e87b3272e2478d37dce53c5bb8a2f2c Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 16:23:34 +0900 Subject: [PATCH 72/90] =?UTF-8?q?PHPDoc=E3=82=B8=E3=82=A7=E3=83=8D?= =?UTF-8?q?=E3=83=AA=E3=83=83=E3=82=AF=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/Payment/PaymentDispatcher.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Eccube/Service/Payment/PaymentDispatcher.php b/src/Eccube/Service/Payment/PaymentDispatcher.php index 8d1bff31030..11be454129b 100644 --- a/src/Eccube/Service/Payment/PaymentDispatcher.php +++ b/src/Eccube/Service/Payment/PaymentDispatcher.php @@ -36,12 +36,12 @@ class PaymentDispatcher private $route; /** - * @var array + * @var array */ private $pathParameters = []; /** - * @var array + * @var array */ private $queryParameters = []; @@ -98,7 +98,7 @@ public function setRoute($route) /** * クエリパラメータの配列を返します. * - * @return array + * @return array */ public function getQueryParameters() { @@ -108,7 +108,7 @@ public function getQueryParameters() /** * クエリパラメータの配列を設定します. * - * @param array $queryParameters + * @param array $queryParameters * * @return PaymentDispatcher */ @@ -122,7 +122,7 @@ public function setQueryParameters(array $queryParameters) /** * パスパラメータの配列を返します. * - * @return array + * @return array */ public function getPathParameters() { @@ -132,7 +132,7 @@ public function getPathParameters() /** * パスパラメータの配列を設定します. * - * @param array $pathParameters + * @param array $pathParameters * * @return PaymentDispatcher */ From 5e8e36434dcd0dd575ca5ad28ac4940ba85309ea Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 16:33:12 +0900 Subject: [PATCH 73/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=81=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Service/PluginService.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Eccube/Service/PluginService.php b/src/Eccube/Service/PluginService.php index 91b7012f456..e5f1f324f17 100644 --- a/src/Eccube/Service/PluginService.php +++ b/src/Eccube/Service/PluginService.php @@ -13,12 +13,10 @@ namespace Eccube\Service; -use Doctrine\Bundle\DoctrineBundle\Mapping\MappingDriver; use Doctrine\Common\Collections\Criteria; use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Mapping\MappingException as ORMMappingException; -use Doctrine\Persistence\Mapping\Driver\MappingDriverChain; use Doctrine\Persistence\Mapping\MappingException as PersistenceMappingException; use Eccube\Common\Constant; use Eccube\Common\EccubeConfig; @@ -349,9 +347,9 @@ public function generateProxyAndCallback(callable $callback, Plugin $plugin, $co $entityDir = $this->eccubeConfig['plugin_realdir'].'/'.$plugin->getCode().'/Entity'; if (file_exists($entityDir)) { $ormConfig = $this->entityManager->getConfiguration(); - /** @var MappingDriver $mapping */ + /** @var \Doctrine\Bundle\DoctrineBundle\Mapping\MappingDriver $mapping */ $mapping = $ormConfig->getMetadataDriverImpl(); - /** @var MappingDriverChain $chain */ + /** @var \Doctrine\Persistence\Mapping\Driver\MappingDriverChain $chain */ $chain = $mapping->getDriver(); $driver = $ormConfig->newDefaultAnnotationDriver([$entityDir], false); $namespace = 'Plugin\\'.$config['code'].'\\Entity'; From 58e6b9657db787ddb0ff796ca5af92359eee835c Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 16:36:06 +0900 Subject: [PATCH 74/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=81=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Service/PurchaseFlow/ItemCollection.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Eccube/Service/PurchaseFlow/ItemCollection.php b/src/Eccube/Service/PurchaseFlow/ItemCollection.php index fe9eec0663f..d42257ef30b 100644 --- a/src/Eccube/Service/PurchaseFlow/ItemCollection.php +++ b/src/Eccube/Service/PurchaseFlow/ItemCollection.php @@ -18,7 +18,6 @@ use Eccube\Entity\ItemInterface; use Eccube\Entity\Master\OrderItemType; use Eccube\Entity\Order; -use Eccube\Entity\OrderItem; class ItemCollection extends ArrayCollection { @@ -81,7 +80,7 @@ public function hasProductByName($productName) { $OrderItems = $this->filter( function (ItemInterface $OrderItem) use ($productName) { - /** @var OrderItem $OrderItem */ + /** @var \Eccube\Entity\OrderItem $OrderItem */ return $OrderItem->getProductName() == $productName; }); @@ -98,7 +97,7 @@ function (ItemInterface $OrderItem) use ($productName) { public function hasItemByOrderItemType($OrderItemType) { $filteredItems = $this->filter(function (ItemInterface $OrderItem) use ($OrderItemType) { - /** @var OrderItem $OrderItem */ + /** @var \Eccube\Entity\OrderItem $OrderItem */ return $OrderItem->getOrderItemType() && $OrderItem->getOrderItemType()->getId() == $OrderItemType->getId(); }); From 3fc6811836968a2e1233174dc5096aad0a44b212 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: Wed, 8 Nov 2023 16:43:37 +0900 Subject: [PATCH 75/90] =?UTF-8?q?=E7=B7=8A=E6=80=A5=E4=BF=AE=E6=AD=A3=20Ad?= =?UTF-8?q?dPointProcessor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php b/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php index d5d303f0521..7943ff662b3 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php @@ -69,7 +69,7 @@ private function calculateAddPoint(ItemHolderInterface $itemHolder) $basicPointRate = $this->BaseInfo->getBasicPointRate(); // 明細ごとのポイントを集計 - $totalPoint = array_reduce($itemHolder->getItems(), + $totalPoint = array_reduce($itemHolder->getItems()->toArray(), function ($carry, ItemInterface $item) use ($basicPointRate) { $pointRate = $item->getPointRate() ? $item->getPointRate() : null; From 6703271f4f9c4288c4798a1c6978a5bd73997842 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 16:46:51 +0900 Subject: [PATCH 76/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=81=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/PurchaseFlow/Processor/EmptyItemsValidator.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Eccube/Service/PurchaseFlow/Processor/EmptyItemsValidator.php b/src/Eccube/Service/PurchaseFlow/Processor/EmptyItemsValidator.php index 6f56537c65f..1ed3164bcb0 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/EmptyItemsValidator.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/EmptyItemsValidator.php @@ -17,7 +17,6 @@ use Eccube\Entity\Cart; use Eccube\Entity\ItemHolderInterface; use Eccube\Entity\Order; -use Eccube\Entity\OrderItem; use Eccube\Service\PurchaseFlow\InvalidItemException; use Eccube\Service\PurchaseFlow\ItemHolderValidator; use Eccube\Service\PurchaseFlow\PurchaseContext; @@ -51,10 +50,10 @@ protected function validate(ItemHolderInterface $itemHolder, PurchaseContext $co if ($item->isProduct() && $item->getQuantity() <= 0) { if ($itemHolder instanceof Order) { foreach ($itemHolder->getShippings() as $Shipping) { - /** @var OrderItem $item */ + /** @var \Eccube\Entity\OrderItem $item */ $Shipping->removeOrderItem($item); } - /** @var OrderItem $item */ + /** @var \Eccube\Entity\OrderItem $item */ $itemHolder->removeOrderItem($item); } else { if ($itemHolder instanceof Cart) { From 3c34e0bc1a6f9cc2676dfd30e0997bf53436d312 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 16:52:48 +0900 Subject: [PATCH 77/90] =?UTF-8?q?null=E6=88=BB=E3=82=8A=E5=80=A4=E3=81=AE?= =?UTF-8?q?=E4=BD=9C=E6=88=90=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php b/src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php index 6c558351ed4..15ccc438185 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/PointProcessor.php @@ -71,7 +71,7 @@ public function removeDiscountItem(ItemHolderInterface $itemHolder, PurchaseCont public function addDiscountItem(ItemHolderInterface $itemHolder, PurchaseContext $context) { if (!$this->supports($itemHolder)) { - return; + return null; } /** @var Order $itemHolder */ From 31e9eb404a43fcb8b00b8ffb24db37bdc6283d4a Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 16:54:29 +0900 Subject: [PATCH 78/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=82=92=E6=B6=88?= =?UTF-8?q?=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/PurchaseFlow/Processor/StockDiffProcessor.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php b/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php index e1d7748320f..7d340f442b6 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php @@ -15,7 +15,6 @@ use Eccube\Entity\ItemHolderInterface; use Eccube\Entity\Master\OrderStatus; -use Eccube\Entity\Order; use Eccube\Entity\ProductClass; use Eccube\Entity\ProductStock; use Eccube\Repository\ProductClassRepository; @@ -55,9 +54,9 @@ public function validate(ItemHolderInterface $itemHolder, PurchaseContext $conte if (is_null($context->getOriginHolder())) { return; } - /** @var Order $From */ + /** @var \Eccube\Entity\Order $From */ $From = $context->getOriginHolder(); - /** @var Order $To */ + /** @var \Eccube\Entity\Order $To */ $To = $itemHolder; $diff = $this->getDiffOfQuantities($From, $To); From 7b53d7ae429f8ef2c9b77300caa86c91a6f771ff Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 16:57:27 +0900 Subject: [PATCH 79/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=82=92=E6=B6=88?= =?UTF-8?q?=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/PurchaseFlow/Processor/StockMultipleValidator.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Eccube/Service/PurchaseFlow/Processor/StockMultipleValidator.php b/src/Eccube/Service/PurchaseFlow/Processor/StockMultipleValidator.php index f3d50a2e0ac..5c79e826640 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/StockMultipleValidator.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/StockMultipleValidator.php @@ -15,7 +15,6 @@ use Eccube\Entity\ItemHolderInterface; use Eccube\Entity\Order; -use Eccube\Entity\ProductClass; use Eccube\Entity\Shipping; use Eccube\Repository\ProductClassRepository; use Eccube\Service\PurchaseFlow\ItemHolderValidator; @@ -59,7 +58,7 @@ public function validate(ItemHolderInterface $itemHolder, PurchaseContext $conte } foreach ($OrderItemsByProductClass as $id => $Items) { - /** @var ProductClass $ProductClass */ + /** @var \Eccube\Entity\ProductClass $ProductClass */ $ProductClass = $this->productClassRepository->find($id); if ($ProductClass->isStockUnlimited()) { continue; From e2627c8a856bea8bbb28ffefa3a488fb9c83a48f Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 17:07:33 +0900 Subject: [PATCH 80/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=82=92=E6=B6=88?= =?UTF-8?q?=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Service/SchemaService.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Eccube/Service/SchemaService.php b/src/Eccube/Service/SchemaService.php index ac6af0d8375..d02c77850a2 100644 --- a/src/Eccube/Service/SchemaService.php +++ b/src/Eccube/Service/SchemaService.php @@ -16,14 +16,11 @@ use Doctrine\Common\Annotations\AnnotationReader; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Tools\SchemaTool; -use Doctrine\Persistence\Mapping\Driver\MappingDriverChain; use Eccube\Doctrine\ORM\Mapping\Driver\NopAnnotationDriver; use Eccube\Doctrine\ORM\Mapping\Driver\ReloadSafeAnnotationDriver; use Eccube\Util\StringUtil; -use Doctrine\DBAL; use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\Finder\Finder; -use Doctrine\Bundle\DoctrineBundle\Mapping\MappingDriver; class SchemaService { @@ -71,9 +68,9 @@ public function executeCallback(callable $callback, $generatedFiles, $proxiesDir } try { - /** @var MappingDriver $mappingDriver */ + /** @var \Doctrine\Bundle\DoctrineBundle\Mapping\MappingDriver $mappingDriver */ $mappingDriver = $this->entityManager->getConfiguration()->getMetadataDriverImpl(); - /** @var MappingDriverChain $driverChain */ + /** @var \Doctrine\Persistence\Mapping\Driver\MappingDriverChain $driverChain */ $driverChain = $mappingDriver->getDriver(); $drivers = $driverChain->getDrivers(); /** @@ -144,9 +141,9 @@ public function updateSchema($generatedFiles, $proxiesDirectory, $saveMode = fal */ public function dropTable($targetNamespace) { - /** @var MappingDriver $mappingDriver */ + /** @var \Doctrine\Bundle\DoctrineBundle\Mapping\MappingDriver $mappingDriver */ $mappingDriver = $this->entityManager->getConfiguration()->getMetadataDriverImpl(); - /** @var MappingDriverChain $driverChain */ + /** @var \Doctrine\Persistence\Mapping\Driver\MappingDriverChain $driverChain */ $driverChain = $mappingDriver->getDriver(); $drivers = $driverChain->getDrivers(); From 89a1e3a3b2b09511a649a5d5f7036e2d98c7ef9f Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 17:09:08 +0900 Subject: [PATCH 81/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=82=92=E6=B6=88?= =?UTF-8?q?=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Service/SchemaService.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Eccube/Service/SchemaService.php b/src/Eccube/Service/SchemaService.php index d02c77850a2..ff7645041de 100644 --- a/src/Eccube/Service/SchemaService.php +++ b/src/Eccube/Service/SchemaService.php @@ -52,7 +52,7 @@ public function __construct(EntityManagerInterface $entityManager, PluginContext * Metadata を出力する一時ディレクトリを指定しない場合は内部で生成し, コールバック関数実行後に削除されます. * * @param callable $callback Metadata を生成した後に実行されるコールバック関数 - * @param array $generatedFiles Proxy ファイルパスの配列 + * @param array $generatedFiles Proxy ファイルパスの配列 * @param string $proxiesDirectory Proxy ファイルを格納したディレクトリ * @param string $outputDir Metadata の出力先ディレクトリ * @@ -119,7 +119,7 @@ public function executeCallback(callable $callback, $generatedFiles, $proxiesDir /** * Doctrine Metadata を生成して UpdateSchema を実行する. * - * @param array $generatedFiles Proxy ファイルパスの配列 + * @param array $generatedFiles Proxy ファイルパスの配列 * @param string $proxiesDirectory Proxy ファイルを格納したディレクトリ * @param bool $saveMode UpdateSchema を即時実行する場合 true * From 90f08178313936c9d8d76c5200cd89c9fd2f88b1 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 17:13:02 +0900 Subject: [PATCH 82/90] =?UTF-8?q?PurchaseContext=E3=81=AE=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E3=82=92=E5=85=83=E3=81=AE=E7=8A=B6=E6=85=8B=E3=81=AB?= =?UTF-8?q?=E6=88=BB=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Service/PurchaseFlow/PurchaseContext.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Eccube/Service/PurchaseFlow/PurchaseContext.php b/src/Eccube/Service/PurchaseFlow/PurchaseContext.php index aec6586888e..d4ee855e911 100644 --- a/src/Eccube/Service/PurchaseFlow/PurchaseContext.php +++ b/src/Eccube/Service/PurchaseFlow/PurchaseContext.php @@ -36,9 +36,9 @@ class PurchaseContext extends \SplObjectStorage /** * @param ItemHolderInterface|null $originHolder - * @param UserInterface|Customer|null $user + * @param Customer|null $user */ - public function __construct(ItemHolderInterface $originHolder = null, ?UserInterface $user = null) + public function __construct(ItemHolderInterface $originHolder = null, ?Customer $user = null) { $this->originHolder = $originHolder; $this->user = $user; From c001291d56985012f323514b87795715280e2ad4 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 17:13:51 +0900 Subject: [PATCH 83/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=81=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Service/PurchaseFlow/PurchaseContext.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Eccube/Service/PurchaseFlow/PurchaseContext.php b/src/Eccube/Service/PurchaseFlow/PurchaseContext.php index d4ee855e911..8c2e4b1683b 100644 --- a/src/Eccube/Service/PurchaseFlow/PurchaseContext.php +++ b/src/Eccube/Service/PurchaseFlow/PurchaseContext.php @@ -15,7 +15,6 @@ use Eccube\Entity\Customer; use Eccube\Entity\ItemHolderInterface; -use Symfony\Component\Security\Core\User\UserInterface; /** * PurchaseFlowの実行中コンテキスト. From acf549e73e115e07c6dbccdb09479b24bb9a2855 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 17:21:23 +0900 Subject: [PATCH 84/90] =?UTF-8?q?=E4=B8=8D=E8=A6=81use=E3=81=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Service/TwoFactorAuthService.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Eccube/Service/TwoFactorAuthService.php b/src/Eccube/Service/TwoFactorAuthService.php index fa0988eac66..3bfae775e3e 100644 --- a/src/Eccube/Service/TwoFactorAuthService.php +++ b/src/Eccube/Service/TwoFactorAuthService.php @@ -14,8 +14,6 @@ namespace Eccube\Service; use Eccube\Common\EccubeConfig; -use Eccube\Entity\Member; -use Eccube\Security\Core\Encoder\PasswordEncoder; use RobThree\Auth\TwoFactorAuth; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\Cookie; @@ -23,7 +21,6 @@ use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactoryInterface; use Symfony\Component\PasswordHasher\PasswordHasherInterface; -use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; class TwoFactorAuthService { @@ -114,7 +111,7 @@ public function __construct( } /** - * @param Member $Member + * @param \Eccube\Entity\Member $Member * * @return boolean */ @@ -122,7 +119,7 @@ public function isAuth($Member) { if (($json = $this->request->cookies->get($this->cookieName))) { $configs = json_decode($json); - /** @var PasswordEncoder $encoder */ + /** @var \Eccube\Security\Core\Encoder\PasswordEncoder $encoder */ $encoder = $this->encoder; $encodedString = $encoder->encodePassword($Member->getId().$Member->getTwoFactorAuthKey(), $Member->getSalt()); if ( @@ -144,13 +141,13 @@ public function isAuth($Member) } /** - * @param Member $Member + * @param \Eccube\Entity\Member $Member * * @return Cookie */ public function createAuthedCookie($Member) { - /** @var PasswordEncoder $encoder */ + /** @var \Eccube\Security\Core\Encoder\PasswordEncoder $encoder */ $encoder = $this->encoder; $encodedString = $encoder->encodePassword($Member->getId().$Member->getTwoFactorAuthKey(), $Member->getSalt()); From 9c3b4cc54430abd93bac686157260e18166f7bf1 Mon Sep 17 00:00:00 2001 From: Piers Gillingham Date: Wed, 8 Nov 2023 18:09:03 +0900 Subject: [PATCH 85/90] =?UTF-8?q?.gitkeep=E3=81=AE=E5=BE=A9=E5=85=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/template/admin/.gitkeep | 0 app/template/default/.gitkeep | 0 app/template/smartphone/.gitkeep | 0 app/template/user_data/.gitkeep | 0 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/template/admin/.gitkeep create mode 100644 app/template/default/.gitkeep create mode 100644 app/template/smartphone/.gitkeep create mode 100644 app/template/user_data/.gitkeep diff --git a/app/template/admin/.gitkeep b/app/template/admin/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d diff --git a/app/template/default/.gitkeep b/app/template/default/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d diff --git a/app/template/smartphone/.gitkeep b/app/template/smartphone/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d diff --git a/app/template/user_data/.gitkeep b/app/template/user_data/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d From d0dcc809332e2b1cedc28f70810caa6ab6ca8f29 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: Wed, 8 Nov 2023 18:28:13 +0900 Subject: [PATCH 86/90] =?UTF-8?q?=E7=B7=8A=E6=80=A5=E4=BF=AE=E6=AD=A3=20Sa?= =?UTF-8?q?meSiteNoneCompatSessionHandler.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Handler/SameSiteNoneCompatSessionHandler.php | 15 ++++++++++----- tests/Fixtures/session/common.php | 12 ++++++++---- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php b/src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php index c382fe55aba..f57b4d601c6 100644 --- a/src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php +++ b/src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php @@ -46,7 +46,8 @@ public function __construct(\SessionHandlerInterface $handler) /** * {@inheritdoc} */ - public function open($savePath, $sessionName): bool + #[\ReturnTypeWillChange] + public function open($savePath, $sessionName) { $this->sessionName = $sessionName; // see https://github.com/symfony/symfony/blob/2adc85d49cbe14e346068fa7e9c2e1f08ab31de6/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/AbstractSessionHandler.php#L35-L37 @@ -68,7 +69,8 @@ protected function doRead($sessionId) /** * {@inheritdoc} */ - public function updateTimestamp($sessionId, $data): bool + #[\ReturnTypeWillChange] + public function updateTimestamp($sessionId, $data) { return $this->write($sessionId, $data); } @@ -86,7 +88,8 @@ 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): bool + #[\ReturnTypeWillChange] + public function destroy($sessionId) { if (\PHP_VERSION_ID < 70000) { $this->prefetchData = null; @@ -152,7 +155,8 @@ protected function doDestroy($sessionId) /** * {@inheritdoc} */ - public function close(): bool + #[\ReturnTypeWillChange] + public function close() { return $this->handler->close(); } @@ -160,7 +164,8 @@ public function close(): bool /** * @return false|int */ - public function gc($maxlifetime): int|false + #[\ReturnTypeWillChange] + public function gc($maxlifetime) { return $this->handler->gc($maxlifetime); } diff --git a/tests/Fixtures/session/common.php b/tests/Fixtures/session/common.php index 87c0d38e84b..2ed84721cd4 100644 --- a/tests/Fixtures/session/common.php +++ b/tests/Fixtures/session/common.php @@ -111,7 +111,7 @@ public function open($path, $name) return parent::open($path, $name); } - + #[\ReturnTypeWillChange] public function validateId($sessionId) { echo __FUNCTION__, "\n"; @@ -122,6 +122,7 @@ public function validateId($sessionId) /** * {@inheritdoc} */ + #[\ReturnTypeWillChange] public function read($sessionId) { echo __FUNCTION__, "\n"; @@ -132,6 +133,7 @@ public function read($sessionId) /** * {@inheritdoc} */ + #[\ReturnTypeWillChange] public function updateTimestamp($sessionId, $data) { echo __FUNCTION__, "\n"; @@ -142,6 +144,7 @@ public function updateTimestamp($sessionId, $data) /** * {@inheritdoc} */ + #[\ReturnTypeWillChange] public function write($sessionId, $data) { echo __FUNCTION__, "\n"; @@ -152,20 +155,21 @@ public function write($sessionId, $data) /** * {@inheritdoc} */ + #[\ReturnTypeWillChange] public function destroy($sessionId) { echo __FUNCTION__, "\n"; return parent::destroy($sessionId); } - - public function close() + #[\ReturnTypeWillChange] + public function close(): bool { echo __FUNCTION__, "\n"; return true; } - + #[\ReturnTypeWillChange] public function gc($maxLifetime) { echo __FUNCTION__, "\n"; From b38805355c458690d471d6de6f8e390a71e20931 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: Wed, 8 Nov 2023 18:34:04 +0900 Subject: [PATCH 87/90] =?UTF-8?q?:=20bool=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/Fixtures/session/common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Fixtures/session/common.php b/tests/Fixtures/session/common.php index 2ed84721cd4..a67b4965124 100644 --- a/tests/Fixtures/session/common.php +++ b/tests/Fixtures/session/common.php @@ -163,7 +163,7 @@ public function destroy($sessionId) return parent::destroy($sessionId); } #[\ReturnTypeWillChange] - public function close(): bool + public function close() { echo __FUNCTION__, "\n"; From cbf10f3e78496caf41a779a979a5f2c858732bd0 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: Mon, 13 Nov 2023 10:29:41 +0900 Subject: [PATCH 88/90] =?UTF-8?q?GitHub=E3=82=B3=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Controller/Admin/AdminController.php | 6 ++---- src/Eccube/Controller/Admin/Product/CsvImportController.php | 2 +- src/Eccube/Entity/CartItem.php | 2 +- src/Eccube/Entity/Customer.php | 4 ++-- src/Eccube/Entity/Layout.php | 2 +- src/Eccube/Entity/Payment.php | 2 +- src/Eccube/Repository/AbstractRepository.php | 2 +- src/Eccube/Repository/OrderPdfRepository.php | 2 +- src/Eccube/Service/PluginApiService.php | 2 +- 9 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/Eccube/Controller/Admin/AdminController.php b/src/Eccube/Controller/Admin/AdminController.php index bd69c4d142f..e585a9f6358 100644 --- a/src/Eccube/Controller/Admin/AdminController.php +++ b/src/Eccube/Controller/Admin/AdminController.php @@ -21,7 +21,6 @@ use Eccube\Entity\Master\CustomerStatus; use Eccube\Entity\Master\OrderStatus; use Eccube\Entity\Master\ProductStatus; -use Eccube\Entity\Member; use Eccube\Entity\ProductStock; use Eccube\Event\EccubeEvents; use Eccube\Event\EventArgs; @@ -33,7 +32,6 @@ use Eccube\Repository\MemberRepository; use Eccube\Repository\OrderRepository; use Eccube\Repository\ProductRepository; -use Eccube\Security\Core\Encoder\PasswordEncoder; use Eccube\Service\PluginApiService; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Component\HttpFoundation\Request; @@ -341,11 +339,11 @@ public function changePassword(Request $request) $form->handleRequest($request); if ($form->isSubmitted() && $form->isValid()) { - /** @var Member $Member */ + /** @var \Eccube\Entity\Member $Member */ $Member = $this->getUser(); $salt = $Member->getSalt(); $password = $form->get('change_password')->getData(); - /** @var PasswordEncoder $encoder */ + /** @var \Eccube\Security\Core\Encoder\PasswordEncoder $encoder */ $encoder = $this->encoderFactory->getEncoder($Member); // 2系からのデータ移行でsaltがセットされていない場合はsaltを生成. diff --git a/src/Eccube/Controller/Admin/Product/CsvImportController.php b/src/Eccube/Controller/Admin/Product/CsvImportController.php index 37ef0966cfe..14f755eeba2 100644 --- a/src/Eccube/Controller/Admin/Product/CsvImportController.php +++ b/src/Eccube/Controller/Admin/Product/CsvImportController.php @@ -879,7 +879,7 @@ public function csvTemplate(Request $request, $type) * @param array $headers * @param bool $rollback * - * @return JsonResponse|array + * @return \Symfony\Component\HttpFoundation\JsonResponse|array * * @throws \Doctrine\DBAL\ConnectionException */ diff --git a/src/Eccube/Entity/CartItem.php b/src/Eccube/Entity/CartItem.php index ce9f5341a24..de950b0f690 100644 --- a/src/Eccube/Entity/CartItem.php +++ b/src/Eccube/Entity/CartItem.php @@ -46,7 +46,7 @@ class CartItem extends \Eccube\Entity\AbstractEntity implements ItemInterface private $price = 0; /** - * @var string|float + * @var string|float|int * * @ORM\Column(name="quantity", type="decimal", precision=10, scale=0, options={"default":0}) */ diff --git a/src/Eccube/Entity/Customer.php b/src/Eccube/Entity/Customer.php index 1906a8ba1dd..f5439b2533a 100644 --- a/src/Eccube/Entity/Customer.php +++ b/src/Eccube/Entity/Customer.php @@ -159,14 +159,14 @@ class Customer extends \Eccube\Entity\AbstractEntity implements UserInterface, \ private $last_buy_date; /** - * @var float|string|null + * @var float|string|int|null * * @ORM\Column(name="buy_times", type="decimal", precision=10, scale=0, nullable=true, options={"unsigned":true,"default":0}) */ private $buy_times = 0; /** - * @var float|string|null + * @var float|string|int|null * * @ORM\Column(name="buy_total", type="decimal", precision=12, scale=2, nullable=true, options={"unsigned":true,"default":0}) */ diff --git a/src/Eccube/Entity/Layout.php b/src/Eccube/Entity/Layout.php index 8ba90be088a..8fe70b91c2b 100644 --- a/src/Eccube/Entity/Layout.php +++ b/src/Eccube/Entity/Layout.php @@ -123,7 +123,7 @@ public function getBlocks($targetId = null) /** * @param integer $targetId * - * @return BlockPosition[]|Collection + * @return BlockPosition[]|Collection */ public function getBlockPositionsByTargetId($targetId) { diff --git a/src/Eccube/Entity/Payment.php b/src/Eccube/Entity/Payment.php index 74bb6482335..f1debae726d 100644 --- a/src/Eccube/Entity/Payment.php +++ b/src/Eccube/Entity/Payment.php @@ -52,7 +52,7 @@ public function __toString() private $method; /** - * @var float|string|null + * @var float|string|int|null * * @ORM\Column(name="charge", type="decimal", precision=12, scale=2, nullable=true, options={"unsigned":true,"default":0}) */ diff --git a/src/Eccube/Repository/AbstractRepository.php b/src/Eccube/Repository/AbstractRepository.php index 196bc251ccf..e8f28df4415 100644 --- a/src/Eccube/Repository/AbstractRepository.php +++ b/src/Eccube/Repository/AbstractRepository.php @@ -19,7 +19,7 @@ abstract class AbstractRepository extends ServiceEntityRepository { /** - * @var EccubeConfig + * @var \Eccube\Common\EccubeConfig $eccubeConfig */ protected $eccubeConfig; diff --git a/src/Eccube/Repository/OrderPdfRepository.php b/src/Eccube/Repository/OrderPdfRepository.php index 5fea00749fa..8ff96270c4d 100644 --- a/src/Eccube/Repository/OrderPdfRepository.php +++ b/src/Eccube/Repository/OrderPdfRepository.php @@ -34,7 +34,7 @@ public function __construct(RegistryInterface $registry) /** * Save admin history. * - * @param AbstractEntity|array $arrData + * @param AbstractEntity $arrData * * @return bool */ diff --git a/src/Eccube/Service/PluginApiService.php b/src/Eccube/Service/PluginApiService.php index a890ba5b9c3..2b0617abda1 100644 --- a/src/Eccube/Service/PluginApiService.php +++ b/src/Eccube/Service/PluginApiService.php @@ -265,7 +265,7 @@ private function updatePluginStatus($url, Plugin $Plugin) * @param string $url * @param array $data * - * @return bool + * @return bool|string * * @throws PluginApiException */ From a3fd9d921a1943d1db44a05fb420926c50ad72e4 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: Mon, 13 Nov 2023 12:09:17 +0900 Subject: [PATCH 89/90] =?UTF-8?q?CsvImportController.php=E3=81=AE=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Controller/Admin/Product/CsvImportController.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Eccube/Controller/Admin/Product/CsvImportController.php b/src/Eccube/Controller/Admin/Product/CsvImportController.php index 14f755eeba2..f0f2674c55d 100644 --- a/src/Eccube/Controller/Admin/Product/CsvImportController.php +++ b/src/Eccube/Controller/Admin/Product/CsvImportController.php @@ -46,7 +46,6 @@ use Symfony\Component\Form\FormInterface; use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpFoundation\StreamedResponse; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -673,7 +672,7 @@ public function csvProduct(Request $request, CacheUtil $cacheUtil) log_info('商品CSV登録完了'); if (!$this->isSplitCsv) { $message = 'admin.common.csv_upload_complete'; - /** @var Session $session */ + /** @var \Symfony\Component\HttpFoundation\Session\Session $session */ $session = $this->session; $session->getFlashBag()->add('eccube.admin.success', $message); } @@ -836,7 +835,7 @@ public function csvCategory(Request $request, CacheUtil $cacheUtil) $this->entityManager->getConnection()->commit(); log_info('カテゴリCSV登録完了'); $message = 'admin.common.csv_upload_complete'; - /** @var Session $session */ + /** @var \Symfony\Component\HttpFoundation\Session\Session $session */ $session = $this->session; $session->getFlashBag()->add('eccube.admin.success', $message); From 293cb2b716cc3440010ddc463b59e5ba093ab0a9 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: Mon, 13 Nov 2023 19:13:12 +0900 Subject: [PATCH 90/90] =?UTF-8?q?=E5=8D=98=E4=BD=93=E3=83=86=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=81=AE=E8=BF=BD=E5=8A=A0=EF=BC=88=E3=83=AC=E3=83=99?= =?UTF-8?q?=E3=83=AB3=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tests/Mock/CsrfTokenManagerMock.php | 8 ++-- .../Tests/Web/AbstractControllerTest.php | 43 ++++++++++++++++++ .../Web/Admin/Content/PageControllerTest.php | 45 +++++++++++++++++++ .../Setting/System/LogControllerTest.php | 15 ++++++- 4 files changed, 106 insertions(+), 5 deletions(-) create mode 100644 tests/Eccube/Tests/Web/AbstractControllerTest.php diff --git a/tests/Eccube/Tests/Mock/CsrfTokenManagerMock.php b/tests/Eccube/Tests/Mock/CsrfTokenManagerMock.php index c873bd87dd5..7b94167ac2e 100644 --- a/tests/Eccube/Tests/Mock/CsrfTokenManagerMock.php +++ b/tests/Eccube/Tests/Mock/CsrfTokenManagerMock.php @@ -26,7 +26,7 @@ class CsrfTokenManagerMock implements CsrfTokenManagerInterface /** * {@inheritdoc} */ - public function getToken($tokenId) + public function getToken($tokenId): \Symfony\Component\Security\Csrf\CsrfToken { return new CsrfToken($tokenId, null); } @@ -34,7 +34,7 @@ public function getToken($tokenId) /** * {@inheritdoc} */ - public function refreshToken($tokenId) + public function refreshToken($tokenId): \Symfony\Component\Security\Csrf\CsrfToken { return new CsrfToken($tokenId, null); } @@ -42,7 +42,7 @@ public function refreshToken($tokenId) /** * {@inheritdoc} */ - public function removeToken($tokenId) + public function removeToken($tokenId): null|string { return null; } @@ -50,7 +50,7 @@ public function removeToken($tokenId) /** * {@inheritdoc} */ - public function isTokenValid(CsrfToken $token) + public function isTokenValid(CsrfToken $token): bool { return true; } diff --git a/tests/Eccube/Tests/Web/AbstractControllerTest.php b/tests/Eccube/Tests/Web/AbstractControllerTest.php new file mode 100644 index 00000000000..03201d5ba17 --- /dev/null +++ b/tests/Eccube/Tests/Web/AbstractControllerTest.php @@ -0,0 +1,43 @@ +client; + $mock = new AbstractControllerMock(); + /** @var Session $session */ + $session = $this->client->getContainer()->get('session'); + $mock->setSession($session); + $mock->setLoginTargetPath($this->generateUrl('mypage', [], UrlGeneratorInterface::ABSOLUTE_URL),"aaaa"); + $this->assertNotNull($session); + } +} +class AbstractControllerMock extends AbstractController{ + +} diff --git a/tests/Eccube/Tests/Web/Admin/Content/PageControllerTest.php b/tests/Eccube/Tests/Web/Admin/Content/PageControllerTest.php index e61780be1e4..8b969edef42 100644 --- a/tests/Eccube/Tests/Web/Admin/Content/PageControllerTest.php +++ b/tests/Eccube/Tests/Web/Admin/Content/PageControllerTest.php @@ -276,4 +276,49 @@ public function testAdminContentPageDuplicateWithEditTypeUser() unlink($templatePath.'/'.$Page->getFileName().'.twig'); } } + + public function testUntestedAbstractControllerFunctions() + { + $client = $this->client; + $redirectUrl = $this->generateUrl('admin_content_page'); + $faker = $this->getFaker(); + $client->request('DELETE', + $this->generateUrl( + 'admin_content_page_delete', + ['id' => 5999999999] + ) + ); + + $actual = $this->client->getResponse()->isRedirect($redirectUrl); + + $this->assertTrue($actual); + + $templatePath = static::getContainer()->getParameter('eccube_theme_user_data_dir'); + + $name = $faker->word; + $source = $faker->realText(); + $client->request( + 'POST', + $this->generateUrl( + 'admin_content_page_new' + ), + [ + 'main_edit' => [ + 'name' => $name, + 'url' => $name, + 'file_name' => $name, + 'tpl_data' => $source, + '_token' => 'dummy', + ], + ] + ); + + $this->assertTrue($client->getResponse()->isRedirection()); + preg_match('|content/page/([0-9]+)/edit|', $client->getResponse()->headers->get('Location'), $matches); + $Page = $this->entityManager->getRepository(\Eccube\Entity\Page::class)->find($matches[1]); + + $this->expected = $name; + $this->actual = $Page->getName(); + $this->verify(); + } } diff --git a/tests/Eccube/Tests/Web/Admin/Setting/System/LogControllerTest.php b/tests/Eccube/Tests/Web/Admin/Setting/System/LogControllerTest.php index c42645a3fff..b8bf36f604c 100644 --- a/tests/Eccube/Tests/Web/Admin/Setting/System/LogControllerTest.php +++ b/tests/Eccube/Tests/Web/Admin/Setting/System/LogControllerTest.php @@ -40,7 +40,7 @@ protected function setUp(): void $logDir = static::getContainer()->getParameter('kernel.logs_dir'); - $this->logTest = $logDir.'/'.$this->formData['files']; + $this->logTest = $logDir.'/test/'.$this->formData['files']; if (!file_exists($this->logTest)) { file_put_contents($this->logTest, 'test'); @@ -69,6 +69,19 @@ public function testRoutingAdminSettingSystemLog() ); $this->assertTrue($this->client->getResponse()->isSuccessful()); } + /** + * Download Button Click処理 + */ + public function testDownloadButtonClick() + { + $this->formData['download'] = null; + $this->client->request( + 'POST', + $this->generateUrl('admin_setting_system_log'), + ['admin_system_log' => $this->formData] + ); + $this->assertTrue($this->client->getResponse()->isSuccessful()); + } /** * change log