Rename to collections extension, Collections\Deque

https://wiki.php.net/rfc/deque_straw_poll

Author: TysonAndre

ext/spl/spl_deque.c renamed to ext/collections/collections_deque.c

@@ -14,11 +14,11 @@
    +----------------------------------------------------------------------+
 */
 
-#ifndef TEDS_DEQUE_H
-#define TEDS_DEQUE_H
+#ifndef COLLECTIONS_DEQUE_H
+#define COLLECTIONS_DEQUE_H
 
-extern zend_class_entry *spl_ce_Deque;
+extern zend_class_entry *collections_ce_Deque;
 
-PHP_MINIT_FUNCTION(spl_deque);
+PHP_MINIT_FUNCTION(collections_deque);
 
-#endif	/* TEDS_DEQUE_H */
+#endif	/* COLLECTIONS_DEQUE_H */

ext/spl/spl_deque.h renamed to ext/collections/collections_deque.h

@@ -2,6 +2,8 @@
 
 /** @generate-class-entries */
 
+namespace Collections;
+
 /**
  * A double-ended queue (Typically abbreviated as Deque, pronounced "deck", like "cheque")
  * represented internally as a circular buffer.
@@ -30,7 +32,7 @@ public function __construct(iterable $iterator = []) {}
      *   position ends up before the start of the Deque at the time iteration resumes.
      * - They will not cause the remaining values to be iterated over more than once or skipped.
      */
-    public function getIterator(): InternalIterator {}
+    public function getIterator(): \InternalIterator {}
     /** Returns the number of elements in the Deque. */
     public function count(): int {}
     /** Returns true if there are 0 elements in the Deque. */

ext/spl/spl_deque.stub.php renamed to ext/collections/collections_deque.stub.php

