Php8 compatibility

app/code/community/EcomDev/PHPUnit/Model/Config.php

@@ -97,7 +97,7 @@ public function getEventConfig($area, $eventName)
      *
      * @param string $type
      * @param string $classAlias
-     * @param PHPUnit_Framework_MockObject_MockObject|PHPUnit_Framework_MockObject_MockBuilder $mock
+     * @param \PHPUnit\Framework\MockObject\MockObject|\PHPUnit\Framework\MockObject\MockBuilder $mock
      * @return EcomDev_PHPUnit_Model_Config
      */
     public function replaceInstanceCreation($type, $classAlias, $mock)

app/code/community/EcomDev/PHPUnit/Model/Expectation.php

@@ -118,7 +118,7 @@ public function isLoaded()
      *
      * @see EcomDev_PHPUnit_Model_Test_LoadableInterface::loadByTestCase()
      */
-    public function loadByTestCase(PHPUnit_Framework_TestCase $testCase)
+    public function loadByTestCase(\PHPUnit\Framework\TestCase $testCase)
     {
         $expectations = EcomDev_PHPUnit_Test_Case_Util::getAnnotationByNameFromClass(
             get_class($testCase), 'loadExpectation', array('class', 'method'), $testCase->getName(false)
@@ -158,4 +158,4 @@ public function loadByTestCase(PHPUnit_Framework_TestCase $testCase)
     }
 
 
-}
+}

app/code/community/EcomDev/PHPUnit/Model/Fixture.php

@@ -295,10 +295,10 @@ public function isScopeDefault()
     /**
      * Loads fixture files from test case annotations
      *
-     * @param PHPUnit_Framework_TestCase $testCase
-     * @return PHPUnit_Framework_TestCase
+     * @param \PHPUnit\Framework\TestCase $testCase
+     * @return \PHPUnit\Framework\TestCase
      */
