Updates regarding SF 3.4 + due to deprecations (#14)

ricohumme · Padam87 · commit 4adc34bba1f0 · 2017-12-13T16:56:15.000+01:00
* Service made public, added environment

Due to deprecation of access to services through the container.
Process class requires environment in SF 4.0

* Added environment

Due to deprecation since SF 3.3, start method requires an array of environments

* Replaced ProcessBuilder with Process

As of SF 3.4, the ProcessBuilder is deprecated

* Removed import ProcessBuilder

* Updated UnitTest for Rasterizer
diff --git a/ConfigHelper.php b/ConfigHelper.php
@@ -4,7 +4,6 @@
 
 use Symfony\Component\Process\InputStream;
 use Symfony\Component\Process\Process;
-use Symfony\Component\Process\ProcessBuilder;
 
 class ConfigHelper
 {
@@ -29,20 +28,17 @@ public function __construct(array $config)
      */
     public function buildProcess($input, $arguments = array())
     {
-        $builder = new ProcessBuilder();
-        $builder
-            ->setPrefix($this->config['phantomjs']['callable'])
-            ->setArguments(
-                array_merge(
-                    $this->processPhantomjsOptions(),
-                    [$this->config['script']],
-                    array_values(array_merge($this->config['arguments'], $arguments))
-                )
-            )
-            ->setInput($input)
-        ;
+        $process = new Process(
+            array_merge(
+                [$this->config['phantomjs']['callable']],
+                $this->processPhantomjsOptions(),
+                [ $this->config['script'] ],
+                array_values(array_merge($this->config['arguments'], $arguments))
+            ),
+            null, [], $input
+        );
 
-        return $builder->getProcess();
+        return $process;
     }
 
     /**
diff --git a/Rasterizer.php b/Rasterizer.php
@@ -17,14 +17,21 @@ class Rasterizer
      */
     protected $stopwatch;
 
+    /**
+     * @var array
+     */
+    protected $environment;
+
     /**
      * @param ConfigHelper $configHelper
      * @param Stopwatch    $stopwatch
+     * @param string       $environment
      */
-    public function __construct(ConfigHelper $configHelper, Stopwatch $stopwatch = null)
+    public function __construct(ConfigHelper $configHelper, Stopwatch $stopwatch = null, $environment)
     {
         $this->configHelper = $configHelper;
         $this->stopwatch = $stopwatch;
+        $this->environment = [ $environment ];
     }
 
     /**
@@ -42,7 +49,7 @@ public function rasterize($html, $arguments = array())
         $input = new InputStream();
 
         $process = $this->configHelper->buildProcess($input, $arguments);
-        $process->start();
+        $process->start(null, $this->environment);
 
         $input->write($html);
         $input->close();
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -14,9 +14,10 @@
         <service id="padam87_rasterize.config_helper" class="%padam87_rasterize.config_helper.class%">
             <argument>%padam87_rasterize.config%</argument>
         </service>
-        <service id="padam87_rasterize.rasterizer" class="%padam87_rasterize.rasterizer.class%">
+        <service id="padam87_rasterize.rasterizer" class="%padam87_rasterize.rasterizer.class%" public="true">
             <argument type="service" id="padam87_rasterize.config_helper" />
             <argument type="service" id="debug.stopwatch" on-invalid="null" />
+            <argument>%kernel.environment%</argument>
         </service>
     </services>
 </container>
diff --git a/Tests/RasterizerTest.php b/Tests/RasterizerTest.php
@@ -52,7 +52,7 @@ public function testRasterize()
         $this->process->expects($this->once())->method('wait');
         $this->process->expects($this->once())->method('getOutput')->willReturn('pdfcontent');
 
-        $rasterizer = new Rasterizer($this->configHelper, $this->stopwatch);
+        $rasterizer = new Rasterizer($this->configHelper, $this->stopwatch, 'test');
 
         $this->assertSame('pdfcontent', $rasterizer->rasterize('<html></html>'));
     }

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function testRasterize()`
`52`	`52`	`$this->process->expects($this->once())->method('wait');`
`53`	`53`	`$this->process->expects($this->once())->method('getOutput')->willReturn('pdfcontent');`
`54`	`54`
`55`		`- $rasterizer = new Rasterizer($this->configHelper, $this->stopwatch);`
	`55`	`+ $rasterizer = new Rasterizer($this->configHelper, $this->stopwatch, 'test');`
`56`	`56`
`57`	`57`	`$this->assertSame('pdfcontent', $rasterizer->rasterize('<html></html>'));`
`58`	`58`	`}`