fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-3620

Browse Source 
Fix conflict with Path class in html2ps library.
This commit is contained in:
davidcallizaya
2017-08-04 15:40:33 -04:00
parent c3a2ba1950
commit 4960c8abc0
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

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

8
thirdparty/html2ps_pdf/output.png.class.php vendored
View File

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

6
thirdparty/html2ps_pdf/path.php vendored
View File

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

2
thirdparty/phing/IntrospectionHelper.php vendored
View File

@@ -36,7 +36,7 @@ include_once 'phing/util/StringHelper.php';
* *
* @author Andreas Aderhold <andi@binarycloud.com> * @author Andreas Aderhold <andi@binarycloud.com>
* @author Hans Lellelid <hans@xmpl.org> * @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 $ * @version $Revision: 1.19 $
* @package phing * @package phing
*/ */