From 38545ddb3ac9644650681f4ae58ccb4cdd502a33 Mon Sep 17 00:00:00 2001
From: Sergey Tsalkov <stsalkov@gmail.com>
Date: Tue, 15 Jun 2021 21:28:14 -0700
Subject: [PATCH] remove more PHP 5.2 cruft, we now require PHP 5.3+

---
 simpletest/BasicTest.php  |  2 +-
 simpletest/ObjectTest.php |  2 +-
 simpletest/test.php       | 34 ++++++++++++----------------------
 3 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/simpletest/BasicTest.php b/simpletest/BasicTest.php
index 7ff3f6d..02eabbf 100644
--- a/simpletest/BasicTest.php
+++ b/simpletest/BasicTest.php
@@ -286,7 +286,7 @@ class BasicTest extends SimpleTest {
     $this->assert($columns[1] === 'picture');
     
     
-    $smile = file_get_contents('smile1.jpg');
+    $smile = file_get_contents(__DIR__ . '/smile1.jpg');
     DB::insert('store data', array(
       'picture' => $smile,
     ));
diff --git a/simpletest/ObjectTest.php b/simpletest/ObjectTest.php
index 87c82bb..06d67f6 100644
--- a/simpletest/ObjectTest.php
+++ b/simpletest/ObjectTest.php
@@ -215,7 +215,7 @@ class ObjectTest extends SimpleTest {
     ) ENGINE = InnoDB");
     
     
-    $smile = file_get_contents('smile1.jpg');
+    $smile = file_get_contents(__DIR__ . '/smile1.jpg');
     $this->mdb->insert('storedata', array(
       'picture' => $smile,
     ));
diff --git a/simpletest/test.php b/simpletest/test.php
index 6c0ae69..41b9b31 100755
--- a/simpletest/test.php
+++ b/simpletest/test.php
@@ -10,8 +10,6 @@ class SimpleTest {
     debug_print_backtrace();
     die;
   }
-  
-
 }
 
 function microtime_float()
@@ -20,14 +18,11 @@ function microtime_float()
     return ((float)$usec + (float)$sec);
 }
 
-if (phpversion() >= '5.3') $is_php_53 = true;
-else $is_php_53 = false;
-
 ini_set('date.timezone', 'America/Los_Angeles');
 
 error_reporting(E_ALL | E_STRICT);
-require_once '../db.class.php';
-include 'test_setup.php'; //test config values go here
+require_once __DIR__ . '/../db.class.php';
+require_once __DIR__ . '/test_setup.php'; //test config values go here
 // WARNING: ALL tables in the database will be dropped before the tests, including non-test related tables. 
 DB::$user = $set_db_user;
 DB::$password = $set_password;
@@ -35,13 +30,14 @@ DB::$dbName = $set_db;
 DB::$host = $set_host;
 DB::get(); //connect to mysql
 
-require_once 'BasicTest.php';
-require_once 'CallTest.php';
-require_once 'ObjectTest.php';
-require_once 'WhereClauseTest.php';
-require_once 'ErrorTest.php';
-require_once 'TransactionTest.php';
-require_once 'HelperTest.php';
+require_once __DIR__ . '/BasicTest.php';
+require_once __DIR__ . '/CallTest.php';
+require_once __DIR__ . '/ObjectTest.php';
+require_once __DIR__ . '/WhereClauseTest.php';
+require_once __DIR__ . '/ErrorTest.php';
+require_once __DIR__ . '/ErrorTest_53.php';
+require_once __DIR__ . '/TransactionTest.php';
+require_once __DIR__ . '/HelperTest.php';
 
 $classes_to_test = array(
   'BasicTest',
@@ -49,20 +45,14 @@ $classes_to_test = array(
   'WhereClauseTest',
   'ObjectTest',
   'ErrorTest',
+  'ErrorTest_53',
   'TransactionTest',
   'HelperTest',
 );
 
-if ($is_php_53) {
-  require_once 'ErrorTest_53.php';
-  $classes_to_test[] = 'ErrorTest_53';
-} else {
-  echo "PHP 5.3 not detected, skipping 5.3 tests..\n";
-}
-
 $mysql_version = DB::serverVersion();
 if ($mysql_version >= '5.5') {
-  require_once 'TransactionTest_55.php';
+  require_once __DIR__ . '/TransactionTest_55.php';
   $classes_to_test[] = 'TransactionTest_55';
 } else {
   echo "MySQL 5.5 not available (version is $mysql_version) -- skipping MySQL 5.5 tests\n";