-    public function loadByTestCase(PHPUnit_Framework_TestCase $testCase)
+    public function loadByTestCase(\PHPUnit\Framework\TestCase $testCase)
     {
         $fixtures = EcomDev_PHPUnit_Test_Case_Util::getAnnotationByNameFromClass(
             get_class($testCase), 'loadFixture', array('method', 'class'), $testCase->getName(false)
@@ -376,7 +376,7 @@ public function getFixtureValue($key)
      */
     protected function _loadFixtureFiles(array $fixtures, $classOrInstance)
     {
-        $isShared = ($this->isScopeShared() || !$classOrInstance instanceof PHPUnit_Framework_TestCase);
+        $isShared = ($this->isScopeShared() || !$classOrInstance instanceof \PHPUnit\Framework\TestCase);
         foreach ($fixtures as $fixture) {
             if (empty($fixture) && $isShared) {
                 $fixture = self::DEFAULT_SHARED_FIXTURE_NAME;
@@ -729,7 +729,7 @@ protected function _discardScope()
      * Returns VFS wrapper instance
      *
      * @return EcomDev_PHPUnit_Model_Fixture_Vfs
-     * @throws PHPUnit_Framework_SkippedTestError
+     * @throws \PHPUnit\Framework\SkippedTestError
      */
     public function getVfs()
     {
@@ -747,7 +747,7 @@ public function getVfs()
             return $this->_vfs;
         }
 
-        throw new PHPUnit_Framework_SkippedTestError(
+        throw new \PHPUnit\Framework\SkippedTestError(
             'The test was skipped, since vfsStream component is not installed. '
             . 'Try install submodules required for this functionality'
         );

app/code/community/EcomDev/PHPUnit/Model/Layout.php

@@ -62,7 +62,7 @@ class EcomDev_PHPUnit_Model_Layout
      * Replaces creation of some block by mock object
      *
      * @param string $classAlias
-     * @param PHPUnit_Framework_MockObject_MockObject|PHPUnit_Framework_MockObject_MockBuilder $mock
+     * @param \PHPUnit\Framework\MockObject\MockObject|\PHPUnit\Framework\MockObject\MockBuilder $mock
      * @return EcomDev_PHPUnit_Model_Layout
      */
     public function replaceBlockCreation($classAlias, $mock)
@@ -327,7 +327,7 @@ protected function _collectActionArguments($node)
                     $helperName = implode('/', $helperName);
                     $arg = $arg->asArray();
                     unset($arg['@']);
-                    $args[$key] = call_user_func_array(array(Mage::helper($helperName), $helperMethod), $arg);
+                    $args[$key] = call_user_func_array(array(Mage::helper($helperName), $helperMethod), array_values($arg));
                 } else {
                     /**
                      * if there is no helper we hope that this is assoc array

app/code/community/EcomDev/PHPUnit/Model/LoadableInterface.php

@@ -25,10 +25,10 @@ interface EcomDev_PHPUnit_Model_LoadableInterface
     /**
      * Loads external data by test case instance
      *
-     * @param PHPUnit_Framework_TestCase $testCase
+     * @param \PHPUnit\Framework\TestCase $testCase
      * @return $this
      */
-    public function loadByTestCase(PHPUnit_Framework_TestCase $testCase);
+    public function loadByTestCase(\PHPUnit\Framework\TestCase $testCase);
 
     /**
      * Applies external data

app/code/community/EcomDev/PHPUnit/Model/Yaml/Loader.php

@@ -16,10 +16,6 @@
  * @author     Ivan Chepurnyi <ivan.chepurnyi@ecomdev.org>
  */
 
-// Loading Spyc yaml parser,
-// because Symfony component is not working properly with nested structures
-require_once 'Spyc/spyc.php';
-
 class EcomDev_PHPUnit_Model_Yaml_Loader
 {
     const XML_PATH_YAML_FILE_LOADERS = 'phpunit/suite/yaml/loaders';
@@ -109,6 +105,6 @@ public function resolveFilePath($className, $type, $name)
      */
     public function load($filePath)
     {
-        return Spyc::YAMLLoad($filePath);
+        return \Symfony\Component\Yaml\Yaml::parse(file_get_contents($filePath));
     }
 }

app/code/community/EcomDev/PHPUnit/Test/Case.php

@@ -33,7 +33,7 @@
  * @method EcomDev_PHPUnit_Mock_Proxy guestSession()
  * @method Varien_Event_Observer generateObserver(array $eventData, string $eventName = null)
  */
-abstract class EcomDev_PHPUnit_Test_Case extends PHPUnit_Framework_TestCase
+abstract class EcomDev_PHPUnit_Test_Case extends \PHPUnit\Framework\TestCase
 {
 
     /**
@@ -83,15 +83,15 @@ public static function app()
     }
 
     /**
-     * Returns a EcomDev_PHPUnit_Constraint_Or matcher object.
+     * Returns a \PHPUnit\Framework\Constraint\LogicalOr matcher object.
      *
-     * @return EcomDev_PHPUnit_Constraint_Or
+     * @return \PHPUnit\Framework\Constraint\LogicalOr
      */
-    public static function logicalOr()
+    public static function logicalOr(): \PHPUnit\Framework\Constraint\LogicalOr
     {
         $constraints = func_get_args();
 
-        $constraint = new EcomDev_PHPUnit_Constraint_Or;
+        $constraint = new \PHPUnit\Framework\Constraint\LogicalOr();
         $constraint->setConstraints($constraints);
 
         return $constraint;
@@ -174,7 +174,7 @@ public static function assertEventDispatchedAtLeast($eventName, $times)
      *
      * @return EcomDev_PHPUnit_Constraint_Json
      */
-    public static function isJson()
+    public static function isJson(): \PHPUnit\Framework\Constraint\IsJson
     {
         return new EcomDev_PHPUnit_Constraint_Json(
             EcomDev_PHPUnit_Constraint_Json::TYPE_VALID
@@ -204,7 +204,7 @@ public static function matchesJson(array $expectedValue, $matchType = EcomDev_PH
      * @param string $string
      * @param string $message
      */
-    public static function assertJson($string, $message = '')
+    public static function assertJson($string, $message = ''): void
     {
         self::assertThat($string, self::isJson(), $message);
     }
@@ -334,7 +334,7 @@ protected function _getExpectations()
      *
      * @param string $type
      * @param string $classAlias
-     * @param PHPUnit_Framework_MockObject_MockObject|PHPUnit_Framework_MockObject_MockBuilder $mock
+     * @param \PHPUnit\Framework\MockObject\MockObject|PHPUnit\Framework\MockObject\MockBuilder $mock
      * @return $this
      */
     protected function replaceByMock($type, $classAlias, $mock)
@@ -554,7 +554,7 @@ protected function getGroupedClassName($type, $classAlias)
      * @param  boolean $callOriginalConstructor
      * @param  boolean $callOriginalClone
      * @param  boolean $callAutoload
-     * @return PHPUnit_Framework_MockObject_MockObject
+     * @return \PHPUnit\Framework\MockObject\MockObject
      */
     public function getGroupedClassMock($type, $classAlias, $methods = array(), $isAbstract = false,
                                         array $constructorArguments = array(),

app/code/community/EcomDev/PHPUnit/Test/Case/Config.php

@@ -201,11 +201,11 @@ public static function configRouter($area, $routeName, $expectedValue,
     /**
      * Executes configuration constraint
      *
-     * @param PHPUnit_Framework_Constraint $constraint
+     * @param \PHPUnit\Framework\Constraint\Constraint $constraint
      * @param string  $message
      * @return void
      */
-    public static function assertThatConfig(PHPUnit_Framework_Constraint $constraint, $message)
+    public static function assertThatConfig(\PHPUnit\Framework\Constraint\Constraint $constraint, $message)
     {
         self::assertThat(Mage::getConfig(), $constraint, $message);
     }

app/code/community/EcomDev/PHPUnit/Test/Case/Controller.php

@@ -135,10 +135,10 @@ public static function layoutBlockAction($blockName, $method, $type, $invocation
      *
      * @param string $blockName
      * @param string $propertyName
-     * @param PHPUnit_Framework_Constraint $constraint
+     * @param \PHPUnit\Framework\Constraint\Constraint $constraint
      * @return EcomDev_PHPUnit_Constraint_Layout_Block_Property
      */
-    public static function layoutBlockProperty($blockName, $propertyName, PHPUnit_Framework_Constraint $constraint)
+    public static function layoutBlockProperty($blockName, $propertyName, \PHPUnit\Framework\Constraint\Constraint $constraint)
     {
         return new EcomDev_PHPUnit_Constraint_Layout_Block_Property($blockName, $propertyName, $constraint);
     }
@@ -161,21 +161,21 @@ public static function request($type, $expectedValue = null)
      *
      * @param string $type
      * @param string $headerName
-     * @param PHPUnit_Framework_Constraint|null $constraint
+     * @param \PHPUnit\Framework\Constraint\Constraint|null $constraint
      * @return EcomDev_PHPUnit_Constraint_Controller_Response_Header
      */
-    public static function responseHeader($headerName, $type, PHPUnit_Framework_Constraint $constraint = null)
+    public static function responseHeader($headerName, $type, \PHPUnit\Framework\Constraint\Constraint $constraint = null)
     {
         return new EcomDev_PHPUnit_Constraint_Controller_Response_Header($headerName, $type, $constraint);
     }
 
     /**
      * Controller response body constraint creation
      *
-     * @param PHPUnit_Framework_Constraint $constraint
+     * @param \PHPUnit\Framework\Constraint\Constraint $constraint
      * @return EcomDev_PHPUnit_Constraint_Controller_Response_Body
      */
-    public static function responseBody(PHPUnit_Framework_Constraint $constraint)
+    public static function responseBody(\PHPUnit\Framework\Constraint\Constraint $constraint)
     {
         return new EcomDev_PHPUnit_Constraint_Controller_Response_Body($constraint);
     }
@@ -437,10 +437,10 @@ public static function assertRequestBeforeForwardedRouteNot($expectedBeforeForwa
     /**
      * Assert shortcut for response assertions
      *
-     * @param PHPUnit_Framework_Constraint $constraint
+     * @param \PHPUnit\Framework\Constraint\Constraint $constraint
      * @param string $message
      */
-    public static function assertThatResponse(PHPUnit_Framework_Constraint $constraint, $message)
+    public static function assertThatResponse(\PHPUnit\Framework\Constraint\Constraint $constraint, $message)
     {
         self::assertThat(self::getResponse(), $constraint, $message);
     }
@@ -485,10 +485,10 @@ public static function assertResponseHeaderNotSent($headerName, $message = '')
      * Assert that response header is evaluated by a specified constraint
      *
      * @param string $headerName
-     * @param PHPUnit_Framework_Constraint $constraint
+     * @param \PHPUnit\Framework\Constraint\Constraint $constraint
      * @param string $message
      */
-    public static function assertResponseHeader($headerName, PHPUnit_Framework_Constraint $constraint, $message = '')
+    public static function assertResponseHeader($headerName, \PHPUnit\Framework\Constraint\Constraint $constraint, $message = '')
     {
         self::assertThatResponse(
             self::responseHeader(
@@ -504,10 +504,10 @@ public static function assertResponseHeader($headerName, PHPUnit_Framework_Const
      * Assert that response header is not evaluated by a specified constraint
      *
      * @param string $headerName
-     * @param PHPUnit_Framework_Constraint $constraint
+     * @param \PHPUnit\Framework\Constraint\Constraint $constraint
      * @param string $message
      */
-    public static function assertResponseHeaderNot($headerName, PHPUnit_Framework_Constraint $constraint, $message = '')
+    public static function assertResponseHeaderNot($headerName, \PHPUnit\Framework\Constraint\Constraint $constraint, $message = '')
     {
         self::assertThatResponse(
             self::responseHeader(
@@ -662,10 +662,10 @@ public static function assertResponseHeaderNotRegExp($headerName, $pcrePattern,
     /**
      * Assert that response body is evaluated by the constraint
      *
-     * @param PHPUnit_Framework_Constraint $constraint
+     * @param \PHPUnit\Framework\Constraint\Constraint $constraint
      * @param string $message
      */
-    public static function assertResponseBody(PHPUnit_Framework_Constraint $constraint, $message = '')
+    public static function assertResponseBody(\PHPUnit\Framework\Constraint\Constraint $constraint, $message = '')
     {
         self::assertThatResponse(
             self::responseBody($constraint),
@@ -676,10 +676,10 @@ public static function assertResponseBody(PHPUnit_Framework_Constraint $constrai
     /**
      * Assert that response body is not evaluated by the constraint
      *
-     * @param PHPUnit_Framework_Constraint $constraint
+     * @param \PHPUnit\Framework\Constraint\Constraint $constraint
      * @param string $message
      */
-    public static function assertResponseBodyNot(PHPUnit_Framework_Constraint $constraint, $message = '')
+    public static function assertResponseBodyNot(\PHPUnit\Framework\Constraint\Constraint $constraint, $message = '')
     {
         self::assertThatResponse(
             self::logicalNot(
@@ -939,11 +939,11 @@ public static function assertRedirectToUrlRegExp($pcrePattern, $message = '')
     /**
      * Assert shortcut for layout constaints
      *
-     * @param PHPUnit_Framework_Constraint $constraint
+     * @param \PHPUnit\Framework\Constraint\Constraint $constraint
      * @param string $message
-     * @internal param \EcomDev_PHPUnit_Constraint_AbstractLayout|\PHPUnit_Framework_Constraint $constaint
+     * @internal param \EcomDev_PHPUnit_Constraint_AbstractLayout|\PHPUnit\Framework\Constraint\Constraint $constaint
      */
-    public static function assertThatLayout(PHPUnit_Framework_Constraint $constraint, $message)
+    public static function assertThatLayout(\PHPUnit\Framework\Constraint\Constraint $constraint, $message)
     {
         self::assertThat(self::getLayout(), $constraint, $message);
     }
@@ -1151,11 +1151,11 @@ public static function assertLayoutBlockNotRendered($blockName, $message = '')
      * Assert that layout block rendered content is evaluated by constraint
      *
      * @param string $blockName
-     * @param PHPUnit_Framework_Constraint $constraint
+     * @param \PHPUnit\Framework\Constraint\Constraint $constraint
      * @param string $message
      */
     public static function assertLayoutBlockRenderedContent($blockName,
-        PHPUnit_Framework_Constraint $constraint, $message = '')
+    \PHPUnit\Framework\Constraint\Constraint $constraint, $message = '')
     {
         self::assertThatLayout(
             self::layoutBlock(
@@ -1171,11 +1171,11 @@ public static function assertLayoutBlockRenderedContent($blockName,
      * Assert that layout block rendered content is not evaluated by constraint
      *
      * @param string $blockName
-     * @param PHPUnit_Framework_Constraint $constraint
+     * @param \PHPUnit\Framework\Constraint\Constraint $constraint
      * @param string $message
      */
     public static function assertLayoutBlockRenderedContentNot($blockName,
-        PHPUnit_Framework_Constraint $constraint, $message = '')
+    \PHPUnit\Framework\Constraint\Constraint $constraint, $message = '')
     {
         self::assertThatLayout(
             self::layoutBlock(
@@ -1361,7 +1361,7 @@ public static function assertLayoutBlockAfterAll($blockName, array $after, $mess
             );
         }
 
-        $logicalAnd = new PHPUnit_Framework_Constraint_And();
+        $logicalAnd = new \PHPUnit\Framework\Constraint\LogicalAnd();
         $logicalAnd->setConstraints($constaints);
         self::assertThatLayout($logicalAnd, $message);
     }
@@ -1382,7 +1382,7 @@ public static function assertLayoutBlockBeforeAll($blockName, array $before, $me
             );
         }
 
-        $logicalAnd = new PHPUnit_Framework_Constraint_And();
+        $logicalAnd = new \PHPUnit\Framework\Constraint\LogicalAnd();
         $logicalAnd->setConstraints($constaints);
         self::assertThatLayout($logicalAnd, $message);
     }
@@ -1531,11 +1531,11 @@ public static function assertLayoutBlockActionInvokedExactly($blockName, $method
      *
      * @param string $blockName
      * @param string $propertyName
-     * @param PHPUnit_Framework_Constraint $constraint
+     * @param \PHPUnit\Framework\Constraint\Constraint $constraint
      * @param string $message
      */
     public static function assertLayoutBlockProperty($blockName, $propertyName,
-        PHPUnit_Framework_Constraint $constraint, $message = '')
+        \PHPUnit\Framework\Constraint\Constraint $constraint, $message = '')
     {
         self::assertThatLayout(
             self::layoutBlockProperty($blockName, $propertyName, $constraint),
@@ -1548,11 +1548,11 @@ public static function assertLayoutBlockProperty($blockName, $propertyName,
      *
      * @param string $blockName
      * @param string $propertyName
-     * @param PHPUnit_Framework_Constraint $constraint
+     * @param \PHPUnit\Framework\Constraint\Constraint $constraint
      * @param string $message
      */
     public static function assertLayoutBlockPropertyNot($blockName, $propertyName,
-        PHPUnit_Framework_Constraint $constraint, $message = '')
+        \PHPUnit\Framework\Constraint\Constraint $constraint, $message = '')
     {
         self::assertThatLayout(
             self::logicalNot(
@@ -1854,7 +1854,7 @@ protected function _dispatch($baseUrl, $requestUri, $urlModel)
      * (non-PHPdoc)
      * @see EcomDev_PHPUnit_Test_Case::setUp()
      */
-    protected function setUp()
+    protected function setUp():void
     {
         parent::setUp();