smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-04 10:24:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update for PHPunit >= 5

Browse Source
This commit is contained in:
uwetews
2017-04-14 12:16:33 +02:00
parent 2652c5ef26
commit c3afe0bc9d
4 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/Bootstrap.php
View File

@@ -16,6 +16,7 @@ if (!class_exists('Smarty_Autoloader')) {
throw new Exception('can not locate Smarty distribution'); throw new Exception('can not locate Smarty distribution');
} }
} }
if (!defined('SMARTY_COMPOSER_INSTALL')) { if (!defined('SMARTY_COMPOSER_INSTALL')) {
foreach (array(dirname(__FILE__) . '/../../autoload.php', dirname(__FILE__) . '/../vendor/autoload.php', foreach (array(dirname(__FILE__) . '/../../autoload.php', dirname(__FILE__) . '/../vendor/autoload.php',
dirname(__FILE__) . '/vendor/autoload.php') as $file) { dirname(__FILE__) . '/vendor/autoload.php') as $file) {
@@ -29,12 +30,16 @@ if (!defined('SMARTY_COMPOSER_INSTALL')) {
if (!class_exists('PHPUnit_Framework_TestCase') && !class_exists('\PHPUnit\Framework\TestCase')){ if (!class_exists('PHPUnit_Framework_TestCase') && !class_exists('\PHPUnit\Framework\TestCase')){
require_once SMARTY_COMPOSER_INSTALL; require_once SMARTY_COMPOSER_INSTALL;
} }
if (!class_exists('\PHPUnit_Framework_TestCase') && class_exists('\PHPUnit\Framework\TestCase')) { if (!class_exists('\PHPUnit_Framework_TestCase') && class_exists('\PHPUnit\Framework\TestCase')) {
class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase'); class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase');
class_alias('\PHPUnit\Framework\Error\Notice', '\PHPUnit_Framework_Error_Notice');
class_alias('\PHPUnit\Framework\Error\Error', '\PHPUnit_Framework_Error_Error');
class_alias('\PHPUnit\Framework\Error\Warning', '\PHPUnit_Framework_Error_Warning');
class_alias('\PHPUnit\Framework\Error\Warning', '\PHPUnit_Framework_Error_Deprecated');
class_alias('\PHPUnit\Util\Configuration', '\PHPUnit_Util_Configuration');
} }
if (!class_exists('\PHPUnit_Framework_Error') && class_exists('\PHPUnit\Framework\Error')) {
class_alias('\PHPUnit\Framework\Error', '\PHPUnit_Framework_Error');
}
require_once 'PHPUnit_Smarty.php'; require_once 'PHPUnit_Smarty.php';
if (!ini_get('date.timezone')) { if (!ini_get('date.timezone')) {
ini_set('date.timezone', 'Europe/Berlin'); ini_set('date.timezone', 'Europe/Berlin');

1
tests/PHPUnit_Smarty.php
View File

@@ -249,6 +249,7 @@ KEY `expire` (`expire`)
if (is_dir(self::$cwd . '/templates_tmp')) { if (is_dir(self::$cwd . '/templates_tmp')) {
$this->cleanDir(self::$cwd . '/templates_tmp'); $this->cleanDir(self::$cwd . '/templates_tmp');
} }
$this->assertTrue(true);
} }
/** /**

2
tests/UnitTests/A_2/UndefinedTemplateVar/UndefinedTemplateVarTest.php
View File

@@ -61,7 +61,7 @@ class UndefinedTemplateVarTest extends PHPUnit_Smarty
/** /**
* Throw E_NOTICE message * Throw E_NOTICE message
* *
* @expectedException PHPUnit_Framework_Error * @expectedException PHPUnit_Framework_Error_Notice
* @expectedExceptionMessage Undefined index: foo * @expectedExceptionMessage Undefined index: foo
*/ */
public function testE_Notice() public function testE_Notice()

21
tests/phpunit.xml
View File

@@ -1,14 +1,22 @@
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd"
bootstrap="Bootstrap.php" bootstrap="Bootstrap.php"
colors="true" colors="true"
backupGlobals="false" backupGlobals="false"
backupStaticAttributes="true" backupStaticAttributes="true"
forceCoversAnnotation="false"
mapTestClassNameToCoveredClassName="false"
processIsolation="false" processIsolation="false"
convertErrorsToExceptions="true" stopOnError="false"
convertNoticesToExceptions="true" stopOnFailure="false"
convertWarningsToExceptions="true" stopOnIncomplete="false"
beStrictAboutOutputDuringTests="true" stopOnSkipped="false"
stopOnFailure="false"> stopOnRisky="false"
timeoutForSmallTests="1"
timeoutForMediumTests="10"
timeoutForLargeTests="60"
verbose="false">
<filter> <filter>
<testsuites> <testsuites>
@@ -29,7 +37,8 @@
</whitelist> </whitelist>
</filter> </filter>
<logging> <logging>
highlight="false" lowUpperBound="35" highLowerBound="70"/> <log type="coverage-html" target="./coverage/report" lowUpperBound="35"
highLowerBound="70"/>
<log type="tap" target="TestResults.tap"/> <log type="tap" target="TestResults.tap"/>
</logging> </logging>