Merge pull request #364 from Nexylan/spork-0.3

Fix kriswallsmith/spork ProcessManager::__construct signature change
symfony · May 26, 2015 · 4282ddd · 4282ddd
2 parents 4bfd74e + 95c2079
commit 4282ddd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/Command/DumpCommand.php b/Command/DumpCommand.php
@@ -56,6 +56,7 @@ protected function initialize(InputInterface $input, OutputInterface $stdout)
 
             $this->spork = new ProcessManager(
                 new WrappedEventDispatcher($this->getContainer()->get('event_dispatcher')),
+                null,
                 $this->getContainer()->getParameter('kernel.debug')
             );
         }

diff --git a/composer.json b/composer.json
@@ -28,6 +28,9 @@
         "symfony/dom-crawler": "~2.3",
         "symfony/css-selector": "~2.3"
     },
+    "conflict": {
+        "kriswallsmith/spork": "<=0.2"
+    },
     "suggest": {
         "symfony/twig-bundle": "to use the Twig integration",
         "kriswallsmith/spork": "to be able to dump assets in parallel"