rename get/setMicroseconds() to get/setMicrosecond()

xabbuh · xabbuh · commit ff06ba4fa7e6 · 2024-03-07T10:17:52.000+01:00
diff --git a/src/Symfony/Component/Clock/CHANGELOG.md b/src/Symfony/Component/Clock/CHANGELOG.md
@@ -4,7 +4,7 @@ CHANGELOG
 7.1
 ---
 
- * Add `DatePoint::get/setMicroseconds()`
+ * Add `DatePoint::get/setMicrosecond()`
 
 6.4
 ---
diff --git a/src/Symfony/Component/Clock/DatePoint.php b/src/Symfony/Component/Clock/DatePoint.php
@@ -118,23 +118,23 @@ public function getTimezone(): \DateTimeZone
         return parent::getTimezone() ?: throw new \DateInvalidTimeZoneException('The DatePoint object has no timezone.');
     }
 
-    public function setMicroseconds(int $microseconds): static
+    public function setMicrosecond(int $microsecond): static
     {
-        if ($microseconds < 0 || $microseconds > 999999) {
-            throw new \DateRangeError('DatePoint::setMicroseconds(): Argument #1 ($microseconds) must be between 0 and 999999, '.$microseconds.' given');
+        if ($microsecond < 0 || $microsecond > 999999) {
+            throw new \DateRangeError('DatePoint::setMicrosecond(): Argument #1 ($microsecond) must be between 0 and 999999, '.$microsecond.' given');
         }
 
         if (\PHP_VERSION_ID < 80400) {
-            return $this->setTime(...explode('.', $this->format('H.i.s.'.$microseconds)));
+            return $this->setTime(...explode('.', $this->format('H.i.s.'.$microsecond)));
         }
 
-        return parent::setMicroseconds($microseconds);
+        return parent::setMicrosecond($microsecond);
     }
 
-    public function getMicroseconds(): int
+    public function getMicrosecond(): int
     {
         if (\PHP_VERSION_ID >= 80400) {
-            return parent::getMicroseconds();
+            return parent::getMicrosecond();
         }
 
         return $this->format('u');
diff --git a/src/Symfony/Component/Clock/Tests/DatePointTest.php b/src/Symfony/Component/Clock/Tests/DatePointTest.php
@@ -58,19 +58,19 @@ public function testModify()
         $date->modify('Bad Date');
     }
 
-    public function testMicroseconds()
+    public function testMicrosecond()
     {
         $date = new DatePoint('2010-01-28 15:00:00.123456');
 
         $this->assertSame('2010-01-28 15:00:00.123456', $date->format('Y-m-d H:i:s.u'));
 
-        $date = $date->setMicroseconds(789);
+        $date = $date->setMicrosecond(789);
 
         $this->assertSame('2010-01-28 15:00:00.000789', $date->format('Y-m-d H:i:s.u'));
-        $this->assertSame(789, $date->getMicroseconds());
+        $this->assertSame(789, $date->getMicrosecond());
 
         $this->expectException(\DateRangeError::class);
-        $this->expectExceptionMessage('DatePoint::setMicroseconds(): Argument #1 ($microseconds) must be between 0 and 999999, 1000000 given');
-        $date->setMicroseconds(1000000);
+        $this->expectExceptionMessage('DatePoint::setMicrosecond(): Argument #1 ($microsecond) must be between 0 and 999999, 1000000 given');
+        $date->setMicrosecond(1000000);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -118,23 +118,23 @@ public function getTimezone(): \DateTimeZone`
`118`	`118`	`return parent::getTimezone() ?: throw new \DateInvalidTimeZoneException('The DatePoint object has no timezone.');`
`119`	`119`	`}`
`120`	`120`
`121`		`- public function setMicroseconds(int $microseconds): static`
	`121`	`+ public function setMicrosecond(int $microsecond): static`
`122`	`122`	`{`
`123`		`- if ($microseconds < 0 \|\| $microseconds > 999999) {`
`124`		`- throw new \DateRangeError('DatePoint::setMicroseconds(): Argument #1 ($microseconds) must be between 0 and 999999, '.$microseconds.' given');`
	`123`	`+ if ($microsecond < 0 \|\| $microsecond > 999999) {`
	`124`	`+ throw new \DateRangeError('DatePoint::setMicrosecond(): Argument #1 ($microsecond) must be between 0 and 999999, '.$microsecond.' given');`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`if (\PHP_VERSION_ID < 80400) {`
`128`		`- return $this->setTime(...explode('.', $this->format('H.i.s.'.$microseconds)));`
	`128`	`+ return $this->setTime(...explode('.', $this->format('H.i.s.'.$microsecond)));`
`129`	`129`	`}`
`130`	`130`
`131`		`- return parent::setMicroseconds($microseconds);`
	`131`	`+ return parent::setMicrosecond($microsecond);`
`132`	`132`	`}`
`133`	`133`
`134`		`- public function getMicroseconds(): int`
	`134`	`+ public function getMicrosecond(): int`
`135`	`135`	`{`
`136`	`136`	`if (\PHP_VERSION_ID >= 80400) {`
`137`		`- return parent::getMicroseconds();`
	`137`	`+ return parent::getMicrosecond();`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`return $this->format('u');`
Original file line number	Diff line number	Diff line change
`@@ -58,19 +58,19 @@ public function testModify()`
`58`	`58`	`$date->modify('Bad Date');`
`59`	`59`	`}`
`60`	`60`
`61`		`- public function testMicroseconds()`
	`61`	`+ public function testMicrosecond()`
`62`	`62`	`{`
`63`	`63`	`$date = new DatePoint('2010-01-28 15:00:00.123456');`
`64`	`64`
`65`	`65`	`$this->assertSame('2010-01-28 15:00:00.123456', $date->format('Y-m-d H:i:s.u'));`
`66`	`66`
`67`		`- $date = $date->setMicroseconds(789);`
	`67`	`+ $date = $date->setMicrosecond(789);`
`68`	`68`
`69`	`69`	`$this->assertSame('2010-01-28 15:00:00.000789', $date->format('Y-m-d H:i:s.u'));`
`70`		`- $this->assertSame(789, $date->getMicroseconds());`
	`70`	`+ $this->assertSame(789, $date->getMicrosecond());`
`71`	`71`
`72`	`72`	`$this->expectException(\DateRangeError::class);`
`73`		`- $this->expectExceptionMessage('DatePoint::setMicroseconds(): Argument #1 ($microseconds) must be between 0 and 999999, 1000000 given');`
`74`		`- $date->setMicroseconds(1000000);`
	`73`	`+ $this->expectExceptionMessage('DatePoint::setMicrosecond(): Argument #1 ($microsecond) must be between 0 and 999999, 1000000 given');`
	`74`	`+ $date->setMicrosecond(1000000);`
`75`	`75`	`}`
`76`	`76`	`}`