DateTimeInstantiationRule - fix error message for new with wrong name case

ondrejmirtes · ondrejmirtes · commit 59ac31a55420 · 2023-05-20T11:17:10.000+02:00
diff --git a/src/Rules/DateTimeInstantiationRule.php b/src/Rules/DateTimeInstantiationRule.php
@@ -28,10 +28,14 @@ public function getNodeType(): string
 	 */
 	public function processNode(Node $node, Scope $scope): array
 	{
+		if (!$node->class instanceof Node\Name) {
+			return [];
+		}
+
+		$lowerClassName = strtolower((string) $node->class);
 		if (
-			!($node->class instanceof Node\Name)
-			|| count($node->getArgs()) === 0
-			|| !in_array(strtolower((string) $node->class), ['datetime', 'datetimeimmutable'], true)
+			count($node->getArgs()) === 0
+			|| !in_array($lowerClassName, ['datetime', 'datetimeimmutable'], true)
 		) {
 			return [];
 		}
@@ -54,7 +58,7 @@ public function processNode(Node $node, Scope $scope): array
 			foreach ($lastErrors['errors'] as $error) {
 				$errors[] = RuleErrorBuilder::message(sprintf(
 					'Instantiating %s with %s produces an error: %s',
-					(string) $node->class,
+					$lowerClassName === 'datetime' ? 'DateTime' : 'DateTimeImmutable',
 					$dateString,
 					$error,
 				))->build();
diff --git a/tests/PHPStan/Rules/DateTimeInstantiationRuleTest.php b/tests/PHPStan/Rules/DateTimeInstantiationRuleTest.php
@@ -44,6 +44,14 @@ public function test(): void
 					'Instantiating DateTime with 2020-04-31 produces a warning: The parsed date was invalid',
 					20,
 				],*/
+				[
+					'Instantiating DateTime with 2020.11.17 produces an error: Double time specification',
+					22,
+				],
+				[
+					'Instantiating DateTimeImmutable with 2020.11.17 produces an error: Double time specification',
+					23,
+				],
 			],
 		);
 	}
diff --git a/tests/PHPStan/Rules/data/datetime-instantiation.php b/tests/PHPStan/Rules/data/datetime-instantiation.php
@@ -18,3 +18,6 @@ function foo(string $date, string $date2): void {
 }
 
 new \DateTime('2020-04-31');
+
+new \dateTime('2020.11.17');
+new \dateTimeImmutablE('2020.11.17');

Original file line number	Diff line number	Diff line change
`@@ -18,3 +18,6 @@ function foo(string $date, string $date2): void {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`new \DateTime('2020-04-31');`
	`21`	`+`
	`22`	`+new \dateTime('2020.11.17');`
	`23`	`+new \dateTimeImmutablE('2020.11.17');`