Replace array_pop with array_last

Author: tvdijen

src/XML/ds/AbstractDSAKeyValueType.php

@@ -13,7 +13,7 @@
 use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
 use SimpleSAML\XMLSchema\Exception\TooManyElementsException;
 
-use function array_pop;
+use function array_last;
 
 /**
  * A class implementing the ds:AbstractDSAKeyValueType element.
@@ -177,13 +177,13 @@ public static function fromXML(DOMElement $xml): static
         Assert::maxCount($pgenCounter, 1, TooManyElementsException::class);
 
         return new static(
-            array_pop($y),
-            array_pop($g),
-            array_pop($j),
-            array_pop($p),
-            array_pop($q),
-            array_pop($seed),
-            array_pop($pgenCounter),
+            array_last($y),
+            array_last($g),
+            array_last($j),
+            array_last($p),
+            array_last($q),
+            array_last($seed),
+            array_last($pgenCounter),
         );
     }
 

src/XML/ds/AbstractPGPDataType.php

@@ -15,7 +15,7 @@
 use SimpleSAML\XMLSchema\XML\Constants\NS;
 use SimpleSAML\XMLSecurity\XML\ds\AbstractDsElement;
 
-use function array_pop;
+use function array_last;
 
 /**
  * Abstract class representing the PGPDataType.
@@ -95,8 +95,8 @@ public static function fromXML(DOMElement $xml): static
         Assert::maxCount($pgpKeyPacket, 1, TooManyElementsException::class);
 
         return new static(
-            array_pop($pgpKeyId),
-            array_pop($pgpKeyPacket),
+            array_last($pgpKeyId),
+            array_last($pgpKeyPacket),
             self::getChildElementsFromXML($xml),
         );
     }

src/XML/ds/KeyValue.php

@@ -18,8 +18,8 @@
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\XML\dsig11\ECKeyValue;
 
+use function array_last;
 use function array_merge;
-use function array_pop;
 
 /**
  * Class representing a ds:KeyValue element.
@@ -107,7 +107,7 @@ public static function fromXML(DOMElement $xml): static
             TooManyElementsException::class,
         );
 
-        return new static(array_pop($keyValue));
+        return new static(array_last($keyValue));
     }
 
 

src/XML/ds/RSAKeyValue.php

@@ -12,6 +12,8 @@
 use SimpleSAML\XMLSchema\Exception\MissingElementException;
 use SimpleSAML\XMLSchema\Exception\TooManyElementsException;
 
+use function array_last;
+
 /**
  * Class representing a ds:RSAKeyValue element.
  *
@@ -98,7 +100,7 @@ public static function fromXML(DOMElement $xml): static
             TooManyElementsException::class,
         );
 
-        return new static(array_pop($modulus), array_pop($exponent));
+        return new static(array_last($modulus), array_last($exponent));
     }
 
 

src/XML/ds/Reference.php

@@ -14,7 +14,7 @@
 use SimpleSAML\XMLSchema\Type\IDValue;
 use SimpleSAML\XMLSecurity\Assert\Assert;
 
-use function array_pop;
+use function array_last;
 use function strval;
 
 /**
@@ -153,9 +153,9 @@ public static function fromXML(DOMElement $xml): static
         );
 
         return new static(
-            array_pop($digestMethod),
-            array_pop($digestValue),
-            empty($transforms) ? null : array_pop($transforms),
+            array_last($digestMethod),
+            array_last($digestValue),
+            empty($transforms) ? null : array_last($transforms),
             $Id,
             $Type,
             $URI,

src/XML/ds/RetrievalMethod.php

@@ -12,6 +12,7 @@
 use SimpleSAML\XMLSchema\Exception\TooManyElementsException;
 use SimpleSAML\XMLSchema\Type\AnyURIValue;
 
+use function array_last;
 use function strval;
 
 /**
@@ -91,7 +92,7 @@ public static function fromXML(DOMElement $xml): static
         );
 
         return new static(
-            array_pop($transforms),
+            array_last($transforms),
             $URI,
             $Type,
         );

src/XML/ds/Signature.php

@@ -14,7 +14,7 @@
 use SimpleSAML\XMLSecurity\Assert\Assert;
 use SimpleSAML\XMLSecurity\Constants as C;
 
-use function array_pop;
+use function array_last;
 use function strval;
 
 /**
@@ -149,9 +149,9 @@ public static function fromXML(DOMElement $xml): static
         $objects = DsObject::getChildrenOfClass($xml);
 
         return new static(
-            array_pop($signedInfo),
-            array_pop($signatureValue),
-            empty($keyInfo) ? null : array_pop($keyInfo),
+            array_last($signedInfo),
+            array_last($signatureValue),
+            empty($keyInfo) ? null : array_last($keyInfo),
             $objects,
             self::getOptionalAttribute($xml, 'Id', IDValue::class, null),
         );

src/XML/ds/SignatureMethod.php

@@ -17,8 +17,8 @@
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 
 use function array_keys;
+use function array_last;
 use function array_merge;
-use function array_pop;
 use function strval;
 
 /**
@@ -102,7 +102,7 @@ public static function fromXML(DOMElement $xml): static
         $hmacOutputLength = HMACOutputLength::getChildrenOfClass($xml);
         Assert::maxCount($hmacOutputLength, 1, TooManyElementsException::class);
 
-        return new static($Algorithm, array_pop($hmacOutputLength), self::getChildElementsFromXML($xml));
+        return new static($Algorithm, array_last($hmacOutputLength), self::getChildElementsFromXML($xml));
     }
 
 

src/XML/ds/SignedInfo.php

@@ -17,7 +17,7 @@
 use SimpleSAML\XMLSecurity\XML\CanonicalizableElementInterface;
 use SimpleSAML\XMLSecurity\XML\CanonicalizableElementTrait;
 
-use function array_pop;
+use function array_last;
 use function strval;
 
 /**
@@ -162,8 +162,8 @@ public static function fromXML(DOMElement $xml): static
         );
 
         $signedInfo = new static(
-            array_pop($canonicalizationMethod),
-            array_pop($signatureMethod),
+            array_last($canonicalizationMethod),
+            array_last($signatureMethod),
             $references,
             self::getOptionalAttribute($xml, 'Id', IDValue::class, null),
         );

src/XML/ds/Transform.php

@@ -15,7 +15,7 @@
 use SimpleSAML\XMLSecurity\XML\ec\InclusiveNamespaces;
 use SimpleSAML\XPath\Constants as XPATH_C;
 
-use function array_pop;
+use function array_last;
 use function strval;
 
 /**
@@ -121,8 +121,8 @@ public static function fromXML(DOMElement $xml): static
 
         return new static(
             self::getAttribute($xml, 'Algorithm', AnyURIValue::class),
-            array_pop($xpath),
-            array_pop($prefixes),
+            array_last($xpath),
+            array_last($prefixes),
         );
     }