remove E_DEPRECATED for PHP 5.2 compatibility

restore @runTestsInSeparateProcess
This commit is contained in:
Uwe Tews
2017-10-18 12:59:55 +02:00
parent 37288b44e0
commit 507b96a571
13 changed files with 20 additions and 17 deletions

View File

@@ -88,7 +88,7 @@ class PHPUnit_Smarty extends PHPUnit_Framework_TestCase
*/ */
public static function setUpBeforeClass() public static function setUpBeforeClass()
{ {
error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT); error_reporting(E_ALL & ~E_STRICT);
self::$init = true; self::$init = true;
self::$pluginsdir =self::getSmartyPluginsDir(); self::$pluginsdir =self::getSmartyPluginsDir();
} }

View File

@@ -0,0 +1 @@
dummy

View File

@@ -5,7 +5,7 @@
* *
* @package PHPunit * @package PHPunit
* @author Rodney Rehm * @author Rodney Rehm
* @run TestsInSeparateProcess * @runTestsInSeparateProcess
* @preserveGlobalState disabled * @preserveGlobalState disabled
* @backupStaticAttributes enabled * @backupStaticAttributes enabled
*/ */

View File

@@ -97,7 +97,7 @@ class CustomResourceAmbiguousTest extends PHPUnit_Smarty
/** /**
* *
* @run InSeparateProcess * @runInSeparateProcess
* @preserveGlobalState disabled * @preserveGlobalState disabled
* *
*/ */

View File

@@ -166,7 +166,7 @@ class SecurityTest extends PHPUnit_Smarty
*/ */
public function testAllowedModifier1() public function testAllowedModifier1()
{ {
error_reporting(E_ALL & ~E_DEPRECATED | E_STRICT); error_reporting(E_ALL & E_STRICT);
$this->smarty->security_policy->allowed_modifiers = array('capitalize'); $this->smarty->security_policy->allowed_modifiers = array('capitalize');
$this->assertEquals("Hello World", $this->smarty->fetch('eval:{"hello world"|capitalize}')); $this->assertEquals("Hello World", $this->smarty->fetch('eval:{"hello world"|capitalize}'));
error_reporting(E_ALL | E_STRICT); error_reporting(E_ALL | E_STRICT);

View File

@@ -255,7 +255,7 @@ class CompileBlockPluginTest extends PHPUnit_Smarty
/** /**
* test tag stack * test tag stack
* *
* @run InSeparateProcess * @runInSeparateProcess
* @preserveGlobalState disabled * @preserveGlobalState disabled
* *
*/ */

View File

@@ -37,7 +37,7 @@ class CompileConfigLoadTest extends PHPUnit_Smarty
} }
/** /**
* @run InSeparateProcess * @runInSeparateProcess
* @preserveGlobalState disabled * @preserveGlobalState disabled
* *
* test {load_config} loading section2 * test {load_config} loading section2
@@ -47,7 +47,7 @@ class CompileConfigLoadTest extends PHPUnit_Smarty
$this->assertEquals("Welcome to Smarty! Global Section1 Hello Section2", $this->smarty->fetch('001_section2.tpl')); $this->assertEquals("Welcome to Smarty! Global Section1 Hello Section2", $this->smarty->fetch('001_section2.tpl'));
} }
/** /**
* @run InSeparateProcess * @runInSeparateProcess
* @preserveGlobalState disabled * @preserveGlobalState disabled
* *
* test {load_config} loading section2 * test {load_config} loading section2
@@ -59,7 +59,7 @@ class CompileConfigLoadTest extends PHPUnit_Smarty
} }
/** /**
* @run InSeparateProcess * @runInSeparateProcess
* @preserveGlobalState disabled * @preserveGlobalState disabled
* *
* test {load_config} loading section2 * test {load_config} loading section2
@@ -104,7 +104,7 @@ class CompileConfigLoadTest extends PHPUnit_Smarty
} }
/** /**
* @run InSeparateProcess * @runInSeparateProcess
* @preserveGlobalState disabled * @preserveGlobalState disabled
*/ */
public function testConfigVariableOverwrite_006() public function testConfigVariableOverwrite_006()
@@ -112,7 +112,7 @@ class CompileConfigLoadTest extends PHPUnit_Smarty
$this->assertEquals("Welcome to Smarty! Overwrite3", $this->smarty->fetch('006_overwrite.tpl')); $this->assertEquals("Welcome to Smarty! Overwrite3", $this->smarty->fetch('006_overwrite.tpl'));
} }
/** /**
* @run InSeparateProcess * @runInSeparateProcess
* @preserveGlobalState disabled * @preserveGlobalState disabled
*/ */
public function testConfigVariableOverwrite_0061() public function testConfigVariableOverwrite_0061()

View File

@@ -0,0 +1 @@
dummy

View File

@@ -18,7 +18,6 @@ class PluginModifierCapitalizeTest extends PHPUnit_Smarty
public function setUp() public function setUp()
{ {
$this->setUpSmarty(dirname(__FILE__)); $this->setUpSmarty(dirname(__FILE__));
error_reporting(E_ALL & ~E_DEPRECATED | E_STRICT);
} }
public function testDefault() public function testDefault()

View File

@@ -39,7 +39,7 @@ class CompileFunctionTest extends PHPUnit_Smarty
$this->assertEquals("default param default 1 2 1", $this->smarty->fetch('test_template_function_001.tpl'), $text); $this->assertEquals("default param default 1 2 1", $this->smarty->fetch('test_template_function_001.tpl'), $text);
} }
/** /**
* @run InSeparateProcess * @runInSeparateProcess
* @preserveGlobalState disabled * @preserveGlobalState disabled
* @dataProvider functionProvider * @dataProvider functionProvider
* test simple function call tag * test simple function call tag
@@ -82,7 +82,7 @@ class CompileFunctionTest extends PHPUnit_Smarty
/** /**
* @run InSeparateProcess * @runInSeparateProcess
* @preserveGlobalState disabled * @preserveGlobalState disabled
* @dataProvider functionProvider * @dataProvider functionProvider
* test simple function call tag cached no cache default variable * test simple function call tag cached no cache default variable
@@ -181,7 +181,7 @@ class CompileFunctionTest extends PHPUnit_Smarty
} }
/** /**
* @run InSeparateProcess * @runInSeparateProcess
* @preserveGlobalState disabled * @preserveGlobalState disabled
* @dataProvider functionProviderInline * @dataProvider functionProviderInline
* test function definition in include * test function definition in include
@@ -214,7 +214,7 @@ class CompileFunctionTest extends PHPUnit_Smarty
} }
/** /**
* @run InSeparateProcess * @runInSeparateProcess
* @preserveGlobalState disabled * @preserveGlobalState disabled
* test external function definition and called by fetch * test external function definition and called by fetch
* *

View File

@@ -31,7 +31,7 @@ class ScopeTest extends PHPUnit_Smarty
/** /**
* Test scope * Test scope
* *
* @run InSeparateProcess * @runInSeparateProcess
* @preserveGlobalState disabled * @preserveGlobalState disabled
* @dataProvider dataTestAppendScope * @dataProvider dataTestAppendScope
*/ */
@@ -173,7 +173,7 @@ class ScopeTest extends PHPUnit_Smarty
/** /**
* Test scope * Test scope
* *
* @run InSeparateProcess * @runInSeparateProcess
* @preserveGlobalState disabled * @preserveGlobalState disabled
* @dataProvider dataTestIncludeScope * @dataProvider dataTestIncludeScope
*/ */