used native PHP 8 functions

nette · Aug 25, 2021 · f0b966a · f0b966a
1 parent 5b03385
commit f0b966a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/src/Database/Drivers/PgSqlDriver.php b/src/Database/Drivers/PgSqlDriver.php
@@ -31,7 +31,7 @@ public function initialize(Nette\Database\Connection $connection, array $options
 	public function convertException(\PDOException $e): Nette\Database\DriverException
 	{
 		$code = $e->errorInfo[0] ?? null;
-		if ($code === '0A000' && strpos($e->getMessage(), 'truncate') !== false) {
+		if ($code === '0A000' && str_contains($e->getMessage(), 'truncate')) {
 			return Nette\Database\ForeignKeyConstraintViolationException::from($e);
 
 		} elseif ($code === '23502') {

diff --git a/src/Database/Drivers/SqliteDriver.php b/src/Database/Drivers/SqliteDriver.php
@@ -40,21 +40,21 @@ public function convertException(\PDOException $e): Nette\Database\DriverExcepti
 			return Nette\Database\DriverException::from($e);
 
 		} elseif (
-			strpos($msg, 'must be unique') !== false
-			|| strpos($msg, 'is not unique') !== false
-			|| strpos($msg, 'UNIQUE constraint failed') !== false
+			str_contains($msg, 'must be unique')
+			|| str_contains($msg, 'is not unique')
+			|| str_contains($msg, 'UNIQUE constraint failed')
 		) {
 			return Nette\Database\UniqueConstraintViolationException::from($e);
 
 		} elseif (
-			strpos($msg, 'may not be null') !== false
-			|| strpos($msg, 'NOT NULL constraint failed') !== false
+			str_contains($msg, 'may not be null')
+			|| str_contains($msg, 'NOT NULL constraint failed')
 		) {
 			return Nette\Database\NotNullConstraintViolationException::from($e);
 
 		} elseif (
-			strpos($msg, 'foreign key constraint failed') !== false
-			|| strpos($msg, 'FOREIGN KEY constraint failed') !== false
+			str_contains($msg, 'foreign key constraint failed')
+			|| str_contains($msg, 'FOREIGN KEY constraint failed')
 		) {
 			return Nette\Database\ForeignKeyConstraintViolationException::from($e);
 

diff --git a/src/Database/ResultSet.php b/src/Database/ResultSet.php
@@ -52,7 +52,7 @@ public function __construct(Connection $connection, string $queryString, array $
 		$this->normalizer = $normalizer;
 
 		try {
-			if (substr($queryString, 0, 2) === '::') {
+			if (str_starts_with($queryString, '::')) {
 				$connection->getPdo()->{substr($queryString, 2)}();
 			} elseif ($queryString !== null) {
 				static $types = ['boolean' => PDO::PARAM_BOOL, 'integer' => PDO::PARAM_INT,

diff --git a/src/Database/SqlPreprocessor.php b/src/Database/SqlPreprocessor.php
@@ -244,7 +244,7 @@ private function formatValue($value, string $mode = null): string
 				foreach ($value as $k => $v) {
 					if (is_int($k)) { // value, value, ...
 						$vx[] = $this->formatValue($v);
-					} elseif (substr($k, -1) === '=') { // key+=value, key-=value, ...
+					} elseif (str_ends_with($k, '=')) { // key+=value, key-=value, ...
 						$k2 = $this->delimite(substr($k, 0, -2));
 						$vx[] = $k2 . '=' . $k2 . ' ' . substr($k, -2, 1) . ' ' . $this->formatValue($v);
 					} else { // key=value, key=value, ...

diff --git a/src/Database/Table/Selection.php b/src/Database/Table/Selection.php
@@ -351,7 +351,7 @@ public function whereOr(array $parameters): static
 		foreach ($parameters as $key => $val) {
 			if (is_int($key)) { // whereOr(['full condition'])
 				$columns[] = $val;
-			} elseif (strpos($key, '?') === false) { // whereOr(['column1' => 1])
+			} elseif (!str_contains($key, '?')) { // whereOr(['column1' => 1])
 				$columns[] = $key . ' ?';
 				$values[] = $val;
 			} else { // whereOr(['column1 > ?' => 1])
@@ -931,7 +931,7 @@ public function getReferencingTable(
 		string $column = null,
 		int|string $active = null,
 	): ?GroupedSelection {
-		if (strpos($table, '.') !== false) {
+		if (str_contains($table, '.')) {
 			[$table, $column] = explode('.', $table);
 		} elseif (!$column) {
 			$hasMany = $this->conventions->getHasManyReference($this->name, $table);

diff --git a/src/Database/Table/SqlBuilder.php b/src/Database/Table/SqlBuilder.php
@@ -370,10 +370,10 @@ protected function addCondition($condition, array $params, array &$conditions, a
 
 				if ($arg !== null) {
 					if (!$arg) {
-						$hasBrackets = strpos($condition, '(') !== false;
+						$hasBrackets = str_contains($condition, '(');
 						$hasOperators = preg_match('#AND|OR#', $condition);
-						$hasNot = strpos($condition, 'NOT') !== false;
-						$hasPrefixNot = strpos($match[2][0], 'NOT') !== false;
+						$hasNot = str_contains($condition, 'NOT');
+						$hasPrefixNot = str_contains($match[2][0], 'NOT');
 						if (!$hasBrackets && ($hasOperators || ($hasNot && !$hasPrefixNot))) {
 							throw new Nette\InvalidArgumentException('Possible SQL query corruption. Add parentheses around operators.');
 						}