MDL-75487 libraries: upgrade to version 2.0.3 of CFPropertyList.

Author: paulholden

lib/plist/classes/CFPropertyList/CFArray.php

@@ -177,17 +177,18 @@ public function toArray()
    * @return void
    * @uses $iteratorPosition set to 0
    */
-    public function rewind()
+    public function rewind(): void
     {
         $this->iteratorPosition = 0;
     }
 
   /**
    * Get Iterator's current {@link CFType} identified by {@link $iteratorPosition}
    * @link http://php.net/manual/en/iterator.current.php
-   * @return CFType current Item
+   * @return mixed current Item
    * @uses $iteratorPosition identify current key
    */
+   #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->value[$this->iteratorPosition];
@@ -196,9 +197,10 @@ public function current()
   /**
    * Get Iterator's current key identified by {@link $iteratorPosition}
    * @link http://php.net/manual/en/iterator.key.php
-   * @return string key of the current Item
+   * @return mixed key of the current Item: mixed
    * @uses $iteratorPosition identify current key
    */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->iteratorPosition;
@@ -210,19 +212,19 @@ public function key()
    * @return void
    * @uses $iteratorPosition increment by 1
    */
-    public function next()
+    public function next(): void
     {
         $this->iteratorPosition++;
     }
 
   /**
    * Test if {@link $iteratorPosition} addresses a valid element of {@link $value}
    * @link http://php.net/manual/en/iterator.valid.php
-   * @return boolean true if current position is valid, false else
+   * @return bool true if current position is valid, false else
    * @uses $iteratorPosition test if within {@link $iteratorKeys}
    * @uses $iteratorPosition test if within {@link $value}
    */
-    public function valid()
+    public function valid(): bool
     {
         return isset($this->value[$this->iteratorPosition]);
     }
@@ -233,53 +235,54 @@ public function valid()
 
   /**
    * Determine if the array's key exists
-   * @param string $key the key to check
+   * @param string $offset the key to check
    * @return bool true if the offset exists, false if not
    * @link http://php.net/manual/en/arrayaccess.offsetexists.php
    * @uses $value to check if $key exists
    * @author Sean Coates <[email protected]>
    */
-    public function offsetExists($key)
+    public function offsetExists($offset): bool
     {
-        return isset($this->value[$key]);
+        return isset($this->value[$offset]);
     }
 
   /**
    * Fetch a specific key from the CFArray
-   * @param string $key the key to check
+   * @param mixed $offset the key to check
    * @return mixed the value associated with the key; null if the key is not found
    * @link http://php.net/manual/en/arrayaccess.offsetget.php
    * @uses get() to get the key's value
    * @author Sean Coates <[email protected]>
    */
-    public function offsetGet($key)
+    #[\ReturnTypeWillChange]
+    public function offsetGet($offset)
     {
-        return $this->get($key);
+        return $this->get($offset);
     }
 
   /**
    * Set a value in the array
-   * @param string $key the key to set
-   * @param string $value the value to set
+   * @param mixed $offset the key to set
+   * @param mixed $value the value to set
    * @return void
    * @link http://php.net/manual/en/arrayaccess.offsetset.php
    * @uses setValue() to set the key's new value
    * @author Sean Coates <[email protected]>
    */
-    public function offsetSet($key, $value)
+    public function offsetSet($offset, $value): void
     {
-        return $this->setValue($value);
+        $this->setValue($value);
     }
 
   /**
    * Unsets a value in the array
    * <b>Note:</b> this dummy does nothing
-   * @param string $key the key to set
+   * @param mixed $offset the key to set
    * @return void
    * @link http://php.net/manual/en/arrayaccess.offsetunset.php
    * @author Sean Coates <[email protected]>
    */
-    public function offsetUnset($key)
+    public function offsetUnset($offset): void
     {
     }
 }

lib/plist/classes/CFPropertyList/CFDictionary.php

@@ -181,29 +181,31 @@ public function toArray()
     * @uses $iteratorPosition set to 0
     * @uses $iteratorKeys store keys of {@link $value}
     */
