summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-09-21 20:25:04 +0200
committerPeter Kokot <peterkokot@gmail.com>2018-09-23 17:20:42 +0200
commitf6605c788f0a73cf4f5f4ea32515b9ba7959e4ac (patch)
tree6e4480515fd750899d118337e3f466da768cae71
parent9e5853b69900a34a8ad64c2f841367a3a8630213 (diff)
downloadphp-git-f6605c788f0a73cf4f5f4ea32515b9ba7959e4ac.tar.gz
Rename *.php files in Zend/tests to *.inc
*.php files are ignored by Git and a better practice might be to rename PHP included files for tests.
-rw-r--r--Zend/tests/bug39542.phpt2
-rw-r--r--Zend/tests/bug39542/bug39542.inc (renamed from Zend/tests/bug39542/bug39542.php)0
-rw-r--r--Zend/tests/bug67436/a.inc (renamed from Zend/tests/bug67436/a.php)0
-rw-r--r--Zend/tests/bug67436/b.inc (renamed from Zend/tests/bug67436/b.php)0
-rw-r--r--Zend/tests/bug67436/bug67436.phpt2
-rw-r--r--Zend/tests/bug67436/bug67436_nohandler.phpt4
-rw-r--r--Zend/tests/bug67436/c.inc (renamed from Zend/tests/bug67436/c.php)0
-rw-r--r--Zend/tests/use_const/includes/foo_bar.inc (renamed from Zend/tests/use_const/includes/foo_bar.php)0
-rw-r--r--Zend/tests/use_const/includes/foo_php_version.inc (renamed from Zend/tests/use_const/includes/foo_php_version.php)0
-rw-r--r--Zend/tests/use_const/includes/global_bar.inc (renamed from Zend/tests/use_const/includes/global_bar.php)0
-rw-r--r--Zend/tests/use_const/includes/global_baz.inc (renamed from Zend/tests/use_const/includes/global_baz.php)0
-rw-r--r--Zend/tests/use_const/no_global_fallback.phpt2
-rw-r--r--Zend/tests/use_const/shadow_core.phpt2
-rw-r--r--Zend/tests/use_const/shadow_global.phpt4
-rw-r--r--Zend/tests/use_function/includes/foo_bar.inc (renamed from Zend/tests/use_function/includes/foo_bar.php)0
-rw-r--r--Zend/tests/use_function/includes/foo_strlen.inc (renamed from Zend/tests/use_function/includes/foo_strlen.php)0
-rw-r--r--Zend/tests/use_function/includes/global_bar.inc (renamed from Zend/tests/use_function/includes/global_bar.php)0
-rw-r--r--Zend/tests/use_function/includes/global_baz.inc (renamed from Zend/tests/use_function/includes/global_baz.php)0
-rw-r--r--Zend/tests/use_function/no_global_fallback.phpt2
-rw-r--r--Zend/tests/use_function/shadow_core.phpt2
-rw-r--r--Zend/tests/use_function/shadow_global.phpt4
21 files changed, 12 insertions, 12 deletions
diff --git a/Zend/tests/bug39542.phpt b/Zend/tests/bug39542.phpt
index 2008fe140a..1409c4181c 100644
--- a/Zend/tests/bug39542.phpt
+++ b/Zend/tests/bug39542.phpt
@@ -11,7 +11,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
}
spl_autoload_register(function ($class) {
- if (!require_once($class.'.php')) {
+ if (!require_once($class.'.inc')) {
error_log('Error: Autoload class: '.$class.' not found!');
}
});
diff --git a/Zend/tests/bug39542/bug39542.php b/Zend/tests/bug39542/bug39542.inc
index 13b3b3eaf4..13b3b3eaf4 100644
--- a/Zend/tests/bug39542/bug39542.php
+++ b/Zend/tests/bug39542/bug39542.inc
diff --git a/Zend/tests/bug67436/a.php b/Zend/tests/bug67436/a.inc
index c560c2db7d..c560c2db7d 100644
--- a/Zend/tests/bug67436/a.php
+++ b/Zend/tests/bug67436/a.inc
diff --git a/Zend/tests/bug67436/b.php b/Zend/tests/bug67436/b.inc
index 793a1394d6..793a1394d6 100644
--- a/Zend/tests/bug67436/b.php
+++ b/Zend/tests/bug67436/b.inc
diff --git a/Zend/tests/bug67436/bug67436.phpt b/Zend/tests/bug67436/bug67436.phpt
index 8a6b3f8027..2bd06a0745 100644
--- a/Zend/tests/bug67436/bug67436.phpt
+++ b/Zend/tests/bug67436/bug67436.phpt
@@ -9,7 +9,7 @@ error_reporting=-1
spl_autoload_register(function($classname) {
if (in_array($classname, array('a','b','c'))) {
- require_once __DIR__ . "/{$classname}.php";
+ require_once __DIR__ . "/{$classname}.inc";
}
});
diff --git a/Zend/tests/bug67436/bug67436_nohandler.phpt b/Zend/tests/bug67436/bug67436_nohandler.phpt
index 232110797a..088761e00b 100644
--- a/Zend/tests/bug67436/bug67436_nohandler.phpt
+++ b/Zend/tests/bug67436/bug67436_nohandler.phpt
@@ -5,7 +5,7 @@ bug67436: E_STRICT instead of custom error handler
spl_autoload_register(function($classname) {
if (in_array($classname, array('a','b','c'))) {
- require_once __DIR__ . "/{$classname}.php";
+ require_once __DIR__ . "/{$classname}.inc";
}
});
@@ -15,6 +15,6 @@ $b = new b();
$b->test();
--EXPECTF--
-Warning: Declaration of b::test() should be compatible with a::test($arg = c::TESTCONSTANT) in %s%ebug67436%eb.php on line %d
+Warning: Declaration of b::test() should be compatible with a::test($arg = c::TESTCONSTANT) in %s%ebug67436%eb.inc on line %d
b::test()
a::test(c::TESTCONSTANT)
diff --git a/Zend/tests/bug67436/c.php b/Zend/tests/bug67436/c.inc
index 47c848bfa0..47c848bfa0 100644
--- a/Zend/tests/bug67436/c.php
+++ b/Zend/tests/bug67436/c.inc
diff --git a/Zend/tests/use_const/includes/foo_bar.php b/Zend/tests/use_const/includes/foo_bar.inc
index 90ed451f36..90ed451f36 100644
--- a/Zend/tests/use_const/includes/foo_bar.php
+++ b/Zend/tests/use_const/includes/foo_bar.inc
diff --git a/Zend/tests/use_const/includes/foo_php_version.php b/Zend/tests/use_const/includes/foo_php_version.inc
index 08f9fd150e..08f9fd150e 100644
--- a/Zend/tests/use_const/includes/foo_php_version.php
+++ b/Zend/tests/use_const/includes/foo_php_version.inc
diff --git a/Zend/tests/use_const/includes/global_bar.php b/Zend/tests/use_const/includes/global_bar.inc
index 609d17b7b5..609d17b7b5 100644
--- a/Zend/tests/use_const/includes/global_bar.php
+++ b/Zend/tests/use_const/includes/global_bar.inc
diff --git a/Zend/tests/use_const/includes/global_baz.php b/Zend/tests/use_const/includes/global_baz.inc
index 8b6fba97b3..8b6fba97b3 100644
--- a/Zend/tests/use_const/includes/global_baz.php
+++ b/Zend/tests/use_const/includes/global_baz.inc
diff --git a/Zend/tests/use_const/no_global_fallback.phpt b/Zend/tests/use_const/no_global_fallback.phpt
index 3adebd68f5..f9ee605515 100644
--- a/Zend/tests/use_const/no_global_fallback.phpt
+++ b/Zend/tests/use_const/no_global_fallback.phpt
@@ -3,7 +3,7 @@ non-existent imported constants should not be looked up in the global table
--FILE--
<?php
-require 'includes/global_baz.php';
+require 'includes/global_baz.inc';
use const foo\bar\baz;
var_dump(baz);
diff --git a/Zend/tests/use_const/shadow_core.phpt b/Zend/tests/use_const/shadow_core.phpt
index 5dbf396e63..55dc03df40 100644
--- a/Zend/tests/use_const/shadow_core.phpt
+++ b/Zend/tests/use_const/shadow_core.phpt
@@ -3,7 +3,7 @@ shadowing a global core constant with a local version
--FILE--
<?php
-require 'includes/foo_php_version.php';
+require 'includes/foo_php_version.inc';
use const foo\PHP_VERSION;
diff --git a/Zend/tests/use_const/shadow_global.phpt b/Zend/tests/use_const/shadow_global.phpt
index 930cc9f0b8..522f972506 100644
--- a/Zend/tests/use_const/shadow_global.phpt
+++ b/Zend/tests/use_const/shadow_global.phpt
@@ -4,8 +4,8 @@ shadowing a global constant with a local version
<?php
namespace {
- require 'includes/global_bar.php';
- require 'includes/foo_bar.php';
+ require 'includes/global_bar.inc';
+ require 'includes/foo_bar.inc';
}
namespace {
diff --git a/Zend/tests/use_function/includes/foo_bar.php b/Zend/tests/use_function/includes/foo_bar.inc
index 6d2f8cab45..6d2f8cab45 100644
--- a/Zend/tests/use_function/includes/foo_bar.php
+++ b/Zend/tests/use_function/includes/foo_bar.inc
diff --git a/Zend/tests/use_function/includes/foo_strlen.php b/Zend/tests/use_function/includes/foo_strlen.inc
index d2df2aa2b4..d2df2aa2b4 100644
--- a/Zend/tests/use_function/includes/foo_strlen.php
+++ b/Zend/tests/use_function/includes/foo_strlen.inc
diff --git a/Zend/tests/use_function/includes/global_bar.php b/Zend/tests/use_function/includes/global_bar.inc
index 6d7d91f805..6d7d91f805 100644
--- a/Zend/tests/use_function/includes/global_bar.php
+++ b/Zend/tests/use_function/includes/global_bar.inc
diff --git a/Zend/tests/use_function/includes/global_baz.php b/Zend/tests/use_function/includes/global_baz.inc
index 6383b9dd38..6383b9dd38 100644
--- a/Zend/tests/use_function/includes/global_baz.php
+++ b/Zend/tests/use_function/includes/global_baz.inc
diff --git a/Zend/tests/use_function/no_global_fallback.phpt b/Zend/tests/use_function/no_global_fallback.phpt
index 1277d4e2c2..106fe4b2f8 100644
--- a/Zend/tests/use_function/no_global_fallback.phpt
+++ b/Zend/tests/use_function/no_global_fallback.phpt
@@ -3,7 +3,7 @@ non-existent imported functions should not be looked up in the global table
--FILE--
<?php
-require 'includes/global_baz.php';
+require 'includes/global_baz.inc';
use function foo\bar\baz;
var_dump(baz());
diff --git a/Zend/tests/use_function/shadow_core.phpt b/Zend/tests/use_function/shadow_core.phpt
index 8f92ff1e1b..8442d77b8c 100644
--- a/Zend/tests/use_function/shadow_core.phpt
+++ b/Zend/tests/use_function/shadow_core.phpt
@@ -3,7 +3,7 @@ shadowing a global core function with a local version
--FILE--
<?php
-require 'includes/foo_strlen.php';
+require 'includes/foo_strlen.inc';
use function foo\strlen;
diff --git a/Zend/tests/use_function/shadow_global.phpt b/Zend/tests/use_function/shadow_global.phpt
index 791bcdf4d5..7c222d3afa 100644
--- a/Zend/tests/use_function/shadow_global.phpt
+++ b/Zend/tests/use_function/shadow_global.phpt
@@ -4,8 +4,8 @@ shadowing a global function with a local version
<?php
namespace {
- require 'includes/global_bar.php';
- require 'includes/foo_bar.php';
+ require 'includes/global_bar.inc';
+ require 'includes/foo_bar.inc';
}
namespace {