Versionnement d'un patch

Async/ImportProductProcessor.php

@@ -50,17 +50,11 @@ public function __construct(
         $this->syncProcessorRegistry = $syncProcessorRegistry;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedTopics()
     {
         return [Topics::IMPORT_PRODUCTS];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function process(MessageInterface $message, SessionInterface $session)
     {
         $body = JSON::decode($message->getBody());

Client/AkeneoClient.php

@@ -4,8 +4,8 @@
 
 use Akeneo\Pim\ApiClient\AkeneoPimClientInterface;
 use Akeneo\Pim\ApiClient\Api\AssetApiInterface;
-use Akeneo\Pim\ApiClient\Api\AssetManager\AssetApiInterface as AssetManagerApiInterface;
 use Akeneo\Pim\ApiClient\Api\AssetCategoryApiInterface;
+use Akeneo\Pim\ApiClient\Api\AssetManager\AssetApiInterface as AssetManagerApiInterface;
 use Akeneo\Pim\ApiClient\Api\AssetManager\AssetAttributeApiInterface;
 use Akeneo\Pim\ApiClient\Api\AssetManager\AssetAttributeOptionApiInterface;
 use Akeneo\Pim\ApiClient\Api\AssetManager\AssetFamilyApiInterface;
@@ -40,7 +40,6 @@
 
 class AkeneoClient implements AkeneoPimClientInterface
 {
-    /** @var AkeneoPimClientInterface */
     protected AkeneoPimClientInterface $decoratedClient;
 
     /** @var ApiAwareInterface[] */
@@ -68,6 +67,7 @@ public function __call($name, $arguments)
         if ('get' === substr($name, 0, 3) && isset($this->apiRegistry[$property])) {
             return $this->apiRegistry[$property];
         }
+
         return $this->decoratedClient->{$name}($arguments);
     }
 

Client/AkeneoClientBuilder.php

@@ -14,9 +14,6 @@ class AkeneoClientBuilder extends AkeneoPimClientBuilder
      */
     protected array $apiRegistry = [];
 
-    /**
-     * @param ApiAwareInterface|null ...$apis
-     */
     public function __construct(?ApiAwareInterface ...$apis)
     {
         foreach ($apis as $api) {
@@ -25,12 +22,12 @@ public function __construct(?ApiAwareInterface ...$apis)
     }
 
     /**
-     * @param string $baseUri
      * @return $this
      */
     public function setBaseUri(string $baseUri): AkeneoClientBuilder
     {
         $this->baseUri = $baseUri;
+
         return $this;
     }
 
@@ -40,9 +37,6 @@ public function addApi(ApiAwareInterface $api): void
         $this->apiRegistry[$shortClass] = $api;
     }
 
-    /**
-     * @inheritDoc
-     */
     protected function buildAuthenticatedClient(Authentication $authentication): AkeneoPimClientInterface
     {
         list($resourceClient, $pageFactory, $cursorFactory, $fileSystem) = parent::setUp($authentication);
@@ -58,6 +52,7 @@ protected function buildAuthenticatedClient(Authentication $authentication): Ake
             ;
             $client->addApi($key, $api);
         }
+
         return $client;
     }
 }

Client/Api/ApiAwareInterface.php

@@ -9,27 +9,11 @@
 
 interface ApiAwareInterface
 {
-    /**
-     * @param ResourceClientInterface $resourceClient
-     * @return ApiAwareInterface
-     */
     public function setResourceClient(ResourceClientInterface $resourceClient): ApiAwareInterface;
 
-    /**
-     * @param PageFactoryInterface $pageFactory
-     * @return ApiAwareInterface
-     */
     public function setPageFactory(PageFactoryInterface $pageFactory): ApiAwareInterface;
 
-    /**
-     * @param ResourceCursorFactoryInterface $cursorFactory
-     * @return ApiAwareInterface
-     */
     public function setCursorFactory(ResourceCursorFactoryInterface $cursorFactory): ApiAwareInterface;
 
-    /**
-     * @param FileSystemInterface $fileSystem
-     * @return ApiAwareInterface
-     */
     public function setFileSystem(FileSystemInterface $fileSystem): ApiAwareInterface;
 }

Client/Api/ApiAwareTrait.php

@@ -21,39 +21,31 @@ trait ApiAwareTrait
     /** @var FileSystemInterface */
     protected $fileSystem;
 
-    /**
-     * @inheritDoc
-     */
     public function setResourceClient(ResourceClientInterface $resourceClient): ApiAwareInterface
     {
         $this->resourceClient = $resourceClient;
+
         return $this;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function setPageFactory(PageFactoryInterface $pageFactory): ApiAwareInterface
     {
         $this->pageFactory = $pageFactory;
+
         return $this;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function setCursorFactory(ResourceCursorFactoryInterface $cursorFactory): ApiAwareInterface
     {
         $this->cursorFactory = $cursorFactory;
+
         return $this;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function setFileSystem(FileSystemInterface $fileSystem): ApiAwareInterface
     {
         $this->fileSystem = $fileSystem;
+
         return $this;
     }
 }

Command/CleanupCommand.php

@@ -91,10 +91,10 @@ private function deleteRecords(): int
         $iterator = new BufferedIdentityQueryResultIterator($jqb->getQuery());
 
         $result = 0;
-        $iterator->setPageLoadedCallback(function (array $rows) use ($qb, &$result): array {
+        $iterator->setPageLoadedCallback(static function (array $rows) use ($qb, &$result): array {
             $ids = array_column($rows, 'id');
 
-            $result = $result + $qb->setParameter('ids', $ids)->getQuery()->execute();
+            $result += $qb->setParameter('ids', $ids)->getQuery()->execute();
 
             return $ids;
         });

Controller/ValidateConnectionController.php

@@ -54,7 +54,7 @@ public function __construct(
      *
      * @throws \InvalidArgumentException
      */
-    public function validateConnectionAction(Request $request, Channel $channel = null): JsonResponse
+    public function validateConnectionAction(Request $request, ?Channel $channel = null): JsonResponse
     {
         if (!$channel) {
             $channel = new Channel();

DependencyInjection/CompilerPass/AdditionalApiCompilerPass.php

@@ -8,9 +8,6 @@
 
 class AdditionalApiCompilerPass implements CompilerPassInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function process(ContainerBuilder $container)
     {
         $definition = $container->getDefinition('oro_akeneo.client_builder');

DependencyInjection/CompilerPass/AdditionalOptionalListenersCompilerPass.php

@@ -12,9 +12,6 @@
  */
 class AdditionalOptionalListenersCompilerPass implements CompilerPassInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function process(ContainerBuilder $container)
     {
         $listeners = array_keys(

DependencyInjection/Configuration.php

@@ -12,9 +12,6 @@
  */
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder(OroAkeneoExtension::ALIAS);

DependencyInjection/OroAkeneoExtension.php

@@ -16,9 +16,6 @@ class OroAkeneoExtension extends Extension
 {
     const ALIAS = 'oro_akeneo';
 
-    /**
-     * {@inheritdoc}
-     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $config = $this->processConfiguration(new Configuration(), $configs);
@@ -34,9 +31,6 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('form_types.yml');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getAlias()
     {
         return self::ALIAS;

Entity/AkeneoLocale.php

@@ -90,7 +90,7 @@ public function getAkeneoSettings()
         return $this->akeneoSettings;
     }
 
-    public function setAkeneoSettings(AkeneoSettings $akeneoSettings = null): self
+    public function setAkeneoSettings(?AkeneoSettings $akeneoSettings = null): self
     {
         $this->akeneoSettings = $akeneoSettings;
 

Entity/AkeneoSettings.php

@@ -401,7 +401,7 @@ public function getAkeneoChannels()
      *
      * @return self
      */
-    public function setAkeneoChannels(array $akeneoChannels = null)
+    public function setAkeneoChannels(?array $akeneoChannels = null)
     {
         $this->akeneoChannels = $akeneoChannels;
 
@@ -472,9 +472,6 @@ public function setPassword($password)
         return $this;
     }
 
-    /**
-     * @return string
-     */
     public function getToken(): ?string
     {
         return $this->token;
@@ -485,9 +482,6 @@ public function setToken(string $token): void
         $this->token = $token;
     }
 
-    /**
-     * @return string
-     */
     public function getRefreshToken(): ?string
     {
         return $this->refreshToken;
@@ -571,7 +565,7 @@ public function getAkeneoCurrencies()
      *
      * @return self
      */
-    public function setAkeneoCurrencies(array $akeneoCurrencies = null)
+    public function setAkeneoCurrencies(?array $akeneoCurrencies = null)
     {
         $this->akeneoCurrencies = $akeneoCurrencies;
 
@@ -593,7 +587,7 @@ public function getAkeneoActiveCurrencies()
      *
      * @return self
      */
-    public function setAkeneoActiveCurrencies(array $akeneoActiveCurrencies = null)
+    public function setAkeneoActiveCurrencies(?array $akeneoActiveCurrencies = null)
     {
         $this->akeneoActiveCurrencies = $akeneoActiveCurrencies;
 
@@ -623,7 +617,7 @@ public function getAkeneoLocalesList()
      *
      * @return self
      */
-    public function setAkeneoLocalesList(array $akeneoLocalesList = null)
+    public function setAkeneoLocalesList(?array $akeneoLocalesList = null)
     {
         $this->akeneoLocalesList = $akeneoLocalesList;
 
@@ -635,10 +629,7 @@ public function getAkeneoAttributesImageList(): ?string
         return $this->akeneoAttributesImageList;
     }
 
-    /**
-     * @param string $akeneoAttributesImageList
-     */
-    public function setAkeneoAttributesImageList(string $akeneoAttributesImageList = null): self
+    public function setAkeneoAttributesImageList(?string $akeneoAttributesImageList = null): self
     {
         $this->akeneoAttributesImageList = $akeneoAttributesImageList;
 
@@ -677,7 +668,7 @@ public function getRootCategory()
      *
      * @return AkeneoSettings
      */
-    public function setRootCategory(Category $rootCategory = null)
+    public function setRootCategory(?Category $rootCategory = null)
     {
         $this->rootCategory = $rootCategory;
 
@@ -720,9 +711,6 @@ public function setAclVoterEnabled($aclVoterEnabled)
         return $this;
     }
 
-    /**
-     * @return PriceList
-     */
     public function getPriceList(): ?PriceList
     {
         return $this->priceList;
@@ -740,19 +728,13 @@ public function getAkeneoAttributesList(): ?string
         return $this->akeneoAttributesList;
     }
 
-    /**
-     * @param string $attributeList
-     */
-    public function setAkeneoAttributesList(string $attributeList = null): self
+    public function setAkeneoAttributesList(?string $attributeList = null): self
     {
         $this->akeneoAttributesList = $attributeList;
 
         return $this;
     }
 
-    /**
-     * @return bool
-     */
     public function isAkeneoMergeImageToParent(): ?bool
     {
         return $this->akeneoMergeImageToParent;
@@ -812,16 +794,13 @@ public function setAkeneoBrandMapping(?string $akeneoBrandMapping): void
         $this->akeneoBrandMapping = $akeneoBrandMapping;
     }
 
-    public function setAlternativeIdentifier(string $alternativeIdentifier = null)
+    public function setAlternativeIdentifier(?string $alternativeIdentifier = null)
     {
         $this->alternativeIdentifier = $alternativeIdentifier;
 
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getAlternativeIdentifier(): ?string
     {
         return $this->alternativeIdentifier;

EventListener/ImportExportTagsSubscriberDecorator.php

@@ -39,9 +39,6 @@ function (TagImportManager $tagImportManager) {
         )($tagImportManager);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public static function getSubscribedEvents()
     {
         return ImportExportTagsSubscriber::getSubscribedEvents();

EventListener/ProductCollectionVariantReindexMessageSendListenerDecorator.php

@@ -8,8 +8,7 @@
 /**
  * Postpone segments updates
  */
-class ProductCollectionVariantReindexMessageSendListenerDecorator extends BaseListener implements
-    AdditionalOptionalListenerInterface
+class ProductCollectionVariantReindexMessageSendListenerDecorator extends BaseListener implements AdditionalOptionalListenerInterface
 {
     use AdditionalOptionalListenerTrait;
 

EventSubscriber/DoctrineSubscriber.php

@@ -12,7 +12,6 @@ class DoctrineSubscriber implements EventSubscriber, ContainerAwareInterface
 {
     use ContainerAwareTrait;
 
-    /** {@inheritdoc} */
     public function getSubscribedEvents()
     {
         return [