diff --git a/composer.json b/composer.json index b149211e..618d33c7 100644 --- a/composer.json +++ b/composer.json @@ -3,13 +3,16 @@ "description": "Dibi is Database Abstraction Library for PHP 5.", "keywords": ["database", "dbal", "mysql", "postgresql", "sqlite", "mssql", "oracle", "access", "pdo", "odbc"], "homepage": "http://dibiphp.com/", - "license": ["BSD-3", "GPLv2", "GPLv3"], + "license": ["BSD-3-Clause", "GPL-2.0", "GPL-3.0"], "authors": [ { "name": "David Grudl", "homepage": "http://davidgrudl.com" } ], + "require": { + "php": ">=5.2.0" + }, "require-dev": { "nette/tester": "@dev" }, diff --git a/dibi/bridges/Nette/DibiNette21Extension.php b/dibi/bridges/Nette/DibiNette21Extension.php index a109586c..1bd0640c 100644 --- a/dibi/bridges/Nette/DibiNette21Extension.php +++ b/dibi/bridges/Nette/DibiNette21Extension.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/bridges/Nette/DibiNettePanel.php b/dibi/bridges/Nette/DibiNettePanel.php index 93ca65de..c26d36d0 100644 --- a/dibi/bridges/Nette/DibiNettePanel.php +++ b/dibi/bridges/Nette/DibiNettePanel.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/dibi.php b/dibi/dibi.php index f8f2e629..6ecd18e5 100644 --- a/dibi/dibi.php +++ b/dibi/dibi.php @@ -4,9 +4,6 @@ * dibi - smart database abstraction layer (http://dibiphp.com) * * Copyright (c) 2005, 2012 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ @@ -267,7 +264,7 @@ class dibi /** * Executes SQL query and fetch results - Monostate for DibiConnection::query() & fetchAll(). * @param array|mixed one or more arguments - * @return array of DibiRow + * @return DibiRow[] * @throws DibiException */ public static function fetchAll($args) diff --git a/dibi/drivers/DibiFirebirdDriver.php b/dibi/drivers/DibiFirebirdDriver.php index 9ddd0cc6..82f331b0 100644 --- a/dibi/drivers/DibiFirebirdDriver.php +++ b/dibi/drivers/DibiFirebirdDriver.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/drivers/DibiMsSql2005Driver.php b/dibi/drivers/DibiMsSql2005Driver.php index a6903bf5..984fee9e 100644 --- a/dibi/drivers/DibiMsSql2005Driver.php +++ b/dibi/drivers/DibiMsSql2005Driver.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/drivers/DibiMsSql2005Reflector.php b/dibi/drivers/DibiMsSql2005Reflector.php index f7175199..a13e8129 100644 --- a/dibi/drivers/DibiMsSql2005Reflector.php +++ b/dibi/drivers/DibiMsSql2005Reflector.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/drivers/DibiMsSqlDriver.php b/dibi/drivers/DibiMsSqlDriver.php index 1a5c90b9..a54a413a 100644 --- a/dibi/drivers/DibiMsSqlDriver.php +++ b/dibi/drivers/DibiMsSqlDriver.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ require_once dirname(__FILE__) . '/DibiMsSqlReflector.php'; diff --git a/dibi/drivers/DibiMsSqlReflector.php b/dibi/drivers/DibiMsSqlReflector.php index f9391525..d097476b 100644 --- a/dibi/drivers/DibiMsSqlReflector.php +++ b/dibi/drivers/DibiMsSqlReflector.php @@ -5,9 +5,6 @@ * * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com) * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. - * * @package dibi\drivers */ diff --git a/dibi/drivers/DibiMySqlDriver.php b/dibi/drivers/DibiMySqlDriver.php index 1cd933ec..8d26d13b 100644 --- a/dibi/drivers/DibiMySqlDriver.php +++ b/dibi/drivers/DibiMySqlDriver.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/drivers/DibiMySqlReflector.php b/dibi/drivers/DibiMySqlReflector.php index 1788e5e1..0bbdcfc4 100644 --- a/dibi/drivers/DibiMySqlReflector.php +++ b/dibi/drivers/DibiMySqlReflector.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/drivers/DibiMySqliDriver.php b/dibi/drivers/DibiMySqliDriver.php index f6698649..4b89e600 100644 --- a/dibi/drivers/DibiMySqliDriver.php +++ b/dibi/drivers/DibiMySqliDriver.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/drivers/DibiOdbcDriver.php b/dibi/drivers/DibiOdbcDriver.php index 70d7cb7c..e42adce3 100644 --- a/dibi/drivers/DibiOdbcDriver.php +++ b/dibi/drivers/DibiOdbcDriver.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/drivers/DibiOracleDriver.php b/dibi/drivers/DibiOracleDriver.php index 41e9069e..3882b4e3 100644 --- a/dibi/drivers/DibiOracleDriver.php +++ b/dibi/drivers/DibiOracleDriver.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/drivers/DibiPdoDriver.php b/dibi/drivers/DibiPdoDriver.php index be2dc3ab..1dca7937 100644 --- a/dibi/drivers/DibiPdoDriver.php +++ b/dibi/drivers/DibiPdoDriver.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/drivers/DibiPostgreDriver.php b/dibi/drivers/DibiPostgreDriver.php index c4740ad6..0b18d9f3 100644 --- a/dibi/drivers/DibiPostgreDriver.php +++ b/dibi/drivers/DibiPostgreDriver.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ @@ -320,7 +316,7 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr $value = pg_escape_string($this->connection, $value); } else { $value = pg_escape_string($value); - } + } $value = strtr($value, array( '%' => '\\\\%', '_' => '\\\\_')); return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'"); diff --git a/dibi/drivers/DibiSqlite3Driver.php b/dibi/drivers/DibiSqlite3Driver.php index dcde878b..8c73a70c 100644 --- a/dibi/drivers/DibiSqlite3Driver.php +++ b/dibi/drivers/DibiSqlite3Driver.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/drivers/DibiSqliteDriver.php b/dibi/drivers/DibiSqliteDriver.php index b2306d3b..ee0b111f 100644 --- a/dibi/drivers/DibiSqliteDriver.php +++ b/dibi/drivers/DibiSqliteDriver.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/drivers/DibiSqliteReflector.php b/dibi/drivers/DibiSqliteReflector.php index 396a6299..bc8bbe3d 100644 --- a/dibi/drivers/DibiSqliteReflector.php +++ b/dibi/drivers/DibiSqliteReflector.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/libs/DibiConnection.php b/dibi/libs/DibiConnection.php index e8d78ead..33988945 100644 --- a/dibi/libs/DibiConnection.php +++ b/dibi/libs/DibiConnection.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ @@ -590,7 +586,7 @@ class DibiConnection extends DibiObject /** * Executes SQL query and fetch results - shortcut for query() & fetchAll(). * @param array|mixed one or more arguments - * @return array of DibiRow + * @return DibiRow[] * @throws DibiException */ public function fetchAll($args) diff --git a/dibi/libs/DibiDataSource.php b/dibi/libs/DibiDataSource.php index 413db2d4..73104aa6 100644 --- a/dibi/libs/DibiDataSource.php +++ b/dibi/libs/DibiDataSource.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/libs/DibiDatabaseInfo.php b/dibi/libs/DibiDatabaseInfo.php index 3e0351a1..be956634 100644 --- a/dibi/libs/DibiDatabaseInfo.php +++ b/dibi/libs/DibiDatabaseInfo.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ @@ -49,7 +45,7 @@ class DibiDatabaseInfo extends DibiObject /** - * @return array of DibiTableInfo + * @return DibiTableInfo[] */ public function getTables() { @@ -59,7 +55,7 @@ class DibiDatabaseInfo extends DibiObject /** - * @return array of string + * @return string[] */ public function getTableNames() { @@ -181,7 +177,7 @@ class DibiTableInfo extends DibiObject /** - * @return array of DibiColumnInfo + * @return DibiColumnInfo[] */ public function getColumns() { @@ -191,7 +187,7 @@ class DibiTableInfo extends DibiObject /** - * @return array of string + * @return string[] */ public function getColumnNames() { @@ -233,7 +229,7 @@ class DibiTableInfo extends DibiObject /** - * @return array of DibiForeignKeyInfo + * @return DibiForeignKeyInfo[] */ public function getForeignKeys() { @@ -243,7 +239,7 @@ class DibiTableInfo extends DibiObject /** - * @return array of DibiIndexInfo + * @return DibiIndexInfo[] */ public function getIndexes() { @@ -336,7 +332,7 @@ class DibiResultInfo extends DibiObject /** - * @return array of DibiColumnInfo + * @return DibiColumnInfo[] */ public function getColumns() { @@ -347,7 +343,7 @@ class DibiResultInfo extends DibiObject /** * @param bool - * @return array of string + * @return string[] */ public function getColumnNames($fullNames = FALSE) { diff --git a/dibi/libs/DibiDateTime.php b/dibi/libs/DibiDateTime.php index df75552a..b6f44bbf 100644 --- a/dibi/libs/DibiDateTime.php +++ b/dibi/libs/DibiDateTime.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/libs/DibiEvent.php b/dibi/libs/DibiEvent.php index 1e4b9e06..238cd6e2 100644 --- a/dibi/libs/DibiEvent.php +++ b/dibi/libs/DibiEvent.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/libs/DibiException.php b/dibi/libs/DibiException.php index a62853f3..6d48e757 100644 --- a/dibi/libs/DibiException.php +++ b/dibi/libs/DibiException.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/libs/DibiFileLogger.php b/dibi/libs/DibiFileLogger.php index d77e03c0..79c55d49 100644 --- a/dibi/libs/DibiFileLogger.php +++ b/dibi/libs/DibiFileLogger.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/libs/DibiFirePhpLogger.php b/dibi/libs/DibiFirePhpLogger.php index bf10ad74..1f2bf311 100644 --- a/dibi/libs/DibiFirePhpLogger.php +++ b/dibi/libs/DibiFirePhpLogger.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/libs/DibiFluent.php b/dibi/libs/DibiFluent.php index 1d63a9e3..eceed3cc 100644 --- a/dibi/libs/DibiFluent.php +++ b/dibi/libs/DibiFluent.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/libs/DibiHashMap.php b/dibi/libs/DibiHashMap.php index 4dd7b98b..cd97ba80 100644 --- a/dibi/libs/DibiHashMap.php +++ b/dibi/libs/DibiHashMap.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/libs/DibiLiteral.php b/dibi/libs/DibiLiteral.php index ee10d04a..5bf15d4f 100644 --- a/dibi/libs/DibiLiteral.php +++ b/dibi/libs/DibiLiteral.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/libs/DibiObject.php b/dibi/libs/DibiObject.php index ad42de18..3bdbb3c4 100644 --- a/dibi/libs/DibiObject.php +++ b/dibi/libs/DibiObject.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/libs/DibiResult.php b/dibi/libs/DibiResult.php index 8683f009..a91ed9dd 100644 --- a/dibi/libs/DibiResult.php +++ b/dibi/libs/DibiResult.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ @@ -245,7 +241,7 @@ class DibiResult extends DibiObject implements IDataSource * Fetches all records from table. * @param int offset * @param int limit - * @return array of DibiRow + * @return DibiRow[] */ final public function fetchAll($offset = NULL, $limit = NULL) { diff --git a/dibi/libs/DibiResultIterator.php b/dibi/libs/DibiResultIterator.php index 4caf7522..8951461e 100644 --- a/dibi/libs/DibiResultIterator.php +++ b/dibi/libs/DibiResultIterator.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/libs/DibiRow.php b/dibi/libs/DibiRow.php index 19a8bc6d..9a913248 100644 --- a/dibi/libs/DibiRow.php +++ b/dibi/libs/DibiRow.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/libs/DibiTranslator.php b/dibi/libs/DibiTranslator.php index 51d5dc1f..aced156b 100644 --- a/dibi/libs/DibiTranslator.php +++ b/dibi/libs/DibiTranslator.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/dibi/libs/interfaces.php b/dibi/libs/interfaces.php index 20880d76..06b05221 100644 --- a/dibi/libs/interfaces.php +++ b/dibi/libs/interfaces.php @@ -2,11 +2,7 @@ /** * This file is part of the "dibi" - smart database abstraction layer. - * * Copyright (c) 2005 David Grudl (http://davidgrudl.com) - * - * For the full copyright and license information, please view - * the file license.txt that was distributed with this source code. */ diff --git a/license.md b/license.md index dc9d0a83..f10f7b43 100644 --- a/license.md +++ b/license.md @@ -16,7 +16,7 @@ remains intact. New BSD License --------------- -Copyright (c) 2004, 2013 David Grudl (http://davidgrudl.com) +Copyright (c) 2004, 2014 David Grudl (http://davidgrudl.com) All rights reserved. Redistribution and use in source and binary forms, with or without modification,