update to 1.8.0

raise dependency on PHP 8.2
switch to phpunit11

4 files changed, 155 insertions, 23 deletions

diff --git a/PHPINFO b/PHPINFO
index dcac97e..92c25c8 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,4 +2,4 @@
 ds
 
 ds support => enabled
-ds version => 1.6.0
+ds version => 1.8.0
diff --git a/REFLECTION b/REFLECTION
index 1fa4927..755545e 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #148 ds version 1.6.0 ] {
+Extension [ <persistent> extension #154 ds version 1.8.0 ] {
 
   - Dependencies {
     Dependency [ json (Required) ]
@@ -381,7 +381,7 @@ Extension [ <persistent> extension #148 ds version 1.6.0 ] {
       - Properties [0] {
       }
 
-      - Methods [39] {
+      - Methods [41] {
         Method [ <internal:ds, ctor> public method __construct ] {
 
           - Parameters [1] {
@@ -663,6 +663,20 @@ Extension [ <persistent> extension #148 ds version 1.6.0 ] {
           }
           - Return [ array ]
         }
+
+        Method [ <internal:ds> public method __serialize ] {
+
+          - Parameters [0] {
+          }
+          - Return [ array ]
+        }
+
+        Method [ <internal:ds> public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $data ]
+          }
+        }
       }
     }
 
@@ -681,7 +695,7 @@ Extension [ <persistent> extension #148 ds version 1.6.0 ] {
       - Properties [0] {
       }
 
-      - Methods [39] {
+      - Methods [41] {
         Method [ <internal:ds, ctor> public method __construct ] {
 
           - Parameters [1] {
@@ -737,6 +751,20 @@ Extension [ <persistent> extension #148 ds version 1.6.0 ] {
           - Return [ array ]
         }
 
+        Method [ <internal:ds> public method __serialize ] {
+
+          - Parameters [0] {
+          }
+          - Return [ array ]
+        }
+
+        Method [ <internal:ds> public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $data ]
+          }
+        }
+
         Method [ <internal:ds, prototype Ds\Sequence> public method allocate ] {
 
           - Parameters [1] {
@@ -980,7 +1008,7 @@ Extension [ <persistent> extension #148 ds version 1.6.0 ] {
       - Properties [0] {
       }
 
-      - Methods [17] {
+      - Methods [19] {
         Method [ <internal:ds, ctor> public method __construct ] {
 
           - Parameters [1] {
@@ -1101,6 +1129,20 @@ Extension [ <persistent> extension #148 ds version 1.6.0 ] {
           }
           - Return [ array ]
         }
+
+        Method [ <internal:ds> public method __serialize ] {
+
+          - Parameters [0] {
+          }
+          - Return [ array ]
+        }
+
+        Method [ <internal:ds> public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $data ]
+          }
+        }
       }
     }
 
@@ -1119,7 +1161,7 @@ Extension [ <persistent> extension #148 ds version 1.6.0 ] {
       - Properties [0] {
       }
 
-      - Methods [17] {
+      - Methods [19] {
         Method [ <internal:ds, ctor> public method __construct ] {
 
           - Parameters [1] {
@@ -1240,6 +1282,20 @@ Extension [ <persistent> extension #148 ds version 1.6.0 ] {
           }
           - Return [ array ]
         }
+
+        Method [ <internal:ds> public method __serialize ] {
+
+          - Parameters [0] {
+          }
+          - Return [ array ]
+        }
+
+        Method [ <internal:ds> public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $data ]
+          }
+        }
       }
     }
 
@@ -1258,7 +1314,7 @@ Extension [ <persistent> extension #148 ds version 1.6.0 ] {
       - Properties [0] {
       }
 
-      - Methods [43] {
+      - Methods [45] {
         Method [ <internal:ds, ctor> public method __construct ] {
 
           - Parameters [1] {
@@ -1579,6 +1635,20 @@ Extension [ <persistent> extension #148 ds version 1.6.0 ] {
           }
           - Return [ array ]
         }
+
+        Method [ <internal:ds> public method __serialize ] {
+
+          - Parameters [0] {
+          }
+          - Return [ array ]
+        }
+
+        Method [ <internal:ds> public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $data ]
+          }
+        }
       }
     }
 
@@ -1597,7 +1667,7 @@ Extension [ <persistent> extension #148 ds version 1.6.0 ] {
       - Properties [0] {
       }
 
-      - Methods [35] {
+      - Methods [37] {
         Method [ <internal:ds, ctor> public method __construct ] {
 
           - Parameters [1] {
@@ -1854,6 +1924,20 @@ Extension [ <persistent> extension #148 ds version 1.6.0 ] {
           }
           - Return [ array ]
         }
+
+        Method [ <internal:ds> public method __serialize ] {
+
+          - Parameters [0] {
+          }
+          - Return [ array ]
+        }
+
+        Method [ <internal:ds> public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $data ]
+          }
+        }
       }
     }
 
@@ -1872,7 +1956,7 @@ Extension [ <persistent> extension #148 ds version 1.6.0 ] {
       - Properties [0] {
       }
 
-      - Methods [13] {
+      - Methods [15] {
         Method [ <internal:ds, ctor> public method __construct ] {
 
           - Parameters [0] {
@@ -1960,6 +2044,20 @@ Extension [ <persistent> extension #148 ds version 1.6.0 ] {
           }
           - Return [ array ]
         }
+
+        Method [ <internal:ds> public method __serialize ] {
+
+          - Parameters [0] {
+          }
+          - Return [ array ]
+        }
+
+        Method [ <internal:ds> public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $data ]
+          }
+        }
       }
     }
 
@@ -1979,7 +2077,7 @@ Extension [ <persistent> extension #148 ds version 1.6.0 ] {
         Property [ public $value = NULL ]
       }
 
-      - Methods [4] {
+      - Methods [6] {
         Method [ <internal:ds, ctor> public method __construct ] {
 
           - Parameters [2] {
@@ -2008,6 +2106,20 @@ Extension [ <persistent> extension #148 ds version 1.6.0 ] {
           }
           - Return [ array ]
         }
+
+        Method [ <internal:ds> public method __serialize ] {
+
+          - Parameters [0] {
+          }
+          - Return [ array ]
+        }
+
+        Method [ <internal:ds> public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $data ]
+          }
+        }
       }
     }
   }
diff --git a/composer.json b/composer.json
index 27ccbfc..144b45c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,7 @@
 {
-    "name": "php-ds/extension",
+    "name": "php-ds/ext-ds",
+    "description": "An extension providing efficient internal data structures as an alternative to arrays",
+    "type": "php-ext",
     "license": "MIT",
     "keywords": [],
     "authors": [
@@ -9,11 +11,17 @@
         }
     ],
     "minimum-stability": "dev",
+    "require": {
+        "php": ">= 8.2.0"
+    },
     "require-dev": {
-        "php-ds/tests": "^1.5"
+        "php-ds/tests": "^1.8"
     },
     "scripts": {
         "test"   : "php test.php",
         "memtest": "USE_ZEND_ALLOC=0 ZEND_DONT_UNLOAD_MODULES=1 valgrind php test.php"
+    },
+    "php-ext": {
+        "extension-name": "ds"
     }
 }
diff --git a/php-pecl-ds.spec b/php-pecl-ds.spec
index 5d2f9e6..af4f4b1 100644
--- a/php-pecl-ds.spec
+++ b/php-pecl-ds.spec
@@ -33,31 +33,35 @@
 # for EL-8 to avoid TAG usage
 %global archivename0 %{gh_proj}-%{version}
 
-# For test suite, see https://github.com/php-ds/tests/commits/master
-# version 1.5.1  (version 1.6.0 exist but requires phpunit12, so PHP 8.3)
+# For test suite, see https://github.com/php-ds/tests/tags
 %global forgeurl1    https://github.com/%{gh_vend}/tests
-%global tag1         v1.5.1
-%global archivename1 tests-1.5.1
+%global tag1         v1.8.0
+%global archivename1 tests-1.8.0
 
 
 Summary:        Data Structures for PHP
 Name:           %{?scl_prefix}php-pecl-%{pecl_name}
 License:        MIT
-Version:        1.6.0
-Release:        4%{?dist}
+Version:        1.8.0
+Release:        1%{?dist}
+%if 0%{?rhel} == 8
+URL:            %{forgeurl0}
+Source0:        %{forgeurl0}/archive/v%{tag0}/%{archivename0}.tar.gz
+Source1:        %{forgeurl1}/archive/v%{tag1}/%{archivename1}.tar.gz
+%else
 %forgemeta -a
 URL:            %{forgeurl}
 Source0:        %{forgesource0}
 Source1:        %{forgesource1}
+%endif
 
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
-BuildRequires:  %{?scl_prefix}php-devel >= 7.4
-BuildRequires:  %{?scl_prefix}php-pear
+BuildRequires:  %{?scl_prefix}php-devel >= 8.2
 BuildRequires:  %{?scl_prefix}php-gmp
 BuildRequires:  %{?scl_prefix}php-json
 %if %{with tests}
-BuildRequires:  %{_bindir}/phpunit9
+BuildRequires:  %{_bindir}/phpunit11
 BuildRequires:  %{_bindir}/phpab
 %endif
 #BuildRequires:  php-debuginfo
@@ -167,6 +171,9 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 %endif
 
 %if %{with tests}
+# This file is not a test file
+mv tests/tests/CollectionTest.php tests/tests/Collection.php
+
 : Generate autoloader for tests
 %{_bindir}/phpab \
    --output tests/autoload.php \
@@ -175,10 +182,10 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 : Run upstream test suite
 %{_bindir}/php \
    -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
-   %{_bindir}/phpunit9 \
+   %{_bindir}/phpunit11 \
       --do-not-cache-result \
       --bootstrap tests/autoload.php \
-      --verbose tests
+      tests
 %endif
 
 
@@ -197,6 +204,11 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 
 
 %changelog
+* Tue Apr 14 2026 Remi Collet <remi@remirepo.net> - 1.8.0-1
+- update to 1.8.0
+- raise dependency on PHP 8.2
+- switch to phpunit11
+
 * Fri Mar 13 2026 Remi Collet <remi@remirepo.net> - 1.6.0-4
 - drop pear/pecl dependency
 - sources from github