Merge pull request #1396 from nextcloud/fix-phpunit-4.8
Make tests work with 4.8 at least
This commit is contained in:
commit
314dc0ef91
|
@ -31,7 +31,7 @@ function print_syntax {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ! [ -x "$PHPUNIT" ]; then
|
if ! [ -x "$PHPUNIT" ]; then
|
||||||
echo "phpunit executable not found, please install phpunit version >= 3.7" >&2
|
echo "phpunit executable not found, please install phpunit version >= 4.8" >&2
|
||||||
exit 3
|
exit 3
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -39,8 +39,8 @@ PHPUNIT_VERSION=$("$PHPUNIT" --version | cut -d" " -f2)
|
||||||
PHPUNIT_MAJOR_VERSION=$(echo $PHPUNIT_VERSION | cut -d"." -f1)
|
PHPUNIT_MAJOR_VERSION=$(echo $PHPUNIT_VERSION | cut -d"." -f1)
|
||||||
PHPUNIT_MINOR_VERSION=$(echo $PHPUNIT_VERSION | cut -d"." -f2)
|
PHPUNIT_MINOR_VERSION=$(echo $PHPUNIT_VERSION | cut -d"." -f2)
|
||||||
|
|
||||||
if ! [ $PHPUNIT_MAJOR_VERSION -gt 4 -o \( $PHPUNIT_MAJOR_VERSION -eq 4 -a $PHPUNIT_MINOR_VERSION -ge 4 \) ]; then
|
if ! [ $PHPUNIT_MAJOR_VERSION -gt 4 -o \( $PHPUNIT_MAJOR_VERSION -eq 4 -a $PHPUNIT_MINOR_VERSION -ge 8 \) ]; then
|
||||||
echo "phpunit version >= 4.4 required. Version found: $PHPUNIT_VERSION" >&2
|
echo "phpunit version >= 4.8 required. Version found: $PHPUNIT_VERSION" >&2
|
||||||
exit 4
|
exit 4
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! [ -x "$PHPUNIT" ]; then
|
if ! [ -x "$PHPUNIT" ]; then
|
||||||
echo "phpunit executable not found, please install phpunit version >= 4.4" >&2
|
echo "phpunit executable not found, please install phpunit version >= 4.8" >&2
|
||||||
exit 3
|
exit 3
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -69,8 +69,8 @@ PHPUNIT_VERSION=$($PHPUNIT --version | cut -d" " -f2)
|
||||||
PHPUNIT_MAJOR_VERSION=$(echo "$PHPUNIT_VERSION" | cut -d"." -f1)
|
PHPUNIT_MAJOR_VERSION=$(echo "$PHPUNIT_VERSION" | cut -d"." -f1)
|
||||||
PHPUNIT_MINOR_VERSION=$(echo "$PHPUNIT_VERSION" | cut -d"." -f2)
|
PHPUNIT_MINOR_VERSION=$(echo "$PHPUNIT_VERSION" | cut -d"." -f2)
|
||||||
|
|
||||||
if ! [ "$PHPUNIT_MAJOR_VERSION" -gt 4 -o \( "$PHPUNIT_MAJOR_VERSION" -eq 4 -a "$PHPUNIT_MINOR_VERSION" -ge 4 \) ]; then
|
if ! [ "$PHPUNIT_MAJOR_VERSION" -gt 4 -o \( "$PHPUNIT_MAJOR_VERSION" -eq 4 -a "$PHPUNIT_MINOR_VERSION" -ge 8 \) ]; then
|
||||||
echo "phpunit version >= 4.4 required. Version found: $PHPUNIT_VERSION" >&2
|
echo "phpunit version >= 4.8 required. Version found: $PHPUNIT_VERSION" >&2
|
||||||
exit 4
|
exit 4
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -47,6 +47,24 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
|
||||||
/** @var array */
|
/** @var array */
|
||||||
protected $services = [];
|
protected $services = [];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Wrapper to be forward compatible to phpunit 5.4+
|
||||||
|
*
|
||||||
|
* @param string $originalClassName
|
||||||
|
* @return \PHPUnit_Framework_MockObject_MockObject
|
||||||
|
*/
|
||||||
|
protected function createMock($originalClassName) {
|
||||||
|
if (is_callable('parent::createMock')) {
|
||||||
|
return parent::createMock($originalClassName);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->getMockBuilder($originalClassName)
|
||||||
|
->disableOriginalConstructor()
|
||||||
|
->disableOriginalClone()
|
||||||
|
->disableArgumentCloning()
|
||||||
|
->getMock();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $name
|
* @param string $name
|
||||||
* @param mixed $newService
|
* @param mixed $newService
|
||||||
|
|
Loading…
Reference in New Issue