Merge pull request #422 from magento-gl/php84_deprecation_fix

KevinBKozan · web-flow · commit 1bbd6b21e149 · 2024-12-13T10:39:02.000-06:00
PHP 8.4: deprecation fixes
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.3', '8.4']
+        php-versions: ['8.2', '8.3', '8.4']
     steps:
       - uses: actions/checkout@v2
 
@@ -54,7 +54,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.3', '8.4']
+        php-versions: ['8.2', '8.3', '8.4']
     steps:
       - uses: actions/checkout@v2
 
@@ -86,7 +86,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.3', '8.4']
+        php-versions: ['8.2', '8.3', '8.4']
     steps:
       - uses: actions/checkout@v2
 
@@ -118,7 +118,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.3', '8.4']
+        php-versions: ['8.2', '8.3', '8.4']
 
     services:
       chrome:
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
         "monolog/monolog": "^2.3||^3.0",
         "mustache/mustache": "~2.5",
         "nikic/php-parser": "^4.4||^5.0",
-        "php": ">8.2",
+        "php": ">=8.2",
         "php-webdriver/webdriver": "^1.14.0",
         "spomky-labs/otphp": "^10.0||^11.0",
         "symfony/console": "^6.4",
diff --git a/composer.lock b/composer.lock
diff --git a/src/Magento/FunctionalTestingFramework/Allure/Adapter/MagentoAllureAdapter.php b/src/Magento/FunctionalTestingFramework/Allure/Adapter/MagentoAllureAdapter.php
@@ -199,7 +199,7 @@ public function stepBefore(StepEvent $stepEvent)
      * @throws \Yandex\Allure\Adapter\AllureException
      * @return void
      */
