chore: Update friendsofphp/php-cs-fixer to 3.43.1

shopware5 · Dec 29, 2023 · bf41786 · bf41786
1 parent ce5d3e8
commit bf41786
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 41 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -36,7 +36,7 @@ class Unit extends ModelEntity
     /**
      * INVERSE SIDE
      *
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Article\Detail>
+     * @var ArrayCollection<Detail>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Article\Detail", mappedBy="unit")
      */
@@ -119,15 +119,15 @@ public function getName()
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Article\Detail>
+     * @return ArrayCollection<Detail>
      */
     public function getArticles()
     {
         return $this->articles;
     }
 
     /**
-     * @param \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Article\Detail>|null $articles
+     * @param ArrayCollection<Detail>|null $articles
      */
     public function setArticles($articles)
     {

diff --git 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<Country>
      *
      * @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<Country>
      */
     public function getCountries()
     {

diff --git 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<Component>
      *
      * @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<Form>
      *
      * @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<Menu>
      *
      * @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<Payment>
      *
      * @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<Template>
      *
      * @ORM\OneToMany(targetEntity="\Shopware\Models\Shop\Template", mappedBy="plugin", cascade={"all"})
      * @ORM\JoinColumn(name="id", referencedColumnName="plugin_id")
@@ -266,7 +272,7 @@ class Plugin extends ModelEntity
     /**
      * INVERSE SIDE
      *
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Widget\Widget>
+     * @var ArrayCollection<Widget>
      *
      * @ORM\OneToMany(targetEntity="\Shopware\Models\Widget\Widget", mappedBy="plugin", cascade={"all"})
      * @ORM\JoinColumn(name="id", referencedColumnName="plugin_id")
@@ -275,7 +281,7 @@ class Plugin extends ModelEntity
     private $widgets;
 
     /**
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Plugin\License>
+     * @var ArrayCollection<License>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Plugin\License", mappedBy="plugin")
      * @ORM\OrderBy({"type" = "ASC"})
@@ -571,79 +577,79 @@ public function setLink($link)
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Config\Form>
+     * @return ArrayCollection<Form>
      */
     public function getConfigForms()
     {
         return $this->configForms;
     }
 
     /**
-     * @param \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Config\Form> $configForms
+     * @param ArrayCollection<Form> $configForms
      */
     public function setConfigForms($configForms)
     {
         $this->configForms = $configForms;
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Menu\Menu>
+     * @return ArrayCollection<Menu>
      */
     public function getMenuItems()
     {
         return $this->menuItems;
     }
 
     /**
-     * @param \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Menu\Menu> $menuItems
+     * @param ArrayCollection<Menu> $menuItems
      */
     public function setMenuItems($menuItems)
     {
         $this->menuItems = $menuItems;
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Payment\Payment>
+     * @return ArrayCollection<Payment>
      */
     public function getPayments()
     {
         return $this->payments;
     }
 
     /**
-     * @param \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Payment\Payment> $payments
+     * @param ArrayCollection<Payment> $payments
      */
     public function setPayments($payments)
     {
         $this->payments = $payments;
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Shop\Template>
+     * @return ArrayCollection<Template>
      */
     public function getTemplates()
     {
         return $this->templates;
     }
 
     /**
-     * @param \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Shop\Template> $templates
+     * @param ArrayCollection<Template> $templates
      */
     public function setTemplates($templates)
     {
         $this->templates = $templates;
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Plugin\License>
+     * @return ArrayCollection<License>
      */
     public function getLicenses()
     {
         return $this->licenses;
     }
 
     /**
-     * @param \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Plugin\License> $licenses
+     * @param ArrayCollection<License> $licenses
      */
     public function setLicenses($licenses)
     {

diff --git a/engine/Shopware/Models/Voucher/Voucher.php b/engine/Shopware/Models/Voucher/Voucher.php
@@ -40,7 +40,7 @@ class Voucher extends ModelEntity
     /**
      * INVERSE SIDE
      *
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Voucher\Code>
+     * @var ArrayCollection<Code>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Voucher\Code", mappedBy="voucher", orphanRemoval=true, cascade={"persist"})
      */
@@ -651,15 +651,15 @@ public function getTaxConfig()
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Voucher\Code>
+     * @return ArrayCollection<Code>
      */
     public function getCodes()
     {
         return $this->codes;
     }
 
     /**
-     * @param \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Voucher\Code>|array|null $codes
+     * @param ArrayCollection<Code>|array|null $codes
      *
      * @return Voucher
      */

diff --git a/tests/Functional/Bundle/SearchBundle/Condition/HasPseudoPriceConditionCustomerGroupTest.php b/tests/Functional/Bundle/SearchBundle/Condition/HasPseudoPriceConditionCustomerGroupTest.php
@@ -52,7 +52,7 @@ class HasPseudoPriceConditionCustomerGroupTest extends TestCase
     protected Converter $converter;
 
     /**
-     * @var \Shopware\Models\Article\Configurator\Group[]
+     * @var Group[]
      */
     private array $groups = [];
 

diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json
@@ -1,6 +1,6 @@
 {
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "3.42.0",
+        "friendsofphp/php-cs-fixer": "3.43.1",
         "kubawerlos/php-cs-fixer-custom-fixers": "3.17.1"
     },
     "sort-packages": true

diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,7 +114,7 @@ public function getTemplate() @@
         }
         /**
-         * @param \Shopware\Bundle\SearchBundle\FacetResultInterface[] $facetResults
+         * @param FacetResultInterface[] $facetResults
          */
         public function setFacetResults(array $facetResults)
         {
@@ Expand Down @@