Rename fromArrayElem() to fromArrayElement()

Author: nikic

ext/reflection/php_reflection.c

@@ -6173,14 +6173,14 @@ ZEND_METHOD(reflection_reference, __construct)
 {
 	_DO_THROW(
 		"Cannot directly instantiate ReflectionReference. "
-		"Use ReflectionReference::fromArrayElem() instead"
+		"Use ReflectionReference::fromArrayElement() instead"
 	);
 }
 /* }}} */
 
-/* {{{ proto public ReflectionReference|null ReflectionReference::fromArrayElem(array array, mixed key)
+/* {{{ proto public ReflectionReference|null ReflectionReference::fromArrayElement(array array, mixed key)
  *     Create ReflectionReference for array item. Returns null if not a reference. */
-ZEND_METHOD(reflection_reference, fromArrayElem)
+ZEND_METHOD(reflection_reference, fromArrayElement)
 {
 	HashTable *ht;
 	zval *key, *item;
@@ -6734,13 +6734,13 @@ static const zend_function_entry reflection_zend_extension_functions[] = {
 	PHP_FE_END
 };
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_reference_fromArrayElem, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_reference_fromArrayElement, 0, 0, 2)
 	ZEND_ARG_INFO(0, array)
 	ZEND_ARG_INFO(0, key)
 ZEND_END_ARG_INFO()
 
 static const zend_function_entry reflection_reference_functions[] = {
-	ZEND_ME(reflection_reference, fromArrayElem, arginfo_reflection_reference_fromArrayElem, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	ZEND_ME(reflection_reference, fromArrayElement, arginfo_reflection_reference_fromArrayElement, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	ZEND_ME(reflection_reference, getId, arginfo_reflection__void, ZEND_ACC_PUBLIC)
 
 	/* Always throwing dummy methods */

ext/reflection/tests/ReflectionReference.phpt

@@ -8,12 +8,12 @@ $ref1 =& $ary[1];
 unset($ref1);
 $ref2 =& $ary[2];
 
-echo "fromArrayElem():\n";
-$r0 = ReflectionReference::fromArrayElem($ary, 0);
+echo "fromArrayElement():\n";
+$r0 = ReflectionReference::fromArrayElement($ary, 0);
 var_dump($r0 === null);
-$r1 = ReflectionReference::fromArrayElem($ary, 1);
+$r1 = ReflectionReference::fromArrayElement($ary, 1);
 var_dump($r1 instanceof ReflectionReference);
-$r2 = ReflectionReference::fromArrayElem($ary, 2);
+$r2 = ReflectionReference::fromArrayElement($ary, 2);
 var_dump($r2 instanceof ReflectionReference);
 
 echo "getId() #1:\n";
@@ -23,23 +23,23 @@ var_dump($r1->getId() !== $r2->getId());
 
 echo "getId() #2:\n";
 $ary2 = [&$ary[1], &$ref2];
-$r1_2 = ReflectionReference::fromArrayElem($ary2, 0);
-$r2_2 = ReflectionReference::fromArrayElem($ary2, 1);
+$r1_2 = ReflectionReference::fromArrayElement($ary2, 0);
+$r2_2 = ReflectionReference::fromArrayElement($ary2, 1);
 var_dump($r1->getId() === $r1_2->getId());
 var_dump($r2->getId() === $r2_2->getId());
 
 echo "getId() #3:\n";
 $r1_id = $r1->getId();
 $r2_id = $r2->getId();
 unset($r0, $r1, $r2, $r1_2, $r2_2);
-$r1 = ReflectionReference::fromArrayElem($ary, 1);
-$r2 = ReflectionReference::fromArrayElem($ary, 2);
+$r1 = ReflectionReference::fromArrayElement($ary, 1);
+$r2 = ReflectionReference::fromArrayElement($ary, 2);
 var_dump($r1_id === $r1->getId());
 var_dump($r2_id === $r2->getId());
 
 ?>
 --EXPECT--
-fromArrayElem():
+fromArrayElement():
 bool(true)
 bool(true)
 bool(true)

ext/reflection/tests/ReflectionReference_errors.phpt

@@ -10,20 +10,20 @@ try {
 }
 
 try {
-    ReflectionReference::fromArrayElem(new stdClass, "test");
+    ReflectionReference::fromArrayElement(new stdClass, "test");
 } catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 
 try {
-    ReflectionReference::fromArrayElem([], 1.5);
+    ReflectionReference::fromArrayElement([], 1.5);
 } catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 
 try {
     $ary = [0, 1, 2];
-    ReflectionReference::fromArrayElem($ary, 3);
+    ReflectionReference::fromArrayElement($ary, 3);
 } catch (ReflectionException $e) {
     echo $e->getMessage(), "\n";
 }
@@ -38,7 +38,7 @@ try {
 ?>
 --EXPECT--
 Call to private ReflectionReference::__construct() from invalid context
-ReflectionReference::fromArrayElem() expects parameter 1 to be array, object given
+ReflectionReference::fromArrayElement() expects parameter 1 to be array, object given
 Key must be array or string
 Array key not found
 Corrupted ReflectionReference object