Merge remote-tracking branch 'origin/master'

rkrx · rkrx · commit 54982d61a165 · 2015-05-05T09:18:39.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,4 @@
 !/.travis.yml
 !/composer.json
 !/README.md
-!/tests.xml
+!/tests.xml
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,10 @@
 language: php
 
 php:
+  - 7
   - 5.6
   - 5.5
   - 5.4
-  - hhvm
 
 before_script:
   - composer self-update
diff --git a/README.md b/README.md
@@ -1,8 +1,10 @@
 mysql query builder (php 5.4+)
 ==============================
 
-[![Build Status](https://travis-ci.org/rkrx/php-mysql-query-builder.svg)](https://travis-ci.org/rkrx/php-mysql-query-builder)
+[![SensioLabsInsight](https://insight.sensiolabs.com/projects/a57881f2-af75-48b7-9f5f-e821cdb75d0c/mini.png)](https://insight.sensiolabs.com/projects/a57881f2-af75-48b7-9f5f-e821cdb75d0c)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/rkrx/php-mysql-query-builder/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/rkrx/php-mysql-query-builder/?branch=master)
+[![Build Status](https://travis-ci.org/rkrx/php-mysql-query-builder.svg)](https://travis-ci.org/rkrx/php-mysql-query-builder)
+
 
 Simple mysql query builder to build select, insert, update and delete queries with conditional parts.
 This library was initially not intended to build prepared statements, but this is also possible.
diff --git a/composer.json b/composer.json
@@ -8,12 +8,14 @@
 	}],
 	"require": {
 		"php": ">= 5.4",
+		"ext-pdo": "*",
+		"ext-spl": "*",
 		"psr/log": "~1"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "~4.0",
 		"phake/phake": "1.0.5",
-		"jimbojsb/pseudo": "dev-master"
+		"rkr/fakepdo": "0.1"
 	},
 	"autoload": {
 		"psr-4": {
@@ -25,4 +27,4 @@
 			"Kir\\MySQL\\": ["src/", "tests/"]
 		}
 	}
-}
+}
diff --git a/src/Builder/Delete.php b/src/Builder/Delete.php
@@ -56,4 +56,4 @@ public function __toString() {
 		$query = $this->buildOffset($query);
 		return $query;
 	}
-}
+}
diff --git a/src/Builder/Exception.php b/src/Builder/Exception.php
@@ -2,4 +2,4 @@
 namespace Kir\MySQL\Builder;
 
 class Exception extends \Exception {
-}
+}
diff --git a/src/Builder/Insert.php b/src/Builder/Insert.php
@@ -17,21 +17,13 @@ class Insert extends InsertUpdateStatement {
 	private $ignore = false;
 	/** @var Select */
 	private $from = null;
-	/** @var callable */
-	private $tableFields = null;
 
 	/**
 	 * @param string $table
 	 * @return $this
 	 */
 	public function into($table) {
 		$this->table = $table;
-		$this->tableFields = function () {
-			static $cache = null;
-			if($cache === null) {
-				$cache = $this->db()->getTableFields($this->table);
-			}
-		};
 		return $this;
 	}
 
@@ -282,4 +274,4 @@ private function clearValues(array $values) {
 
 		return $result;
 	}
-}
+}
diff --git a/src/Builder/InsertUpdateStatement.php b/src/Builder/InsertUpdateStatement.php
@@ -62,4 +62,4 @@ protected function isFieldAccessible($fieldName, array $tableFields) {
 		}
 		return in_array($fieldName, $this->mask);
 	}
-} 
+}
diff --git a/src/Builder/Internal/ConditionBuilder.php b/src/Builder/Internal/ConditionBuilder.php
@@ -25,4 +25,4 @@ public static function build(Database $db, $query, array $conditions, $token) {
 		$query .= join("\n\tAND\n", $arr);
 		return $query."\n";
 	}
-}
+}
diff --git a/src/Builder/Internal/DefaultValue.php b/src/Builder/Internal/DefaultValue.php
@@ -2,4 +2,4 @@
 namespace Kir\MySQL\Builder\Internal;
 
 class DefaultValue {
-}
+}
diff --git a/src/Builder/QueryStatement.php b/src/Builder/QueryStatement.php
@@ -89,4 +89,4 @@ public function columnCount() {
 	public function getColumnMeta($columnNo) {
 		return $this->statement->getColumnMeta($columnNo);
 	}
-}
+}
diff --git a/src/Builder/RunnableDelete.php b/src/Builder/RunnableDelete.php
@@ -10,4 +10,4 @@ public function run(array $params = array()) {
 		$query = (string)$this;
 		return $this->db()->exec($query, $params);
 	}
-}
+}
diff --git a/src/Builder/RunnableInsert.php b/src/Builder/RunnableInsert.php
@@ -27,4 +27,4 @@ public function run(array $params = array()) {
 		$this->db()->exec($query, $params);
 		return (int) $this->db()->getLastInsertId();
 	}
