Upgrade to use PHP 8 syntax in tests (#126)

webgriffe · Apr 4, 2022 · dfd590d · dfd590d
1 parent a7279c0
commit dfd590d
Show file tree

Hide file tree

Showing 20 changed files with 48 additions and 202 deletions.
diff --git a/spec/ValueHandler/FileAttributeValueHandlerSpec.php b/spec/ValueHandler/FileAttributeValueHandlerSpec.php
@@ -18,7 +18,7 @@
 
 class FileAttributeValueHandlerSpec extends ObjectBehavior
 {
-    const AKENEO_FILE_ATTRIBUTE_CODE = 'allegato_1';
+    public const AKENEO_FILE_ATTRIBUTE_CODE = 'allegato_1';
 
     function let(
         \SplFileInfo $attachmentFile,

diff --git a/spec/ValueHandler/GenericPropertyValueHandlerSpec.php b/spec/ValueHandler/GenericPropertyValueHandlerSpec.php
@@ -127,8 +127,8 @@ public function it_throws_if_provided_property_path_is_not_writeable_on_both_pro
                     sprintf(
                         'Property path "%s" is not writable on both %s and %s but it should be for at least once.',
                         self::PROPERTY_PATH,
-                        get_class($productVariant->getWrappedObject()),
-                        get_class($product->getWrappedObject())
+                        $productVariant->getWrappedObject()::class,
+                        $product->getWrappedObject()::class
                     )
                 )
             )

diff --git a/spec/ValueHandler/MetricPropertyValueHandlerSpec.php b/spec/ValueHandler/MetricPropertyValueHandlerSpec.php
@@ -176,8 +176,8 @@ public function it_throws_if_provided_property_path_is_not_writeable_on_both_pro
                     sprintf(
                         'Property path "%s" is not writable on both %s and %s but it should be for at least once.',
                         self::PROPERTY_PATH,
-                        get_class($productVariant->getWrappedObject()),
-                        get_class($product->getWrappedObject())
+                        $productVariant->getWrappedObject()::class,
+                        $product->getWrappedObject()::class
                     )
                 )
             )

