Remove old services and fix PHPStan (#123)

webgriffe · Jun 20, 2022 · 8c32f6c · 8c32f6c
1 parent b6a7435
commit 8c32f6c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 256 deletions.
diff --git a/tests/Behat/Context/Messenger/MessengerContext.php b/tests/Behat/Context/Messenger/MessengerContext.php
@@ -23,15 +23,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * @Given /^the queue item with identifier "([^"]*)" for the "([^"]*)" importer has an error message containing "([^"]*)"$/
-     */
-    public function theQueueItemHasAnErrorMessageContaining(string $identifier, string $importer, string $message): void
-    {
-        $queueItem = $this->getQueueItemByImporterAndIdentifier($importer, $identifier);
-        Assert::contains((string) $queueItem->getErrorMessage(), $message);
-    }
-
     /**
      * @Then the queue item with identifier :identifier for the :importer importer should not be in the Akeneo queue
      */
@@ -47,8 +38,10 @@ public function theQueueItemWithIdentifierForTheImporterShouldNotBeInTheAkeneoQu
      */
     public function theQueueItemWithIdentifierForTheImporterShouldBeInTheAkeneoQueue(string $identifier, string $importer): void
     {
+        $envelope = $this->getEnvelopeByImporterAndIdentifier($importer, $identifier);
+        Assert::notNull($envelope);
         Assert::isInstanceOf(
-            $this->getEnvelopeByImporterAndIdentifier($importer, $identifier)->getMessage(),
+            $envelope->getMessage(),
             ItemImport::class,
         );
     }
@@ -69,17 +62,6 @@ public function thereShouldBeNoItemInTheAkeneoQueue(): void
         Assert::isEmpty($this->transport->get());
     }
 
-    /**
-     * @Then /^there should be only one queue item with identifier "([^"]*)" for the "([^"]*)" importer in the Akeneo queue$/
-     */
-    public function thereShouldBeOnlyOneProductQueueItemForInTheAkeneoQueue(string $identifier, string $importer): void
-    {
-        $items = $this->queueItemRepository->findBy(
-            ['akeneoEntity' => $importer, 'akeneoIdentifier' => $identifier],
-        );
-        Assert::count($items, 1);
-    }
-
     /**
      * @Then /^there should be (\d+) items for the "([^"]*)" importer in the Akeneo queue$/
      */
