Skip to content

Commit 0b4d2e5

Browse files
dgdg
committed
utilization of operator ??
1 parent 1af09b8 commit 0b4d2e5

12 files changed

+19
-20
lines changed

‎src/Bridges/DatabaseTracy/ConnectionPanel.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ public function logQuery(Nette\Database\Connection $connection, $result)
5858
$trace = $result instanceof \PDOException ? $result->getTrace() : debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
5959
foreach ($trace as $row) {
6060
if (isset($row['file']) && is_file($row['file']) && !Tracy\Debugger::getBluescreen()->isCollapsed($row['file'])) {
61-
if ((isset($row['function']) && strpos($row['function'], 'call_user_func') === 0)
62-
|| (isset($row['class']) && is_subclass_of($row['class'], '\\Nette\\Database\\Connection'))
61+
if ((strpos($row['function'] ?? '', 'call_user_func') === 0)
62+
|| (is_subclass_of($row['class'] ?? '', '\\Nette\\Database\\Connection'))
6363
) {
6464
continue;
6565
}

‎src/Database/DriverException.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static function from(\PDOException $src)
4040
*/
4141
public function getDriverCode()
4242
{
43-
return isset($this->errorInfo[1]) ? $this->errorInfo[1] : NULL;
43+
return $this->errorInfo[1] ?? NULL;
4444
}
4545

4646

@@ -49,7 +49,7 @@ public function getDriverCode()
4949
*/
5050
public function getSqlState()
5151
{
52-
return isset($this->errorInfo[0]) ? $this->errorInfo[0] : NULL;
52+
return $this->errorInfo[0] ?? NULL;
5353
}
5454

5555

‎src/Database/Drivers/MySqlDriver.php

+4-5
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ class MySqlDriver implements Nette\Database\ISupplementalDriver
3333
public function __construct(Nette\Database\Connection $connection, array $options)
3434
{
3535
$this->connection = $connection;
36-
$charset = isset($options['charset'])
37-
? $options['charset']
38-
: (version_compare($connection->getPdo()->getAttribute(\PDO::ATTR_SERVER_VERSION), '5.5.3', '>=') ? 'utf8mb4' : 'utf8');
36+
$charset = $options['charset']
37+
?? (version_compare($connection->getPdo()->getAttribute(\PDO::ATTR_SERVER_VERSION), '5.5.3', '>=') ? 'utf8mb4' : 'utf8');
3938
if ($charset) {
4039
$connection->query("SET NAMES '$charset'");
4140
}
@@ -50,7 +49,7 @@ public function __construct(Nette\Database\Connection $connection, array $option
5049
*/
5150
public function convertException(\PDOException $e)
5251
{
53-
$code = isset($e->errorInfo[1]) ? $e->errorInfo[1] : NULL;
52+
$code = $e->errorInfo[1] ?? NULL;
5453
if (in_array($code, [1216, 1217, 1451, 1452, 1701], TRUE)) {
5554
return Nette\Database\ForeignKeyConstraintViolationException::from($e);
5655

@@ -157,7 +156,7 @@ public function getTables()
157156
foreach ($this->connection->query('SHOW FULL TABLES') as $row) {
158157
$tables[] = [
159158
'name' => $row[0],
160-
'view' => isset($row[1]) && $row[1] === 'VIEW',
159+
'view' => ($row[1] ?? NULL) === 'VIEW',
161160
];
162161
}
163162
return $tables;

‎src/Database/Drivers/OciDriver.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ class OciDriver implements Nette\Database\ISupplementalDriver
2727
public function __construct(Nette\Database\Connection $connection, array $options)
2828
{
2929
$this->connection = $connection;
30-
$this->fmtDateTime = isset($options['formatDateTime']) ? $options['formatDateTime'] : 'U';
30+
$this->fmtDateTime = $options['formatDateTime'] ?? 'U';
3131
}
3232

3333

3434
public function convertException(\PDOException $e)
3535
{
36-
$code = isset($e->errorInfo[1]) ? $e->errorInfo[1] : NULL;
36+
$code = $e->errorInfo[1] ?? NULL;
3737
if (in_array($code, [1, 2299, 38911], TRUE)) {
3838
return Nette\Database\UniqueConstraintViolationException::from($e);
3939

‎src/Database/Drivers/PgSqlDriver.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function __construct(Nette\Database\Connection $connection, array $option
2929

3030
public function convertException(\PDOException $e)
3131
{
32-
$code = isset($e->errorInfo[0]) ? $e->errorInfo[0] : NULL;
32+
$code = $e->errorInfo[0] ?? NULL;
3333
if ($code === '0A000' && strpos($e->getMessage(), 'truncate') !== FALSE) {
3434
return Nette\Database\ForeignKeyConstraintViolationException::from($e);
3535

‎src/Database/Drivers/SqliteDriver.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ class SqliteDriver implements Nette\Database\ISupplementalDriver
2727
public function __construct(Nette\Database\Connection $connection, array $options)
2828
{
2929
$this->connection = $connection;
30-
$this->fmtDateTime = isset($options['formatDateTime']) ? $options['formatDateTime'] : 'U';
30+
$this->fmtDateTime = $options['formatDateTime'] ?? 'U';
3131
}
3232

3333

3434
public function convertException(\PDOException $e)
3535
{
36-
$code = isset($e->errorInfo[1]) ? $e->errorInfo[1] : NULL;
36+
$code = $e->errorInfo[1] ?? NULL;
3737
$msg = $e->getMessage();
3838
if ($code !== 19) {
3939
return Nette\Database\DriverException::from($e);

‎src/Database/Helpers.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ public static function findDuplicates(\PDOStatement $statement)
277277
$cols = [];
278278
for ($i = 0; $i < $statement->columnCount(); $i++) {
279279
$meta = $statement->getColumnMeta($i);
280-
$cols[$meta['name']][] = isset($meta['table']) ? $meta['table'] : '';
280+
$cols[$meta['name']][] = $meta['table'] ?? '';
281281
}
282282
$duplicates = [];
283283
foreach ($cols as $name => $tables) {

‎src/Database/ResultSet.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function __construct(Connection $connection, $queryString, array $params)
6666
$this->pdoStatement = $connection->getPdo()->prepare($queryString);
6767
foreach ($params as $key => $value) {
6868
$type = gettype($value);
69-
$this->pdoStatement->bindValue(is_int($key) ? $key + 1 : $key, $value, isset($types[$type]) ? $types[$type] : PDO::PARAM_STR);
69+
$this->pdoStatement->bindValue(is_int($key) ? $key + 1 : $key, $value, $types[$type] ?? PDO::PARAM_STR);
7070
}
7171
$this->pdoStatement->setFetchMode(PDO::FETCH_ASSOC);
7272
$this->pdoStatement->execute();

‎src/Database/Structure.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function getPrimaryKeySequence($table)
8282

8383
foreach ($this->structure['columns'][$table] as $columnMeta) {
8484
if ($columnMeta['name'] === $primary) {
85-
return isset($columnMeta['vendor']['sequence']) ? $columnMeta['vendor']['sequence'] : NULL;
85+
return $columnMeta['vendor']['sequence'] ?? NULL;
8686
}
8787
}
8888

‎src/Database/Table/GroupedSelection.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public function aggregation($function)
114114
public function count($column = NULL)
115115
{
116116
$return = parent::count($column);
117-
return isset($return) ? $return : 0;
117+
return $return ?? 0;
118118
}
119119

120120

‎src/Database/Table/Selection.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ public function getReferencedTable(ActiveRow $row, $table, $column = NULL)
944944
}
945945
}
946946

947-
return isset($selection[$checkPrimaryKey]) ? $selection[$checkPrimaryKey] : NULL;
947+
return $selection[$checkPrimaryKey] ?? NULL;
948948
}
949949

950950

‎src/Database/Table/SqlBuilder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ private function getCachedTableList()
795795
{
796796
if (!$this->cacheTableList) {
797797
$this->cacheTableList = array_flip(array_map(function ($pair) {
798-
return isset($pair['fullName']) ? $pair['fullName'] : $pair['name'];
798+
return $pair['fullName'] ?? $pair['name'];
799799
}, $this->structure->getTables()));
800800
}
801801

0 commit comments

Comments
 (0)