Singular DateTime::[get|set]Microsecond & no tentative return type

Author: marc-mabe

NEWS

@@ -22,7 +22,7 @@ PHP                                                                        NEWS
 
 - Date:
   . Added DateTime[Immutable]::createFromTimestamp. (Marc Bennewitz)
-  . Added DateTime[Immutable]::[get|set]Microseconds. (Marc Bennewitz)
+  . Added DateTime[Immutable]::[get|set]Microsecond. (Marc Bennewitz)
 
 - DOM:
   . Added DOMNode::compareDocumentPosition(). (nielsdos)

UPGRADING

@@ -168,9 +168,9 @@ PHP 8.4 UPGRADE NOTES
 - Date:
   . Added static methods
     DateTime[Immutable]::createFromTimestamp(int|float $timestamp): static.
-  . Added method DateTime[Immutable]::getMicroseconds(): int.
+  . Added method DateTime[Immutable]::getMicrosecond(): int.
   . Added method
-    DateTime[Immutable]::setMicroseconds(int $microseconds): static.
+    DateTime[Immutable]::setMicrosecond(int $microsecond): static.
 
 - DOM:
   . Added constant DOMNode::DOCUMENT_POSITION_DISCONNECTED.

ext/date/php_date.c

@@ -2377,15 +2377,15 @@ static void update_errors_warnings(timelib_error_container **last_errors) /* {{{
 	*last_errors = NULL;
 } /* }}} */
 
-static void php_date_set_time_fraction(timelib_time *time, int microseconds)
+static void php_date_set_time_fraction(timelib_time *time, int microsecond)
 {
-	time->us = microseconds;
+	time->us = microsecond;
 }
 
 static void php_date_get_current_time_with_fraction(time_t *sec, suseconds_t *usec)
 {
 #if HAVE_GETTIMEOFDAY
-	struct timeval tp = {0}; /* For setting microseconds */
+	struct timeval tp = {0}; /* For setting microsecond */
 
 	gettimeofday(&tp, NULL);
 	*sec = tp.tv_sec;
@@ -3855,7 +3855,7 @@ PHP_METHOD(DateTimeImmutable, setTimestamp)
 /* }}} */
 
 /* {{{ */
-PHP_METHOD(DateTimeImmutable, setMicroseconds)
+PHP_METHOD(DateTimeImmutable, setMicrosecond)
 {
 	zval *object, new_object;
 	php_date_obj *dateobj, *new_dateobj;
@@ -3889,7 +3889,7 @@ PHP_METHOD(DateTimeImmutable, setMicroseconds)
 /* }}} */
 
 /* {{{ */
-PHP_METHOD(DateTime, setMicroseconds)
+PHP_METHOD(DateTime, setMicrosecond)
 {
 	zval *object;
 	php_date_obj *dateobj;
@@ -3947,7 +3947,7 @@ PHP_FUNCTION(date_timestamp_get)
 }
 /* }}} */
 
-PHP_METHOD(DateTime, getMicroseconds) /* {{{ */
+PHP_METHOD(DateTime, getMicrosecond) /* {{{ */
 {
 	zval *object;
 	php_date_obj *dateobj;

ext/date/php_date.stub.php

@@ -412,8 +412,7 @@ public function setTimezone(DateTimeZone $timezone): DateTime {}
      */
     public function getOffset(): int {}
 
-    /** @tentative-return-type */
-    public function getMicroseconds(): int {}
+    public function getMicrosecond(): int {}
 
     /**
      * @tentative-return-type
@@ -439,8 +438,7 @@ public function setISODate(int $year, int $week, int $dayOfWeek = 1): DateTime {
      */
     public function setTimestamp(int $timestamp): DateTime {}
 
-    /** @tentative-return-type */
-    public function setMicroseconds(int $microseconds): static {}
+    public function setMicrosecond(int $microsecond): static {}
 
     /**
      * @tentative-return-type
@@ -510,10 +508,9 @@ public function getOffset(): int {}
     public function getTimestamp(): int {}
 
     /**
-     * @alias DateTime::getMicroseconds
-     * @tentative-return-type
+     * @alias DateTime::getMicrosecond
      */
-    public function getMicroseconds(): int {}
+    public function getMicrosecond(): int {}
 
     /**
      * @tentative-return-type
@@ -545,8 +542,7 @@ public function setISODate(int $year, int $week, int $dayOfWeek = 1): DateTimeIm
     /** @tentative-return-type */
     public function setTimestamp(int $timestamp): DateTimeImmutable {}
 
-    /** @tentative-return-type */
-    public function setMicroseconds(int $microseconds): static {}
+    public function setMicrosecond(int $microsecond): static {}
 
     /** @tentative-return-type */
     public static function createFromMutable(DateTime $object): static {}