Merge #400 - Fixing tests on php 8.3 - making getMergedOptions protected

williamdes · williamdes · commit 6d873dbd96da · 2022-12-13T20:11:17.000+01:00
Pull-request: #400 This is an acceptable workaround, related functions are protected Signed-off-by: William Desportes <williamdes@wdes.fr>
diff --git a/src/Utils/Formatter.php b/src/Utils/Formatter.php
@@ -92,7 +92,7 @@ public function __construct(array $options = [])
      *
      * @return array<string, bool|string|array<int, array<string, int|string>>>
      */
-    private function getMergedOptions(array $options)
+    protected function getMergedOptions(array $options)
     {
         $options = array_merge(
             $this->getDefaultOptions(),

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public function __construct(array $options = [])`
`92`	`92`	`*`
`93`	`93`	`* @return array<string, bool\|string\|array<int, array<string, int\|string>>>`
`94`	`94`	`*/`
`95`		`- private function getMergedOptions(array $options)`
	`95`	`+ protected function getMergedOptions(array $options)`
`96`	`96`	`{`
`97`	`97`	`$options = array_merge(`
`98`	`98`	`$this->getDefaultOptions(),`