diff --git a/tests/Behat/Context/Cli/ConsumeCommandContext.php b/tests/Behat/Context/Cli/ConsumeCommandContext.php
@@ -12,18 +12,8 @@
 
 final class ConsumeCommandContext implements Context
 {
-    /** @var KernelInterface */
-    private $kernel;
-
-    /** @var ConsumeCommand */
-    private $consumeCommand;
-
-    public function __construct(
-        KernelInterface $kernel,
-        ConsumeCommand $consumeCommand
-    ) {
-        $this->kernel = $kernel;
-        $this->consumeCommand = $consumeCommand;
+    public function __construct(private KernelInterface $kernel, private ConsumeCommand $consumeCommand)
+    {
     }
 
     /**

diff --git a/tests/Behat/Context/Cli/EnqueueCommandContext.php b/tests/Behat/Context/Cli/EnqueueCommandContext.php
@@ -15,23 +15,8 @@
 
 final class EnqueueCommandContext implements Context
 {
-    /** @var KernelInterface */
-    private $kernel;
-
-    /** @var EnqueueCommand */
-    private $enqueueCommand;
-
-    /** @var SharedStorageInterface */
-    private $sharedStorage;
-
-    public function __construct(
-        KernelInterface $kernel,
-        EnqueueCommand $enqueueCommand,
-        SharedStorageInterface $sharedStorage
-    ) {
-        $this->kernel = $kernel;
-        $this->enqueueCommand = $enqueueCommand;
-        $this->sharedStorage = $sharedStorage;
+    public function __construct(private KernelInterface $kernel, private EnqueueCommand $enqueueCommand, private SharedStorageInterface $sharedStorage)
+    {
     }
 
     /**

diff --git a/tests/Behat/Context/Cli/QueueCleanupCommandContext.php b/tests/Behat/Context/Cli/QueueCleanupCommandContext.php
@@ -14,20 +14,8 @@
 
 final class QueueCleanupCommandContext implements Context
 {
-    /** @var KernelInterface */
-    private $kernel;
-
-    /** @var QueueCleanupCommand */
-    private $queueCleanupCommand;
-
-    /** @var SharedStorageInterface */
-    private $sharedStorage;
-
-    public function __construct(KernelInterface $kernel, QueueCleanupCommand $queueCleanupCommand, SharedStorageInterface $sharedStorage)
+    public function __construct(private KernelInterface $kernel, private QueueCleanupCommand $queueCleanupCommand, private SharedStorageInterface $sharedStorage)
     {
-        $this->kernel = $kernel;
-        $this->queueCleanupCommand = $queueCleanupCommand;
-        $this->sharedStorage = $sharedStorage;
     }
 
     /**

diff --git a/tests/Behat/Context/Cli/ReconcileCommandContext.php b/tests/Behat/Context/Cli/ReconcileCommandContext.php
@@ -12,18 +12,8 @@
 
 final class ReconcileCommandContext implements Context
 {
-    /** @var KernelInterface */
-    private $kernel;
-
-    /** @var ReconcileCommand */
-    private $reconcileCommand;
-
-    public function __construct(
-        KernelInterface $kernel,
-        ReconcileCommand $reconcileCommand
-    ) {
-        $this->kernel = $kernel;
-        $this->reconcileCommand = $reconcileCommand;
+    public function __construct(private KernelInterface $kernel, private ReconcileCommand $reconcileCommand)
+    {
     }
 
     /**

diff --git a/tests/Behat/Context/Db/ProductContext.php b/tests/Behat/Context/Db/ProductContext.php
@@ -17,28 +17,8 @@
 
 final class ProductContext implements Context
 {
-    /** @var ProductRepositoryInterface */
-    private $productRepository;
-
-    /** @var ProductVariantRepositoryInterface */
-    private $productVariantRepository;
-
-    /** @var RepositoryInterface */
-    private $productAssociationRepository;
-
-    /** @var ProductAssociationTypeRepositoryInterface */
-    private $productAssociationTypeRepository;
-
-    public function __construct(
-        ProductRepositoryInterface $productRepository,
-        ProductVariantRepositoryInterface $productVariantRepository,
-        RepositoryInterface $productAssociationRepository,
-        ProductAssociationTypeRepositoryInterface $productAssociationTypeRepository
-    ) {
-        $this->productRepository = $productRepository;
-        $this->productVariantRepository = $productVariantRepository;
-        $this->productAssociationRepository = $productAssociationRepository;
-        $this->productAssociationTypeRepository = $productAssociationTypeRepository;
+    public function __construct(private ProductRepositoryInterface $productRepository, private ProductVariantRepositoryInterface $productVariantRepository, private RepositoryInterface $productAssociationRepository, private ProductAssociationTypeRepositoryInterface $productAssociationTypeRepository)
+    {
     }
 
     /**

diff --git a/tests/Behat/Context/Db/QueueContext.php b/tests/Behat/Context/Db/QueueContext.php
@@ -11,13 +11,8 @@
 
 final class QueueContext implements Context
 {
-    /** @var QueueItemRepositoryInterface */
-    private $queueItemRepository;
-
-    public function __construct(
-        QueueItemRepositoryInterface $queueItemRepository
-    ) {
-        $this->queueItemRepository = $queueItemRepository;
+    public function __construct(private QueueItemRepositoryInterface $queueItemRepository)
+    {
     }
 
     /**

diff --git a/tests/Behat/Context/Setup/AkeneoContext.php b/tests/Behat/Context/Setup/AkeneoContext.php
@@ -11,12 +11,8 @@
 
 final class AkeneoContext implements Context
 {
-    /** @var ApiClientInterface|ApiClientMock */
-    private $apiClient;
-
-    public function __construct(ApiClientInterface $apiClient)
+    public function __construct(private ApiClientInterface $apiClient)
     {
-        $this->apiClient = $apiClient;
     }
 
     /**

diff --git a/tests/Behat/Context/Setup/QueueContext.php b/tests/Behat/Context/Setup/QueueContext.php
@@ -12,23 +12,8 @@
 
 final class QueueContext implements Context
 {
-    /** @var FactoryInterface */
-    private $queueItemFactory;
-
-    /** @var QueueItemRepositoryInterface */
-    private $queueItemRepository;
-
-    /** @var SharedStorageInterface */
-    private $sharedStorage;
-
-    public function __construct(
-        FactoryInterface $queueItemFactory,
-        QueueItemRepositoryInterface $queueItemRepository,
-        SharedStorageInterface $sharedStorage
-    ) {
-        $this->queueItemFactory = $queueItemFactory;
-        $this->queueItemRepository = $queueItemRepository;
-        $this->sharedStorage = $sharedStorage;
+    public function __construct(private FactoryInterface $queueItemFactory, private QueueItemRepositoryInterface $queueItemRepository, private SharedStorageInterface $sharedStorage)
+    {
     }
 
     /**

diff --git a/tests/Behat/Context/System/FilesystemContext.php b/tests/Behat/Context/System/FilesystemContext.php
@@ -11,19 +11,10 @@
 
 final class FilesystemContext implements Context
 {
-    /** @var vfsStreamContainer */
-    private $vfsStream;
+    private ?vfsStreamContainer $vfsStream = null;
 
-    /** @var string */
-    private $temporaryDirectory;
-
-    /** @var string */
-    private $temporaryFilesPrefix;
-
-    public function __construct(string $temporaryDirectory, string $temporaryFilesPrefix)
+    public function __construct(private string $temporaryDirectory, private string $temporaryFilesPrefix)
     {
-        $this->temporaryDirectory = $temporaryDirectory;
-        $this->temporaryFilesPrefix = $temporaryFilesPrefix;
     }
 
     /**

diff --git a/tests/Behat/Context/Transform/QueueItemContext.php b/tests/Behat/Context/Transform/QueueItemContext.php
@@ -11,12 +11,8 @@
 
 final class QueueItemContext implements Context
 {
-    /** @var QueueItemRepositoryInterface */
-    private $queueItemRepository;
-
-    public function __construct(QueueItemRepositoryInterface $queueItemRepository)
+    public function __construct(private QueueItemRepositoryInterface $queueItemRepository)
     {
-        $this->queueItemRepository = $queueItemRepository;
     }
 
     /**

diff --git a/tests/Behat/Context/Ui/Admin/ManagingProductsContext.php b/tests/Behat/Context/Ui/Admin/ManagingProductsContext.php
@@ -18,31 +18,11 @@ final class ManagingProductsContext implements Context
 {
     private const SCHEDULE_AKENEO_PIM_IMPORT = 'Schedule Akeneo PIM import';
 
-    /** @var IndexPageInterface */
-    private $indexPage;
-
-    /** @var JavaScriptTestHelperInterface */
-    private $testHelper;
-
-    /** @var NotificationCheckerInterface */
-    private $notificationChecker;
-
-    /** @var QueueItemsIndexPageInterface */
-    private $queueItemsIndexPage;
-
     /**
      * ProductItems constructor.
      */
-    public function __construct(
-        IndexPageInterface $indexPage,
-        JavaScriptTestHelperInterface $testHelper,
-        NotificationCheckerInterface $notificationChecker,
-        QueueItemsIndexPageInterface $queueItemsIndexPage
-    ) {
-        $this->indexPage = $indexPage;
-        $this->testHelper = $testHelper;
-        $this->notificationChecker = $notificationChecker;
-        $this->queueItemsIndexPage = $queueItemsIndexPage;
+    public function __construct(private IndexPageInterface $indexPage, private JavaScriptTestHelperInterface $testHelper, private NotificationCheckerInterface $notificationChecker, private QueueItemsIndexPageInterface $queueItemsIndexPage)
+    {
     }
 
     /**

diff --git a/tests/Behat/Context/Ui/Admin/ManagingQueueItems.php b/tests/Behat/Context/Ui/Admin/ManagingQueueItems.php
@@ -12,16 +12,8 @@
 
 final class ManagingQueueItems implements Context
 {
-    /** @var IndexPageInterface */
-    private $indexPage;
-
-    /** @var SharedStorageInterface */
-    private $sharedStorage;
-
-    public function __construct(IndexPageInterface $indexPage, SharedStorageInterface $sharedStorage)
+    public function __construct(private IndexPageInterface $indexPage, private SharedStorageInterface $sharedStorage)
     {
-        $this->indexPage = $indexPage;
-        $this->sharedStorage = $sharedStorage;
     }
 
     /**

diff --git a/tests/Integration/AttributeOptions/ImporterTest.php b/tests/Integration/AttributeOptions/ImporterTest.php
@@ -13,14 +13,11 @@
 
 final class ImporterTest extends KernelTestCase
 {
-    /** @var ImporterInterface */
-    private $importer;
+    private ImporterInterface $importer;
 
-    /** @var PurgerLoader */
-    private $fixtureLoader;
+    private PurgerLoader $fixtureLoader;
 
-    /** @var RepositoryInterface */
-    private $attributeRepository;
+    private RepositoryInterface $attributeRepository;
 
     protected function setUp(): void
     {

diff --git a/tests/Integration/Product/ImporterTest.php b/tests/Integration/Product/ImporterTest.php
@@ -19,23 +19,17 @@
 
 final class ImporterTest extends KernelTestCase
 {
-    /** @var ImporterInterface */
-    private $importer;
+    private ImporterInterface $importer;
 
-    /** @var ProductRepositoryInterface */
-    private $productRepository;
+    private ProductRepositoryInterface $productRepository;
 
-    /** @var ProductVariantRepository */
-    private $productVariantRepository;
+    private ProductVariantRepository $productVariantRepository;
 
-    /** @var PurgerLoader */
-    private $fixtureLoader;
+    private PurgerLoader $fixtureLoader;
 
-    /** @var ChannelRepository */
-    private $channelRepository;
+    private ChannelRepository $channelRepository;
 
-    /** @var Filesystem */
-    private $filesystem;
+    private Filesystem $filesystem;
 
     protected function setUp(): void
     {

diff --git a/tests/Integration/Product/ReconcilerTest.php b/tests/Integration/Product/ReconcilerTest.php
@@ -17,23 +17,17 @@
 
 final class ReconcilerTest extends KernelTestCase
 {
-    /** @var ReconcilerInterface */
-    private $reconciler;
+    private ReconcilerInterface $reconciler;
 
-    /** @var ProductRepositoryInterface */
-    private $productRepository;
+    private ProductRepositoryInterface $productRepository;
 
-    /** @var ProductVariantRepository */
-    private $productVariantRepository;
+    private ProductVariantRepository $productVariantRepository;
 
-    /** @var PurgerLoader */
-    private $fixtureLoader;
+    private PurgerLoader $fixtureLoader;
 
-    /** @var ChannelRepository */
-    private $channelRepository;
+    private ChannelRepository $channelRepository;
 
-    /** @var Filesystem */
-    private $filesystem;
+    private Filesystem $filesystem;
 
     protected function setUp(): void
     {

diff --git a/tests/Integration/ProductAssociations/ImporterTest.php b/tests/Integration/ProductAssociations/ImporterTest.php
@@ -13,14 +13,11 @@
 
 final class ImporterTest extends KernelTestCase
 {
-    /** @var ImporterInterface */
-    private $importer;
+    private ImporterInterface $importer;
 
-    /** @var PurgerLoader */
-    private $fixtureLoader;
+    private PurgerLoader $fixtureLoader;
 
-    /** @var ProductRepositoryInterface */
-    private $productRepository;
+    private ProductRepositoryInterface $productRepository;
 
     protected function setUp(): void
     {