Merge pull request #15 from jobcloud/chore/PRO-3141/solve-deprecations

chore(PRO-3141): solve deprecations; some cleanup

Author: haeber

composer.json

@@ -24,11 +24,11 @@
         "ext-libxml": "*",
         "ext-mbstring": "*",
         "ext-xmlreader": "*",
-        "jobcloud/zendpdf": "^4.0.0"
+        "jobcloud/zendpdf": "^4.0.1"
     },
     "require-dev": {
         "imagine/imagine": ">=0.2.0,<0.6.0",
-        "phpunit/phpunit": "^8.5.44"
+        "phpunit/phpunit": "^8.5.48"
     },
     "prefer-stable": true,
     "minimum-stability": "dev",

lib/PHPPdf/Core/Node/BasicList.php

@@ -10,10 +10,7 @@
 
 use PHPPdf\Core\DrawingTaskHeap;
 use PHPPdf\Core\Node\BasicList\EnumerationStrategyFactory;
-use PHPPdf\Core\Node\BasicList\ImageEnumerationStrategy,
-    PHPPdf\Core\Node\BasicList\EnumerationStrategy,
-    PHPPdf\Core\Node\BasicList\OrderedEnumerationStrategy,
-    PHPPdf\Core\Node\BasicList\UnorderedEnumerationStrategy,
+use PHPPdf\Core\Node\BasicList\EnumerationStrategy,
     PHPPdf\Core\Document,
     PHPPdf\Core\DrawingTask;
 
@@ -38,6 +35,7 @@ class BasicList extends Container
     const LIST_POSITION_OUTSIDE = 'outside';
 
     private $enumerationStrategy;
+    private $enumerationStrategyFactory;
     private $omitEnumerationOfFirstElement = false;
 
     protected static function setDefaultAttributes()

lib/PHPPdf/Core/Node/Node.php

@@ -17,10 +17,8 @@
 use PHPPdf\Core\UnitConverter;
 use PHPPdf\Core\Document;
 use PHPPdf\Util;
-use PHPPdf\Core\Node\Container;
 use PHPPdf\Core\Boundary;
 use PHPPdf\Core\DrawingTask;
-use PHPPdf\Core\Formatter\Formatter;
 use PHPPdf\Core\Node\Behaviour\Behaviour;
 use PHPPdf\Core\Exception\InvalidAttributeException;
 use PHPPdf\Core\Point;
@@ -87,6 +85,8 @@ abstract class Node implements Drawable, NodeAware, \ArrayAccess
 
     private $preFormatInvoked = false;
 
+    private $drawingTasks = [];
+
     public function __construct(array $attributes = [], ?UnitConverter $converter = null)
     {
         static::initializeTypeIfNecessary();

lib/PHPPdf/Core/Parser/XmlDocumentParser.php

@@ -11,16 +11,13 @@
 use PHPPdf\Parser\XmlParser;
 use PHPPdf\Core\Document;
 use PHPPdf\Core\Node\Manager;
-use PHPPdf\Core\Node\NodeWrapper;
 use PHPPdf\Core\Node\Text,
     PHPPdf\Parser\Exception\ParseException,
     PHPPdf\Core\Node\NodeFactory,
     PHPPdf\Core\Node\PageCollection,
     PHPPdf\Core\Node\Node,
-    PHPPdf\Core\Parser\BagContainer,
     PHPPdf\Core\Parser\Exception as Exceptions,
     PHPPdf\Core\ComplexAttribute\ComplexAttributeFactory,
-    PHPPdf\Core\Parser\StylesheetConstraint,
     PHPPdf\Core\Node\Behaviour\Factory as BehaviourFactory;
 
 /**
@@ -57,7 +54,9 @@ class XmlDocumentParser extends XmlParser implements DocumentParser
     private $isPreviousText = false;
 
     private $currentParagraph = null;
-    
+
+    private $prototypes = [];
+
     private $document;
 
     private $listeners = array();