HOR-3620

Fix conflict with Path class in html2ps library.

composer.json

@@ -67,7 +67,6 @@
             "thirdparty/pear",
             "thirdparty/html2ps_pdf",
             "thirdparty/phing",
-            "thirdparty/phpmailer",
             "rbac/engine/classes/"
         ],
         "files": [

thirdparty/html2ps_pdf/output.png.class.php

@@ -185,7 +185,7 @@ class OutputDriverPNG extends OutputDriverGeneric {
 
     $this->_color    = array();
     $this->_font     = array();
-    $this->_path     = new Path;
+    $this->_path     = new HtmlPsPath;
     $this->_clipping = array();
 
     $this->_font_factory = new FontFactory();
@@ -266,7 +266,7 @@ class OutputDriverPNG extends OutputDriverGeneric {
     /**
      * Reset path after clipping have been applied
      */
-    $this->_path = new Path;
+    $this->_path = new HtmlPsPath;
   }
 
   function close() { 
@@ -311,7 +311,7 @@ class OutputDriverPNG extends OutputDriverGeneric {
 
   function fill() { 
     $this->_path->fill($this->_transform, $this->_image, $this->_getCurrentColor());
-    $this->_path = new Path;
+    $this->_path = new HtmlPsPath;
   }
 
   function font_ascender($name, $encoding) {
@@ -524,7 +524,7 @@ class OutputDriverPNG extends OutputDriverGeneric {
 
   function stroke() { 
     $this->_path->stroke($this->_transform, $this->_image, $this->_getCurrentColor());
-    $this->_path = new Path;
+    $this->_path = new HtmlPsPath;
   }
 }
 ?>

thirdparty/html2ps_pdf/path.php

@@ -3,10 +3,10 @@
 require_once(HTML2PS_DIR.'path.point.php');
 require_once(HTML2PS_DIR.'path.rectangle.php');
 
-class Path {
+class HtmlPsPath {
   var $_points;
 
-  function Path() {
+  function HtmlPsPath() {
     $this->clear();
   }
 
@@ -101,7 +101,7 @@ class Path {
   }
 }
 
-class PathCircle extends Path {
+class PathCircle extends HtmlPsPath {
   var $_x;
   var $_y;
   var $_r;

thirdparty/phing/IntrospectionHelper.php

@@ -36,7 +36,7 @@ include_once 'phing/util/StringHelper.php';
  *
  * @author    Andreas Aderhold <andi@binarycloud.com>
  * @author    Hans Lellelid <hans@xmpl.org>
- * @copyright <EFBFBD> 2001,2002 THYRELL. All rights reserved
+ * @copyright © 2001,2002 THYRELL. All rights reserved
  * @version   $Revision: 1.19 $
  * @package   phing
  */