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/pdo_sqlite/tests | |
| 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/pdo_sqlite/tests')
| -rw-r--r-- | ext/pdo_sqlite/tests/bug33841.phpt | 4 | ||||
| -rw-r--r-- | ext/pdo_sqlite/tests/bug46139.phpt | 4 | ||||
| -rw-r--r-- | ext/pdo_sqlite/tests/bug52487.phpt | 4 | ||||
| -rw-r--r-- | ext/pdo_sqlite/tests/pdo_sqlite_open_flags.phpt | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/ext/pdo_sqlite/tests/bug33841.phpt b/ext/pdo_sqlite/tests/bug33841.phpt index b053b6ee3a..1c9fe201f4 100644 --- a/ext/pdo_sqlite/tests/bug33841.phpt +++ b/ext/pdo_sqlite/tests/bug33841.phpt @@ -6,8 +6,8 @@ if (!extension_loaded('pdo_sqlite')) print 'skip not loaded'; ?> --FILE-- <?php -require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc'; -$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt'); +require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc'; +$db = PDOTest::test_factory(__DIR__ . '/common.phpt'); $db->exec('CREATE TABLE test (text)'); diff --git a/ext/pdo_sqlite/tests/bug46139.phpt b/ext/pdo_sqlite/tests/bug46139.phpt index c361d7a9b1..c85d1b91af 100644 --- a/ext/pdo_sqlite/tests/bug46139.phpt +++ b/ext/pdo_sqlite/tests/bug46139.phpt @@ -7,8 +7,8 @@ if (!extension_loaded('pdo_sqlite')) print 'skip not loaded'; --FILE-- <?php -require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc'; -$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt'); +require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc'; +$db = PDOTest::test_factory(__DIR__ . '/common.phpt'); class Person { public $test = NULL; diff --git a/ext/pdo_sqlite/tests/bug52487.phpt b/ext/pdo_sqlite/tests/bug52487.phpt index 4861f6204f..ff586d2f64 100644 --- a/ext/pdo_sqlite/tests/bug52487.phpt +++ b/ext/pdo_sqlite/tests/bug52487.phpt @@ -6,8 +6,8 @@ if (!extension_loaded('pdo_sqlite')) print 'skip not loaded'; ?> --FILE-- <?php -require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc'; -$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt'); +require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc'; +$db = PDOTest::test_factory(__DIR__ . '/common.phpt'); $stmt = $db->prepare("select 1 as attr"); for ($i = 0; $i < 10; $i++) { diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_open_flags.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_open_flags.phpt index 89cb6c89bd..0023f91031 100644 --- a/ext/pdo_sqlite/tests/pdo_sqlite_open_flags.phpt +++ b/ext/pdo_sqlite/tests/pdo_sqlite_open_flags.phpt @@ -5,7 +5,7 @@ PDO_sqlite: Testing open flags --FILE-- <?php -$filename = dirname(__FILE__) . DIRECTORY_SEPARATOR . "pdo_sqlite_open_flags.db"; +$filename = __DIR__ . DIRECTORY_SEPARATOR . "pdo_sqlite_open_flags.db"; // Default open flag is read-write|create $db = new PDO('sqlite:' . $filename, null, null, [PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION]); @@ -18,7 +18,7 @@ var_dump($db->exec('CREATE TABLE test2 (id INT);')); ?> --CLEAN-- <?php -$filename = dirname(__FILE__) . DIRECTORY_SEPARATOR . "pdo_sqlite_open_flags.db"; +$filename = __DIR__ . DIRECTORY_SEPARATOR . "pdo_sqlite_open_flags.db"; if (file_exists($filename)) { unlink($filename); } |