[TASK] Ensure PHP 8.4 compatibility for nullable parameters (MyIntervals#643)

oliverklee · web-flow · commit 7276b93bedaf · 2024-07-04T11:37:12.000+02:00
Ensure that parameters that have a `null` default value also have `null` as part of their type declarations. Also ensure a uniform notation for nullable types. https://php.watch/versions/8.4/implicitly-marking-parameter-type-nullable-deprecated Fixes MyIntervals#634
diff --git a/config/php-cs-fixer.php b/config/php-cs-fixer.php
@@ -41,6 +41,10 @@
 
             // function notation
             'native_function_invocation' => ['include' => ['@all']],
+            'nullable_type_declaration' => [
+                'syntax' => 'question_mark',
+            ],
+            'nullable_type_declaration_for_default_null_value' => true,
 
             // import
             'no_unused_imports' => true,
diff --git a/src/CSSList/Document.php b/src/CSSList/Document.php
@@ -138,7 +138,7 @@ public function createShorthands(): void
      *
      * @param OutputFormat|null $oOutputFormat
      */
-    public function render(OutputFormat $oOutputFormat = null): string
+    public function render(?OutputFormat $oOutputFormat = null): string
     {
         if ($oOutputFormat === null) {
             $oOutputFormat = new OutputFormat();
diff --git a/src/Parser.php b/src/Parser.php
@@ -21,7 +21,7 @@ class Parser
      * @param Settings|null $oParserSettings
      * @param int $iLineNo the line number (starting from 1, not from 0)
      */
-    public function __construct($sText, Settings $oParserSettings = null, $iLineNo = 1)
+    public function __construct($sText, ?Settings $oParserSettings = null, $iLineNo = 1)
     {
         if ($oParserSettings === null) {
             $oParserSettings = Settings::create();
diff --git a/src/RuleSet/RuleSet.php b/src/RuleSet/RuleSet.php
@@ -98,7 +98,7 @@ public function getLineNo()
     /**
      * @param Rule|null $oSibling
      */
-    public function addRule(Rule $oRule, Rule $oSibling = null): void
+    public function addRule(Rule $oRule, ?Rule $oSibling = null): void
     {
         $sRule = $oRule->getRule();
         if (!isset($this->aRules[$sRule])) {

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public function createShorthands(): void`
`138`	`138`	`*`
`139`	`139`	`* @param OutputFormat\|null $oOutputFormat`
`140`	`140`	`*/`
`141`		`- public function render(OutputFormat $oOutputFormat = null): string`
	`141`	`+ public function render(?OutputFormat $oOutputFormat = null): string`
`142`	`142`	`{`
`143`	`143`	`if ($oOutputFormat === null) {`
`144`	`144`	`$oOutputFormat = new OutputFormat();`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class Parser`
`21`	`21`	`* @param Settings\|null $oParserSettings`
`22`	`22`	`* @param int $iLineNo the line number (starting from 1, not from 0)`
`23`	`23`	`*/`
`24`		`- public function __construct($sText, Settings $oParserSettings = null, $iLineNo = 1)`
	`24`	`+ public function __construct($sText, ?Settings $oParserSettings = null, $iLineNo = 1)`
`25`	`25`	`{`
`26`	`26`	`if ($oParserSettings === null) {`
`27`	`27`	`$oParserSettings = Settings::create();`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public function getLineNo()`
`98`	`98`	`/**`
`99`	`99`	`* @param Rule\|null $oSibling`
`100`	`100`	`*/`
`101`		`- public function addRule(Rule $oRule, Rule $oSibling = null): void`
	`101`	`+ public function addRule(Rule $oRule, ?Rule $oSibling = null): void`
`102`	`102`	`{`
`103`	`103`	`$sRule = $oRule->getRule();`
`104`	`104`	`if (!isset($this->aRules[$sRule])) {`