typos, PHP 5.5 syntax

Author: dg

src/Database/IConventions.php

@@ -16,7 +16,7 @@ interface IConventions
 	/**
 	 * Returns primary key for table.
 	 * @param  string
-	 * @return string
+	 * @return string|array|NULL
 	 */
 	function getPrimary($table);
 

src/Database/Table/Selection.php

@@ -33,7 +33,7 @@ class Selection extends Nette\Object implements \Iterator, IRowContainer, \Array
 	/** @var string table name */
 	protected $name;
 
-	/** @var string primary key field name */
+	/** @var string|array|NULL primary key field name */
 	protected $primary;
 
 	/** @var string|bool primary column sequence name, FALSE for autodetection */
@@ -122,7 +122,7 @@ public function getName()
 
 	/**
 	 * @param  bool
-	 * @return string|array
+	 * @return string|array|NULL
 	 */
 	public function getPrimary($need = TRUE)
 	{

src/Database/Table/SqlBuilder.php

@@ -80,7 +80,6 @@ public function __construct($tableName, Context $context)
 		$this->driver = $context->getConnection()->getSupplementalDriver();
 		$this->conventions = $context->getConventions();
 		$this->structure = $context->getStructure();
-
 		$this->delimitedTable = implode('.', array_map([$this->driver, 'delimite'], explode('.', $tableName)));
 	}
 
@@ -151,7 +150,6 @@ public function buildSelectQuery($columns = NULL)
 		} else {
 			$prefix = $joins ? "{$this->delimitedTable}." : '';
 			$querySelect = $this->buildSelect([$prefix . '*']);
-
 		}
 
 		$queryJoins = $this->buildQueryJoins($joins);
@@ -405,16 +403,15 @@ protected function buildSelect(array $columns)
 
 	protected function parseJoins(& $joins, & $query)
 	{
-		$builder = $this;
 		$query = preg_replace_callback('~
 			(?(DEFINE)
 				(?P<word> [\w_]*[a-z][\w_]* )
 				(?P<del> [.:] )
 				(?P<node> (?&del)? (?&word) (\((?&word)\))? )
 			)
 			(?P<chain> (?!\.) (?&node)*)  \. (?P<column> (?&word) | \*  )
-		~xi', function ($match) use (& $joins, $builder) {
-			return $builder->parseJoinsCb($joins, $match);
+		~xi', function ($match) use (& $joins) {
+			return $this->parseJoinsCb($joins, $match);
 		}, $query);
 	}
 
@@ -503,14 +500,11 @@ public function parseJoinsCb(& $joins, $match)
 	protected function buildQueryJoins(array $joins)
 	{
 		$return = '';
-		foreach ($joins as $join) {
-			list($joinTable, $joinAlias, $table, $tableColumn, $joinColumn) = $join;
-
+		foreach ($joins as list($joinTable, $joinAlias, $table, $tableColumn, $joinColumn)) {
 			$return .=
 				" LEFT JOIN {$joinTable}" . ($joinTable !== $joinAlias ? " {$joinAlias}" : '') .
 				" ON {$table}.{$tableColumn} = {$joinAlias}.{$joinColumn}";
 		}
-
 		return $return;
 	}
 
@@ -539,9 +533,8 @@ protected function buildQueryEnd()
 
 	protected function tryDelimite($s)
 	{
-		$driver = $this->driver;
-		return preg_replace_callback('#(?<=[^\w`"\[?]|^)[a-z_][a-z0-9_]*(?=[^\w`"(\]]|\z)#i', function ($m) use ($driver) {
-			return strtoupper($m[0]) === $m[0] ? $m[0] : $driver->delimite($m[0]);
+		return preg_replace_callback('#(?<=[^\w`"\[?]|^)[a-z_][a-z0-9_]*(?=[^\w`"(\]]|\z)#i', function ($m) {
+			return strtoupper($m[0]) === $m[0] ? $m[0] : $this->driver->delimite($m[0]);
 		}, $s);
 	}