mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-03 20:57:36 +02:00
Code Issues Releases Wiki Activity

removed support for PHP 7

Browse Source
This commit is contained in:
David Grudl
2021-12-12 04:09:30 +01:00
parent 4b1a2faa76
commit 76b8ed2108
4 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Dibi/DataSource.php
View File

@@ -229,24 +229,19 @@ class DataSource implements IDataSource
*/
public function __toString(): string
{
try {
return $this->connection->translate(
"\nSELECT %n",
(empty($this->cols) ? '*' : $this->cols),
"\nFROM %SQL",
$this->sql,
"\n%ex",
$this->conds ? ['WHERE %and', $this->conds] : null,
"\n%ex",
$this->sorting ? ['ORDER BY %by', $this->sorting] : null,
"\n%ofs %lmt",
$this->offset,
$this->limit,
);
} catch (\Throwable $e) {
trigger_error($e->getMessage(), E_USER_ERROR);
return '';
}
return $this->connection->translate(
"\nSELECT %n",
(empty($this->cols) ? '*' : $this->cols),
"\nFROM %SQL",
$this->sql,
"\n%ex",
$this->conds ? ['WHERE %and', $this->conds] : null,
"\n%ex",
$this->sorting ? ['ORDER BY %by', $this->sorting] : null,
"\n%ofs %lmt",
$this->offset,
$this->limit,
);
}

6
src/Dibi/Drivers/OdbcDriver.php
View File

@@ -125,7 +125,7 @@ class OdbcDriver implements Dibi\Driver
*/
public function begin(?string $savepoint = null): void
{
if (!odbc_autocommit($this->connection, PHP_VERSION_ID < 80000 ? 0 : false)) {
if (!odbc_autocommit($this->connection, false)) {
throw new Dibi\DriverException(odbc_errormsg($this->connection) . ' ' . odbc_error($this->connection));
}
}
@@ -141,7 +141,7 @@ class OdbcDriver implements Dibi\Driver
throw new Dibi\DriverException(odbc_errormsg($this->connection) . ' ' . odbc_error($this->connection));
}
odbc_autocommit($this->connection, PHP_VERSION_ID < 80000 ? 1 : true);
odbc_autocommit($this->connection, true);
}
@@ -155,7 +155,7 @@ class OdbcDriver implements Dibi\Driver
throw new Dibi\DriverException(odbc_errormsg($this->connection) . ' ' . odbc_error($this->connection));
}
odbc_autocommit($this->connection, PHP_VERSION_ID < 80000 ? 1 : true);
odbc_autocommit($this->connection, true);
}

7
src/Dibi/Fluent.php
View File

@@ -411,12 +411,7 @@ class Fluent implements IDataSource
*/
final public function __toString(): string
{
try {
return $this->connection->translate($this->_export());
} catch (\Throwable $e) {
trigger_error($e->getMessage(), E_USER_ERROR);
return '';
}
return $this->connection->translate($this->_export());
}

4
tests/dibi/Fluent.select.phpt
View File

@@ -147,9 +147,9 @@ if ($config['system'] === 'mysql') {
->limit(' 1; DROP TABLE users')
->offset(' 1; DROP TABLE users');
Assert::error(function () use ($fluent) {
Assert::exception(function () use ($fluent) {
(string) $fluent;
}, E_USER_ERROR, "Expected number, ' 1; DROP TABLE users' given.");
}, Dibi\Exception::class, "Expected number, ' 1; DROP TABLE users' given.");
}