[TASK] Make AbstractConditionMatcherTest run on HHVM 58/36058/2
authorTymoteusz Motylewski <t.motylewski@gmail.com>
Fri, 16 Jan 2015 23:19:49 +0000 (00:19 +0100)
committerMarkus Klein <klein.t3@reelworx.at>
Sat, 17 Jan 2015 16:42:04 +0000 (17:42 +0100)
AbstractConditionMatcherTest contains unnecessary method mocking
which is breaking the test in HHVM

Resolves: #64326
Releases: master
Change-Id: I97e81c632b4704541873f0dcd842a527bb482273
Reviewed-on: http://review.typo3.org/36058
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
typo3/sysext/core/Tests/Unit/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcherTest.php

index 299800b..ea4b03f 100644 (file)
@@ -71,13 +71,7 @@ class AbstractConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
                /** @var \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface $abstractConditionMatcherMock */
                $abstractConditionMatcherMock = $this->getMockForAbstractClass(
-                       \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher::class,
-                       array(),
-                       '',
-                       TRUE,
-                       TRUE,
-                       TRUE,
-                       array('evaluateConditionCommon')
+                       \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher::class
                );
 
                $method = new \ReflectionMethod(
@@ -118,13 +112,7 @@ class AbstractConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
                /** @var \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface $abstractConditionMatcherMock */
                $abstractConditionMatcherMock = $this->getMockForAbstractClass(
-                       \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher::class,
-                       array(),
-                       '',
-                       TRUE,
-                       TRUE,
-                       TRUE,
-                       array('evaluateConditionCommon')
+                       \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher::class
                );
 
                $method = new \ReflectionMethod(
@@ -198,13 +186,7 @@ class AbstractConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function evaluateConditionCommonEvaluatesIpAddressesCorrectly($devIpMask, $actualIp, $expectedResult) {
                /** @var \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface $abstractConditionMatcherMock */
                $abstractConditionMatcherMock = $this->getMockForAbstractClass(
-                       \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher::class,
-                       array(),
-                       '',
-                       TRUE,
-                       TRUE,
-                       TRUE,
-                       array('evaluateConditionCommon')
+                       \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher::class
                );
                $method = new \ReflectionMethod(
                        \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher::class,