Skip to content

Commit 52909df

Browse files
authored
Merge pull request #2 from jobcloud/feat/PRO-1403/resolve-dependency-hell
feat(PRO-1403): resolve dependency hell
2 parents ae3cc6c + b5014f7 commit 52909df

3 files changed

Lines changed: 11 additions & 26 deletions

File tree

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"zf2",
88
"pdf"
99
],
10-
"homepage": "http://packages.zendframework.com/",
10+
"homepage": "https://packages.zendframework.com/",
1111
"autoload": {
1212
"psr-0": {
1313
"ZendPdf\\": "library/"
@@ -16,13 +16,13 @@
1616
"repositories": [
1717
{
1818
"type": "composer",
19-
"url": "http://packages.zendframework.com/"
19+
"url": "https://packages.zendframework.com/"
2020
}
2121
],
2222
"require": {
23-
"php": "^8.0 || ^8.1 || ^8.2",
24-
"zendframework/zend-memory": ">=2.0.0",
25-
"zendframework/zend-stdlib": ">=2.0.0"
23+
"php": "^8.0",
24+
"laminas/laminas-memory": "^2.11.1",
25+
"laminas/laminas-stdlib": "^3.20"
2626
},
2727
"extra": {
2828
"branch-alias": {

library/ZendPdf/BinaryParser/DataSource/File.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
use ZendPdf as Pdf;
1414
use ZendPdf\Exception;
15-
use Zend\Stdlib\ErrorHandler;
15+
use Laminas\Stdlib\ErrorHandler;
1616

1717
/**
1818
* Concrete subclass of {@link \ZendPdf\BinaryParser\DataSource\AbstractDataSource}

library/ZendPdf/PdfDocument.php

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
namespace ZendPdf;
1212

13-
use Zend\Memory;
13+
use Laminas\Memory\MemoryManager;
1414
use ZendPdf\Exception;
1515

1616
/**
@@ -131,12 +131,7 @@ class PdfDocument
131131
*/
132132
protected $_objFactory = null;
133133

134-
/**
135-
* Memory manager for stream objects
136-
*
137-
* @var \Zend\Memory\MemoryManager|null
138-
*/
139-
protected static $_memoryManager = null;
134+
protected static ?MemoryManager $_memoryManager = null;
140135

141136
/**
142137
* PDF file parser.
@@ -154,26 +149,16 @@ class PdfDocument
154149
*/
155150
protected static $_inheritableAttributes = array('Resources', 'MediaBox', 'CropBox', 'Rotate');
156151

157-
/**
158-
* Request used memory manager
159-
*
160-
* @return Zend\Memory\MemoryManager
161-
*/
162-
public static function getMemoryManager()
152+
public static function getMemoryManager(): ?MemoryManager
163153
{
164154
if (self::$_memoryManager === null) {
165-
self::$_memoryManager = new Memory\MemoryManager();
155+
self::$_memoryManager = new MemoryManager();
166156
}
167157

168158
return self::$_memoryManager;
169159
}
170160

171-
/**
172-
* Set user defined memory manager
173-
*
174-
* @param Zend\Memory\MemoryManager $memoryManager
175-
*/
176-
public static function setMemoryManager(Memory\MemoryManager $memoryManager)
161+
public static function setMemoryManager(MemoryManager $memoryManager): void
177162
{
178163
self::$_memoryManager = $memoryManager;
179164
}

0 commit comments

Comments
 (0)