From bf41786db88ca54e640beae71dbd1dea31afdcfe Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Fri, 29 Dec 2023 10:45:28 +0100 Subject: [PATCH] chore: Update friendsofphp/php-cs-fixer to 3.43.1 --- .../FacetResult/FacetResultGroup.php | 2 +- .../SearchBundleES/ProductNumberSearch.php | 2 +- .../Struct/Configurator/Option.php | 2 +- .../Shopware/Components/Routing/Context.php | 4 +- engine/Shopware/Components/Routing/Router.php | 2 +- engine/Shopware/Models/Article/Unit.php | 6 +-- engine/Shopware/Models/Country/Area.php | 4 +- engine/Shopware/Models/Plugin/Plugin.php | 40 +++++++++++-------- engine/Shopware/Models/Voucher/Voucher.php | 6 +-- ...sPseudoPriceConditionCustomerGroupTest.php | 2 +- vendor-bin/cs-fixer/composer.json | 2 +- vendor-bin/cs-fixer/composer.lock | 16 ++++---- 12 files changed, 47 insertions(+), 41 deletions(-) diff --git a/engine/Shopware/Bundle/SearchBundle/FacetResult/FacetResultGroup.php b/engine/Shopware/Bundle/SearchBundle/FacetResult/FacetResultGroup.php index 6d886d77347..944293fba23 100644 --- a/engine/Shopware/Bundle/SearchBundle/FacetResult/FacetResultGroup.php +++ b/engine/Shopware/Bundle/SearchBundle/FacetResult/FacetResultGroup.php @@ -114,7 +114,7 @@ public function getTemplate() } /** - * @param \Shopware\Bundle\SearchBundle\FacetResultInterface[] $facetResults + * @param FacetResultInterface[] $facetResults */ public function setFacetResults(array $facetResults) { diff --git a/engine/Shopware/Bundle/SearchBundleES/ProductNumberSearch.php b/engine/Shopware/Bundle/SearchBundleES/ProductNumberSearch.php index 3fd48da7fa5..737e79d03bc 100644 --- a/engine/Shopware/Bundle/SearchBundleES/ProductNumberSearch.php +++ b/engine/Shopware/Bundle/SearchBundleES/ProductNumberSearch.php @@ -150,7 +150,7 @@ private function addCriteriaParts( /** * @param array[] $data * - * @return \Shopware\Bundle\StoreFrontBundle\Struct\BaseProduct[] + * @return BaseProduct[] */ private function createProducts(array $data): array { diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Option.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Option.php index 2033075017f..d53e0988385 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Option.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Option.php @@ -102,7 +102,7 @@ public function setSelected($selected) } /** - * @return \Shopware\Bundle\StoreFrontBundle\Struct\Media|null + * @return Media|null */ public function getMedia() { diff --git a/engine/Shopware/Components/Routing/Context.php b/engine/Shopware/Components/Routing/Context.php index 6e4e0b7b969..308640f89a5 100644 --- a/engine/Shopware/Components/Routing/Context.php +++ b/engine/Shopware/Components/Routing/Context.php @@ -51,7 +51,7 @@ class Context implements JsonSerializable protected $baseFile = 'shopware.php'; /** - * @see \Enlight_Controller_Request_Request::getHttpHost + * @see EnlightRequest::getHttpHost * * @var string */ @@ -90,7 +90,7 @@ class Context implements JsonSerializable /** * Module keys for retrieving module from params * - * @see \Enlight_Controller_Request_Request::$_moduleKey + * @see EnlightRequest::$_moduleKey * * @var string */ diff --git a/engine/Shopware/Components/Routing/Router.php b/engine/Shopware/Components/Routing/Router.php index f12e63051f6..83b89fe9ffc 100644 --- a/engine/Shopware/Components/Routing/Router.php +++ b/engine/Shopware/Components/Routing/Router.php @@ -295,7 +295,7 @@ public function route(EnlightRequest $request) * Sets a global parameter. * * @see \Shopware_Controllers_Backend_Newsletter::initMailing - * @see \Enlight_Controller_Router::setGlobalParam + * @see EnlightRouter::setGlobalParam * * @param string $name * @param string $value diff --git a/engine/Shopware/Models/Article/Unit.php b/engine/Shopware/Models/Article/Unit.php index 675f7365298..4e653254e99 100644 --- a/engine/Shopware/Models/Article/Unit.php +++ b/engine/Shopware/Models/Article/Unit.php @@ -36,7 +36,7 @@ class Unit extends ModelEntity /** * INVERSE SIDE * - * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Article\Detail> + * @var ArrayCollection * * @ORM\OneToMany(targetEntity="Shopware\Models\Article\Detail", mappedBy="unit") */ @@ -119,7 +119,7 @@ public function getName() } /** - * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Article\Detail> + * @return ArrayCollection */ public function getArticles() { @@ -127,7 +127,7 @@ public function getArticles() } /** - * @param \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Article\Detail>|null $articles + * @param ArrayCollection|null $articles */ public function setArticles($articles) { diff --git a/engine/Shopware/Models/Country/Area.php b/engine/Shopware/Models/Country/Area.php index 876573e9aaf..6624890e9f8 100644 --- a/engine/Shopware/Models/Country/Area.php +++ b/engine/Shopware/Models/Country/Area.php @@ -38,7 +38,7 @@ class Area extends ModelEntity * The countries property is the inverse side of the association between area and countries. * The association is joined over the area id field and the areaID field of the country. * - * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Country\Country> + * @var ArrayCollection * * @ORM\OneToMany(targetEntity="Shopware\Models\Country\Country", mappedBy="area", orphanRemoval=true, cascade={"persist"}) */ @@ -121,7 +121,7 @@ public function getActive() } /** - * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Country\Country> + * @return ArrayCollection */ public function getCountries() { diff --git a/engine/Shopware/Models/Plugin/Plugin.php b/engine/Shopware/Models/Plugin/Plugin.php index de4af6f3f0b..b32a72a9438 100644 --- a/engine/Shopware/Models/Plugin/Plugin.php +++ b/engine/Shopware/Models/Plugin/Plugin.php @@ -28,6 +28,12 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Mapping as ORM; use Shopware\Components\Model\ModelEntity; +use Shopware\Models\Config\Form; +use Shopware\Models\Emotion\Library\Component; +use Shopware\Models\Menu\Menu; +use Shopware\Models\Payment\Payment; +use Shopware\Models\Shop\Template; +use Shopware\Models\Widget\Widget; /** * @ORM\Table(name="s_core_plugins") @@ -36,7 +42,7 @@ class Plugin extends ModelEntity { /** - * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Emotion\Library\Component> + * @var ArrayCollection * * @ORM\OneToMany(targetEntity="Shopware\Models\Emotion\Library\Component", mappedBy="plugin", orphanRemoval=true, cascade={"all"}) */ @@ -222,7 +228,7 @@ class Plugin extends ModelEntity /** * INVERSE SIDE * - * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Config\Form> + * @var ArrayCollection
* * @ORM\OneToMany(targetEntity="\Shopware\Models\Config\Form", mappedBy="plugin", cascade={"all"}) * @ORM\JoinColumn(name="id", referencedColumnName="plugin_id") @@ -233,7 +239,7 @@ class Plugin extends ModelEntity /** * INVERSE SIDE * - * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Menu\Menu> + * @var ArrayCollection * * @ORM\OneToMany(targetEntity="\Shopware\Models\Menu\Menu", mappedBy="plugin", cascade={"all"}) * @ORM\JoinColumn(name="id", referencedColumnName="pluginID") @@ -244,7 +250,7 @@ class Plugin extends ModelEntity /** * INVERSE SIDE * - * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Payment\Payment> + * @var ArrayCollection * * @ORM\OneToMany(targetEntity="\Shopware\Models\Payment\Payment", mappedBy="plugin", cascade={"all"}) * @ORM\JoinColumn(name="id", referencedColumnName="pluginID") @@ -255,7 +261,7 @@ class Plugin extends ModelEntity /** * INVERSE SIDE * - * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Shop\Template> + * @var ArrayCollection