From 6619d96a83732d85ea63fd5d6879f9fdaa15d330 Mon Sep 17 00:00:00 2001 From: Atul-glo35265 Date: Thu, 12 Dec 2024 18:47:43 +0530 Subject: [PATCH 1/3] Php84 deprication fix --- library/Zend/Pdf.php | 2 +- library/Zend/Pdf/Action.php | 4 ++-- library/Zend/Pdf/Outline.php | 4 ++-- library/Zend/Pdf/Outline/Created.php | 4 ++-- library/Zend/Pdf/Outline/Loaded.php | 6 +++--- library/Zend/Pdf/Resource/GraphicsState.php | 2 +- library/Zend/Pdf/Trailer/Keeper.php | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/library/Zend/Pdf.php b/library/Zend/Pdf.php index 9d82539..568e440 100644 --- a/library/Zend/Pdf.php +++ b/library/Zend/Pdf.php @@ -1013,7 +1013,7 @@ public function getOpenAction() * @param Zend_Pdf_Target $openAction * @returns Zend_Pdf */ - public function setOpenAction(Zend_Pdf_Target $openAction = null) + public function setOpenAction(?Zend_Pdf_Target $openAction = null) { $root = $this->_trailer->Root; $root->touch(); diff --git a/library/Zend/Pdf/Action.php b/library/Zend/Pdf/Action.php index ee0f832..a94a071 100644 --- a/library/Zend/Pdf/Action.php +++ b/library/Zend/Pdf/Action.php @@ -112,7 +112,7 @@ public function __construct(Zend_Pdf_Element $dictionary, SplObjectStorage $proc * @return Zend_Pdf_Action * @throws Zend_Pdf_Exception */ - public static function load(Zend_Pdf_Element $dictionary, SplObjectStorage $processedActions = null) + public static function load(Zend_Pdf_Element $dictionary, ?SplObjectStorage $processedActions = null) { if ($processedActions === null) { $processedActions = new SplObjectStorage(); @@ -252,7 +252,7 @@ public function getResource() * @param SplObjectStorage $processedActions list of already processed actions (used to prevent infinity loop caused by cyclic references) * @return Zend_Pdf_Element_Object|Zend_Pdf_Element_Reference Dictionary indirect object */ - public function dumpAction(Zend_Pdf_ElementFactory_Interface $factory, SplObjectStorage $processedActions = null) + public function dumpAction(Zend_Pdf_ElementFactory_Interface $factory, ?SplObjectStorage $processedActions = null) { if ($processedActions === null) { $processedActions = new SplObjectStorage(); diff --git a/library/Zend/Pdf/Outline.php b/library/Zend/Pdf/Outline.php index b10512b..4f7ab1b 100644 --- a/library/Zend/Pdf/Outline.php +++ b/library/Zend/Pdf/Outline.php @@ -325,8 +325,8 @@ public function openOutlinesCount() abstract public function dumpOutline(Zend_Pdf_ElementFactory_Interface $factory, $updateNavigation, Zend_Pdf_Element $parent, - Zend_Pdf_Element $prev = null, - SplObjectStorage $processedOutlines = null); + ?Zend_Pdf_Element $prev = null, + ?SplObjectStorage $processedOutlines = null); //////////////////////////////////////////////////////////////////////// diff --git a/library/Zend/Pdf/Outline/Created.php b/library/Zend/Pdf/Outline/Created.php index 86f20d2..4cb1b05 100644 --- a/library/Zend/Pdf/Outline/Created.php +++ b/library/Zend/Pdf/Outline/Created.php @@ -202,8 +202,8 @@ public function __construct($options = array()) public function dumpOutline(Zend_Pdf_ElementFactory_Interface $factory, $updateNavigation, Zend_Pdf_Element $parent, - Zend_Pdf_Element $prev = null, - SplObjectStorage $processedOutlines = null) + ?Zend_Pdf_Element $prev = null, + ?SplObjectStorage $processedOutlines = null) { if ($processedOutlines === null) { $processedOutlines = new SplObjectStorage(); diff --git a/library/Zend/Pdf/Outline/Loaded.php b/library/Zend/Pdf/Outline/Loaded.php index 1c9077d..1409b5c 100644 --- a/library/Zend/Pdf/Outline/Loaded.php +++ b/library/Zend/Pdf/Outline/Loaded.php @@ -308,7 +308,7 @@ public function setOptions(array $options) * @return Zend_Pdf_Action * @throws Zend_Pdf_Exception */ - public function __construct(Zend_Pdf_Element $dictionary, SplObjectStorage $processedDictionaries = null) + public function __construct(Zend_Pdf_Element $dictionary, ?SplObjectStorage $processedDictionaries = null) { if ($dictionary->getType() != Zend_Pdf_Element::TYPE_DICTIONARY) { #require_once 'Zend/Pdf/Exception.php'; @@ -372,8 +372,8 @@ public function __construct(Zend_Pdf_Element $dictionary, SplObjectStorage $proc public function dumpOutline(Zend_Pdf_ElementFactory_Interface $factory, $updateNavigation, Zend_Pdf_Element $parent, - Zend_Pdf_Element $prev = null, - SplObjectStorage $processedOutlines = null) + ?Zend_Pdf_Element $prev = null, + ?SplObjectStorage $processedOutlines = null) { if ($processedOutlines === null) { $processedOutlines = new SplObjectStorage(); diff --git a/library/Zend/Pdf/Resource/GraphicsState.php b/library/Zend/Pdf/Resource/GraphicsState.php index a812186..98bb844 100644 --- a/library/Zend/Pdf/Resource/GraphicsState.php +++ b/library/Zend/Pdf/Resource/GraphicsState.php @@ -50,7 +50,7 @@ class Zend_Pdf_Resource_GraphicsState extends Zend_Pdf_Resource * @param Zend_Pdf_Element_Object $extGStateObject * @throws Zend_Pdf_Exception */ - public function __construct(Zend_Pdf_Element_Object $extGStateObject = null) + public function __construct(?Zend_Pdf_Element_Object $extGStateObject = null) { if ($extGStateObject == null) { // Create new Graphics State object diff --git a/library/Zend/Pdf/Trailer/Keeper.php b/library/Zend/Pdf/Trailer/Keeper.php index b2711b4..e424606 100644 --- a/library/Zend/Pdf/Trailer/Keeper.php +++ b/library/Zend/Pdf/Trailer/Keeper.php @@ -57,7 +57,7 @@ class Zend_Pdf_Trailer_Keeper extends Zend_Pdf_Trailer */ public function __construct(Zend_Pdf_Element_Dictionary $dict, Zend_Pdf_Element_Reference_Context $context, - Zend_Pdf_Trailer $prev = null) + ?Zend_Pdf_Trailer $prev = null) { parent::__construct($dict); From 049313c0b7ab527fbcfc535637d1db3513e302c8 Mon Sep 17 00:00:00 2001 From: Atul-glo35265 Date: Fri, 13 Dec 2024 13:34:33 +0530 Subject: [PATCH 2/3] Php84 deprecation fix --- composer.json | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index f3ba40c..fe23500 100644 --- a/composer.json +++ b/composer.json @@ -7,15 +7,29 @@ ], "homepage": "http://framework.zend.com/", "license": "BSD-3-Clause", + "repositories": [ + { + "type": "vcs", + "url": "git@github.com:magento-gl/magento-zend-exception.git" + }, + { + "type": "vcs", + "url": "git@github.com:magento-gl/magento-zend-log.git" + }, + { + "type": "vcs", + "url": "git@github.com:magento-gl/magento-zend-memory.git" + } + ], "require": { "php": ">=7.0.0", "ext-ctype": "*", "ext-gd": "*", "ext-iconv": "*", "ext-zlib": "*", - "magento/zend-exception": "^1.16", - "magento/zend-log": "^1.16", - "magento/zend-memory": "^1.16" + "magento/zend-exception": "dev-php84_deprication_fix", + "magento/zend-log": "dev-php84_deprication_fix", + "magento/zend-memory": "dev-php84_deprication_fix" }, "replace": { "zf1/zend-pdf": "^1.12", From 812051f4b59996833d8976d79a1857afb2ceadc6 Mon Sep 17 00:00:00 2001 From: Rajesh Kumar Date: Wed, 18 Dec 2024 20:27:53 +0530 Subject: [PATCH 3/3] Update the latest version --- composer.json | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/composer.json b/composer.json index fe23500..f3ba40c 100644 --- a/composer.json +++ b/composer.json @@ -7,29 +7,15 @@ ], "homepage": "http://framework.zend.com/", "license": "BSD-3-Clause", - "repositories": [ - { - "type": "vcs", - "url": "git@github.com:magento-gl/magento-zend-exception.git" - }, - { - "type": "vcs", - "url": "git@github.com:magento-gl/magento-zend-log.git" - }, - { - "type": "vcs", - "url": "git@github.com:magento-gl/magento-zend-memory.git" - } - ], "require": { "php": ">=7.0.0", "ext-ctype": "*", "ext-gd": "*", "ext-iconv": "*", "ext-zlib": "*", - "magento/zend-exception": "dev-php84_deprication_fix", - "magento/zend-log": "dev-php84_deprication_fix", - "magento/zend-memory": "dev-php84_deprication_fix" + "magento/zend-exception": "^1.16", + "magento/zend-log": "^1.16", + "magento/zend-memory": "^1.16" }, "replace": { "zf1/zend-pdf": "^1.12",