Fix PHPStan level 2

Author: jissereitsma

DataLayer/Mapper/OrderItemDataMapper.php

@@ -108,8 +108,9 @@ private function getPrice(OrderItemInterface $orderItem): float
     }
 
     /**
-     * @param ProductInterface $product
-     * @param array $data
+     * @param OrderItemInterface $orderItem
+     * @param array              $data
+     *
      * @return array
      */
     private function parseDataLayerMapping(OrderItemInterface $orderItem, array $data): array

DataLayer/Tag/Category/Products.php

@@ -43,6 +43,7 @@ public function __construct(
      */
     public function get(): array
     {
+        /** @var Category $category */
         $category = $this->getCurrentCategory->get();
         if ($category->getDisplayMode() === Category::DM_PAGE) {
             return [];

Test/Integration/Block/DataLayerTest.php

@@ -29,9 +29,10 @@ public function testValidBlockContent()
         $layout = ObjectManager::getInstance()->get(LayoutInterface::class);
         $layout->getUpdate()->addHandle('datalayer_default');
 
+        /** @var Template $block */
         $block = $layout->createBlock(Template::class);
         $block->setNameInLayout('yireo_googletagmanager2.data-layer');
-        $block->setTemplate('Yireo_GoogleTagManager2::luma/data-layer.phtml');
+        $block->setTemplate('Yireo_GoogleTagManager2::luma/data-layer.phtml'); // @phpstan-ignore-line
         $block->setData('data_layer_view_model', ObjectManager::getInstance()->get(DataLayer::class));
         $block->setData('config', ObjectManager::getInstance()->get(Config::class));
         $html = $block->toHtml();

Test/Integration/Page/AddToWishlistTest.php

@@ -3,6 +3,7 @@
 namespace Yireo\GoogleTagManager2\Test\Integration\Page;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
 use Magento\Customer\CustomerData\SectionPool;
 use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\App\Response\Http as HttpResponse;
@@ -33,6 +34,8 @@ public function testAddToWishlist()
         $this->loginCustomer();
 
         $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+
+        /** @var Product $product */
         $product = $productRepository->get('simple');
         $product->setData('is_saleable', 1);
         $productRepository->save($product);

Test/Integration/Page/CategoryPageTest.php

@@ -6,6 +6,10 @@
 
 use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Block\Product\ListProduct;
+use Magento\Catalog\Model\Category;
+use Magento\CatalogWidget\Block\Product\ProductsList;
+use Magento\Eav\Model\Entity\Collection\AbstractCollection;
+use Magento\Framework\App\Response\Http;
 use Yireo\GoogleTagManager2\Test\Integration\FixtureTrait\GetCategory;
 use Yireo\GoogleTagManager2\Test\Integration\FixtureTrait\Reindex;
 use Yireo\GoogleTagManager2\Test\Integration\PageTestCase;
@@ -35,18 +39,23 @@ public function testValidDataLayerWithOneCategory()
     {
         $this->assertEnabledFlagIsWorking();
 
+        /** @var Category $category */
         $category = $this->getCategoryByName('Category 999');
 
+        /** @var AbstractCollection $productCollection */
         $productCollection = $category->getProductCollection();
         $this->assertTrue($productCollection->count() >= 3, 'Product count is '.$productCollection->count());
 
         $this->dispatch('catalog/category/view/id/' . $category->getId());
         $this->assertRequestActionName('view');
 
-        $body = $this->getResponse()->getBody();
+        /** @var Http $response */
+        $response = $this->getResponse();
+        $body = $response->getBody();
         $this->assertStringContainsString($category->getName(), $body);
         $this->assertStringContainsString('"view_item_list"', $body);
 
+        /** @var ListProduct $productListBlock */
         $productListBlock = $this->layout->getBlock('category.products.list');
         $productListBlock->setCollection($productCollection);
         $this->assertInstanceOf(ListProduct::class, $productListBlock);
@@ -82,7 +91,7 @@ public function testValidDataLayerWithOneCategory()
         }
     }
 
-    private function getProductsByCategory(CategoryInterface $category): array
+    private function getProductsByCategory(Category $category): array
     {
         return $category->getProductCollection()->toArray();
     }

Test/Integration/Page/CheckoutOnepageSuccessTest.php

@@ -7,6 +7,7 @@
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
 use Yireo\GoogleTagManager2\Test\Integration\PageTestCase;
 
 class CheckoutOnepageSuccessTest extends PageTestCase
@@ -74,6 +75,8 @@ private function getOrder(): OrderInterface
         $searchResult = $orderRepository->getList($searchCriteriaBuilder->create());
         $orders = $searchResult->getItems();
         $this->assertNotEmpty($orders);
+
+        /** @var Order $order */
         $order = array_pop($orders);
         $this->assertNotEmpty($order);
         $this->assertNotEmpty($order->getId());

Test/Integration/Page/ProductPageTest.php

@@ -4,6 +4,7 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Response\Http;
 use Yireo\GoogleTagManager2\Test\Integration\FixtureTrait\GetProduct;
 use Yireo\GoogleTagManager2\Test\Integration\PageTestCase;
 use Yireo\IntegrationTestHelper\Test\Integration\Traits\Layout\AssertHandleInLayout;
@@ -35,7 +36,9 @@ public function testValidDataLayerWithOneCategory()
         $this->dispatch('catalog/product/view/id/' . $product->getId());
         $this->assertRequestActionName('view');
 
-        $body = $this->getResponse()->getBody();
+        /** @var Http $response */
+        $response = $this->getResponse();
+        $body = $response->getBody();
         $this->assertStringContainsString($product->getName(), $body);
 
         $block = $this->layout->getBlock('yireo_googletagmanager2.data-layer');

Test/Integration/SessionDataProvider/CustomerSessionDataProviderTest.php

@@ -23,13 +23,13 @@ public function testSettingOnce()
         $this->getRequest()->setParams(['sections' => 'customer']);
         $this->dispatch('customer/section/load');
         $body = $this->getResponse()->getBody(); // @phpstan-ignore-line
-        $data = $serializer->unserialize($body, true);
+        $data = $serializer->unserialize($body);
         $this->assertEquals('bar', $data['customer']['gtm_events']['foobar']['foo']);
 
         $this->getRequest()->setParams(['sections' => 'customer']);
         $this->dispatch('customer/section/load');
         $body = $this->getResponse()->getBody(); // @phpstan-ignore-line
-        $data = $serializer->unserialize($body, true);
+        $data = $serializer->unserialize($body);
         $this->assertEmpty($data['customer']['gtm_events']);
     }
 }