used PHP 7.1 features

dg · dg · commit 6b7e0598eef8 · 2017-01-26T02:58:52.000+01:00
diff --git a/src/Bridges/DatabaseTracy/ConnectionPanel.php b/src/Bridges/DatabaseTracy/ConnectionPanel.php
@@ -58,8 +58,8 @@ public function logQuery(Nette\Database\Connection $connection, $result)
 		$trace = $result instanceof \PDOException ? $result->getTrace() : debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
 		foreach ($trace as $row) {
 			if (isset($row['file']) && is_file($row['file']) && !Tracy\Debugger::getBluescreen()->isCollapsed($row['file'])) {
-				if ((isset($row['function']) && strpos($row['function'], 'call_user_func') === 0)
-					|| (isset($row['class']) && is_subclass_of($row['class'], '\\Nette\\Database\\Connection'))
+				if ((strpos($row['function'] ?? '', 'call_user_func') === 0)
+					|| (is_subclass_of($row['class'] ?? '', '\\Nette\\Database\\Connection'))
 				) {
 					continue;
 				}
@@ -120,7 +120,7 @@ public function getPanel()
 		$totalTime = $this->totalTime;
 		$queries = [];
 		foreach ($this->queries as $query) {
-			list($connection, $sql, $params, $source, $time, $rows, $error) = $query;
+			[$connection, $sql, $params, $source, $time, $rows, $error] = $query;
 			$explain = NULL;
 			if (!$error && $this->explain && preg_match('#\s*\(?\s*SELECT\s#iA', $sql)) {
 				try {
diff --git a/src/Database/Connection.php b/src/Database/Connection.php
@@ -171,7 +171,7 @@ public function rollBack()
 	 */
 	public function query($sql, ...$params)
 	{
-		list($sql, $params) = $this->preprocess($sql, ...$params);
+		[$sql, $params] = $this->preprocess($sql, ...$params);
 		try {
 			$result = new ResultSet($this, $sql, $params);
 		} catch (PDOException $e) {
diff --git a/src/Database/DriverException.php b/src/Database/DriverException.php
@@ -40,7 +40,7 @@ public static function from(\PDOException $src)
 	 */
 	public function getDriverCode()
 	{
-		return isset($this->errorInfo[1]) ? $this->errorInfo[1] : NULL;
+		return $this->errorInfo[1] ?? NULL;
 	}
 
 
@@ -49,7 +49,7 @@ public function getDriverCode()
 	 */
 	public function getSqlState()
 	{
-		return isset($this->errorInfo[0]) ? $this->errorInfo[0] : NULL;
+		return $this->errorInfo[0] ?? NULL;
 	}
 
 
diff --git a/src/Database/Drivers/MySqlDriver.php b/src/Database/Drivers/MySqlDriver.php
@@ -33,9 +33,8 @@ class MySqlDriver implements Nette\Database\ISupplementalDriver
 	public function __construct(Nette\Database\Connection $connection, array $options)
 	{
 		$this->connection = $connection;
-		$charset = isset($options['charset'])
-			? $options['charset']
-			: (version_compare($connection->getPdo()->getAttribute(\PDO::ATTR_SERVER_VERSION), '5.5.3', '>=') ? 'utf8mb4' : 'utf8');
+		$charset = $options['charset']
+			?? (version_compare($connection->getPdo()->getAttribute(\PDO::ATTR_SERVER_VERSION), '5.5.3', '>=') ? 'utf8mb4' : 'utf8');
 		if ($charset) {
 			$connection->query("SET NAMES '$charset'");
 		}
@@ -50,7 +49,7 @@ public function __construct(Nette\Database\Connection $connection, array $option
 	 */
 	public function convertException(\PDOException $e)
 	{
-		$code = isset($e->errorInfo[1]) ? $e->errorInfo[1] : NULL;
+		$code = $e->errorInfo[1] ?? NULL;
 		if (in_array($code, [1216, 1217, 1451, 1452, 1701], TRUE)) {
 			return Nette\Database\ForeignKeyConstraintViolationException::from($e);
 
@@ -157,7 +156,7 @@ public function getTables()
 		foreach ($this->connection->query('SHOW FULL TABLES') as $row) {
 			$tables[] = [
 				'name' => $row[0],
-				'view' => isset($row[1]) && $row[1] === 'VIEW',
+				'view' => ($row[1] ?? NULL) === 'VIEW',
 			];
 		}
 		return $tables;
diff --git a/src/Database/Drivers/OciDriver.php b/src/Database/Drivers/OciDriver.php
@@ -27,13 +27,13 @@ class OciDriver implements Nette\Database\ISupplementalDriver
 	public function __construct(Nette\Database\Connection $connection, array $options)
 	{
 		$this->connection = $connection;
-		$this->fmtDateTime = isset($options['formatDateTime']) ? $options['formatDateTime'] : 'U';
+		$this->fmtDateTime = $options['formatDateTime'] ?? 'U';
 	}
 
 
 	public function convertException(\PDOException $e)
 	{
-		$code = isset($e->errorInfo[1]) ? $e->errorInfo[1] : NULL;
+		$code = $e->errorInfo[1] ?? NULL;
 		if (in_array($code, [1, 2299, 38911], TRUE)) {
 			return Nette\Database\UniqueConstraintViolationException::from($e);
 
diff --git a/src/Database/Drivers/PgSqlDriver.php b/src/Database/Drivers/PgSqlDriver.php
@@ -29,7 +29,7 @@ public function __construct(Nette\Database\Connection $connection, array $option
 
 	public function convertException(\PDOException $e)
 	{
-		$code = isset($e->errorInfo[0]) ? $e->errorInfo[0] : NULL;
+		$code = $e->errorInfo[0] ?? NULL;
 		if ($code === '0A000' && strpos($e->getMessage(), 'truncate') !== FALSE) {
 			return Nette\Database\ForeignKeyConstraintViolationException::from($e);
 
diff --git a/src/Database/Drivers/SqliteDriver.php b/src/Database/Drivers/SqliteDriver.php
@@ -27,13 +27,13 @@ class SqliteDriver implements Nette\Database\ISupplementalDriver
 	public function __construct(Nette\Database\Connection $connection, array $options)
 	{
 		$this->connection = $connection;
-		$this->fmtDateTime = isset($options['formatDateTime']) ? $options['formatDateTime'] : 'U';
+		$this->fmtDateTime = $options['formatDateTime'] ?? 'U';
 	}
 
 
 	public function convertException(\PDOException $e)
 	{
-		$code = isset($e->errorInfo[1]) ? $e->errorInfo[1] : NULL;
+		$code = $e->errorInfo[1] ?? NULL;
 		$msg = $e->getMessage();
 		if ($code !== 19) {
 			return Nette\Database\DriverException::from($e);
diff --git a/src/Database/Helpers.php b/src/Database/Helpers.php
@@ -246,9 +246,9 @@ public static function toPairs(array $rows, $key = NULL, $value = NULL)
 
 		} elseif ($key === NULL && $value === NULL) {
 			if (count($keys) === 1) {
-				list($value) = $keys;
+				[$value] = $keys;
 			} else {
-				list($key, $value) = $keys;
+				[$key, $value] = $keys;
 			}
 		}
 
@@ -277,7 +277,7 @@ public static function findDuplicates(\PDOStatement $statement)
 		$cols = [];
 		for ($i = 0; $i < $statement->columnCount(); $i++) {
 			$meta = $statement->getColumnMeta($i);
-			$cols[$meta['name']][] = isset($meta['table']) ? $meta['table'] : '';
+			$cols[$meta['name']][] = $meta['table'] ?? '';
 		}
 		$duplicates = [];
 		foreach ($cols as $name => $tables) {
diff --git a/src/Database/ResultSet.php b/src/Database/ResultSet.php
@@ -66,7 +66,7 @@ public function __construct(Connection $connection, $queryString, array $params)
 				$this->pdoStatement = $connection->getPdo()->prepare($queryString);
 				foreach ($params as $key => $value) {
 					$type = gettype($value);
-					$this->pdoStatement->bindValue(is_int($key) ? $key + 1 : $key, $value, isset($types[$type]) ? $types[$type] : PDO::PARAM_STR);
+					$this->pdoStatement->bindValue(is_int($key) ? $key + 1 : $key, $value, $types[$type] ?? PDO::PARAM_STR);
 				}
 				$this->pdoStatement->setFetchMode(PDO::FETCH_ASSOC);
 				$this->pdoStatement->execute();
diff --git a/src/Database/SqlPreprocessor.php b/src/Database/SqlPreprocessor.php
@@ -139,7 +139,7 @@ private function formatValue($value, $mode = NULL)
 
 			} elseif ($value instanceof SqlLiteral) {
 				$prep = clone $this;
-				list($res, $params) = $prep->process(array_merge([$value->__toString()], $value->getParameters()));
+				[$res, $params] = $prep->process(array_merge([$value->__toString()], $value->getParameters()));
 				$this->remaining = array_merge($this->remaining, $params);
 				return $res;
 
@@ -217,7 +217,7 @@ private function formatValue($value, $mode = NULL)
 						$vx[] = $this->formatValue($v);
 						continue;
 					}
-					list($k, $operator) = explode(' ', $k . ' ');
+					[$k, $operator] = explode(' ', $k . ' ');
 					$k = $this->delimite($k);
 					if (is_array($v)) {
 						if ($v) {
diff --git a/src/Database/Structure.php b/src/Database/Structure.php
@@ -82,7 +82,7 @@ public function getPrimaryKeySequence($table)
 
 		foreach ($this->structure['columns'][$table] as $columnMeta) {
 			if ($columnMeta['name'] === $primary) {
-				return isset($columnMeta['vendor']['sequence']) ? $columnMeta['vendor']['sequence'] : NULL;
+				return $columnMeta['vendor']['sequence'] ?? NULL;
 			}
 		}
 
diff --git a/src/Database/Table/GroupedSelection.php b/src/Database/Table/GroupedSelection.php
@@ -123,7 +123,7 @@ public function aggregation($function)
 	public function count($column = NULL)
 	{
 		$return = parent::count($column);
-		return isset($return) ? $return : 0;
+		return $return ?? 0;
 	}
 
 
diff --git a/src/Database/Table/Selection.php b/src/Database/Table/Selection.php
@@ -925,7 +925,7 @@ public function getReferencedTable(ActiveRow $row, $table, $column = NULL)
 			if (!$belongsTo) {
 				return FALSE;
 			}
-			list($table, $column) = $belongsTo;
+			[$table, $column] = $belongsTo;
 		}
 		if (!$row->accessColumn($column)) {
 			return FALSE;
@@ -956,7 +956,7 @@ public function getReferencedTable(ActiveRow $row, $table, $column = NULL)
 			}
 		}
 
-		return isset($selection[$checkPrimaryKey]) ? $selection[$checkPrimaryKey] : NULL;
+		return $selection[$checkPrimaryKey] ?? NULL;
 	}
 
 
@@ -970,13 +970,13 @@ public function getReferencedTable(ActiveRow $row, $table, $column = NULL)
 	public function getReferencingTable($table, $column, $active = NULL)
 	{
 		if (strpos($table, '.') !== FALSE) {
-			list($table, $column) = explode('.', $table);
+			[$table, $column] = explode('.', $table);
 		} elseif (!$column) {
 			$hasMany = $this->conventions->getHasManyReference($this->name, $table);
 			if (!$hasMany) {
 				return NULL;
 			}
-			list($table, $column) = $hasMany;
+			[$table, $column] = $hasMany;
 		}
 
 		$prototype = &$this->refCache['referencingPrototype'][$this->getSpecificCacheKey()]["$table.$column"];
diff --git a/src/Database/Table/SqlBuilder.php b/src/Database/Table/SqlBuilder.php
@@ -722,7 +722,7 @@ public function parseJoinsCb(&$joins, $match)
 					$this->parseJoins($requiredJoins, $query);
 					$aliasJoin = array_pop($requiredJoins);
 					$joins += $requiredJoins;
-					list($table, , $parentAlias, $column, $primary) = $aliasJoin;
+					[$table, , $parentAlias, $column, $primary] = $aliasJoin;
 					$this->currentAlias = $previousAlias;
 				}
 			} elseif ($keyMatch['del'] === ':') {
@@ -732,14 +732,14 @@ public function parseJoinsCb(&$joins, $match)
 					if (!$belongsTo) {
 						throw new Nette\InvalidArgumentException("No reference found for \${$parent}->{$keyMatch['key']}.");
 					}
-					list(, $primary) = $belongsTo;
+					[, $primary] = $belongsTo;
 
 				} else {
 					$hasMany = $this->conventions->getHasManyReference($parent, $keyMatch['key']);
 					if (!$hasMany) {
 						throw new Nette\InvalidArgumentException("No reference found for \${$parent}->related({$keyMatch['key']}).");
 					}
-					list($table, $primary) = $hasMany;
+					[$table, $primary] = $hasMany;
 				}
 				$column = $this->conventions->getPrimary($parent);
 
@@ -748,7 +748,7 @@ public function parseJoinsCb(&$joins, $match)
 				if (!$belongsTo) {
 					throw new Nette\InvalidArgumentException("No reference found for \${$parent}->{$keyMatch['key']}.");
 				}
-				list($table, $column) = $belongsTo;
+				[$table, $column] = $belongsTo;
 				$primary = $this->conventions->getPrimary($table);
 			}
 
@@ -781,7 +781,7 @@ public function parseJoinsCb(&$joins, $match)
 	protected function buildQueryJoins(array $joins, array $leftJoinConditions = [])
 	{
 		$return = '';
-		foreach ($joins as list($joinTable, $joinAlias, $table, $tableColumn, $joinColumn)) {
+		foreach ($joins as [$joinTable, $joinAlias, $table, $tableColumn, $joinColumn]) {
 			$return .=
 				" LEFT JOIN {$joinTable}" . ($joinTable !== $joinAlias ? " {$joinAlias}" : '') .
 				" ON {$table}.{$tableColumn} = {$joinAlias}.{$joinColumn}" .
@@ -885,7 +885,7 @@ private function getCachedTableList()
 	{
 		if (!$this->cacheTableList) {
 			$this->cacheTableList = array_flip(array_map(function ($pair) {
-				return isset($pair['fullName']) ? $pair['fullName'] : $pair['name'];
+				return $pair['fullName'] ?? $pair['name'];
 			}, $this->structure->getTables()));
 		}
 
diff --git a/tests/Database/SqlPreprocessor.phpt b/tests/Database/SqlPreprocessor.phpt

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ public function rollBack()`
`171`	`171`	`*/`
`172`	`172`	`public function query($sql, ...$params)`
`173`	`173`	`{`
`174`		`- list($sql, $params) = $this->preprocess($sql, ...$params);`
	`174`	`+ [$sql, $params] = $this->preprocess($sql, ...$params);`
`175`	`175`	`try {`
`176`	`176`	`$result = new ResultSet($this, $sql, $params);`
`177`	`177`	`} catch (PDOException $e) {`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public static function from(\PDOException $src)`
`40`	`40`	`*/`
`41`	`41`	`public function getDriverCode()`
`42`	`42`	`{`
`43`		`- return isset($this->errorInfo[1]) ? $this->errorInfo[1] : NULL;`
	`43`	`+ return $this->errorInfo[1] ?? NULL;`
`44`	`44`	`}`
`45`	`45`
`46`	`46`
`@@ -49,7 +49,7 @@ public function getDriverCode()`
`49`	`49`	`*/`
`50`	`50`	`public function getSqlState()`
`51`	`51`	`{`
`52`		`- return isset($this->errorInfo[0]) ? $this->errorInfo[0] : NULL;`
	`52`	`+ return $this->errorInfo[0] ?? NULL;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,13 @@ class OciDriver implements Nette\Database\ISupplementalDriver`
`27`	`27`	`public function __construct(Nette\Database\Connection $connection, array $options)`
`28`	`28`	`{`
`29`	`29`	`$this->connection = $connection;`
`30`		`- $this->fmtDateTime = isset($options['formatDateTime']) ? $options['formatDateTime'] : 'U';`
	`30`	`+ $this->fmtDateTime = $options['formatDateTime'] ?? 'U';`
`31`	`31`	`}`
`32`	`32`
`33`	`33`
`34`	`34`	`public function convertException(\PDOException $e)`
`35`	`35`	`{`
`36`		`- $code = isset($e->errorInfo[1]) ? $e->errorInfo[1] : NULL;`
	`36`	`+ $code = $e->errorInfo[1] ?? NULL;`
`37`	`37`	`if (in_array($code, [1, 2299, 38911], TRUE)) {`
`38`	`38`	`return Nette\Database\UniqueConstraintViolationException::from($e);`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function __construct(Nette\Database\Connection $connection, array $option`
`29`	`29`
`30`	`30`	`public function convertException(\PDOException $e)`
`31`	`31`	`{`
`32`		`- $code = isset($e->errorInfo[0]) ? $e->errorInfo[0] : NULL;`
	`32`	`+ $code = $e->errorInfo[0] ?? NULL;`
`33`	`33`	`if ($code === '0A000' && strpos($e->getMessage(), 'truncate') !== FALSE) {`
`34`	`34`	`return Nette\Database\ForeignKeyConstraintViolationException::from($e);`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,13 @@ class SqliteDriver implements Nette\Database\ISupplementalDriver`
`27`	`27`	`public function __construct(Nette\Database\Connection $connection, array $options)`
`28`	`28`	`{`
`29`	`29`	`$this->connection = $connection;`
`30`		`- $this->fmtDateTime = isset($options['formatDateTime']) ? $options['formatDateTime'] : 'U';`
	`30`	`+ $this->fmtDateTime = $options['formatDateTime'] ?? 'U';`
`31`	`31`	`}`
`32`	`32`
`33`	`33`
`34`	`34`	`public function convertException(\PDOException $e)`
`35`	`35`	`{`
`36`		`- $code = isset($e->errorInfo[1]) ? $e->errorInfo[1] : NULL;`
	`36`	`+ $code = $e->errorInfo[1] ?? NULL;`
`37`	`37`	`$msg = $e->getMessage();`
`38`	`38`	`if ($code !== 19) {`
`39`	`39`	`return Nette\Database\DriverException::from($e);`
Original file line number	Diff line number	Diff line change
`@@ -246,9 +246,9 @@ public static function toPairs(array $rows, $key = NULL, $value = NULL)`
`246`	`246`
`247`	`247`	`} elseif ($key === NULL && $value === NULL) {`
`248`	`248`	`if (count($keys) === 1) {`
`249`		`- list($value) = $keys;`
	`249`	`+ [$value] = $keys;`
`250`	`250`	`} else {`
`251`		`- list($key, $value) = $keys;`
	`251`	`+ [$key, $value] = $keys;`
`252`	`252`	`}`
`253`	`253`	`}`
`254`	`254`
`@@ -277,7 +277,7 @@ public static function findDuplicates(\PDOStatement $statement)`
`277`	`277`	`$cols = [];`
`278`	`278`	`for ($i = 0; $i < $statement->columnCount(); $i++) {`
`279`	`279`	`$meta = $statement->getColumnMeta($i);`
`280`		`- $cols[$meta['name']][] = isset($meta['table']) ? $meta['table'] : '';`
	`280`	`+ $cols[$meta['name']][] = $meta['table'] ?? '';`
`281`	`281`	`}`
`282`	`282`	`$duplicates = [];`
`283`	`283`	`foreach ($cols as $name => $tables) {`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function __construct(Connection $connection, $queryString, array $params)`
`66`	`66`	`$this->pdoStatement = $connection->getPdo()->prepare($queryString);`
`67`	`67`	`foreach ($params as $key => $value) {`
`68`	`68`	`$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);`
`70`	`70`	`}`
`71`	`71`	`$this->pdoStatement->setFetchMode(PDO::FETCH_ASSOC);`
`72`	`72`	`$this->pdoStatement->execute();`