-}
+}
diff --git a/src/Builder/RunnableSelect.php b/src/Builder/RunnableSelect.php
@@ -229,4 +229,4 @@ private function convertValue($value, $type) {
 		}
 		return $value;
 	}
-}
+}
diff --git a/src/Builder/RunnableUpdate.php b/src/Builder/RunnableUpdate.php
@@ -10,4 +10,4 @@ public function run(array $params = array()) {
 		$query = $this->__toString();
 		return $this->db()->exec($query, $params);
 	}
-}
+}
diff --git a/src/Builder/Select.php b/src/Builder/Select.php
@@ -173,4 +173,4 @@ private function buildForUpdate($query) {
 		}
 		return $query;
 	}
-}
+}
diff --git a/src/Builder/Traits/AbstractAliasReplacer.php b/src/Builder/Traits/AbstractAliasReplacer.php
@@ -8,4 +8,4 @@ trait AbstractAliasReplacer {
 	 * @return AliasReplacer
 	 */
 	abstract protected function aliasReplacer();
-}
+}
diff --git a/src/Builder/Traits/AbstractDB.php b/src/Builder/Traits/AbstractDB.php
@@ -8,4 +8,4 @@ trait AbstractDB {
 	 * @return Database
 	 */
 	abstract protected function db();
-}
+}
diff --git a/src/Builder/Traits/AbstractTableNameBuilder.php b/src/Builder/Traits/AbstractTableNameBuilder.php
@@ -8,4 +8,4 @@ trait AbstractTableNameBuilder {
 	 * @return string
 	 */
 	abstract protected function buildTableName($alias, $name);
-}
+}
diff --git a/src/Builder/Traits/GroupByBuilder.php b/src/Builder/Traits/GroupByBuilder.php
@@ -52,4 +52,4 @@ protected function buildGroups($query) {
 	protected function quoteExpr(array $arguments) {
 		return call_user_func_array(array($this->db(), 'quoteExpression'), $arguments);
 	}
-}
+}
diff --git a/src/Builder/Traits/HavingBuilder.php b/src/Builder/Traits/HavingBuilder.php
@@ -25,4 +25,4 @@ public function having($expression) {
 	protected function buildHavingConditions($query) {
 		return ConditionBuilder::build($this->db(), $query, $this->having, 'HAVING');
 	}
-}
+}
diff --git a/src/Builder/Traits/JoinBuilder.php b/src/Builder/Traits/JoinBuilder.php
@@ -81,4 +81,4 @@ private function addJoin($type, $alias, $name, $expression = null, array $argume
 		);
 		return $this;
 	}
-}
+}
diff --git a/src/Builder/Traits/LimitBuilder.php b/src/Builder/Traits/LimitBuilder.php
@@ -26,4 +26,4 @@ protected function buildLimit($query) {
 		}
 		return $query;
 	}
-}
+}
diff --git a/src/Builder/Traits/OffsetBuilder.php b/src/Builder/Traits/OffsetBuilder.php
@@ -26,4 +26,4 @@ protected function buildOffset($query) {
 		}
 		return $query;
 	}
-}
+}
diff --git a/src/Builder/Traits/OrderByBuilder.php b/src/Builder/Traits/OrderByBuilder.php
@@ -48,4 +48,4 @@ protected function buildOrder($query) {
 		}
 		return $query.join(",\n", $arr)."\n";
 	}
-}
+}
diff --git a/src/Builder/Traits/TableBuilder.php b/src/Builder/Traits/TableBuilder.php
@@ -40,4 +40,4 @@ protected function buildTables($query) {
 	protected function getTables() {
 		return $this->tables;
 	}
-}
+}
diff --git a/src/Builder/Traits/TableNameBuilder.php b/src/Builder/Traits/TableNameBuilder.php
@@ -25,4 +25,4 @@ protected function buildTableName($alias, $name) {
 		}
 		return $name;
 	}
-}
+}
diff --git a/src/Builder/Traits/WhereBuilder.php b/src/Builder/Traits/WhereBuilder.php
@@ -14,7 +14,7 @@ trait WhereBuilder {
 	 * @param mixed ...$param
 	 * @return $this
 	 */
-	public function where($expression, $param = null) {
+	public function where($expression) {
 		$this->where[] = array($expression, array_slice(func_get_args(), 1));
 		return $this;
 	}
@@ -26,4 +26,4 @@ public function where($expression, $param = null) {
 	protected function buildWhereConditions($query) {
 		return ConditionBuilder::build($this->db(), $query, $this->where, 'WHERE');
 	}
-}
+}
diff --git a/src/Builder/Update.php b/src/Builder/Update.php
@@ -151,4 +151,4 @@ private function clearValues(array $values) {
 
 		return $result;
 	}
-}
+}
diff --git a/src/Database.php b/src/Database.php
@@ -106,4 +106,4 @@ public function transactionRollback();
 	 * @throws \Exception
 	 */
 	public function transaction($tries = 1, $callback = null);
