Merge pull request #6 from magento-trigger/AC-2892-fix-return-type

xmav · web-flow · commit 2381396d2a9a · 2022-06-20T20:22:39.000-05:00
AC-2892 fix return type
diff --git a/library/Zend/Pdf/Action.php b/library/Zend/Pdf/Action.php
@@ -326,6 +326,7 @@ public function dumpAction(Zend_Pdf_ElementFactory_Interface $factory, SplObject
      *
      * @return Zend_Pdf_Action
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return current($this->next);
@@ -336,6 +337,7 @@ public function current()
      *
      * @return integer
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return key($this->next);
@@ -344,6 +346,7 @@ public function key()
     /**
      * Go to next child
      */
+    #[\ReturnTypeWillChange]
     public function next()
     {
         return next($this->next);
@@ -352,6 +355,7 @@ public function next()
     /**
      * Rewind children
      */
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         return reset($this->next);
@@ -362,6 +366,7 @@ public function rewind()
      *
      * @return boolean
      */
+    #[\ReturnTypeWillChange]
     public function valid()
     {
         return current($this->next) !== false;
@@ -372,6 +377,7 @@ public function valid()
      *
      * @return Zend_Pdf_Action|null
      */
+    #[\ReturnTypeWillChange]
     public function getChildren()
     {
         return current($this->next);
@@ -382,6 +388,7 @@ public function getChildren()
      *
      * @return bool  whether container has any pages
      */
+    #[\ReturnTypeWillChange]
     public function hasChildren()
     {
         return count($this->next) > 0;
@@ -397,6 +404,7 @@ public function hasChildren()
      *
      * @return int
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return count($this->childOutlines);
diff --git a/library/Zend/Pdf/Element/Reference.php b/library/Zend/Pdf/Element/Reference.php
@@ -82,14 +82,18 @@ class Zend_Pdf_Element_Reference extends Zend_Pdf_Element
     /**
      * Object constructor:
      *
-     * @param integer $objNum
-     * @param integer $genNum
+     * @param int $objNum
+     * @param int $genNum
      * @param Zend_Pdf_Element_Reference_Context $context
      * @param Zend_Pdf_ElementFactory $factory
      * @throws Zend_Pdf_Exception
      */
-    public function __construct($objNum, $genNum = 0, Zend_Pdf_Element_Reference_Context $context, Zend_Pdf_ElementFactory $factory)
-    {
+    public function __construct(
+        $objNum,
+        $genNum,
+        Zend_Pdf_Element_Reference_Context $context,
+        Zend_Pdf_ElementFactory $factory
+    ){
         if ( !(is_integer($objNum) && $objNum > 0) ) {
             #require_once 'Zend/Pdf/Exception.php';
             throw new Zend_Pdf_Exception('Object number must be positive integer');
diff --git a/library/Zend/Pdf/NameTree.php b/library/Zend/Pdf/NameTree.php
@@ -85,68 +85,71 @@ public function __construct(Zend_Pdf_Element $rootDictionary)
         }
     }
 
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return current($this->_items);
     }
 
-
+    #[\ReturnTypeWillChange]
     public function next()
     {
         return next($this->_items);
     }
 
-
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return key($this->_items);
     }
 
-
-    public function valid() {
+    #[\ReturnTypeWillChange]
+    public function valid()
+    {
         return current($this->_items)!==false;
     }
 
-
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         reset($this->_items);
     }
 
-
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return array_key_exists($offset, $this->_items);
     }
 
-
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->_items[$offset];
     }
 
-
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         if ($offset === null) {
-            $this->_items[]        = $value;
+            $this->_items[] = $value;
         } else {
             $this->_items[$offset] = $value;
         }
     }
 
-
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         unset($this->_items[$offset]);
     }
 