-    public function stepAfter(StepEvent $stepEvent = null)
+    public function stepAfter(?StepEvent $stepEvent = null)
     {
         // Simply return if step is INVISIBLE_STEP_ACTIONS
         if ($this->atInvisibleSteps) {
diff --git a/src/Magento/FunctionalTestingFramework/Config/FileResolver/Mask.php b/src/Magento/FunctionalTestingFramework/Config/FileResolver/Mask.php
@@ -28,7 +28,7 @@ class Mask implements FileResolverInterface
      *
      * @param ModuleResolver|null $moduleResolver
      */
-    public function __construct(ModuleResolver $moduleResolver = null)
+    public function __construct(?ModuleResolver $moduleResolver = null)
     {
         if ($moduleResolver) {
             $this->moduleResolver = $moduleResolver;
diff --git a/src/Magento/FunctionalTestingFramework/Config/FileResolver/Module.php b/src/Magento/FunctionalTestingFramework/Config/FileResolver/Module.php
@@ -27,7 +27,7 @@ class Module implements FileResolverInterface
      * @param ModuleResolver|null $moduleResolver
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function __construct(ModuleResolver $moduleResolver = null)
+    public function __construct(?ModuleResolver $moduleResolver = null)
     {
         $this->moduleResolver = ModuleResolver::getInstance();
     }
diff --git a/src/Magento/FunctionalTestingFramework/ObjectManager.php b/src/Magento/FunctionalTestingFramework/ObjectManager.php
@@ -39,8 +39,8 @@ class ObjectManager extends \Magento\FunctionalTestingFramework\ObjectManager\Ob
      * @param array                              $sharedInstances
      */
     public function __construct(
-        \Magento\FunctionalTestingFramework\ObjectManager\Factory $factory = null,
-        \Magento\FunctionalTestingFramework\ObjectManager\ConfigInterface $config = null,
+        ?\Magento\FunctionalTestingFramework\ObjectManager\Factory $factory = null,
+        ?\Magento\FunctionalTestingFramework\ObjectManager\ConfigInterface $config = null,
         array $sharedInstances = []
     ) {
         parent::__construct($factory, $config, $sharedInstances);
diff --git a/src/Magento/FunctionalTestingFramework/ObjectManager/Config/Config.php b/src/Magento/FunctionalTestingFramework/ObjectManager/Config/Config.php
@@ -76,7 +76,7 @@ class Config implements \Magento\FunctionalTestingFramework\ObjectManager\Config
      * @param RelationsInterface|null  $relations
      * @param DefinitionInterface|null $definitions
      */
-    public function __construct(RelationsInterface $relations = null, DefinitionInterface $definitions = null)
+    public function __construct(?RelationsInterface $relations = null, ?DefinitionInterface $definitions = null)
     {
         $this->relations = $relations ? : new RelationsRuntime();
         $this->definitions = $definitions ? : new DefinitionRuntime();
diff --git a/src/Magento/FunctionalTestingFramework/ObjectManager/Config/Mapper/Dom.php b/src/Magento/FunctionalTestingFramework/ObjectManager/Config/Mapper/Dom.php
@@ -33,8 +33,8 @@ class Dom implements \Magento\FunctionalTestingFramework\Config\ConverterInterfa
      */
     public function __construct(
         InterpreterInterface $argumentInterpreter,
-        BooleanUtils $booleanUtils = null,
-        ArgumentParser $argumentParser = null
+        ?BooleanUtils $booleanUtils = null,
+        ?ArgumentParser $argumentParser = null
     ) {
         $this->argumentInterpreter = $argumentInterpreter;
         $this->booleanUtils = $booleanUtils ?: new BooleanUtils();
diff --git a/src/Magento/FunctionalTestingFramework/ObjectManager/Definition/Runtime.php b/src/Magento/FunctionalTestingFramework/ObjectManager/Definition/Runtime.php
@@ -29,7 +29,7 @@ class Runtime implements \Magento\FunctionalTestingFramework\ObjectManager\Defin
      * Runtime constructor.
      * @param \Magento\FunctionalTestingFramework\Code\Reader\ClassReader|null $reader
      */
-    public function __construct(\Magento\FunctionalTestingFramework\Code\Reader\ClassReader $reader = null)
+    public function __construct(?\Magento\FunctionalTestingFramework\Code\Reader\ClassReader $reader = null)
     {
         $this->reader = $reader ? : new \Magento\FunctionalTestingFramework\Code\Reader\ClassReader();
     }
diff --git a/src/Magento/FunctionalTestingFramework/ObjectManager/Factory.php b/src/Magento/FunctionalTestingFramework/ObjectManager/Factory.php
@@ -31,8 +31,8 @@ class Factory extends \Magento\FunctionalTestingFramework\ObjectManager\Factory\
      */
     public function __construct(
         ConfigInterface $config,
-        \Magento\FunctionalTestingFramework\ObjectManagerInterface $objectManager = null,
-        DefinitionInterface $definitions = null,
+        ?\Magento\FunctionalTestingFramework\ObjectManagerInterface $objectManager = null,
+        ?DefinitionInterface $definitions = null,
         $globalArguments = []
     ) {
         parent::__construct($config, $objectManager, $definitions, $globalArguments);
diff --git a/src/Magento/FunctionalTestingFramework/ObjectManager/Factory/Dynamic/Developer.php b/src/Magento/FunctionalTestingFramework/ObjectManager/Factory/Dynamic/Developer.php
@@ -54,8 +54,8 @@ class Developer implements \Magento\FunctionalTestingFramework\ObjectManager\Fac
      */
     public function __construct(
         \Magento\FunctionalTestingFramework\ObjectManager\ConfigInterface $config,
-        \Magento\FunctionalTestingFramework\ObjectManagerInterface $objectManager = null,
-        \Magento\FunctionalTestingFramework\ObjectManager\DefinitionInterface $definitions = null,
+        ?\Magento\FunctionalTestingFramework\ObjectManagerInterface $objectManager = null,
+        ?\Magento\FunctionalTestingFramework\ObjectManager\DefinitionInterface $definitions = null,
         $globalArguments = []
     ) {
         $this->config = $config;
diff --git a/src/Magento/FunctionalTestingFramework/ObjectManager/Relations/Runtime.php b/src/Magento/FunctionalTestingFramework/ObjectManager/Relations/Runtime.php
@@ -28,7 +28,7 @@ class Runtime implements \Magento\FunctionalTestingFramework\ObjectManager\Relat
      * Runtime constructor.
      * @param \Magento\FunctionalTestingFramework\Code\Reader\ClassReader|null $classReader
      */
-    public function __construct(\Magento\FunctionalTestingFramework\Code\Reader\ClassReader $classReader = null)
+    public function __construct(?\Magento\FunctionalTestingFramework\Code\Reader\ClassReader $classReader = null)
     {
         $this->classReader = $classReader ? : new \Magento\FunctionalTestingFramework\Code\Reader\ClassReader();
     }

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ public function stepBefore(StepEvent $stepEvent)`
`199`	`199`	`* @throws \Yandex\Allure\Adapter\AllureException`
`200`	`200`	`* @return void`
`201`	`201`	`*/`
`202`		`- public function stepAfter(StepEvent $stepEvent = null)`
	`202`	`+ public function stepAfter(?StepEvent $stepEvent = null)`
`203`	`203`	`{`
`204`	`204`	`// Simply return if step is INVISIBLE_STEP_ACTIONS`
`205`	`205`	`if ($this->atInvisibleSteps) {`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class Mask implements FileResolverInterface`
`28`	`28`	`*`
`29`	`29`	`* @param ModuleResolver\|null $moduleResolver`
`30`	`30`	`*/`
`31`		`- public function __construct(ModuleResolver $moduleResolver = null)`
	`31`	`+ public function __construct(?ModuleResolver $moduleResolver = null)`
`32`	`32`	`{`
`33`	`33`	`if ($moduleResolver) {`
`34`	`34`	`$this->moduleResolver = $moduleResolver;`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class Module implements FileResolverInterface`
`27`	`27`	`* @param ModuleResolver\|null $moduleResolver`
`28`	`28`	`* @SuppressWarnings(PHPMD.UnusedFormalParameter)`
`29`	`29`	`*/`
`30`		`- public function __construct(ModuleResolver $moduleResolver = null)`
	`30`	`+ public function __construct(?ModuleResolver $moduleResolver = null)`
`31`	`31`	`{`
`32`	`32`	`$this->moduleResolver = ModuleResolver::getInstance();`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ class Config implements \Magento\FunctionalTestingFramework\ObjectManager\Config`
`76`	`76`	`* @param RelationsInterface\|null $relations`
`77`	`77`	`* @param DefinitionInterface\|null $definitions`
`78`	`78`	`*/`
`79`		`- public function __construct(RelationsInterface $relations = null, DefinitionInterface $definitions = null)`
	`79`	`+ public function __construct(?RelationsInterface $relations = null, ?DefinitionInterface $definitions = null)`
`80`	`80`	`{`
`81`	`81`	`$this->relations = $relations ? : new RelationsRuntime();`
`82`	`82`	`$this->definitions = $definitions ? : new DefinitionRuntime();`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class Runtime implements \Magento\FunctionalTestingFramework\ObjectManager\Defin`
`29`	`29`	`* Runtime constructor.`
`30`	`30`	`* @param \Magento\FunctionalTestingFramework\Code\Reader\ClassReader\|null $reader`
`31`	`31`	`*/`
`32`		`- public function __construct(\Magento\FunctionalTestingFramework\Code\Reader\ClassReader $reader = null)`
	`32`	`+ public function __construct(?\Magento\FunctionalTestingFramework\Code\Reader\ClassReader $reader = null)`
`33`	`33`	`{`
`34`	`34`	`$this->reader = $reader ? : new \Magento\FunctionalTestingFramework\Code\Reader\ClassReader();`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class Runtime implements \Magento\FunctionalTestingFramework\ObjectManager\Relat`
`28`	`28`	`* Runtime constructor.`
`29`	`29`	`* @param \Magento\FunctionalTestingFramework\Code\Reader\ClassReader\|null $classReader`
`30`	`30`	`*/`
`31`		`- public function __construct(\Magento\FunctionalTestingFramework\Code\Reader\ClassReader $classReader = null)`
	`31`	`+ public function __construct(?\Magento\FunctionalTestingFramework\Code\Reader\ClassReader $classReader = null)`
`32`	`32`	`{`
`33`	`33`	`$this->classReader = $classReader ? : new \Magento\FunctionalTestingFramework\Code\Reader\ClassReader();`
`34`	`34`	`}`