diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-03-15 23:36:47 +0100 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-03-15 23:36:47 +0100 |
| commit | 6426420f61de0df32a6085924d25b347c8788363 (patch) | |
| tree | ef32814ffbea0ad3c3c38a942f9751302606c736 /tests/classes | |
| parent | f26c8644bb340e9e7abb6d1cedb091e9d87dd1d4 (diff) | |
| parent | 26dfce7f36d1c6f737ac241df1315a1b42b932c7 (diff) | |
| download | php-git-6426420f61de0df32a6085924d25b347c8788363.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Replace dirname(__FILE__) by __DIR__ in tests
Diffstat (limited to 'tests/classes')
| -rw-r--r-- | tests/classes/autoload_001.phpt | 2 | ||||
| -rw-r--r-- | tests/classes/autoload_002.phpt | 2 | ||||
| -rw-r--r-- | tests/classes/autoload_003.phpt | 2 | ||||
| -rw-r--r-- | tests/classes/autoload_004.phpt | 2 | ||||
| -rw-r--r-- | tests/classes/autoload_005.phpt | 2 | ||||
| -rw-r--r-- | tests/classes/autoload_006.phpt | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/tests/classes/autoload_001.phpt b/tests/classes/autoload_001.phpt index 56e22f5e4a..350e1e0f12 100644 --- a/tests/classes/autoload_001.phpt +++ b/tests/classes/autoload_001.phpt @@ -8,7 +8,7 @@ ZE2 Autoload and class_exists <?php spl_autoload_register(function ($class_name) { - require_once(dirname(__FILE__) . '/' . $class_name . '.inc'); + require_once(__DIR__ . '/' . $class_name . '.inc'); echo 'autoload(' . $class_name . ")\n"; }); diff --git a/tests/classes/autoload_002.phpt b/tests/classes/autoload_002.phpt index 0df897495f..1b049c3414 100644 --- a/tests/classes/autoload_002.phpt +++ b/tests/classes/autoload_002.phpt @@ -8,7 +8,7 @@ ZE2 Autoload and get_class_methods <?php spl_autoload_register(function ($class_name) { - require_once(dirname(__FILE__) . '/' . $class_name . '.inc'); + require_once(__DIR__ . '/' . $class_name . '.inc'); echo 'autoload(' . $class_name . ")\n"; }); diff --git a/tests/classes/autoload_003.phpt b/tests/classes/autoload_003.phpt index 2f173d80ab..52fd264d46 100644 --- a/tests/classes/autoload_003.phpt +++ b/tests/classes/autoload_003.phpt @@ -8,7 +8,7 @@ ZE2 Autoload and derived classes <?php spl_autoload_register(function ($class_name) { - require_once(dirname(__FILE__) . '/' . $class_name . '.inc'); + require_once(__DIR__ . '/' . $class_name . '.inc'); echo 'autoload(' . $class_name . ")\n"; }); diff --git a/tests/classes/autoload_004.phpt b/tests/classes/autoload_004.phpt index 2a71a893d9..6f24f157d2 100644 --- a/tests/classes/autoload_004.phpt +++ b/tests/classes/autoload_004.phpt @@ -9,7 +9,7 @@ ZE2 Autoload and recursion spl_autoload_register(function ($class_name) { var_dump(class_exists($class_name)); - require_once(dirname(__FILE__) . '/' . $class_name . '.inc'); + require_once(__DIR__ . '/' . $class_name . '.inc'); echo 'autoload(' . $class_name . ")\n"; }); diff --git a/tests/classes/autoload_005.phpt b/tests/classes/autoload_005.phpt index 622e1fdee4..67dd23daf7 100644 --- a/tests/classes/autoload_005.phpt +++ b/tests/classes/autoload_005.phpt @@ -9,7 +9,7 @@ ZE2 Autoload from destructor spl_autoload_register(function ($class_name) { var_dump(class_exists($class_name, false)); - require_once(dirname(__FILE__) . '/' . $class_name . '.inc'); + require_once(__DIR__ . '/' . $class_name . '.inc'); echo 'autoload(' . $class_name . ")\n"; }); diff --git a/tests/classes/autoload_006.phpt b/tests/classes/autoload_006.phpt index a7afb3b904..746cbee3f6 100644 --- a/tests/classes/autoload_006.phpt +++ b/tests/classes/autoload_006.phpt @@ -8,7 +8,7 @@ ZE2 Autoload from destructor <?php spl_autoload_register(function ($class_name) { - require_once(dirname(__FILE__) . '/' . strtolower($class_name) . '.inc'); + require_once(__DIR__ . '/' . strtolower($class_name) . '.inc'); echo 'autoload(' . $class_name . ")\n"; }); |