-
+    #[\ReturnTypeWillChange]
     public function clear()
     {
         $this->_items = array();
     }
 
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return count($this->_items);
diff --git a/library/Zend/Pdf/Outline.php b/library/Zend/Pdf/Outline.php
@@ -295,6 +295,7 @@ abstract public function dumpOutline(Zend_Pdf_ElementFactory_Interface $factory,
      *
      * @return Zend_Pdf_Outline
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return current($this->childOutlines);
@@ -305,6 +306,7 @@ public function current()
      *
      * @return integer
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return key($this->childOutlines);
@@ -313,6 +315,7 @@ public function key()
     /**
      * Go to next child
      */
+    #[\ReturnTypeWillChange]
     public function next()
     {
         return next($this->childOutlines);
@@ -321,6 +324,7 @@ public function next()
     /**
      * Rewind children
      */
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         return reset($this->childOutlines);
@@ -331,6 +335,7 @@ public function rewind()
      *
      * @return boolean
      */
+    #[\ReturnTypeWillChange]
     public function valid()
     {
         return current($this->childOutlines) !== false;
@@ -341,6 +346,7 @@ public function valid()
      *
      * @return Zend_Pdf_Outline|null
      */
+    #[\ReturnTypeWillChange]
     public function getChildren()
     {
         return current($this->childOutlines);
@@ -351,6 +357,7 @@ public function getChildren()
      *
      * @return bool  whether container has any pages
      */
+    #[\ReturnTypeWillChange]
     public function hasChildren()
     {
         return count($this->childOutlines) > 0;
@@ -366,6 +373,7 @@ public function hasChildren()
      *
      * @return int
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return count($this->childOutlines);
diff --git a/library/Zend/Pdf/StringParser.php b/library/Zend/Pdf/StringParser.php
@@ -514,7 +514,12 @@ private function _readReference($nextLexeme = null)
             return null;
         }
 
-        $ref = new Zend_Pdf_Element_Reference((int)$objNum, (int)$genNum, $this->_context, $this->_objFactory->resolve());
+        $ref = new Zend_Pdf_Element_Reference(
+            (int)$objNum,
+            (int)$genNum,
+            $this->_context,
+            $this->_objFactory->resolve()
+        );
 
         return $ref;
     }

Original file line number	Diff line number	Diff line change
`@@ -326,6 +326,7 @@ public function dumpAction(Zend_Pdf_ElementFactory_Interface $factory, SplObject`
`326`	`326`	`*`
`327`	`327`	`* @return Zend_Pdf_Action`
`328`	`328`	`*/`
	`329`	`+ #[\ReturnTypeWillChange]`
`329`	`330`	`public function current()`
`330`	`331`	`{`
`331`	`332`	`return current($this->next);`
`@@ -336,6 +337,7 @@ public function current()`
`336`	`337`	`*`
`337`	`338`	`* @return integer`
`338`	`339`	`*/`
	`340`	`+ #[\ReturnTypeWillChange]`
`339`	`341`	`public function key()`
`340`	`342`	`{`
`341`	`343`	`return key($this->next);`
`@@ -344,6 +346,7 @@ public function key()`
`344`	`346`	`/**`
`345`	`347`	`* Go to next child`
`346`	`348`	`*/`
	`349`	`+ #[\ReturnTypeWillChange]`
`347`	`350`	`public function next()`
`348`	`351`	`{`
`349`	`352`	`return next($this->next);`
`@@ -352,6 +355,7 @@ public function next()`
`352`	`355`	`/**`
`353`	`356`	`* Rewind children`
`354`	`357`	`*/`
	`358`	`+ #[\ReturnTypeWillChange]`
`355`	`359`	`public function rewind()`
`356`	`360`	`{`
`357`	`361`	`return reset($this->next);`
`@@ -362,6 +366,7 @@ public function rewind()`
`362`	`366`	`*`
`363`	`367`	`* @return boolean`
`364`	`368`	`*/`
	`369`	`+ #[\ReturnTypeWillChange]`
`365`	`370`	`public function valid()`
`366`	`371`	`{`
`367`	`372`	`return current($this->next) !== false;`
`@@ -372,6 +377,7 @@ public function valid()`
`372`	`377`	`*`
`373`	`378`	`* @return Zend_Pdf_Action\|null`
`374`	`379`	`*/`
	`380`	`+ #[\ReturnTypeWillChange]`
`375`	`381`	`public function getChildren()`
`376`	`382`	`{`
`377`	`383`	`return current($this->next);`
`@@ -382,6 +388,7 @@ public function getChildren()`
`382`	`388`	`*`
`383`	`389`	`* @return bool whether container has any pages`
`384`	`390`	`*/`
	`391`	`+ #[\ReturnTypeWillChange]`
`385`	`392`	`public function hasChildren()`
`386`	`393`	`{`
`387`	`394`	`return count($this->next) > 0;`
`@@ -397,6 +404,7 @@ public function hasChildren()`
`397`	`404`	`*`
`398`	`405`	`* @return int`
`399`	`406`	`*/`
	`407`	`+ #[\ReturnTypeWillChange]`
`400`	`408`	`public function count()`
`401`	`409`	`{`
`402`	`410`	`return count($this->childOutlines);`
Original file line number	Diff line number	Diff line change
`@@ -85,68 +85,71 @@ public function __construct(Zend_Pdf_Element $rootDictionary)`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
	`88`	`+ #[\ReturnTypeWillChange]`
`88`	`89`	`public function current()`
`89`	`90`	`{`
`90`	`91`	`return current($this->_items);`
`91`	`92`	`}`
`92`	`93`
`93`		`-`
	`94`	`+ #[\ReturnTypeWillChange]`
`94`	`95`	`public function next()`
`95`	`96`	`{`
`96`	`97`	`return next($this->_items);`
`97`	`98`	`}`
`98`	`99`
`99`		`-`
	`100`	`+ #[\ReturnTypeWillChange]`
`100`	`101`	`public function key()`
`101`	`102`	`{`
`102`	`103`	`return key($this->_items);`
`103`	`104`	`}`
`104`	`105`
`105`		`-`
`106`		`- public function valid() {`
	`106`	`+ #[\ReturnTypeWillChange]`
	`107`	`+ public function valid()`
	`108`	`+ {`
`107`	`109`	`return current($this->_items)!==false;`
`108`	`110`	`}`
`109`	`111`
`110`		`-`
	`112`	`+ #[\ReturnTypeWillChange]`
`111`	`113`	`public function rewind()`
`112`	`114`	`{`
`113`	`115`	`reset($this->_items);`
`114`	`116`	`}`
`115`	`117`
`116`		`-`
	`118`	`+ #[\ReturnTypeWillChange]`
`117`	`119`	`public function offsetExists($offset)`
`118`	`120`	`{`
`119`	`121`	`return array_key_exists($offset, $this->_items);`
`120`	`122`	`}`
`121`	`123`
`122`		`-`
	`124`	`+ #[\ReturnTypeWillChange]`
`123`	`125`	`public function offsetGet($offset)`
`124`	`126`	`{`
`125`	`127`	`return $this->_items[$offset];`
`126`	`128`	`}`
`127`	`129`
`128`		`-`
	`130`	`+ #[\ReturnTypeWillChange]`
`129`	`131`	`public function offsetSet($offset, $value)`
`130`	`132`	`{`
`131`	`133`	`if ($offset === null) {`
`132`		`- $this->_items[] = $value;`
	`134`	`+ $this->_items[] = $value;`
`133`	`135`	`} else {`
`134`	`136`	`$this->_items[$offset] = $value;`
`135`	`137`	`}`
`136`	`138`	`}`
`137`	`139`
`138`		`-`
	`140`	`+ #[\ReturnTypeWillChange]`
`139`	`141`	`public function offsetUnset($offset)`
`140`	`142`	`{`
`141`	`143`	`unset($this->_items[$offset]);`
`142`	`144`	`}`
`143`	`145`
`144`		`-`
	`146`	`+ #[\ReturnTypeWillChange]`
`145`	`147`	`public function clear()`
`146`	`148`	`{`
`147`	`149`	`$this->_items = array();`
`148`	`150`	`}`
`149`	`151`
	`152`	`+ #[\ReturnTypeWillChange]`
`150`	`153`	`public function count()`
`151`	`154`	`{`
`152`	`155`	`return count($this->_items);`
Original file line number	Diff line number	Diff line change
`@@ -295,6 +295,7 @@ abstract public function dumpOutline(Zend_Pdf_ElementFactory_Interface $factory,`
`295`	`295`	`*`
`296`	`296`	`* @return Zend_Pdf_Outline`
`297`	`297`	`*/`
	`298`	`+ #[\ReturnTypeWillChange]`
`298`	`299`	`public function current()`
`299`	`300`	`{`
`300`	`301`	`return current($this->childOutlines);`
`@@ -305,6 +306,7 @@ public function current()`
`305`	`306`	`*`
`306`	`307`	`* @return integer`
`307`	`308`	`*/`
	`309`	`+ #[\ReturnTypeWillChange]`
`308`	`310`	`public function key()`
`309`	`311`	`{`
`310`	`312`	`return key($this->childOutlines);`
`@@ -313,6 +315,7 @@ public function key()`
`313`	`315`	`/**`
`314`	`316`	`* Go to next child`
`315`	`317`	`*/`
	`318`	`+ #[\ReturnTypeWillChange]`
`316`	`319`	`public function next()`
`317`	`320`	`{`
`318`	`321`	`return next($this->childOutlines);`
`@@ -321,6 +324,7 @@ public function next()`
`321`	`324`	`/**`
`322`	`325`	`* Rewind children`
`323`	`326`	`*/`
	`327`	`+ #[\ReturnTypeWillChange]`
`324`	`328`	`public function rewind()`
`325`	`329`	`{`
`326`	`330`	`return reset($this->childOutlines);`
`@@ -331,6 +335,7 @@ public function rewind()`
`331`	`335`	`*`
`332`	`336`	`* @return boolean`
`333`	`337`	`*/`
	`338`	`+ #[\ReturnTypeWillChange]`
`334`	`339`	`public function valid()`
`335`	`340`	`{`
`336`	`341`	`return current($this->childOutlines) !== false;`
`@@ -341,6 +346,7 @@ public function valid()`
`341`	`346`	`*`
`342`	`347`	`* @return Zend_Pdf_Outline\|null`
`343`	`348`	`*/`
	`349`	`+ #[\ReturnTypeWillChange]`
`344`	`350`	`public function getChildren()`
`345`	`351`	`{`
`346`	`352`	`return current($this->childOutlines);`
`@@ -351,6 +357,7 @@ public function getChildren()`
`351`	`357`	`*`
`352`	`358`	`* @return bool whether container has any pages`
`353`	`359`	`*/`
	`360`	`+ #[\ReturnTypeWillChange]`
`354`	`361`	`public function hasChildren()`
`355`	`362`	`{`
`356`	`363`	`return count($this->childOutlines) > 0;`
`@@ -366,6 +373,7 @@ public function hasChildren()`
`366`	`373`	`*`
`367`	`374`	`* @return int`
`368`	`375`	`*/`
	`376`	`+ #[\ReturnTypeWillChange]`
`369`	`377`	`public function count()`
`370`	`378`	`{`
`371`	`379`	`return count($this->childOutlines);`
Original file line number	Diff line number	Diff line change
`@@ -514,7 +514,12 @@ private function _readReference($nextLexeme = null)`
`514`	`514`	`return null;`
`515`	`515`	`}`
`516`	`516`
`517`		`- $ref = new Zend_Pdf_Element_Reference((int)$objNum, (int)$genNum, $this->_context, $this->_objFactory->resolve());`
	`517`	`+ $ref = new Zend_Pdf_Element_Reference(`
	`518`	`+ (int)$objNum,`
	`519`	`+ (int)$genNum,`
	`520`	`+ $this->_context,`
	`521`	`+ $this->_objFactory->resolve()`
	`522`	`+ );`
`518`	`523`
`519`	`524`	`return $ref;`
`520`	`525`	`}`