Merge branch 'master' into dev/4.0

iMattPro · iMattPro · commit c7231dc7000d · 2025-06-04T16:20:00.000-07:00
diff --git a/console/command/db/tool.php b/console/command/db/tool.php
@@ -160,11 +160,11 @@ protected function br2nl($text)
 	 */
 	protected function get_return_code(bool $success): int
 	{
-		$returnCode = $success ? 'SUCCESS' : 'FAILURE';
-		$defaultCode = $success ? 0 : 1;
+		$return_code = $success ? 'SUCCESS' : 'FAILURE';
+		$default_code = $success ? 0 : 1;
 
-		return defined("Symfony\Component\Console\Command\Command::$returnCode")
-			? constant("Symfony\Component\Console\Command\Command::$returnCode")
-			: $defaultCode;
+		return defined("Symfony\Component\Console\Command\Command::$return_code")
+			? constant("Symfony\Component\Console\Command\Command::$return_code")
+			: $default_code;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -160,11 +160,11 @@ protected function br2nl($text)`
`160`	`160`	`*/`
`161`	`161`	`protected function get_return_code(bool $success): int`
`162`	`162`	`{`
`163`		`- $returnCode = $success ? 'SUCCESS' : 'FAILURE';`
`164`		`- $defaultCode = $success ? 0 : 1;`
	`163`	`+ $return_code = $success ? 'SUCCESS' : 'FAILURE';`
	`164`	`+ $default_code = $success ? 0 : 1;`
`165`	`165`
`166`		`- return defined("Symfony\Component\Console\Command\Command::$returnCode")`
`167`		`- ? constant("Symfony\Component\Console\Command\Command::$returnCode")`
`168`		`- : $defaultCode;`
	`166`	`+ return defined("Symfony\Component\Console\Command\Command::$return_code")`
	`167`	`+ ? constant("Symfony\Component\Console\Command\Command::$return_code")`
	`168`	`+ : $default_code;`
`169`	`169`	`}`
`170`	`170`	`}`