-    public function rewind()
+    public function rewind(): void
     {
         $this->iteratorPosition = 0;
         $this->iteratorKeys = array_keys($this->value);
     }
    /**
     * Get Iterator's current {@link CFType} identified by {@link $iteratorPosition}
     * @link http://php.net/manual/en/iterator.current.php
-    * @return CFType current Item
+    * @return mixed current Item
     * @uses $iteratorPosition identify current key
     * @uses $iteratorKeys identify current value
     */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->value[$this->iteratorKeys[$this->iteratorPosition]];
     }
    /**
     * Get Iterator's current key identified by {@link $iteratorPosition}
     * @link http://php.net/manual/en/iterator.key.php
-    * @return string key of the current Item
+    * @return mixed key of the current Item
     * @uses $iteratorPosition identify current key
     * @uses $iteratorKeys identify current value
     */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->iteratorKeys[$this->iteratorPosition];
@@ -214,18 +216,18 @@ public function key()
     * @return void
     * @uses $iteratorPosition increment by 1
     */
-    public function next()
+    public function next(): void
     {
         $this->iteratorPosition++;
     }
    /**
     * Test if {@link $iteratorPosition} addresses a valid element of {@link $value}
     * @link http://php.net/manual/en/iterator.valid.php
-    * @return boolean true if current position is valid, false else
+    * @return bool true if current position is valid, false else
     * @uses $iteratorPosition test if within {@link $iteratorKeys}
     * @uses $iteratorPosition test if within {@link $value}
     */
-    public function valid()
+    public function valid(): bool
     {
         return isset($this->iteratorKeys[$this->iteratorPosition]) && isset($this->value[$this->iteratorKeys[$this->iteratorPosition]]);
     }

lib/plist/classes/CFPropertyList/CFPropertyList.php

@@ -591,7 +591,7 @@ public function purge()
 
   /**
    * Get first (and only) child, or complete collection.
-   * @param string $cftype if set to true returned value will be CFArray instead of an array in case of a collection
+   * @param boolean $cftype if set to true returned value will be CFArray instead of an array in case of a collection
    * @return CFType|array CFType or list of CFTypes known to the PropertyList
    * @uses $value for retrieving CFTypes
    */
@@ -667,7 +667,7 @@ public function toArray()
    * @uses $iteratorPosition set to 0
    * @uses $iteratorKeys store keys of {@link $value}
    */
-    public function rewind()
+    public function rewind(): void
     {
         $this->iteratorPosition = 0;
         $this->iteratorKeys = array_keys($this->value);
@@ -676,10 +676,11 @@ public function rewind()
   /**
    * Get Iterator's current {@link CFType} identified by {@link $iteratorPosition}
    * @link http://php.net/manual/en/iterator.current.php
-   * @return CFType current Item
+   * @return mixed current Item
    * @uses $iteratorPosition identify current key
    * @uses $iteratorKeys identify current value
    */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->value[$this->iteratorKeys[$this->iteratorPosition]];
@@ -688,10 +689,11 @@ public function current()
   /**
    * Get Iterator's current key identified by {@link $iteratorPosition}
    * @link http://php.net/manual/en/iterator.key.php
-   * @return string key of the current Item
+   * @return mixed key of the current Item
    * @uses $iteratorPosition identify current key
    * @uses $iteratorKeys identify current value
    */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->iteratorKeys[$this->iteratorPosition];
@@ -703,7 +705,7 @@ public function key()
    * @return void
    * @uses $iteratorPosition increment by 1
    */
-    public function next()
+    public function next(): void
     {
         $this->iteratorPosition++;
     }
@@ -715,7 +717,7 @@ public function next()
    * @uses $iteratorPosition test if within {@link $iteratorKeys}
    * @uses $iteratorPosition test if within {@link $value}
    */
-    public function valid()
+    public function valid(): bool
     {
         return isset($this->iteratorKeys[$this->iteratorPosition]) && isset($this->value[$this->iteratorKeys[$this->iteratorPosition]]);
     }

lib/plist/readme_moodle.txt

@@ -1,7 +1,7 @@
 CFPropertyList library
 ---------------
 
-Downloaded last release from: https://github.com/TECLIB/CFPropertyList/releases/
+Downloaded last release from: https://github.com/TECLIB/CFPropertyList/tags
 
 Import procedure:
 
@@ -18,4 +18,3 @@ Removed:
 Added:
  * readme_moodle.txt
 
-Downloaded version: 2.0.2

lib/thirdpartylibs.xml

@@ -573,7 +573,7 @@ All rights reserved.</copyright>
     <location>plist</location>
     <name>plist</name>
     <description>PHP Implementation of Apple's PList (binary and XML).</description>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
     <license>MIT</license>
     <repository>https://github.com/TECLIB/CFPropertyList</repository>
     <copyrights>