B2B-2471: Defects in CatalogUrlResolverIdentity and CmsUrlResolverIdentity prevent caching

- Fix some static issues

Author: danmooney2

dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/UrlRewrite/RouteCacheTest.php

@@ -365,7 +365,10 @@ public function testUrlRewriteCleansCacheOnChange(string $requestPath)
         // renaming entity request path and validating that API will not return cached response
         $urlRewrite->setRequestPath('test' . $requestPath);
         $urlRewriteResourceModel->save($urlRewrite);
-        $apiResponse = $this->assertCacheMissAndReturnResponse($query($requestPath), [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]);
+        $apiResponse = $this->assertCacheMissAndReturnResponse(
+            $query($requestPath),
+            [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]
+        );
         $this->assertNull($apiResponse['body']['route']);
 
         // rolling back changes
@@ -399,7 +402,6 @@ public function urlRewriteEntitiesDataProvider(): array
      */
     public function testUrlRewriteCleansCacheForCustomRewrites()
     {
-
         /** @var UrlRewriteResourceModel $urlRewriteResourceModel */
         $urlRewriteResourceModel = $this->objectManager->create(UrlRewriteResourceModel::class);
         $storeId = 1;
@@ -457,10 +459,16 @@ public function testUrlRewriteCleansCacheForCustomRewrites()
             $cacheId = $apiResponse['headers'][CacheIdCalculator::CACHE_ID_HEADER];
 
             // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
-            $this->assertCacheMissAndReturnResponse($query($customRequestPath), [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]);
+            $this->assertCacheMissAndReturnResponse(
+                $query($customRequestPath),
+                [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]
+            );
 
             // Verify we obtain a cache HIT the second time around for this X-Magento-Cache-Id
-            $this->assertCacheHitAndReturnResponse($query($customRequestPath), [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]);
+            $this->assertCacheHitAndReturnResponse(
+                $query($customRequestPath),
+                [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]
+            );
 
             // confirm that API returns non-cached response for the second custom rewrite
             $apiResponse = $this->graphQlQueryWithResponseHeaders($query($customSecondRequestPath));
@@ -469,10 +477,16 @@ public function testUrlRewriteCleansCacheForCustomRewrites()
             $cacheId = $apiResponse['headers'][CacheIdCalculator::CACHE_ID_HEADER];
 
             // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
-            $this->assertCacheMissAndReturnResponse($query($customSecondRequestPath), [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]);
+            $this->assertCacheMissAndReturnResponse(
+                $query($customSecondRequestPath),
+                [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]
+            );
 
             // Verify we obtain a cache HIT the second time around for this X-Magento-Cache-Id
-            $this->assertCacheHitAndReturnResponse($query($customSecondRequestPath), [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]);
+            $this->assertCacheHitAndReturnResponse(
+                $query($customSecondRequestPath),
+                [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]
+            );
         }
 
         $urlRewriteResourceModel->delete($secondUrlRewriteModel);

dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/VarnishTest.php

@@ -105,7 +105,10 @@ public function testCacheResultForGuestWithCurrencyHeader()
         $defaultCurrencyCacheId = $response['headers'][CacheIdCalculator::CACHE_ID_HEADER];
 
         // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
-        $this->assertCacheMissAndReturnResponse($query, [CacheIdCalculator::CACHE_ID_HEADER => $defaultCurrencyCacheId]);
+        $this->assertCacheMissAndReturnResponse(
+            $query,
+            [CacheIdCalculator::CACHE_ID_HEADER => $defaultCurrencyCacheId]
+        );
         // Verify we obtain a cache HIT the second time we search the cache using this X-Magento-Cache-Id
         $this->assertCacheHitAndReturnResponse($query, [CacheIdCalculator::CACHE_ID_HEADER => $defaultCurrencyCacheId]);