Fixing one more bug with caching system and strengthening test

Author: weaverryan

src/CacheWarmer/EntrypointCacheWarmer.php

@@ -44,5 +44,7 @@ protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter)
                 // ignore exception
             }
         }
+
+        return true;
     }
 }

src/Resources/config/services.xml

@@ -36,8 +36,6 @@
             <argument type="service" id="cache.webpack_encore" />
         </service>
 
-        <service id="Symfony\WebpackEncoreBundle\CacheWarmer\EntrypointCacheWarmer" alias="webpack_encore.entrypoint_lookup.cache_warmer" />
-
         <service id="webpack_encore.cache" class="Symfony\Component\Cache\Adapter\PhpArrayAdapter">
             <factory class="Symfony\Component\Cache\Adapter\PhpArrayAdapter" method="create" />
             <argument>%kernel.cache_dir%/webpack_encore.cache.php</argument>

tests/IntegrationTest.php

@@ -2,6 +2,7 @@
 
 namespace Symfony\WebpackEncoreBundle\Tests;
 
+use Symfony\Component\DependencyInjection\Reference;
 use Symfony\WebpackEncoreBundle\CacheWarmer\EntrypointCacheWarmer;
 use Symfony\WebpackEncoreBundle\WebpackEncoreBundle;
 use PHPUnit\Framework\TestCase;
@@ -81,15 +82,19 @@ public function testEntriesAreNotRepeteadWhenAlreadyOutputIntegration()
 
     public function testCacheWarmer()
     {
-        $kernal = new WebpackEncoreIntegrationTestKernel(true);
-        $kernal->boot();
-        $container = $kernal->getContainer();
+        $kernel = new WebpackEncoreIntegrationTestKernel(true);
+        $kernel->boot();
+        $container = $kernel->getContainer();
 
-        $cacheWarmer = $container->get(CacheWarmerTester::class);
+        $cacheWarmer = $container->get(WebpackEncoreCacheWarmerTester::class);
 
-        $cacheWarmer->warmCache($kernal->getCacheDir());
+        $cacheWarmer->warmCache($kernel->getCacheDir());
 
-        $this->assertTrue(true, 'Cache warmer has successfully filled that cache and went without exceptions');
+        $cachePath = $kernel->getCacheDir().'/webpack_encore.cache.php';
+        $this->assertFileExists($cachePath);
+        $data = require $cachePath;
+        // check for both build keys
+        $this->assertEquals(['_default' => 0, 'different_build' => 1], $data[0]);
     }
 }
 
@@ -137,7 +142,9 @@ public function registerContainerConfiguration(LoaderInterface $loader)
                 ]
             ]);
 
-            $container->autowire(CacheWarmerTester::class)->setPublic(true);
+            $container->register(WebpackEncoreCacheWarmerTester::class)
+                ->addArgument(new Reference('webpack_encore.entrypoint_lookup.cache_warmer'))
+                ->setPublic(true);
         });
     }
 
@@ -152,7 +159,7 @@ public function getLogDir()
     }
 }
 
-class CacheWarmerTester
+class WebpackEncoreCacheWarmerTester
 {
     private $entrypointCacheWarmer;