-}
+}
diff --git a/src/Databases/MySQL.php b/src/Databases/MySQL.php
@@ -282,4 +282,4 @@ public function transaction($tries = 1, $callback = null) {
 		}
 		throw $e;
 	}
-}
+}
diff --git a/src/Databases/MySQL/MySQLExceptionInterpreter.php b/src/Databases/MySQL/MySQLExceptionInterpreter.php
@@ -33,4 +33,4 @@ public function throwMoreConcreteException(PDOException $exception) {
 		}
 		throw $exception;
 	}
-}
+}
diff --git a/src/Exceptions/LockWaitTimeoutExceededException.php b/src/Exceptions/LockWaitTimeoutExceededException.php
@@ -2,4 +2,4 @@
 namespace Kir\MySQL\Exceptions;
 
 class LockWaitTimeoutExceededException extends SqlLockException {
-}
+}
diff --git a/src/Exceptions/SqlDeadLockException.php b/src/Exceptions/SqlDeadLockException.php
@@ -2,4 +2,4 @@
 namespace Kir\MySQL\Exceptions;
 
 class SqlDeadLockException extends SqlLockException {
-}
+}
diff --git a/src/Exceptions/SqlException.php b/src/Exceptions/SqlException.php
@@ -4,4 +4,4 @@
 use PDOException;
 
 class SqlException extends PDOException {
-}
+}
diff --git a/src/Exceptions/SqlLockException.php b/src/Exceptions/SqlLockException.php
@@ -2,4 +2,4 @@
 namespace Kir\MySQL\Exceptions;
 
 class SqlLockException extends SqlException {
-}
+}
diff --git a/src/QueryLogger/ClosureQueryLogger.php b/src/QueryLogger/ClosureQueryLogger.php
@@ -20,4 +20,4 @@ public function __construct($fn) {
 	public function log($query, $duration) {
 		call_user_func($this->fn, $query, $duration);
 	}
-}
+}
diff --git a/src/QueryLogger/LoggerInterfaceQueryLogger.php b/src/QueryLogger/LoggerInterfaceQueryLogger.php
@@ -22,4 +22,4 @@ public function __construct(LoggerInterface $logger) {
 	public function log($query, $duration) {
 		$this->logger->info(sprintf("Query %s took %0.4f seconds", $query, $duration), ['query' => $query, 'duration' => $duration]);
 	}
-}
+}
diff --git a/src/QueryLogger/QueryLogger.php b/src/QueryLogger/QueryLogger.php
@@ -8,4 +8,4 @@ interface QueryLogger {
 	 * @return void
 	 */
 	public function log($query, $duration);
-}
+}
diff --git a/src/QueryLogger/QueryLoggers.php b/src/QueryLogger/QueryLoggers.php
@@ -25,4 +25,4 @@ public function log($query, $duration) {
 		}
 		return $this;
 	}
-}
+}
diff --git a/src/Tools/AliasRegistry.php b/src/Tools/AliasRegistry.php
@@ -35,4 +35,4 @@ public function get($alias) {
 	public function getAll() {
 		return $this->aliases;
 	}
-}
+}
diff --git a/src/Tools/AliasReplacer.php b/src/Tools/AliasReplacer.php
@@ -27,4 +27,4 @@ public function replace($name) {
 		};
 		return preg_replace_callback('/^(\\w+)#(\\w+)$/', $fn, $name);
 	}
-}
+}
diff --git a/tests.xml b/tests.xml
@@ -1,12 +1,11 @@
 <phpunit bootstrap="vendor/autoload.php"
 		 backupGlobals="false"
 		 backupStaticAttributes="false"
-		 strict="true"
 		 verbose="true"
 		 timeoutForSmallTests="5">
 	<testsuites>
 		<testsuite name="Tests">
 			<directory>tests</directory>
 		</testsuite>
 	</testsuites>
-</phpunit>
+</phpunit>
diff --git a/tests/Databases/MySQLTest.php b/tests/Databases/MySQLTest.php

Original file line number	Diff line number	Diff line change
`@@ -56,4 +56,4 @@ public function __toString() {`
`56`	`56`	`$query = $this->buildOffset($query);`
`57`	`57`	`return $query;`
`58`	`58`	`}`
`59`		`-}`
	`59`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -62,4 +62,4 @@ protected function isFieldAccessible($fieldName, array $tableFields) {`
`62`	`62`	`}`
`63`	`63`	`return in_array($fieldName, $this->mask);`
`64`	`64`	`}`
`65`		`-}`
	`65`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,4 @@ public static function build(Database $db, $query, array $conditions, $token) {`
`25`	`25`	`$query .= join("\n\tAND\n", $arr);`
`26`	`26`	`return $query."\n";`
`27`	`27`	`}`
`28`		`-}`
	`28`	`+}`