rlkollman/meekrodb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove more PHP 5.2 cruft, we now require PHP 5.3+

Browse Source
This commit is contained in:
Sergey Tsalkov
2021-06-15 21:28:14 -07:00
parent 0fb0071314
commit 38545ddb3a
3 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
simpletest/BasicTest.php
View File

@@ -286,7 +286,7 @@ class BasicTest extends SimpleTest {
$this->assert($columns[1] === 'picture'); $this->assert($columns[1] === 'picture');
$smile = file_get_contents('smile1.jpg'); $smile = file_get_contents(__DIR__ . '/smile1.jpg');
DB::insert('store data', array( DB::insert('store data', array(
'picture' => $smile, 'picture' => $smile,
)); ));

2
simpletest/ObjectTest.php
View File

@@ -215,7 +215,7 @@ class ObjectTest extends SimpleTest {
) ENGINE = InnoDB"); ) ENGINE = InnoDB");
$smile = file_get_contents('smile1.jpg'); $smile = file_get_contents(__DIR__ . '/smile1.jpg');
$this->mdb->insert('storedata', array( $this->mdb->insert('storedata', array(
'picture' => $smile, 'picture' => $smile,
)); ));

34
simpletest/test.php
View File

@@ -10,8 +10,6 @@ class SimpleTest {
debug_print_backtrace(); debug_print_backtrace();
die; die;
} }
} }
function microtime_float() function microtime_float()
@@ -20,14 +18,11 @@ function microtime_float()
return ((float)$usec + (float)$sec); 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'); ini_set('date.timezone', 'America/Los_Angeles');
error_reporting(E_ALL | E_STRICT); error_reporting(E_ALL | E_STRICT);
require_once '../db.class.php'; require_once __DIR__ . '/../db.class.php';
include 'test_setup.php'; //test config values go here 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. // WARNING: ALL tables in the database will be dropped before the tests, including non-test related tables.
DB::$user = $set_db_user; DB::$user = $set_db_user;
DB::$password = $set_password; DB::$password = $set_password;
@@ -35,13 +30,14 @@ DB::$dbName = $set_db;
DB::$host = $set_host; DB::$host = $set_host;
DB::get(); //connect to mysql DB::get(); //connect to mysql
require_once 'BasicTest.php'; require_once __DIR__ . '/BasicTest.php';
require_once 'CallTest.php'; require_once __DIR__ . '/CallTest.php';
require_once 'ObjectTest.php'; require_once __DIR__ . '/ObjectTest.php';
require_once 'WhereClauseTest.php'; require_once __DIR__ . '/WhereClauseTest.php';
require_once 'ErrorTest.php'; require_once __DIR__ . '/ErrorTest.php';
require_once 'TransactionTest.php'; require_once __DIR__ . '/ErrorTest_53.php';
require_once 'HelperTest.php'; require_once __DIR__ . '/TransactionTest.php';
require_once __DIR__ . '/HelperTest.php';
$classes_to_test = array( $classes_to_test = array(
'BasicTest', 'BasicTest',
@@ -49,20 +45,14 @@ $classes_to_test = array(
'WhereClauseTest', 'WhereClauseTest',
'ObjectTest', 'ObjectTest',
'ErrorTest', 'ErrorTest',
'ErrorTest_53',
'TransactionTest', 'TransactionTest',
'HelperTest', '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(); $mysql_version = DB::serverVersion();
if ($mysql_version >= '5.5') { if ($mysql_version >= '5.5') {
require_once 'TransactionTest_55.php'; require_once __DIR__ . '/TransactionTest_55.php';
$classes_to_test[] = 'TransactionTest_55'; $classes_to_test[] = 'TransactionTest_55';
} else { } else {
echo "MySQL 5.5 not available (version is $mysql_version) -- skipping MySQL 5.5 tests\n"; echo "MySQL 5.5 not available (version is $mysql_version) -- skipping MySQL 5.5 tests\n";