Merge branch 'backport/bug/dump-check' into 5.4

Backporting #12
lcobucci · Jan 12, 2018 · 6dcc58c · 6dcc58c
2 parents b89022f + db2194d
commit 6dcc58c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/src/Compiler/DumpXmlContainer.php b/src/Compiler/DumpXmlContainer.php
@@ -23,7 +23,7 @@ public function __construct(ConfigCacheInterface $configCache)
 
     public function process(ContainerBuilder $container): void
     {
-        if (! $container->getParameter('app.devmode') || ! $this->configCache->isFresh()) {
+        if (! $container->getParameter('app.devmode') || $this->configCache->isFresh()) {
             return;
         }
 

diff --git a/test/Compiler/DumpXmlContainerTest.php b/test/Compiler/DumpXmlContainerTest.php
@@ -49,10 +49,10 @@ public function processShouldBeSkippedWhenDevModeIsNotEnabled(): void
      * @covers \Lcobucci\DependencyInjection\Compiler\DumpXmlContainer::__construct
      * @covers \Lcobucci\DependencyInjection\Compiler\DumpXmlContainer::process
      */
-    public function processShouldBeSkippedWhenCacheIsNotFresh(): void
+    public function processShouldBeSkippedWhenCacheIsFresh(): void
     {
         $this->configCache->method('isFresh')
-                          ->willReturn(false);
+                          ->willReturn(true);
 
         $this->configCache->expects($this->never())
                           ->method('write');
@@ -77,7 +77,7 @@ public function processShouldDumpTheContainerUsingTheXmlDumper(): void
         );
 
         $this->configCache->method('isFresh')
-                          ->willReturn(true);
+                          ->willReturn(false);
 
         $this->configCache->expects($this->once())
                           ->method('write')

diff --git a/test/GeneratorTest.php b/test/GeneratorTest.php
@@ -3,6 +3,7 @@
 
 namespace Lcobucci\DependencyInjection;
 
+use Lcobucci\DependencyInjection\Compiler\DumpXmlContainer;
 use Lcobucci\DependencyInjection\Compiler\ParameterBag;
 use Lcobucci\DependencyInjection\Config\ContainerConfiguration;
 use org\bovigo\vfs\vfsStream;
@@ -81,7 +82,16 @@ public function generateShouldCompileAndLoadTheContainer(): void
 
         $config = new ContainerConfiguration(
             [vfsStream::url('tests/services.yml')],
-            [[new ParameterBag(['app.devmode' => true]), PassConfig::TYPE_BEFORE_OPTIMIZATION]]
+            [
+                [new ParameterBag(['app.devmode' => true]), PassConfig::TYPE_BEFORE_OPTIMIZATION],
+                [
+                    new DumpXmlContainer(
+                        new ConfigCache(vfsStream::url('tests/dump.xml'), true)
+                    ),
+                    PassConfig::TYPE_AFTER_REMOVING,
+                    -255
+                ],
+            ]
         );
 
         $dump = new ConfigCache(vfsStream::url('tests/container.php'), false);
@@ -99,5 +109,6 @@ function (SymfonyBuilder $container, array $paths) {
 
         self::assertInstanceOf(ContainerInterface::class, $container);
         self::assertInstanceOf(stdClass::class, $container->get('testing'));
+        self::assertFileExists(vfsStream::url('tests/dump.xml'));
     }
 }