@@ -0,0 +1,6 @@
+PHP_NEW_EXTENSION(collections, php_collections.c collections_deque.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+PHP_INSTALL_HEADERS([ext/spl], [php_collections.h collections_deque.h])
+PHP_ADD_EXTENSION_DEP(collections, pcre, true)
+PHP_ADD_EXTENSION_DEP(collections, spl, true)
+PHP_ADD_EXTENSION_DEP(collections, standard, true)
+PHP_ADD_EXTENSION_DEP(collections, json)

ext/collections/collections_deque_arginfo.h

@@ -0,0 +1,5 @@
+// vim:ft=javascript
+
+EXTENSION("collections", "php_collections.c collections_deque.c", false /*never shared */, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
+PHP_COLLECTIONS="yes";
+PHP_INSTALL_HEADERS("ext/collections", "php_collections.h collections_deque.h");

ext/collections/config.m4

@@ -0,0 +1,62 @@
+/*
+  +----------------------------------------------------------------------+
+  | collections extension for PHP                                        |
+  | See COPYING file for further copyright information                   |
+  +----------------------------------------------------------------------+
+  | Author: Tyson Andre <tandre@php.net>                                 |
+  +----------------------------------------------------------------------+
+*/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "php.h"
+
+#include "ext/standard/info.h"
+
+#include "collections_deque.h"
+
+#include "php_collections.h"
+
+/* {{{ PHP_MINIT_FUNCTION */
+PHP_MINIT_FUNCTION(collections)
+{
+	PHP_MINIT(collections_deque)(INIT_FUNC_ARGS_PASSTHRU);
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_MINFO_FUNCTION */
+PHP_MINFO_FUNCTION(collections)
+{
+	(void) ((ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU));
+	php_info_print_table_start();
+	php_info_print_table_header(2, "collections support", "enabled");
+	php_info_print_table_row(2, "collections version", PHP_COLLECTIONS_VERSION);
+	php_info_print_table_end();
+}
+/* }}} */
+
+/* {{{ collections_module_entry */
+zend_module_entry collections_module_entry = {
+	STANDARD_MODULE_HEADER,
+	"collections",				/* Extension name */
+	NULL,						/* zend_function_entry */
+	PHP_MINIT(collections),		/* PHP_MINIT - Module initialization */
+	NULL,						/* PHP_MSHUTDOWN - Module shutdown */
+	NULL,						/* PHP_RINIT - Request initialization */
+	NULL,						/* PHP_RSHUTDOWN - Request shutdown */
+	PHP_MINFO(collections),		/* PHP_MINFO - Module info */
+	PHP_COLLECTIONS_VERSION,	/* Version */
+	STANDARD_MODULE_PROPERTIES
+};
+/* }}} */
+
+
+#ifdef COMPILE_DL_COLLECTIONS
+# ifdef ZTS
+ZEND_TSRMLS_CACHE_DEFINE()
+# endif
+ZEND_GET_MODULE(collections)
+#endif

ext/collections/config.w32

@@ -0,0 +1,31 @@
+/*
+   +----------------------------------------------------------------------+
+   | Copyright (c) The PHP Group                                          |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | https://www.php.net/license/3_01.txt                                 |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Tyson Andre <tandre@php.net>                                |
+   +----------------------------------------------------------------------+
+ */
+
+#ifndef PHP_COLLECTIONS_H
+#define PHP_COLLECTIONS_H
+
+#include "php.h"
+#include <stdarg.h>
+
+#define PHP_COLLECTIONS_VERSION PHP_VERSION
+
+extern zend_module_entry collections_module_entry;
+#define phpext_collections_ptr &collections_module_entry
+
+PHP_MINIT_FUNCTION(collections);
+PHP_MINFO_FUNCTION(collections);
+
+#endif /* PHP_COLLECTIONS_H */

ext/collections/php_collections.c

@@ -1,16 +1,16 @@
 --TEST--
-Deque constructed from array
+Collections\Deque constructed from array
 --FILE--
 <?php
 // discards keys
-$it = new Deque(['first' => 'x', 'second' => new stdClass()]);
+$it = new Collections\Deque(['first' => 'x', 'second' => new stdClass()]);
 foreach ($it as $key => $value) {
     printf("Key: %s\nValue: %s\n", var_export($key, true), var_export($value, true));
 }
 var_dump($it);
 var_dump((array)$it);
 
-$it = new Deque([]);
+$it = new Collections\Deque([]);
 var_dump($it);
 var_dump((array)$it);
 foreach ($it as $key => $value) {
@@ -24,7 +24,7 @@ Value: 'x'
 Key: 1
 Value: (object) array(
 )
-object(Deque)#1 (2) {
+object(Collections\Deque)#1 (2) {
   [0]=>
   string(1) "x"
   [1]=>
@@ -38,7 +38,7 @@ array(2) {
   object(stdClass)#2 (0) {
   }
 }
-object(Deque)#3 (0) {
+object(Collections\Deque)#3 (0) {
 }
 array(0) {
 }

ext/collections/php_collections.h

@@ -1,9 +1,9 @@
 --TEST--
-Deque is an IteratorAggregate
+Collections\Deque is an IteratorAggregate
 --FILE--
 <?php
 
-$it = new Deque(['discarded_first' => 'x', 'discardedsecond' => (object)['key' => 'value']]);
+$it = new Collections\Deque(['discarded_first' => 'x', 'discardedsecond' => (object)['key' => 'value']]);
 foreach ($it as $k1 => $v1) {
     foreach ($it as $k2 => $v2) {
         printf("k1=%s k2=%s v1=%s v2=%s\n", json_encode($k1), json_encode($k2), json_encode($v1), json_encode($v2));

ext/spl/tests/Deque/Deque.phpt renamed to ext/collections/tests/Deque/Deque.phpt

@@ -1,9 +1,9 @@
 --TEST--
-Deque to array
+Collections\Deque to array
 --FILE--
 <?php
 // discards keys
-$it = new Deque([strtoupper('test')]);
+$it = new Collections\Deque([strtoupper('test')]);
 var_dump((array)$it);
 $it[0] = strtoupper('test2');
 var_dump((array)$it);
@@ -22,9 +22,9 @@ array(1) {
   [0]=>
   string(5) "TEST2"
 }
-object(Deque)#1 (1) {
+object(Collections\Deque)#1 (1) {
   [0]=>
   string(5) "TEST2"
 }
-object(Deque)#1 (0) {
+object(Collections\Deque)#1 (0) {
 }

ext/spl/tests/Deque/aggregate.phpt renamed to ext/collections/tests/Deque/aggregate.phpt

@@ -1,9 +1,9 @@
 --TEST--
-Deque clear
+Collections\Deque clear
 --FILE--
 <?php
 
-$it = new Deque(['first' => new stdClass()]);
+$it = new Collections\Deque(['first' => new stdClass()]);
 var_dump($it->toArray());
 printf("count=%d\n", $it->count());
 $it->clear();

ext/spl/tests/Deque/arrayCast.phpt renamed to ext/collections/tests/Deque/arrayCast.phpt

@@ -1,9 +1,9 @@
 --TEST--
-Deque can be cloned
+Collections\Deque can be cloned
 --FILE--
 <?php
 
-$it = new Deque([new stdClass(), new ArrayObject()]);
+$it = new Collections\Deque([new stdClass(), new ArrayObject()]);
 $it2 = clone $it;
 unset($it);
 foreach ($it2 as $key => $value) {

ext/spl/tests/Deque/clear.phpt renamed to ext/collections/tests/Deque/clear.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Deque constructed from Traversable throwing
+Collections\Deque constructed from Traversable throwing
 --FILE--
 <?php
 
@@ -21,7 +21,7 @@ function yields_and_throws() {
     echo "Unreachable\n";
 }
 try {
-    $it = new Deque(yields_and_throws());
+    $it = new Collections\Deque(yields_and_throws());
 } catch (RuntimeException $e) {
     echo "Caught " . $e->getMessage() . "\n";
 }