Replace array_pop with array_last

Author: tvdijen

src/XML/SerializableElementTrait.php

@@ -7,7 +7,7 @@
 use DOMElement;
 use SimpleSAML\XML\DOMDocumentFactory;
 
-use function array_pop;
+use function array_last;
 use function get_object_vars;
 
 /**
@@ -73,7 +73,7 @@ public function __serialize(): array
     public function __unserialize(array $serialized): void
     {
         $xml = static::fromXML(
-            DOMDocumentFactory::fromString(array_pop($serialized))->documentElement,
+            DOMDocumentFactory::fromString(array_last($serialized))->documentElement,
         );
 
         $vars = get_object_vars($xml);

src/XMLSchema/XML/AbstractNoFixedFacet.php

@@ -12,7 +12,7 @@
 use SimpleSAML\XMLSchema\Type\Interface\ValueTypeInterface;
 use SimpleSAML\XMLSchema\Type\StringValue;
 
-use function array_pop;
+use function array_last;
 
 /**
  * Abstract class representing the facet-type.
@@ -58,7 +58,7 @@ public static function fromXML(DOMElement $xml): static
 
         return new static(
             self::getAttribute($xml, 'value', StringValue::class),
-            array_pop($annotation),
+            array_last($annotation),
             self::getOptionalAttribute($xml, 'id', IDValue::class, null),
             self::getAttributesNSFromXML($xml),
         );

src/XMLSchema/XML/AbstractNumFacet.php

@@ -13,6 +13,8 @@
 use SimpleSAML\XMLSchema\Type\Interface\ValueTypeInterface;
 use SimpleSAML\XMLSchema\Type\NonNegativeIntegerValue;
 
+use function array_last;
+
 /**
  * Abstract class representing the facet-type.
  *
@@ -62,7 +64,7 @@ public static function fromXML(DOMElement $xml): static
         return new static(
             self::getAttribute($xml, 'value', NonNegativeIntegerValue::class),
             self::getOptionalAttribute($xml, 'fixed', BooleanValue::class, null),
-            array_pop($annotation),
+            array_last($annotation),
             self::getOptionalAttribute($xml, 'id', IDValue::class, null),
             self::getAttributesNSFromXML($xml),
         );

src/XMLSchema/XML/All.php

@@ -19,7 +19,7 @@
 use SimpleSAML\XMLSchema\XML\Interface\ParticleInterface;
 use SimpleSAML\XMLSchema\XML\Interface\TypeDefParticleInterface;
 
-use function array_pop;
+use function array_last;
 
 /**
  * Class representing the all-element.
@@ -69,7 +69,7 @@ public static function fromXML(DOMElement $xml): static
             self::getOptionalAttribute($xml, 'minCount', MinOccursValue::class, null),
             self::getOptionalAttribute($xml, 'maxCount', MaxOccursValue::class, null),
             $narrowMaxMin,
-            annotation: array_pop($annotation),
+            annotation: array_last($annotation),
             id: self::getOptionalAttribute($xml, 'id', IDValue::class, null),
             namespacedAttributes: self::getAttributesNSFromXML($xml),
         );

src/XMLSchema/XML/Any.php

@@ -18,7 +18,7 @@
 use SimpleSAML\XMLSchema\XML\Interface\NestedParticleInterface;
 use SimpleSAML\XMLSchema\XML\Trait\OccursTrait;
 
-use function array_pop;
+use function array_last;
 use function strval;
 
 /**
@@ -97,7 +97,7 @@ public static function fromXML(DOMElement $xml): static
         return new static(
             self::getOptionalAttribute($xml, 'namespace', NamespaceListValue::class, null),
             self::getOptionalAttribute($xml, 'processContents', ProcessContentsValue::class, null),
-            array_pop($annotation),
+            array_last($annotation),
             self::getOptionalAttribute($xml, 'id', IDValue::class, null),
             self::getAttributesNSFromXML($xml),
             self::getOptionalAttribute($xml, 'minOccurs', MinOccursValue::class, null),

src/XMLSchema/XML/AnyAttribute.php

@@ -14,7 +14,7 @@
 use SimpleSAML\XMLSchema\Type\Schema\NamespaceListValue;
 use SimpleSAML\XMLSchema\Type\Schema\ProcessContentsValue;
 
-use function array_pop;
+use function array_last;
 
 /**
  * Class representing the anyAttribute element
@@ -49,7 +49,7 @@ public static function fromXML(DOMElement $xml): static
         return new static(
             self::getOptionalAttribute($xml, 'namespace', NamespaceListValue::class, null),
             self::getOptionalAttribute($xml, 'processContents', ProcessContentsValue::class, null),
-            array_pop($annotation),
+            array_last($annotation),
             self::getOptionalAttribute($xml, 'id', IDValue::class, null),
             self::getAttributesNSFromXML($xml),
         );

src/XMLSchema/XML/Choice.php

@@ -20,7 +20,7 @@
 use SimpleSAML\XMLSchema\XML\Interface\TypeDefParticleInterface;
 
 use function array_merge;
-use function array_pop;
+use function array_last;
 
 /**
  * Class representing the choice-element.
@@ -74,7 +74,7 @@ public static function fromXML(DOMElement $xml): static
             self::getOptionalAttribute($xml, 'minOccurs', MinOccursValue::class, null),
             self::getOptionalAttribute($xml, 'maxOccurs', MaxOccursValue::class, null),
             $particles,
-            array_pop($annotation),
+            array_last($annotation),
             self::getOptionalAttribute($xml, 'id', IDValue::class, null),
             self::getAttributesNSFromXML($xml),
         );

src/XMLSchema/XML/ComplexContent.php

@@ -13,6 +13,7 @@
 use SimpleSAML\XMLSchema\Type\BooleanValue;
 use SimpleSAML\XMLSchema\Type\IDValue;
 
+use function array_last;
 use function array_merge;
 use function strval;
 
@@ -131,7 +132,7 @@ public static function fromXML(DOMElement $xml): static
         return new static(
             $content[0],
             self::getOptionalAttribute($xml, 'mixed', BooleanValue::class, null),
-            array_pop($annotation),
+            array_last($annotation),
             self::getOptionalAttribute($xml, 'id', IDValue::class, null),
             self::getAttributesNSFromXML($xml),
         );

src/XMLSchema/XML/ComplexRestriction.php

@@ -11,8 +11,8 @@
 use SimpleSAML\XMLSchema\Type\IDValue;
 use SimpleSAML\XMLSchema\Type\QNameValue;
 
+use function array_last;
 use function array_merge;
-use function array_pop;
 
 /**
  * Class representing the complexRestrictionType restriction-element.
@@ -65,10 +65,10 @@ public static function fromXML(DOMElement $xml): static
 
         return new static(
             self::getAttribute($xml, 'base', QNameValue::class),
-            array_pop($particles),
+            array_last($particles),
             $attributes,
-            array_pop($anyAttribute),
-            array_pop($annotation),
+            array_last($anyAttribute),
+            array_last($annotation),
             self::getOptionalAttribute($xml, 'id', IDValue::class, null),
             self::getAttributesNSFromXML($xml),
         );

src/XMLSchema/XML/Extension.php

@@ -11,8 +11,8 @@
 use SimpleSAML\XMLSchema\Type\IDValue;
 use SimpleSAML\XMLSchema\Type\QNameValue;
 
+use function array_last;
 use function array_merge;
-use function array_pop;
 
 /**
  * Class representing the local version of xs:extension.
@@ -65,10 +65,10 @@ public static function fromXML(DOMElement $xml): static
 
         return new static(
             self::getAttribute($xml, 'base', QNameValue::class),
-            array_pop($particles),
+            array_last($particles),
             $attributes,
-            array_pop($anyAttribute),
-            array_pop($annotation),
+            array_last($anyAttribute),
+            array_last($annotation),
             self::getOptionalAttribute($xml, 'id', IDValue::class, null),
             self::getAttributesNSFromXML($xml),
         );