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 /ext/tidy | |
| 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 'ext/tidy')
| -rw-r--r-- | ext/tidy/tests/005-mb.phpt | 2 | ||||
| -rw-r--r-- | ext/tidy/tests/005.phpt | 2 | ||||
| -rw-r--r-- | ext/tidy/tests/007.phpt | 2 | ||||
| -rw-r--r-- | ext/tidy/tests/013.phpt | 2 | ||||
| -rw-r--r-- | ext/tidy/tests/015.phpt | 2 | ||||
| -rw-r--r-- | ext/tidy/tests/016.phpt | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/ext/tidy/tests/005-mb.phpt b/ext/tidy/tests/005-mb.phpt index d19104ab29..c7b8e20676 100644 --- a/ext/tidy/tests/005-mb.phpt +++ b/ext/tidy/tests/005-mb.phpt @@ -4,7 +4,7 @@ tidy_parse_file() <?php if (!extension_loaded("tidy")) print "skip"; ?> --FILE-- <?php - $a = tidy_parse_file(dirname(__FILE__)."/005私はガラスを食べられます.html"); + $a = tidy_parse_file(__DIR__."/005私はガラスを食べられます.html"); echo tidy_get_output($a); ?> diff --git a/ext/tidy/tests/005.phpt b/ext/tidy/tests/005.phpt index ea4aab3125..49b0a2ad4d 100644 --- a/ext/tidy/tests/005.phpt +++ b/ext/tidy/tests/005.phpt @@ -4,7 +4,7 @@ tidy_parse_file() <?php if (!extension_loaded("tidy")) print "skip"; ?> --FILE-- <?php - $a = tidy_parse_file(dirname(__FILE__)."/005.html"); + $a = tidy_parse_file(__DIR__."/005.html"); echo tidy_get_output($a); ?> diff --git a/ext/tidy/tests/007.phpt b/ext/tidy/tests/007.phpt index f6bb13d556..bae8918625 100644 --- a/ext/tidy/tests/007.phpt +++ b/ext/tidy/tests/007.phpt @@ -6,7 +6,7 @@ Verbose tidy_getopt() tidy.default_config= --FILE-- <?php - $a = new tidy(dirname(__FILE__)."/007.html"); + $a = new tidy(__DIR__."/007.html"); echo "Current Value of 'tidy-mark': "; var_dump($a->getopt("tidy-mark")); echo "Current Value of 'error-file': "; diff --git a/ext/tidy/tests/013.phpt b/ext/tidy/tests/013.phpt index 8f1ac94ef4..a43a88d585 100644 --- a/ext/tidy/tests/013.phpt +++ b/ext/tidy/tests/013.phpt @@ -4,7 +4,7 @@ Parsing a file using constructor <?php if (!extension_loaded("tidy")) print "skip"; ?> --FILE-- <?php - $tidy = new tidy(dirname(__FILE__)."/013.html", array("show-body-only"=>true)); + $tidy = new tidy(__DIR__."/013.html", array("show-body-only"=>true)); $tidy->cleanRepair(); echo $tidy; diff --git a/ext/tidy/tests/015.phpt b/ext/tidy/tests/015.phpt index 5b8255c52b..c5bc1dc4d3 100644 --- a/ext/tidy/tests/015.phpt +++ b/ext/tidy/tests/015.phpt @@ -4,7 +4,7 @@ Passing configuration options through tidy_parse_file(). <?php if (!extension_loaded("tidy")) print "skip"; ?> --FILE-- <?php - $tidy = tidy_parse_file(dirname(__FILE__)."/015.html", array('show-body-only'=>true)); + $tidy = tidy_parse_file(__DIR__."/015.html", array('show-body-only'=>true)); tidy_clean_repair($tidy); echo tidy_get_output($tidy); diff --git a/ext/tidy/tests/016.phpt b/ext/tidy/tests/016.phpt index 05b7cc18f9..9b9718ec25 100644 --- a/ext/tidy/tests/016.phpt +++ b/ext/tidy/tests/016.phpt @@ -4,8 +4,8 @@ Passing configuration file through tidy_parse_file() (may fail with buggy libtid <?php if (!extension_loaded("tidy")) print "skip"; ?> --FILE-- <?php - $tidy = tidy_parse_file(dirname(__FILE__)."/016.html", - dirname(__FILE__)."/016.tcfg"); + $tidy = tidy_parse_file(__DIR__."/016.html", + __DIR__."/016.tcfg"); $cfg = $tidy->getConfig(); echo $cfg["clean"]; ?> |