@@ -94,8 +76,10 @@ public function thereShouldBeItemsForTheImporterInTheAkeneoQueue(int $count, str
      */
     public function thereShouldBeItemsForTheImporterOnlyInTheAkeneoQueue(string $importer): void
     {
+        /** @var Envelope[] $envelopes */
+        $envelopes = $this->transport->get();
         $importerItems = $this->getEnvelopesByImporter($importer);
-        Assert::count($this->transport->get(), count($importerItems));
+        Assert::count($envelopes, count($importerItems));
     }
 
     private function getQueueItemByImporterAndIdentifier(string $importer, string $identifier): ItemImport
@@ -146,7 +130,10 @@ public function theItemImportMessageForProductShouldHaveFailed(string $identifie
 
     private function getEnvelopesByImporter(string $importer): array
     {
-        return array_filter($this->transport->get(), static function (Envelope $envelope) use ($importer): bool {
+        /** @var Envelope[] $envelopes */
+        $envelopes = $this->transport->get();
+
+        return array_filter($envelopes, static function (Envelope $envelope) use ($importer): bool {
             /** @var ItemImport|mixed $message */
             $message = $envelope->getMessage();
 
@@ -156,7 +143,9 @@ private function getEnvelopesByImporter(string $importer): array
 
     private function getEnvelopeByImporterAndIdentifier(string $importer, string $identifier): ?Envelope
     {
-        $envelopes = array_filter($this->transport->get(), static function (Envelope $envelope) use ($importer, $identifier): bool {
+        /** @var Envelope[] $envelopes */
+        $envelopes = $this->transport->get();
+        $envelopes = array_filter($envelopes, static function (Envelope $envelope) use ($importer, $identifier): bool {
             /** @var ItemImport|mixed $message */
             $message = $envelope->getMessage();
 

diff --git a/tests/Behat/Context/Setup/QueueContext.php b/tests/Behat/Context/Setup/QueueContext.php
@@ -7,7 +7,6 @@
 use Behat\Behat\Context\Context;
 use Sylius\Behat\Service\SharedStorageInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
-use Webgriffe\SyliusAkeneoPlugin\Entity\QueueItemInterface;
 use Webgriffe\SyliusAkeneoPlugin\Message\ItemImport;
 
 final class QueueContext implements Context
@@ -40,37 +39,4 @@ public function thereIsOneProductAssociationsToImportWithIdentifierInTheAkeneoQu
 
         $this->sharedStorage->set('item', $itemImport);
     }
-
-    /**
-     * @Given /^there is an already imported item with identifier "([^"]*)" for the "([^"]*)" importer in the Akeneo queue$/
-     */
-    public function thereIsAnAlreadyImportedItemWithIdentifierForTheImporterInTheAkeneoQueue(string $identifier, string $importer): void
-    {
-        /** @var QueueItemInterface $queueItem */
-        $queueItem = $this->queueItemFactory->createNew();
-        $queueItem->setAkeneoEntity($importer);
-        $queueItem->setAkeneoIdentifier($identifier);
-        $queueItem->setCreatedAt(new \DateTime());
-        $queueItem->setImportedAt(new \DateTime());
-        $this->queueItemRepository->add($queueItem);
-        $this->sharedStorage->set('item', $queueItem);
-    }
-
-    /**
-     * @Given /^(this item) has been imported (\d+) days ago$/
-     */
-    public function thisItemHasBeenImportedDaysAgo(QueueItemInterface $queueItem, int $days): void
-    {
-        $queueItem->setImportedAt(new \DateTime("$days days ago"));
-        $this->queueItemRepository->add($queueItem);
-    }
-
-    /**
-     * @Given /^(this item) has been imported now$/
-     */
-    public function thisItemHasBeenImportedNow(QueueItemInterface $queueItem): void
-    {
-        $queueItem->setImportedAt(new \DateTime());
-        $this->queueItemRepository->add($queueItem);
-    }
 }
diff --git a/tests/Behat/Context/Transform/QueueItemContext.php b/tests/Behat/Context/Transform/QueueItemContext.php
diff --git a/tests/Behat/Context/Ui/Admin/ManagingProductsContext.php b/tests/Behat/Context/Ui/Admin/ManagingProductsContext.php
@@ -11,7 +11,6 @@
 use Sylius\Behat\Service\Helper\JavaScriptTestHelperInterface;
 use Sylius\Behat\Service\NotificationCheckerInterface;
 use Sylius\Component\Core\Model\ProductInterface;
-use Webmozart\Assert\Assert;
 
 final class ManagingProductsContext implements Context
 {
@@ -58,16 +57,4 @@ public function iShouldBeNotifiedThatItHasBeenAlreadyEnqueued(): void
             'Akeneo PIM import for this product has been already scheduled before',
         );
     }
-
-    /**
-     * @Then /^I should see (\d+), not imported, items? in the Akeneo queue items list$/
-     */
-    public function iShouldSeeNotImportedItemInTheAkeneoQueueItemsList(int $numberOfItems): void
-    {
-        $this->queueItemsIndexPage->open();
-        Assert::same($this->queueItemsIndexPage->countItems(), $numberOfItems);
-        foreach ($this->indexPage->getColumnFields('importedAt') as $columnField) {
-            Assert::eq($columnField, 'No');
-        }
-    }
 }
diff --git a/tests/Behat/Context/Ui/Admin/ManagingQueueItems.php b/tests/Behat/Context/Ui/Admin/ManagingQueueItems.php
diff --git a/tests/Behat/Resources/services.xml b/tests/Behat/Resources/services.xml
@@ -4,9 +4,6 @@
     <services>
         <defaults public="true" />
 
-        <service id="webgriffe_sylius_akeneo.behat.context.transform.queue_item" class="Tests\Webgriffe\SyliusAkeneoPlugin\Behat\Context\Transform\QueueItemContext">
-        </service>
-
         <service id="webgriffe_sylius_akeneo.behat.context.setup.queue" class="Tests\Webgriffe\SyliusAkeneoPlugin\Behat\Context\Setup\QueueContext">
             <argument type="service" id="sylius.behat.shared_storage" />
             <argument type="service" id="messenger.default_bus"/>
@@ -46,10 +43,6 @@
 
         <service id="webgriffe_sylius_akeneo.behat.context.system.datetime" class="Tests\Webgriffe\SyliusAkeneoPlugin\Behat\Context\System\DateTimeContext" />
 
-        <service id="webgriffe_sylius_akeneo.behat.context.ui.admin.managing_queue_items" class="Tests\Webgriffe\SyliusAkeneoPlugin\Behat\Context\Ui\Admin\ManagingQueueItems">
-            <argument type="service" id="sylius.behat.shared_storage" />
-        </service>
-
         <service id="webgriffe_sylius_akeneo.behat.context.ui.admin.managing_products" class="Tests\Webgriffe\SyliusAkeneoPlugin\Behat\Context\Ui\Admin\ManagingProductsContext">
             <argument type="service" id="sylius.behat.page.admin.product.index" />
             <argument type="service" id="sylius.behat.java_script_test_helper" />

diff --git a/tests/Behat/Resources/suites.yml b/tests/Behat/Resources/suites.yml
@@ -130,12 +130,10 @@ default:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.shared_storage
-                - webgriffe_sylius_akeneo.behat.context.transform.queue_item
 
                 - sylius.behat.context.setup.admin_security
                 - webgriffe_sylius_akeneo.behat.context.setup.queue
 
-                - webgriffe_sylius_akeneo.behat.context.ui.admin.managing_queue_items
                 - sylius.behat.context.ui.admin.notification
 
             filters: