Skip to content

Commit

Permalink
used native PHP 8 functions
Browse files Browse the repository at this point in the history
  • Loading branch information
dg committed Dec 12, 2021
1 parent da4df73 commit abb949b
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions src/Dibi/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -516,9 +516,9 @@ public function getSubstitutes(): HashMap
*/
public function substitute(string $value): string
{
return strpos($value, ':') === false
? $value
: preg_replace_callback('#:([^:\s]*):#', fn(array $m) => $this->substitutes->{$m[1]}, $value);
return str_contains($value, ':')
? preg_replace_callback('#:([^:\s]*):#', fn(array $m) => $this->substitutes->{$m[1]}, $value)
: $value;
}


Expand Down
2 changes: 1 addition & 1 deletion src/Dibi/Drivers/PostgreDriver.php
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public static function createException(string $message, $code = null, string $sq
$message = substr($message, strlen($m[0]));
}

if ($code === '0A000' && strpos($message, 'truncate') !== false) {
if ($code === '0A000' && str_contains($message, 'truncate')) {
return new Dibi\ForeignKeyConstraintViolationException($message, $code, $sql);

} elseif ($code === '23502') {
Expand Down
2 changes: 1 addition & 1 deletion src/Dibi/Drivers/PostgreReflector.php
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public function getColumns(string $table): array
'size' => $size > 0 ? $size : null,
'nullable' => $row['is_nullable'] === 'YES' || $row['is_nullable'] === 't' || $row['is_nullable'] === true,
'default' => $row['column_default'],
'autoincrement' => (int) $row['ordinal_position'] === $primary && substr($row['column_default'] ?? '', 0, 7) === 'nextval',
'autoincrement' => (int) $row['ordinal_position'] === $primary && str_starts_with($row['column_default'] ?? '', 'nextval'),
'vendor' => $row,
];
}
Expand Down
14 changes: 7 additions & 7 deletions src/Dibi/Drivers/SqliteDriver.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,19 +99,19 @@ public static function createException(string $message, $code, string $sql): Dib
if ($code !== 19) {
return new Dibi\DriverException($message, $code, $sql);

} elseif (strpos($message, 'must be unique') !== false
|| strpos($message, 'is not unique') !== false
|| strpos($message, 'UNIQUE constraint failed') !== false
} elseif (str_contains($message, 'must be unique')
|| str_contains($message, 'is not unique')
|| str_contains($message, 'UNIQUE constraint failed')
) {
return new Dibi\UniqueConstraintViolationException($message, $code, $sql);

} elseif (strpos($message, 'may not be null') !== false
|| strpos($message, 'NOT NULL constraint failed') !== false
} elseif (str_contains($message, 'may not be null')
|| str_contains($message, 'NOT NULL constraint failed')
) {
return new Dibi\NotNullConstraintViolationException($message, $code, $sql);

} elseif (strpos($message, 'foreign key constraint failed') !== false
|| strpos($message, 'FOREIGN KEY constraint failed') !== false
} elseif (str_contains($message, 'foreign key constraint failed')
|| str_contains($message, 'FOREIGN KEY constraint failed')
) {
return new Dibi\ForeignKeyConstraintViolationException($message, $code, $sql);

Expand Down
2 changes: 1 addition & 1 deletion src/Dibi/Event.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function __construct(Connection $connection, int $type, string $sql = nul

$dibiDir = dirname((new \ReflectionClass('dibi'))->getFileName()) . DIRECTORY_SEPARATOR;
foreach (debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) as $row) {
if (isset($row['file']) && is_file($row['file']) && strpos($row['file'], $dibiDir) !== 0) {
if (isset($row['file']) && is_file($row['file']) && !str_starts_with($row['file'], $dibiDir)) {
$this->source = [$row['file'], (int) $row['line']];
break;
}
Expand Down
6 changes: 3 additions & 3 deletions src/Dibi/Helpers.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public static function dump(string|Result $sql = null, bool $return = false): ?s
{
ob_start();
if ($sql instanceof Result && PHP_SAPI === 'cli') {
$hasColors = (substr((string) getenv('TERM'), 0, 5) === 'xterm');
$hasColors = (str_starts_with((string) getenv('TERM'), 'xterm'));
$maxLen = 0;
foreach ($sql as $i => $row) {
if ($i === 0) {
Expand Down Expand Up @@ -89,7 +89,7 @@ public static function dump(string|Result $sql = null, bool $return = false): ?s
// syntax highlight
$highlighter = "#(/\\*.+?\\*/)|(\\*\\*.+?\\*\\*)|(?<=[\\s,(])($keywords1)(?=[\\s,)])|(?<=[\\s,(=])($keywords2)(?=[\\s,)=])#is";
if (PHP_SAPI === 'cli') {
if (substr((string) getenv('TERM'), 0, 5) === 'xterm') {
if (str_starts_with((string) getenv('TERM'), 'xterm')) {
$sql = preg_replace_callback($highlighter, function (array $m) {
if (!empty($m[1])) { // comment
return "\033[1;30m" . $m[1] . "\033[0m";
Expand Down Expand Up @@ -257,7 +257,7 @@ public static function loadFromFile(Connection $connection, string $file, callab
if (strtoupper(substr($s, 0, 10)) === 'DELIMITER ') {
$delimiter = trim(substr($s, 10));

} elseif (substr($ts = rtrim($s), -strlen($delimiter)) === $delimiter) {
} elseif (str_ends_with($ts = rtrim($s), $delimiter)) {
$sql .= substr($ts, 0, -strlen($delimiter));
$driver->query($sql);
$sql = '';
Expand Down
4 changes: 2 additions & 2 deletions src/Dibi/Result.php
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ final public function fetchAll(int $offset = null, int $limit = null): array
*/
final public function fetchAssoc(string $assoc): array
{
if (strpos($assoc, ',') !== false) {
if (str_contains($assoc, ',')) {
return $this->oldFetchAssoc($assoc);
}

Expand Down Expand Up @@ -491,7 +491,7 @@ private function normalize(array &$row): void
$row[$key] = ((bool) $value) && $value !== 'f' && $value !== 'F';

} elseif ($type === Type::DATETIME || $type === Type::DATE || $type === Type::TIME) {
if ($value && substr((string) $value, 0, 7) !== '0000-00') { // '', null, false, '0000-00-00', ...
if ($value && !str_starts_with((string) $value, '0000-00')) { // '', null, false, '0000-00-00', ...
$value = new DateTime($value);
$row[$key] = $format ? $value->format($format) : $value;
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/Dibi/Row.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function asDateTime(string $key, string $format = null): DateTime|string|
{
$time = $this[$key];
if (!$time instanceof DateTime) {
if (!$time || substr((string) $time, 0, 7) === '0000-00') { // '', null, false, '0000-00-00', ...
if (!$time || str_starts_with((string) $time, '0000-00')) { // '', null, false, '0000-00-00', ...
return null;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Dibi/Translator.php
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ public function formatValue(mixed $value, ?string $modifier): string
$v = $this->formatValue($v, $pair[1]);
if ($pair[1] === 'l' || $pair[1] === 'in') {
$op = 'IN ';
} elseif (strpos($pair[1], 'like') !== false) {
} elseif (str_contains($pair[1], 'like')) {
$op = 'LIKE ';
} elseif ($v === 'NULL') {
$op = 'IS ';
Expand Down

0 comments on commit abb949b

Please sign in to comment.