Refactored tests, updated bootstrap for current version of ZF2, and refactored where rendering options are.

Author: Raymond J. Kolbe

src/DOMPDFModule/View/Model/PdfModel.php

@@ -23,6 +23,17 @@
 
 class PdfModel extends ViewModel
 {
+    /**
+     * Renderer options
+     * @var array
+     */
+    protected $options = array(
+        'paperSize' => '8x11',
+        'paperOrientation' => 'portrait',
+        'basePath' => '/',
+        'fileName' => null
+    );
+    
     /**
      * PDF probably won't need to be captured into a 
      * a parent container by default.

src/DOMPDFModule/View/Renderer/PdfRenderer.php

@@ -25,10 +25,6 @@
 
 class PdfRenderer implements Renderer
 {
-    private $paperSize = '8x11';
-    private $paperOrientation = 'portrait';
-    private $basePath = '/';
-    private $fileName = null;
     private $resolver = null;
     private $htmlRenderer = null;
 
@@ -43,39 +39,6 @@ public function getHtmlRenderer()
         return $this->htmlRenderer;
     }
 
-    public function setPaperSize($size)
-    {
-        $this->paperSize = $size;
-        
-        return $this;
-    }
-    
-    public function setPaperOrientation($orientation)
-    {
-        $this->paperOrientation = $orientation;
-        
-        return $this;
-    }
-    
-    public function setBasePath($path)
-    {
-        $this->path = $path;
-        
-        return $this;
-    }
-    
-    public function setFileName($name)
-    {
-        $this->fileName = $name;
-        
-        return $this;
-    }
-    
-    public function getFileName()
-    {
-        return $this->fileName;
-    }
-    
     /**
      * Renders values as a PDF
      *
@@ -87,13 +50,17 @@ public function render($nameOrModel, $values = null)
     {
         $html = $this->getHtmlRenderer()->render($nameOrModel, $values);
 
+        $paperSize = $nameOrModel->getOption('paperSize');
+        $paperOrientation = $nameOrModel->getOption('paperOrientation');
+        $basePath = $nameOrModel->getOption('basePath');
+        
         $pdf = new DOMPDF();
-        $pdf->set_paper($this->paperSize, $this->paperOrientation);
-        $pdf->set_base_path($this->basePath);
+        $pdf->set_paper($paperSize, $paperOrientation);
+        $pdf->set_base_path($basePath);
 
         $pdf->load_html($html);
         $pdf->render();
-
+        
         return $pdf->output();
     }
 

src/DOMPDFModule/View/Strategy/PdfStrategy.php

@@ -87,10 +87,6 @@ public function selectRenderer(ViewEvent $e)
         $model = $e->getModel();
 
         if ($model instanceof Model\PdfModel) {
-            $this->renderer->setPaperSize($model->getOption('paperSize'));
-            $this->renderer->setPaperOrientation($model->getOption('paperOrientation'));
-            $this->renderer->setBasePath($model->getOption('basePath'));
-            
             return $this->renderer;
         }
 
@@ -122,10 +118,11 @@ public function injectResponse(ViewEvent $e)
         $response->setContent($result);
         $response->getHeaders()->addHeaderLine('content-type', 'application/pdf');
 
-        if ($renderer->getFileName()) {
+        $fileName = $e->getModel()->getOption('filename');
+        if (isset($fileName)) {
             $response->getHeaders()->addHeaderLine(
             	'Content-Disposition', 
-            	'attachment; filename=' . $renderer->getFileName());
+            	'attachment; filename=' . $e->getModel()->getOption('filename'));
         }
     }
 }

tests/Bootstrap.php

@@ -1,7 +1,7 @@
 <?php
 
 use Zend\ServiceManager\ServiceManager;
-use Zend\Mvc\Service\ServiceManagerConfiguration;
+use Zend\Mvc\Service\ServiceManagerConfig;
 
 error_reporting( E_ALL | E_STRICT );
 
@@ -29,8 +29,8 @@
 // Assumes PHP Composer autoloader w/compiled classmaps, etc.
 require_once('vendor/autoload.php');
 
-$serviceManager = new ServiceManager(new ServiceManagerConfiguration($configuration['service_manager']));
-$serviceManager->setService('ApplicationConfiguration', $configuration);
+$serviceManager = new ServiceManager(new ServiceManagerConfig($configuration['service_manager']));
+$serviceManager->setService('ApplicationConfig', $configuration);
 $serviceManager->setAllowOverride(true);
 
 $moduleManager = $serviceManager->get('ModuleManager');

tests/DOMPDFModuleTest/View/Strategy/PdfStrategyTest.php

@@ -2,25 +2,21 @@
 
 namespace DOMPDFModuleTest\View\Strategy;
 
-use Zend\Filter\RealPath;
-
 use Zend\View\Resolver\TemplatePathStack;
-
-use PHPUnit_Framework_TestCase as TestCase;
-use Zend\EventManager\EventManager;
-use Zend\Http\Request as HttpRequest;
+use Zend\View\Renderer\PhpRenderer;
+use Zend\View\ViewEvent;
 use Zend\Http\Response as HttpResponse;
+use PHPUnit_Framework_TestCase as TestCase;
 use DOMPDFModule\View\Model\PdfModel;
-use Zend\View\Model\ViewModel;
 use DOMPDFModule\View\Renderer\PdfRenderer;
 use DOMPDFModule\View\Strategy\PdfStrategy;
-use Zend\View\ViewEvent;
+
 
 class PdfStrategyTest extends TestCase
 {
     public function setUp()
     {
-        $this->renderer = new PdfRenderer;
+        $this->renderer = new PdfRenderer();
         $this->strategy = new PdfStrategy($this->renderer);
         $this->event    = new ViewEvent();
         $this->response = new HttpResponse();
@@ -29,6 +25,10 @@ public function setUp()
         $this->resolver->addPath(dirname(__DIR__) . '/_templates');
 
         $this->renderer->setResolver($this->resolver);
+        
+        $htmlRenderer = new PhpRenderer();
+        $htmlRenderer->setResolver($this->resolver);
+        $this->renderer->setHtmlRenderer($htmlRenderer);
     }
 
     public function testPdfModelSelectsPdfStrategy()

tests/TestConfiguration.php.dist

@@ -8,6 +8,7 @@ return array(
         'cache_dir'            => 'data/cache',
         'module_paths' => array(
             './vendor',
+            './module'
         ),
     ),
     'service_manager' => array(