diff options
| author | Greg Roach <fisharebest@gmail.com> | 2015-02-15 22:06:18 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2015-02-15 22:06:18 +0000 |
| commit | 2f917820cff9488a4620c2202aecd1dba67557fc (patch) | |
| tree | 7e53399c998fdc4e06be1098f5d9ccb1ee55ae84 /vendor | |
| parent | 1f1352839b16c4a2a4b65aa5aff1f0be0d8009f3 (diff) | |
| download | webtrees-2f917820cff9488a4620c2202aecd1dba67557fc.tar.gz webtrees-2f917820cff9488a4620c2202aecd1dba67557fc.tar.bz2 webtrees-2f917820cff9488a4620c2202aecd1dba67557fc.zip | |
Upgrade ZF from 1.12.10 to 1.12.11
Diffstat (limited to 'vendor')
119 files changed, 460 insertions, 416 deletions
diff --git a/vendor/autoload.php b/vendor/autoload.php index 9bf07a898e..48f332e5fe 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer' . '/autoload_real.php'; -return ComposerAutoloaderInit1f2dbb76b9fe7ee72961841a5a54ab48::getLoader(); +return ComposerAutoloaderInit207af526399948cc5e2e445108bc9b12::getLoader(); diff --git a/vendor/bombayworks/zendframework1/library/Zend/Application/Resource/Multidb.php b/vendor/bombayworks/zendframework1/library/Zend/Application/Resource/Multidb.php index b49b1c6501..c2136e28cf 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Application/Resource/Multidb.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Application/Resource/Multidb.php @@ -22,7 +22,7 @@ // require_once 'Zend/Application/Resource/ResourceAbstract.php'; -// require_once 'Zend/Database/Table.php'; +// require_once 'Zend/Db/Table.php'; /** */ diff --git a/vendor/bombayworks/zendframework1/library/Zend/Auth/Adapter/DbTable.php b/vendor/bombayworks/zendframework1/library/Zend/Auth/Adapter/DbTable.php index 5c71ea1a53..3d86d27243 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Auth/Adapter/DbTable.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Auth/Adapter/DbTable.php @@ -29,7 +29,7 @@ /** * @see Zend_Db_Adapter_Abstract */ -// require_once 'Zend/Database/Adapter/Abstract.php'; +// require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Auth_Result @@ -170,7 +170,7 @@ class Zend_Auth_Adapter_DbTable implements Zend_Auth_Adapter_Interface * If no adapter is specified, fetch default database adapter. */ if(null === $this->_zendDb) { - // require_once 'Zend/Database/Table/Abstract.php'; + // require_once 'Zend/Db/Table/Abstract.php'; $this->_zendDb = Zend_Db_Table_Abstract::getDefaultAdapter(); if (null === $this->_zendDb) { // require_once 'Zend/Auth/Adapter/Exception.php'; @@ -294,7 +294,7 @@ class Zend_Auth_Adapter_DbTable implements Zend_Auth_Adapter_Interface } /** - * getDbSelect() - Return the preauthentication Database Select object for userland select query modification + * getDbSelect() - Return the preauthentication Db Select object for userland select query modification * * @return Zend_Db_Select */ diff --git a/vendor/bombayworks/zendframework1/library/Zend/Barcode/Renderer/Pdf.php b/vendor/bombayworks/zendframework1/library/Zend/Barcode/Renderer/Pdf.php index b14d233228..ec9ac29638 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Barcode/Renderer/Pdf.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Barcode/Renderer/Pdf.php @@ -24,7 +24,7 @@ // require_once 'Zend/Barcode/Renderer/RendererAbstract.php'; /** @see Zend_Pdf */ -// require_once 'Zend/ReportPdf.php'; +// require_once 'Zend/Pdf.php'; /** @see Zend_Pdf_Page */ // require_once 'Zend/Pdf/Page.php'; diff --git a/vendor/bombayworks/zendframework1/library/Zend/Captcha/ReCaptcha.php b/vendor/bombayworks/zendframework1/library/Zend/Captcha/ReCaptcha.php index 4aaad1a25d..dfc36f75d4 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Captcha/ReCaptcha.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Captcha/ReCaptcha.php @@ -20,7 +20,7 @@ */ /** @see Zend_Captcha_Base */ -// require_once 'Zend/Captcha/ReportBase.php'; +// require_once 'Zend/Captcha/Base.php'; /** @see Zend_Service_ReCaptcha */ // require_once 'Zend/Service/ReCaptcha.php'; diff --git a/vendor/bombayworks/zendframework1/library/Zend/Captcha/Word.php b/vendor/bombayworks/zendframework1/library/Zend/Captcha/Word.php index 8db4f370c8..be4bf00ed3 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Captcha/Word.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Captcha/Word.php @@ -20,7 +20,7 @@ */ /** @see Zend_Captcha_Base */ -// require_once 'Zend/Captcha/ReportBase.php'; +// require_once 'Zend/Captcha/Base.php'; /** * Word-based captcha adapter diff --git a/vendor/bombayworks/zendframework1/library/Zend/Config/Ini.php b/vendor/bombayworks/zendframework1/library/Zend/Config/Ini.php index 5e38a83e68..ec7a7ae62b 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Config/Ini.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Config/Ini.php @@ -23,7 +23,7 @@ /** * @see Zend_Config */ -// require_once 'Zend/ConfigInterface.php'; +// require_once 'Zend/Config.php'; /** diff --git a/vendor/bombayworks/zendframework1/library/Zend/Config/Json.php b/vendor/bombayworks/zendframework1/library/Zend/Config/Json.php index 0ae94cb18c..1470655273 100755 --- a/vendor/bombayworks/zendframework1/library/Zend/Config/Json.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Config/Json.php @@ -22,7 +22,7 @@ /** * @see Zend_Config */ -// require_once 'Zend/ConfigInterface.php'; +// require_once 'Zend/Config.php'; /** * @see Zend_Json diff --git a/vendor/bombayworks/zendframework1/library/Zend/Config/Xml.php b/vendor/bombayworks/zendframework1/library/Zend/Config/Xml.php index 7894403802..d072ae4f95 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Config/Xml.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Config/Xml.php @@ -22,7 +22,7 @@ /** * @see Zend_Config */ -// require_once 'Zend/ConfigInterface.php'; +// require_once 'Zend/Config.php'; /** @see Zend_Xml_Security */ // require_once 'Zend/Xml/Security.php'; diff --git a/vendor/bombayworks/zendframework1/library/Zend/Config/Yaml.php b/vendor/bombayworks/zendframework1/library/Zend/Config/Yaml.php index 5d07238ffe..c2c6f40202 100755 --- a/vendor/bombayworks/zendframework1/library/Zend/Config/Yaml.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Config/Yaml.php @@ -22,7 +22,7 @@ /** * @see Zend_Config */ -// require_once 'Zend/ConfigInterface.php'; +// require_once 'Zend/Config.php'; /** * YAML Adapter for Zend_Config diff --git a/vendor/bombayworks/zendframework1/library/Zend/Controller/Action/Helper/ViewRenderer.php b/vendor/bombayworks/zendframework1/library/Zend/Controller/Action/Helper/ViewRenderer.php index 0fa798b59b..808e7e034e 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Controller/Action/Helper/ViewRenderer.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Controller/Action/Helper/ViewRenderer.php @@ -842,11 +842,12 @@ class Zend_Controller_Action_Helper_ViewRenderer extends Zend_Controller_Action_ $request = $this->getRequest(); $dispatcher = $this->getFrontController()->getDispatcher(); $module = $dispatcher->formatModuleName($request->getModuleName()); - $controller = substr( - $dispatcher->formatControllerName($request->getControllerName()), - 0, - -10 + $controller = $dispatcher->formatControllerName( + $request->getControllerName() ); + if ('Controller' == substr($controller, -10)) { + $controller = substr($controller, 0, -10); + } $action = $dispatcher->formatActionName($request->getActionName()); $params = compact('module', 'controller', 'action'); diff --git a/vendor/bombayworks/zendframework1/library/Zend/Controller/Router/Route/Interface.php b/vendor/bombayworks/zendframework1/library/Zend/Controller/Router/Route/Interface.php index 817a276ac2..2887db532f 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Controller/Router/Route/Interface.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Controller/Router/Route/Interface.php @@ -21,7 +21,7 @@ */ /** Zend_Config */ -// require_once 'Zend/ConfigInterface.php'; +// require_once 'Zend/Config.php'; /** * @package Zend_Controller diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db.php b/vendor/bombayworks/zendframework1/library/Zend/Db.php index 182e29ee41..36a0322a02 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db.php @@ -224,7 +224,7 @@ class Zend_Db /** * @see Zend_Db_Exception */ - // require_once 'Zend/Database/Exception.php'; + // require_once 'Zend/Db/Exception.php'; throw new Zend_Db_Exception('Adapter parameters must be in an array or a Zend_Config object'); } @@ -235,7 +235,7 @@ class Zend_Db /** * @see Zend_Db_Exception */ - // require_once 'Zend/Database/Exception.php'; + // require_once 'Zend/Db/Exception.php'; throw new Zend_Db_Exception('Adapter name must be specified in a string'); } @@ -276,7 +276,7 @@ class Zend_Db /** * @see Zend_Db_Exception */ - // require_once 'Zend/Database/Exception.php'; + // require_once 'Zend/Db/Exception.php'; throw new Zend_Db_Exception("Adapter class '$adapterName' does not extend Zend_Db_Adapter_Abstract"); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Abstract.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Abstract.php index d5043077e1..1ba8ed6589 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Abstract.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Abstract.php @@ -24,12 +24,12 @@ /** * @see Zend_Db */ -// require_once 'Zend/Database.php'; +// require_once 'Zend/Db.php'; /** * @see Zend_Db_Select */ -// require_once 'Zend/Database/Select.php'; +// require_once 'Zend/Db/Select.php'; /** * Class for connecting to SQL databases and performing common operations. @@ -176,7 +176,7 @@ abstract class Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception('Adapter parameters must be in an array or a Zend_Config object'); } } @@ -232,7 +232,7 @@ abstract class Zend_Db_Adapter_Abstract break; default: /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception('Case must be one of the following constants: ' . 'Zend_Db::CASE_NATURAL, Zend_Db::CASE_LOWER, Zend_Db::CASE_UPPER'); } @@ -284,7 +284,7 @@ abstract class Zend_Db_Adapter_Abstract // we need at least a dbname if (! array_key_exists('dbname', $config)) { /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'dbname' that names the database instance"); } @@ -292,7 +292,7 @@ abstract class Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'password' for login credentials"); } @@ -300,7 +300,7 @@ abstract class Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'username' for login credentials"); } } @@ -370,7 +370,7 @@ abstract class Zend_Db_Adapter_Abstract /** * @see Zend_Db_Profiler_Exception */ - // require_once 'Zend/Database/Profiler/Exception.php'; + // require_once 'Zend/Db/Profiler/Exception.php'; throw new Zend_Db_Profiler_Exception('Profiler argument must be an instance of either Zend_Db_Profiler' . ' or Zend_Config when provided as an object'); } @@ -400,7 +400,7 @@ abstract class Zend_Db_Adapter_Abstract if (!$profilerInstance instanceof Zend_Db_Profiler) { /** @see Zend_Db_Profiler_Exception */ - // require_once 'Zend/Database/Profiler/Exception.php'; + // require_once 'Zend/Db/Profiler/Exception.php'; throw new Zend_Db_Profiler_Exception('Class ' . get_class($profilerInstance) . ' does not extend ' . 'Zend_Db_Profiler'); } @@ -556,7 +556,7 @@ abstract class Zend_Db_Adapter_Abstract $i++; } else { /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception(get_class($this) ." doesn't support positional or named binding"); } } @@ -610,7 +610,7 @@ abstract class Zend_Db_Adapter_Abstract $i++; } else { /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception(get_class($this) ." doesn't support positional or named binding"); } } @@ -1120,7 +1120,7 @@ abstract class Zend_Db_Adapter_Abstract { if ($this->_allowSerialization == false) { /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception( get_class($this) . ' is not allowed to be serialized' ); diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Db2.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Db2.php index 47861950b9..6c42bb6787 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Db2.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Db2.php @@ -24,17 +24,17 @@ /** * @see Zend_Db */ -// require_once 'Zend/Database.php'; +// require_once 'Zend/Db.php'; /** * @see Zend_Db_Adapter_Abstract */ -// require_once 'Zend/Database/Adapter/Abstract.php'; +// require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Db_Statement_Db2 */ -// require_once 'Zend/Database/Statement/Db2.php'; +// require_once 'Zend/Db/Statement/Db2.php'; /** @@ -127,7 +127,7 @@ class Zend_Db_Adapter_Db2 extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Db2_Exception */ - // require_once 'Zend/Database/Adapter/Db2/Exception.php'; + // require_once 'Zend/Db/Adapter/Db2/Exception.php'; throw new Zend_Db_Adapter_Db2_Exception('The IBM DB2 extension is required for this adapter but the extension is not loaded'); } @@ -192,7 +192,7 @@ class Zend_Db_Adapter_Db2 extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Db2_Exception */ - // require_once 'Zend/Database/Adapter/Db2/Exception.php'; + // require_once 'Zend/Db/Adapter/Db2/Exception.php'; throw new Zend_Db_Adapter_Db2_Exception(db2_conn_errormsg(), db2_conn_error()); } } @@ -266,7 +266,7 @@ class Zend_Db_Adapter_Db2 extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Db2_Exception */ - // require_once 'Zend/Database/Adapter/Db2/Exception.php'; + // require_once 'Zend/Db/Adapter/Db2/Exception.php'; throw new Zend_Db_Adapter_Db2_Exception("execution mode not supported"); break; } @@ -591,7 +591,7 @@ class Zend_Db_Adapter_Db2 extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Db2_Exception */ - // require_once 'Zend/Database/Adapter/Db2/Exception.php'; + // require_once 'Zend/Db/Adapter/Db2/Exception.php'; throw new Zend_Db_Adapter_Db2_Exception( db2_conn_errormsg($this->_connection), db2_conn_error($this->_connection)); @@ -611,7 +611,7 @@ class Zend_Db_Adapter_Db2 extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Db2_Exception */ - // require_once 'Zend/Database/Adapter/Db2/Exception.php'; + // require_once 'Zend/Db/Adapter/Db2/Exception.php'; throw new Zend_Db_Adapter_Db2_Exception( db2_conn_errormsg($this->_connection), db2_conn_error($this->_connection)); @@ -639,14 +639,14 @@ class Zend_Db_Adapter_Db2 extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Db2_Exception */ - // require_once 'Zend/Database/Adapter/Db2/Exception.php'; + // require_once 'Zend/Db/Adapter/Db2/Exception.php'; throw new Zend_Db_Adapter_Db2_Exception('FETCH_BOUND is not supported yet'); break; default: /** * @see Zend_Db_Adapter_Db2_Exception */ - // require_once 'Zend/Database/Adapter/Db2/Exception.php'; + // require_once 'Zend/Db/Adapter/Db2/Exception.php'; throw new Zend_Db_Adapter_Db2_Exception("Invalid fetch mode '$mode' specified"); break; } @@ -667,7 +667,7 @@ class Zend_Db_Adapter_Db2 extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Db2_Exception */ - // require_once 'Zend/Database/Adapter/Db2/Exception.php'; + // require_once 'Zend/Db/Adapter/Db2/Exception.php'; throw new Zend_Db_Adapter_Db2_Exception("LIMIT argument count=$count is not valid"); } @@ -676,7 +676,7 @@ class Zend_Db_Adapter_Db2 extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Db2_Exception */ - // require_once 'Zend/Database/Adapter/Db2/Exception.php'; + // require_once 'Zend/Db/Adapter/Db2/Exception.php'; throw new Zend_Db_Adapter_Db2_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Db2/Exception.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Db2/Exception.php index 6bd2b6a360..5d98df1a0d 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Db2/Exception.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Db2/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Adapter_Exception */ -// require_once 'Zend/Database/Adapter/Exception.php'; +// require_once 'Zend/Db/Adapter/Exception.php'; /** * Zend_Db_Adapter_Db2_Exception diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Exception.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Exception.php index 188d18ca2e..07117c1b66 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Exception.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Exception */ -// require_once 'Zend/Database/Exception.php'; +// require_once 'Zend/Db/Exception.php'; /** * @category Zend diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Mysqli.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Mysqli.php index 71b5924cc5..942dc3f4e6 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Mysqli.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Mysqli.php @@ -24,22 +24,22 @@ /** * @see Zend_Db_Adapter_Abstract */ -// require_once 'Zend/Database/Adapter/Abstract.php'; +// require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Db_Profiler */ -// require_once 'Zend/Database/Profiler.php'; +// require_once 'Zend/Db/Profiler.php'; /** * @see Zend_Db_Select */ -// require_once 'Zend/Database/Select.php'; +// require_once 'Zend/Db/Select.php'; /** * @see Zend_Db_Statement_Mysqli */ -// require_once 'Zend/Database/Statement/Mysqli.php'; +// require_once 'Zend/Db/Statement/Mysqli.php'; /** @@ -140,7 +140,7 @@ class Zend_Db_Adapter_Mysqli extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Mysqli_Exception */ - // require_once 'Zend/Database/Adapter/Mysqli/Exception.php'; + // require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; throw new Zend_Db_Adapter_Mysqli_Exception($this->getConnection()->error); } return $result; @@ -200,7 +200,7 @@ class Zend_Db_Adapter_Mysqli extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Mysqli_Exception */ - // require_once 'Zend/Database/Adapter/Mysqli/Exception.php'; + // require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; throw new Zend_Db_Adapter_Mysqli_Exception($this->getConnection()->error); } @@ -287,7 +287,7 @@ class Zend_Db_Adapter_Mysqli extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Mysqli_Exception */ - // require_once 'Zend/Database/Adapter/Mysqli/Exception.php'; + // require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; throw new Zend_Db_Adapter_Mysqli_Exception('The Mysqli extension is required for this adapter but the extension is not loaded'); } @@ -336,7 +336,7 @@ class Zend_Db_Adapter_Mysqli extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Mysqli_Exception */ - // require_once 'Zend/Database/Adapter/Mysqli/Exception.php'; + // require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; throw new Zend_Db_Adapter_Mysqli_Exception(mysqli_connect_error()); } @@ -474,14 +474,14 @@ class Zend_Db_Adapter_Mysqli extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Mysqli_Exception */ - // require_once 'Zend/Database/Adapter/Mysqli/Exception.php'; + // require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; throw new Zend_Db_Adapter_Mysqli_Exception('FETCH_BOUND is not supported yet'); break; default: /** * @see Zend_Db_Adapter_Mysqli_Exception */ - // require_once 'Zend/Database/Adapter/Mysqli/Exception.php'; + // require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; throw new Zend_Db_Adapter_Mysqli_Exception("Invalid fetch mode '$mode' specified"); } } @@ -501,7 +501,7 @@ class Zend_Db_Adapter_Mysqli extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Mysqli_Exception */ - // require_once 'Zend/Database/Adapter/Mysqli/Exception.php'; + // require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; throw new Zend_Db_Adapter_Mysqli_Exception("LIMIT argument count=$count is not valid"); } @@ -510,7 +510,7 @@ class Zend_Db_Adapter_Mysqli extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Mysqli_Exception */ - // require_once 'Zend/Database/Adapter/Mysqli/Exception.php'; + // require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; throw new Zend_Db_Adapter_Mysqli_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Mysqli/Exception.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Mysqli/Exception.php index 5142e2935a..f1692ab121 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Mysqli/Exception.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Mysqli/Exception.php @@ -24,7 +24,7 @@ /** * Zend */ -// require_once 'Zend/Database/Adapter/Exception.php'; +// require_once 'Zend/Db/Adapter/Exception.php'; /** * Zend_Db_Adapter_Mysqli_Exception diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Oracle.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Oracle.php index c00277318e..855ffe459d 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Oracle.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Oracle.php @@ -23,12 +23,12 @@ /** * @see Zend_Db_Adapter_Abstract */ -// require_once 'Zend/Database/Adapter/Abstract.php'; +// require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Db_Statement_Oracle */ -// require_once 'Zend/Database/Statement/Oracle.php'; +// require_once 'Zend/Db/Statement/Oracle.php'; /** * @category Zend @@ -115,7 +115,7 @@ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Adapter/Oracle/Exception.php'; + // require_once 'Zend/Db/Adapter/Oracle/Exception.php'; throw new Zend_Db_Adapter_Oracle_Exception('The OCI8 extension is required for this adapter but the extension is not loaded'); } @@ -134,7 +134,7 @@ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Adapter/Oracle/Exception.php'; + // require_once 'Zend/Db/Adapter/Oracle/Exception.php'; throw new Zend_Db_Adapter_Oracle_Exception(oci_error()); } } @@ -468,7 +468,7 @@ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Adapter/Oracle/Exception.php'; + // require_once 'Zend/Db/Adapter/Oracle/Exception.php'; throw new Zend_Db_Adapter_Oracle_Exception(oci_error($this->_connection)); } $this->_setExecuteMode(OCI_COMMIT_ON_SUCCESS); @@ -486,7 +486,7 @@ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Adapter/Oracle/Exception.php'; + // require_once 'Zend/Db/Adapter/Oracle/Exception.php'; throw new Zend_Db_Adapter_Oracle_Exception(oci_error($this->_connection)); } $this->_setExecuteMode(OCI_COMMIT_ON_SUCCESS); @@ -514,14 +514,14 @@ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Adapter/Oracle/Exception.php'; + // require_once 'Zend/Db/Adapter/Oracle/Exception.php'; throw new Zend_Db_Adapter_Oracle_Exception('FETCH_BOUND is not supported yet'); break; default: /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Adapter/Oracle/Exception.php'; + // require_once 'Zend/Db/Adapter/Oracle/Exception.php'; throw new Zend_Db_Adapter_Oracle_Exception("Invalid fetch mode '$mode' specified"); break; } @@ -543,7 +543,7 @@ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Adapter/Oracle/Exception.php'; + // require_once 'Zend/Db/Adapter/Oracle/Exception.php'; throw new Zend_Db_Adapter_Oracle_Exception("LIMIT argument count=$count is not valid"); } @@ -552,7 +552,7 @@ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Adapter/Oracle/Exception.php'; + // require_once 'Zend/Db/Adapter/Oracle/Exception.php'; throw new Zend_Db_Adapter_Oracle_Exception("LIMIT argument offset=$offset is not valid"); } @@ -589,7 +589,7 @@ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Adapter/Oracle/Exception.php'; + // require_once 'Zend/Db/Adapter/Oracle/Exception.php'; throw new Zend_Db_Adapter_Oracle_Exception("Invalid execution mode '$mode' specified"); break; } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Oracle/Exception.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Oracle/Exception.php index 51b237bc0b..bd0278a51f 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Oracle/Exception.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Oracle/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Adapter_Exception */ -// require_once 'Zend/Database/Adapter/Exception.php'; +// require_once 'Zend/Db/Adapter/Exception.php'; /** * Zend_Db_Adapter_Oracle_Exception diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Abstract.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Abstract.php index 5064e99a34..35373a7bf3 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Abstract.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Abstract.php @@ -24,13 +24,13 @@ /** * @see Zend_Db_Adapter_Abstract */ -// require_once 'Zend/Database/Adapter/Abstract.php'; +// require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Db_Statement_Pdo */ -// require_once 'Zend/Database/Statement/Pdo.php'; +// require_once 'Zend/Db/Statement/Pdo.php'; /** @@ -99,7 +99,7 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception('The PDO extension is required for this adapter but the extension is not loaded'); } @@ -108,7 +108,7 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception('The ' . $this->_pdoType . ' driver is not currently installed'); } @@ -140,7 +140,7 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception($e->getMessage(), $e->getCode(), $e); } @@ -240,7 +240,7 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Statement_Exception */ - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -267,7 +267,7 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception($errorInfo[2]); } @@ -276,7 +276,7 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -338,7 +338,7 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception('The PDO extension is required for this adapter but the extension is not loaded'); } switch ($mode) { @@ -354,7 +354,7 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Invalid fetch mode '$mode' specified"); break; } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Ibm.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Ibm.php index 7ac8626162..4ebb5cd871 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Ibm.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Ibm.php @@ -22,16 +22,16 @@ /** @see Zend_Db_Adapter_Pdo_Abstract */ -// require_once 'Zend/Database/Adapter/Pdo/Abstract.php'; +// require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; /** @see Zend_Db_Abstract_Pdo_Ibm_Db2 */ -// require_once 'Zend/Database/Adapter/Pdo/Ibm/Db2.php'; +// require_once 'Zend/Db/Adapter/Pdo/Ibm/Db2.php'; /** @see Zend_Db_Abstract_Pdo_Ibm_Ids */ -// require_once 'Zend/Database/Adapter/Pdo/Ibm/Ids.php'; +// require_once 'Zend/Db/Adapter/Pdo/Ibm/Ids.php'; /** @see Zend_Db_Statement_Pdo_Ibm */ -// require_once 'Zend/Database/Statement/Pdo/Ibm.php'; +// require_once 'Zend/Db/Statement/Pdo/Ibm.php'; /** @@ -131,7 +131,7 @@ class Zend_Db_Adapter_Pdo_Ibm extends Zend_Db_Adapter_Pdo_Abstract } } catch (PDOException $e) { /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; $error = strpos($e->getMessage(), 'driver does not support that attribute'); if ($error) { throw new Zend_Db_Adapter_Exception("PDO_IBM driver extension is downlevel. Please use driver release version 1.2.1 or later", 0, $e); @@ -178,7 +178,7 @@ class Zend_Db_Adapter_Pdo_Ibm extends Zend_Db_Adapter_Pdo_Abstract if (array_key_exists('host', $this->_config) && !array_key_exists('port', $config)) { /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration must have a key for 'port' when 'host' is specified"); } } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Ibm/Db2.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Ibm/Db2.php index b2832fa0b2..0f4b2cb025 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Ibm/Db2.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Ibm/Db2.php @@ -22,10 +22,10 @@ /** @see Zend_Db_Adapter_Pdo_Ibm */ -// require_once 'Zend/Database/Adapter/Pdo/Ibm.php'; +// require_once 'Zend/Db/Adapter/Pdo/Ibm.php'; /** @see Zend_Db_Statement_Pdo_Ibm */ -// require_once 'Zend/Database/Statement/Pdo/Ibm.php'; +// require_once 'Zend/Db/Statement/Pdo/Ibm.php'; /** @@ -168,13 +168,13 @@ class Zend_Db_Adapter_Pdo_Ibm_Db2 $count = intval($count); if ($count < 0) { /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } else { $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Ibm/Ids.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Ibm/Ids.php index c065c43c1f..be989f9053 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Ibm/Ids.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Ibm/Ids.php @@ -22,10 +22,10 @@ /** @see Zend_Db_Adapter_Pdo_Ibm */ -// require_once 'Zend/Database/Adapter/Pdo/Ibm.php'; +// require_once 'Zend/Db/Adapter/Pdo/Ibm.php'; /** @see Zend_Db_Statement_Pdo_Ibm */ -// require_once 'Zend/Database/Statement/Pdo/Ibm.php'; +// require_once 'Zend/Db/Statement/Pdo/Ibm.php'; /** @@ -250,7 +250,7 @@ class Zend_Db_Adapter_Pdo_Ibm_Ids $count = intval($count); if ($count < 0) { /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } else if ($count == 0) { $limit_sql = str_ireplace("SELECT", "SELECT * FROM (SELECT", $sql); @@ -259,7 +259,7 @@ class Zend_Db_Adapter_Pdo_Ibm_Ids $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } if ($offset == 0) { diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Mssql.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Mssql.php index feb1f96b12..7d0a3829af 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Mssql.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Mssql.php @@ -24,7 +24,7 @@ /** * @see Zend_Db_Adapter_Pdo_Abstract */ -// require_once 'Zend/Database/Adapter/Pdo/Abstract.php'; +// require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; /** @@ -319,14 +319,14 @@ class Zend_Db_Adapter_Pdo_Mssql extends Zend_Db_Adapter_Pdo_Abstract $count = intval($count); if ($count <= 0) { /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Mysql.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Mysql.php index c3f39f418c..6cbb1e08ee 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Mysql.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Mysql.php @@ -24,7 +24,7 @@ /** * @see Zend_Db_Adapter_Pdo_Abstract */ -// require_once 'Zend/Database/Adapter/Pdo/Abstract.php'; +// require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; /** @@ -250,14 +250,14 @@ class Zend_Db_Adapter_Pdo_Mysql extends Zend_Db_Adapter_Pdo_Abstract $count = intval($count); if ($count <= 0) { /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Oci.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Oci.php index ea3127ca0e..01d19868ee 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Oci.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Oci.php @@ -24,7 +24,7 @@ /** * @see Zend_Db_Adapter_Pdo_Abstract */ -// require_once 'Zend/Database/Adapter/Pdo/Abstract.php'; +// require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; /** @@ -347,14 +347,14 @@ class Zend_Db_Adapter_Pdo_Oci extends Zend_Db_Adapter_Pdo_Abstract $count = intval($count); if ($count <= 0) { /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Pgsql.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Pgsql.php index ac5a0a8d52..4b23202e28 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Pgsql.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Pgsql.php @@ -24,7 +24,7 @@ /** * @see Zend_Db_Adapter_Pdo_Abstract */ -// require_once 'Zend/Database/Adapter/Pdo/Abstract.php'; +// require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; /** @@ -249,7 +249,7 @@ class Zend_Db_Adapter_Pdo_Pgsql extends Zend_Db_Adapter_Pdo_Abstract /** * @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } @@ -258,7 +258,7 @@ class Zend_Db_Adapter_Pdo_Pgsql extends Zend_Db_Adapter_Pdo_Abstract /** * @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Sqlite.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Sqlite.php index c07b95b0aa..32574dfa27 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Sqlite.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Sqlite.php @@ -24,7 +24,7 @@ /** * @see Zend_Db_Adapter_Pdo_Abstract */ -// require_once 'Zend/Database/Adapter/Pdo/Abstract.php'; +// require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; /** @@ -106,7 +106,7 @@ class Zend_Db_Adapter_Pdo_Sqlite extends Zend_Db_Adapter_Pdo_Abstract // we need at least a dbname if (! array_key_exists('dbname', $config)) { /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'dbname' that names the database instance"); } } @@ -140,7 +140,7 @@ class Zend_Db_Adapter_Pdo_Sqlite extends Zend_Db_Adapter_Pdo_Abstract if ($retval === false) { $error = $this->_connection->errorInfo(); /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception($error[2]); } @@ -148,7 +148,7 @@ class Zend_Db_Adapter_Pdo_Sqlite extends Zend_Db_Adapter_Pdo_Abstract if ($retval === false) { $error = $this->_connection->errorInfo(); /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception($error[2]); } } @@ -275,14 +275,14 @@ class Zend_Db_Adapter_Pdo_Sqlite extends Zend_Db_Adapter_Pdo_Abstract $count = intval($count); if ($count <= 0) { /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Sqlsrv.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Sqlsrv.php index f31b4c36ac..e5a4453b90 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Sqlsrv.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Sqlsrv.php @@ -23,12 +23,12 @@ /** * @see Zend_Db_Adapter_Abstract */ -// require_once 'Zend/Database/Adapter/Abstract.php'; +// require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Db_Statement_Sqlsrv */ -// require_once 'Zend/Database/Statement/Sqlsrv.php'; +// require_once 'Zend/Db/Statement/Sqlsrv.php'; /** * @category Zend @@ -121,7 +121,7 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Sqlsrv_Exception */ - // require_once 'Zend/Database/Adapter/Sqlsrv/Exception.php'; + // require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception('The Sqlsrv extension is required for this adapter but the extension is not loaded'); } @@ -164,7 +164,7 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Sqlsrv_Exception */ - // require_once 'Zend/Database/Adapter/Sqlsrv/Exception.php'; + // require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception(sqlsrv_errors()); } } @@ -181,7 +181,7 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract // we need at least a dbname if (! array_key_exists('dbname', $config)) { /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'dbname' that names the database instance"); } @@ -189,7 +189,7 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'password' for login credentials. If Windows Authentication is desired, both keys 'username' and 'password' should be ommited from config."); } @@ -198,7 +198,7 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'username' for login credentials. If Windows Authentication is desired, both keys 'username' and 'password' should be ommited from config."); } @@ -239,12 +239,12 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract $sql = "SERIALIZABLE"; break; default: - // require_once 'Zend/Database/Adapter/Sqlsrv/Exception.php'; + // require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception("Invalid transaction isolation level mode '$level' specified"); } if (!sqlsrv_query($this->_connection, "SET TRANSACTION ISOLATION LEVEL $sql;")) { - // require_once 'Zend/Database/Adapter/Sqlsrv/Exception.php'; + // require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception("Transaction cannot be changed to '$level'"); } @@ -527,7 +527,7 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract protected function _beginTransaction() { if (!sqlsrv_begin_transaction($this->_connection)) { - // require_once 'Zend/Database/Adapter/Sqlsrv/Exception.php'; + // require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception(sqlsrv_errors()); } } @@ -541,7 +541,7 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract protected function _commit() { if (!sqlsrv_commit($this->_connection)) { - // require_once 'Zend/Database/Adapter/Sqlsrv/Exception.php'; + // require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception(sqlsrv_errors()); } } @@ -555,7 +555,7 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract protected function _rollBack() { if (!sqlsrv_rollback($this->_connection)) { - // require_once 'Zend/Database/Adapter/Sqlsrv/Exception.php'; + // require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception(sqlsrv_errors()); } } @@ -579,11 +579,11 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract $this->_fetchMode = $mode; break; case Zend_Db::FETCH_BOUND: // bound to PHP variable - // require_once 'Zend/Database/Adapter/Sqlsrv/Exception.php'; + // require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception('FETCH_BOUND is not supported yet'); break; default: - // require_once 'Zend/Database/Adapter/Sqlsrv/Exception.php'; + // require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception("Invalid fetch mode '$mode' specified"); break; } @@ -602,14 +602,14 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract { $count = intval($count); if ($count <= 0) { - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - // require_once 'Zend/Database/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Sqlsrv/Exception.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Sqlsrv/Exception.php index 662d7a009c..d92d36bc37 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Sqlsrv/Exception.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Sqlsrv/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Adapter_Exception */ -// require_once 'Zend/Database/Adapter/Exception.php'; +// require_once 'Zend/Db/Adapter/Exception.php'; /** * Zend_Db_Adapter_Sqlsrv_Exception diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Profiler.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Profiler.php index e3bb2c3d43..b8c7a0c104 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Profiler.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Profiler.php @@ -280,7 +280,7 @@ class Zend_Db_Profiler /** * @see Zend_Db_Profiler_Query */ - // require_once 'Zend/Database/Profiler/Query.php'; + // require_once 'Zend/Db/Profiler/Query.php'; $this->_queryProfiles[] = new Zend_Db_Profiler_Query($queryText, $queryType); end($this->_queryProfiles); @@ -308,7 +308,7 @@ class Zend_Db_Profiler /** * @see Zend_Db_Profiler_Exception */ - // require_once 'Zend/Database/Profiler/Exception.php'; + // require_once 'Zend/Db/Profiler/Exception.php'; throw new Zend_Db_Profiler_Exception("Profiler has no query with handle '$queryId'."); } @@ -319,7 +319,7 @@ class Zend_Db_Profiler /** * @see Zend_Db_Profiler_Exception */ - // require_once 'Zend/Database/Profiler/Exception.php'; + // require_once 'Zend/Db/Profiler/Exception.php'; throw new Zend_Db_Profiler_Exception("Query with profiler handle '$queryId' has already ended."); } @@ -361,7 +361,7 @@ class Zend_Db_Profiler /** * @see Zend_Db_Profiler_Exception */ - // require_once 'Zend/Database/Profiler/Exception.php'; + // require_once 'Zend/Db/Profiler/Exception.php'; throw new Zend_Db_Profiler_Exception("Query handle '$queryId' not found in profiler log."); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Profiler/Exception.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Profiler/Exception.php index 09087270b0..013fd4afa9 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Profiler/Exception.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Profiler/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Db_Exception */ -// require_once 'Zend/Database/Exception.php'; +// require_once 'Zend/Db/Exception.php'; /** diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Profiler/Firebug.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Profiler/Firebug.php index 09024ecf0e..a723c195e2 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Profiler/Firebug.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Profiler/Firebug.php @@ -21,7 +21,7 @@ */ /** Zend_Db_Profiler */ -// require_once 'Zend/Database/Profiler.php'; +// require_once 'Zend/Db/Profiler.php'; /** Zend_Wildfire_Plugin_FirePhp */ // require_once 'Zend/Wildfire/Plugin/FirePhp.php'; diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Select.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Select.php index d9eef949ef..d2a654365d 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Select.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Select.php @@ -24,12 +24,12 @@ /** * @see Zend_Db_Adapter_Abstract */ -// require_once 'Zend/Database/Adapter/Abstract.php'; +// require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Db_Expr */ -// require_once 'Zend/Database/Expr.php'; +// require_once 'Zend/Db/Expr.php'; /** @@ -251,7 +251,7 @@ class Zend_Db_Select /** * @see Zend_Db_Select_Exception */ - // require_once 'Zend/Database/Select/Exception.php'; + // require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("No table has been specified for the FROM clause"); } @@ -280,14 +280,14 @@ class Zend_Db_Select public function union($select = array(), $type = self::SQL_UNION) { if (!is_array($select)) { - // require_once 'Zend/Database/Select/Exception.php'; + // require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception( "union() only accepts an array of Zend_Db_Select instances of sql query strings." ); } if (!in_array($type, self::$_unionTypes)) { - // require_once 'Zend/Database/Select/Exception.php'; + // require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Invalid union type '{$type}'"); } @@ -664,7 +664,7 @@ class Zend_Db_Select { $part = strtolower($part); if (!array_key_exists($part, $this->_parts)) { - // require_once 'Zend/Database/Select/Exception.php'; + // require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Invalid Select part '$part'"); } return $this->_parts[$part]; @@ -757,12 +757,12 @@ class Zend_Db_Select /** * @see Zend_Db_Select_Exception */ - // require_once 'Zend/Database/Select/Exception.php'; + // require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Invalid join type '$type'"); } if (count($this->_parts[self::UNION])) { - // require_once 'Zend/Database/Select/Exception.php'; + // require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Invalid use of table with " . self::SQL_UNION); } @@ -804,7 +804,7 @@ class Zend_Db_Select /** * @see Zend_Db_Select_Exception */ - // require_once 'Zend/Database/Select/Exception.php'; + // require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("You cannot define a correlation name '$correlationName' more than once"); } @@ -873,7 +873,7 @@ class Zend_Db_Select public function _joinUsing($type, $name, $cond, $cols = '*', $schema = null) { if (empty($this->_parts[self::FROM])) { - // require_once 'Zend/Database/Select/Exception.php'; + // require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("You can only perform a joinUsing after specifying a FROM table"); } @@ -997,7 +997,7 @@ class Zend_Db_Select protected function _where($condition, $value = null, $type = null, $bool = true) { if (count($this->_parts[self::UNION])) { - // require_once 'Zend/Database/Select/Exception.php'; + // require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Invalid use of where clause with " . self::SQL_UNION); } @@ -1319,11 +1319,11 @@ class Zend_Db_Select if ($type) { $type .= ' join'; if (!in_array($type, self::$_joinTypes)) { - // require_once 'Zend/Database/Select/Exception.php'; + // require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Unrecognized method '$method()'"); } if (in_array($type, array(self::CROSS_JOIN, self::NATURAL_JOIN))) { - // require_once 'Zend/Database/Select/Exception.php'; + // require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Cannot perform a joinUsing with method '$method()'"); } } else { @@ -1333,7 +1333,7 @@ class Zend_Db_Select return call_user_func_array(array($this, '_joinUsing'), $args); } - // require_once 'Zend/Database/Select/Exception.php'; + // require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Unrecognized method '$method()'"); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Select/Exception.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Select/Exception.php index cffa2a151f..a66b95edcd 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Select/Exception.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Select/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Exception */ -// require_once 'Zend/Database/Exception.php'; +// require_once 'Zend/Db/Exception.php'; /** * @category Zend diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement.php index 8e1fd658f0..140daf9680 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement.php @@ -23,12 +23,12 @@ /** * @see Zend_Db */ -// require_once 'Zend/Database.php'; +// require_once 'Zend/Db.php'; /** * @see Zend_Db_Statement_Interface */ -// require_once 'Zend/Database/Statement/Interface.php'; +// require_once 'Zend/Db/Statement/Interface.php'; /** * Abstract class to emulate a PDOStatement for native database adapters. @@ -148,7 +148,7 @@ abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface /** * @see Zend_Db_Statement_Exception */ - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception("Invalid bind-variable position '$val'"); } } else if ($val[0] == ':') { @@ -156,7 +156,7 @@ abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface /** * @see Zend_Db_Statement_Exception */ - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception("Invalid bind-variable name '$val'"); } } @@ -244,7 +244,7 @@ abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface /** * @see Zend_Db_Statement_Exception */ - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception('Invalid bind-variable position'); } @@ -266,7 +266,7 @@ abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface /** * @see Zend_Db_Statement_Exception */ - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception("Invalid bind-variable position '$parameter'"); } @@ -436,7 +436,7 @@ abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface /** * @see Zend_Db_Statement_Exception */ - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception('invalid fetch mode'); break; } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Db2.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Db2.php index d6f4e0535d..c7abd36d53 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Db2.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Db2.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Statement */ -// require_once 'Zend/Database/Statement.php'; +// require_once 'Zend/Db/Statement.php'; /** * Extends for DB2 native adapter. @@ -65,7 +65,7 @@ class Zend_Db_Statement_Db2 extends Zend_Db_Statement /** * @see Zend_Db_Statement_Db2_Exception */ - // require_once 'Zend/Database/Statement/Db2/Exception.php'; + // require_once 'Zend/Db/Statement/Db2/Exception.php'; throw new Zend_Db_Statement_Db2_Exception( db2_stmt_errormsg(), db2_stmt_error() @@ -100,7 +100,7 @@ class Zend_Db_Statement_Db2 extends Zend_Db_Statement /** * @see Zend_Db_Statement_Db2_Exception */ - // require_once 'Zend/Database/Statement/Db2/Exception.php'; + // require_once 'Zend/Db/Statement/Db2/Exception.php'; throw new Zend_Db_Statement_Db2_Exception( db2_stmt_errormsg(), db2_stmt_error() @@ -208,7 +208,7 @@ class Zend_Db_Statement_Db2 extends Zend_Db_Statement /** * @see Zend_Db_Statement_Db2_Exception */ - // require_once 'Zend/Database/Statement/Db2/Exception.php'; + // require_once 'Zend/Db/Statement/Db2/Exception.php'; throw new Zend_Db_Statement_Db2_Exception( db2_stmt_errormsg(), db2_stmt_error()); @@ -272,7 +272,7 @@ class Zend_Db_Statement_Db2 extends Zend_Db_Statement /** * @see Zend_Db_Statement_Db2_Exception */ - // require_once 'Zend/Database/Statement/Db2/Exception.php'; + // require_once 'Zend/Db/Statement/Db2/Exception.php'; throw new Zend_Db_Statement_Db2_Exception("Invalid fetch mode '$style' specified"); break; } @@ -306,7 +306,7 @@ class Zend_Db_Statement_Db2 extends Zend_Db_Statement /** * @see Zend_Db_Statement_Db2_Exception */ - // require_once 'Zend/Database/Statement/Db2/Exception.php'; + // require_once 'Zend/Db/Statement/Db2/Exception.php'; throw new Zend_Db_Statement_Db2_Exception(__FUNCTION__ . '() is not implemented'); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Db2/Exception.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Db2/Exception.php index b1fbecb232..c004331cad 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Db2/Exception.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Db2/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Statement_Exception */ -// require_once 'Zend/Database/Statement/Exception.php'; +// require_once 'Zend/Db/Statement/Exception.php'; /** * @package Zend_Db diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Exception.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Exception.php index 8a5828127d..b66cefc5e0 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Exception.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Exception */ -// require_once 'Zend/Database/Exception.php'; +// require_once 'Zend/Db/Exception.php'; /** * Zend_Db_Statement_Exception diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Mysqli.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Mysqli.php index 638803cfe7..ed2cf7a6d3 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Mysqli.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Mysqli.php @@ -24,7 +24,7 @@ /** * @see Zend_Db_Statement */ -// require_once 'Zend/Database/Statement.php'; +// require_once 'Zend/Db/Statement.php'; /** @@ -73,7 +73,7 @@ class Zend_Db_Statement_Mysqli extends Zend_Db_Statement /** * @see Zend_Db_Statement_Mysqli_Exception */ - // require_once 'Zend/Database/Statement/Mysqli/Exception.php'; + // require_once 'Zend/Db/Statement/Mysqli/Exception.php'; throw new Zend_Db_Statement_Mysqli_Exception("Mysqli prepare error: " . $mysqli->error, $mysqli->errno); } } @@ -210,7 +210,7 @@ class Zend_Db_Statement_Mysqli extends Zend_Db_Statement /** * @see Zend_Db_Statement_Mysqli_Exception */ - // require_once 'Zend/Database/Statement/Mysqli/Exception.php'; + // require_once 'Zend/Db/Statement/Mysqli/Exception.php'; throw new Zend_Db_Statement_Mysqli_Exception("Mysqli statement execute error : " . $this->_stmt->error, $this->_stmt->errno); } @@ -222,7 +222,7 @@ class Zend_Db_Statement_Mysqli extends Zend_Db_Statement /** * @see Zend_Db_Statement_Mysqli_Exception */ - // require_once 'Zend/Database/Statement/Mysqli/Exception.php'; + // require_once 'Zend/Db/Statement/Mysqli/Exception.php'; throw new Zend_Db_Statement_Mysqli_Exception("Mysqli statement metadata error: " . $this->_stmt->error, $this->_stmt->errno); } } @@ -319,7 +319,7 @@ class Zend_Db_Statement_Mysqli extends Zend_Db_Statement /** * @see Zend_Db_Statement_Mysqli_Exception */ - // require_once 'Zend/Database/Statement/Mysqli/Exception.php'; + // require_once 'Zend/Db/Statement/Mysqli/Exception.php'; throw new Zend_Db_Statement_Mysqli_Exception("Invalid fetch mode '$style' specified"); break; } @@ -339,7 +339,7 @@ class Zend_Db_Statement_Mysqli extends Zend_Db_Statement /** * @see Zend_Db_Statement_Mysqli_Exception */ - // require_once 'Zend/Database/Statement/Mysqli/Exception.php'; + // require_once 'Zend/Db/Statement/Mysqli/Exception.php'; throw new Zend_Db_Statement_Mysqli_Exception(__FUNCTION__.'() is not implemented'); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Mysqli/Exception.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Mysqli/Exception.php index 3313bbf244..07c7536778 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Mysqli/Exception.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Mysqli/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Statement_Exception */ -// require_once 'Zend/Database/Statement/Exception.php'; +// require_once 'Zend/Db/Statement/Exception.php'; /** * @package Zend_Db diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Oracle.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Oracle.php index b93dfaec2f..aae0a55be6 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Oracle.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Oracle.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Statement */ -// require_once 'Zend/Database/Statement.php'; +// require_once 'Zend/Db/Statement.php'; /** * Extends for Oracle. @@ -92,7 +92,7 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @see Zend_Db_Statement_Oracle_Exception */ - // require_once 'Zend/Database/Statement/Oracle/Exception.php'; + // require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception(oci_error($connection)); } } @@ -125,7 +125,7 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Statement/Oracle/Exception.php'; + // require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception(oci_error($this->_stmt)); } @@ -249,7 +249,7 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Statement/Oracle/Exception.php'; + // require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception(oci_error($this->_stmt)); } } @@ -259,7 +259,7 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Statement/Oracle/Exception.php'; + // require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception(oci_error($this->_stmt)); } @@ -323,7 +323,7 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Statement/Oracle/Exception.php'; + // require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception( array( 'code' => 'HYC00', @@ -337,7 +337,7 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Statement/Oracle/Exception.php'; + // require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception($error); } @@ -374,7 +374,7 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Statement/Oracle/Exception.php'; + // require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception( array( 'code' => 'HYC00', @@ -402,7 +402,7 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Statement/Oracle/Exception.php'; + // require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception( array( 'code' => 'HYC00', @@ -419,7 +419,7 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Statement/Oracle/Exception.php'; + // require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception($error); } if (!$rows) { @@ -442,7 +442,7 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Statement/Oracle/Exception.php'; + // require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception($error); } } @@ -472,7 +472,7 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Statement/Oracle/Exception.php'; + // require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception($error); } @@ -481,7 +481,7 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Statement/Oracle/Exception.php'; + // require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception(oci_error($this->_stmt)); } @@ -516,7 +516,7 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Statement/Oracle/Exception.php'; + // require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception($error); } @@ -538,7 +538,7 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @see Zend_Db_Statement_Oracle_Exception */ - // require_once 'Zend/Database/Statement/Oracle/Exception.php'; + // require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception( array( 'code' => 'HYC00', @@ -567,7 +567,7 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @see Zend_Db_Adapter_Oracle_Exception */ - // require_once 'Zend/Database/Statement/Oracle/Exception.php'; + // require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception(oci_error($this->_stmt)); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Oracle/Exception.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Oracle/Exception.php index b0a6ba9d2a..93208c0e88 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Oracle/Exception.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Oracle/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Statement_Exception */ -// require_once 'Zend/Database/Statement/Exception.php'; +// require_once 'Zend/Db/Statement/Exception.php'; /** * @category Zend diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Pdo.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Pdo.php index ca2f8db65a..a6a84a80ff 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Pdo.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Pdo.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Statement */ -// require_once 'Zend/Database/Statement.php'; +// require_once 'Zend/Db/Statement.php'; /** * Proxy class to wrap a PDOStatement object. @@ -57,7 +57,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { $this->_stmt = $this->_adapter->getConnection()->prepare($sql); } catch (PDOException $e) { - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -81,7 +81,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega return $this->_stmt->bindColumn($column, $param, $type); } } catch (PDOException $e) { - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -113,7 +113,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega } return $this->_stmt->bindParam($parameter, $variable, $type, $length, $options); } catch (PDOException $e) { - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -142,7 +142,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega return $this->_stmt->bindValue($parameter, $value, $type); } } catch (PDOException $e) { - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -158,7 +158,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->closeCursor(); } catch (PDOException $e) { - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -175,7 +175,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->columnCount(); } catch (PDOException $e) { - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -192,7 +192,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->errorCode(); } catch (PDOException $e) { - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -209,7 +209,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->errorInfo(); } catch (PDOException $e) { - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -230,7 +230,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega return $this->_stmt->execute(); } } catch (PDOException $e) { - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; $message = sprintf('%s, query was: %s', $e->getMessage(), $this->_stmt->queryString); throw new Zend_Db_Statement_Exception($message, (int) $e->getCode(), $e); } @@ -253,7 +253,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->fetch($style, $cursor, $offset); } catch (PDOException $e) { - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -291,7 +291,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega return $this->_stmt->fetchAll($style); } } catch (PDOException $e) { - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -308,7 +308,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->fetchColumn($col); } catch (PDOException $e) { - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -326,7 +326,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->fetchObject($class, $config); } catch (PDOException $e) { - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -343,7 +343,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->getAttribute($key); } catch (PDOException $e) { - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -360,7 +360,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->getColumnMeta($column); } catch (PDOException $e) { - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -378,7 +378,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->nextRowset(); } catch (PDOException $e) { - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -396,7 +396,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->rowCount(); } catch (PDOException $e) { - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -414,7 +414,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->setAttribute($key, $val); } catch (PDOException $e) { - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -432,7 +432,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->setFetchMode($mode); } catch (PDOException $e) { - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Pdo/Ibm.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Pdo/Ibm.php index de6cec8a20..c428b11d97 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Pdo/Ibm.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Pdo/Ibm.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Statement_Pdo */ -// require_once 'Zend/Database/Statement/Pdo.php'; +// require_once 'Zend/Db/Statement/Pdo.php'; /** * Proxy class to wrap a PDOStatement object for IBM Databases. @@ -86,7 +86,7 @@ class Zend_Db_Statement_Pdo_Ibm extends Zend_Db_Statement_Pdo return $this->_stmt->bindParam($parameter, $variable, $type, $length, $options); } } catch (PDOException $e) { - // require_once 'Zend/Database/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Pdo/Oci.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Pdo/Oci.php index efa4e5a1c6..f3912e4650 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Pdo/Oci.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Pdo/Oci.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Statement_Pdo */ -// require_once 'Zend/Database/Statement/Pdo.php'; +// require_once 'Zend/Db/Statement/Pdo.php'; /** * Proxy class to wrap a PDOStatement object for IBM Databases. diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Sqlsrv.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Sqlsrv.php index 8aa48761a3..ddb27d245e 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Sqlsrv.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Sqlsrv.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Statement */ -// require_once 'Zend/Database/Statement.php'; +// require_once 'Zend/Db/Statement.php'; /** * Extends for Microsoft SQL Server Driver for PHP @@ -66,7 +66,7 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement $this->_stmt = sqlsrv_prepare($connection, $sql); if (!$this->_stmt) { - // require_once 'Zend/Database/Statement/Sqlsrv/Exception.php'; + // require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors()); } @@ -202,7 +202,7 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement $this->_stmt = sqlsrv_query($connection, $this->_originalSQL, $params); if (!$this->_stmt) { - // require_once 'Zend/Database/Statement/Sqlsrv/Exception.php'; + // require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors()); } @@ -233,7 +233,7 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement $values = sqlsrv_fetch_array($this->_stmt, SQLSRV_FETCH_ASSOC); if (!$values && (null !== $error = sqlsrv_errors())) { - // require_once 'Zend/Database/Statement/Sqlsrv/Exception.php'; + // require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception($error); } @@ -270,7 +270,7 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement $row = $this->_fetchBound($row); break; default: - // require_once 'Zend/Database/Statement/Sqlsrv/Exception.php'; + // require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception("Invalid fetch mode '$style' specified"); break; } @@ -293,7 +293,7 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement if (!sqlsrv_fetch($this->_stmt)) { if (null !== $error = sqlsrv_errors()) { - // require_once 'Zend/Database/Statement/Sqlsrv/Exception.php'; + // require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception($error); } @@ -303,7 +303,7 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement $data = sqlsrv_get_field($this->_stmt, $col); //0-based if ($data === false) { - // require_once 'Zend/Database/Statement/Sqlsrv/Exception.php'; + // require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors()); } @@ -327,7 +327,7 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement $obj = sqlsrv_fetch_object($this->_stmt); if ($error = sqlsrv_errors()) { - // require_once 'Zend/Database/Statement/Sqlsrv/Exception.php'; + // require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception($error); } @@ -373,7 +373,7 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement public function nextRowset() { if (sqlsrv_next_result($this->_stmt) === false) { - // require_once 'Zend/Database/Statement/Sqlsrv/Exception.php'; + // require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors()); } @@ -405,7 +405,7 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement // Strict check is necessary; 0 is a valid return value if ($num_rows === false) { - // require_once 'Zend/Database/Statement/Sqlsrv/Exception.php'; + // require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors()); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Sqlsrv/Exception.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Sqlsrv/Exception.php index d275c48b8a..080758edb7 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Sqlsrv/Exception.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Statement/Sqlsrv/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Statement_Exception */ -// require_once 'Zend/Database/Statement/Exception.php'; +// require_once 'Zend/Db/Statement/Exception.php'; /** * @package Zend_Db diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Table.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Table.php index eb4aaa6ea9..a1ff7925f1 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Table.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Table.php @@ -23,12 +23,12 @@ /** * @see Zend_Db_Table_Abstract */ -// require_once 'Zend/Database/Table/Abstract.php'; +// require_once 'Zend/Db/Table/Abstract.php'; /** * @see Zend_Db_Table_Definition */ -// require_once 'Zend/Database/Table/Definition.php'; +// require_once 'Zend/Db/Table/Definition.php'; /** * Class for SQL table interface. diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Abstract.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Abstract.php index 43b5a79c61..2433dcda94 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Abstract.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Abstract.php @@ -23,17 +23,17 @@ /** * @see Zend_Db_Adapter_Abstract */ -// require_once 'Zend/Database/Adapter/Abstract.php'; +// require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Db_Adapter_Abstract */ -// require_once 'Zend/Database/Select.php'; +// require_once 'Zend/Db/Select.php'; /** * @see Zend_Db */ -// require_once 'Zend/Database.php'; +// require_once 'Zend/Db.php'; /** * Class for SQL table interface. @@ -250,7 +250,7 @@ abstract class Zend_Db_Table_Abstract * - dependentTables = array of child tables. * - metadataCache = cache for information from adapter describeTable(). * - * @param mixed $config Array of user-specified config options, or just the Database Adapter. + * @param mixed $config Array of user-specified config options, or just the Db Adapter. * @return void */ public function __construct($config = array()) @@ -467,11 +467,11 @@ abstract class Zend_Db_Table_Abstract $refMap = $this->_getReferenceMapNormalized(); if ($ruleKey !== null) { if (!isset($refMap[$ruleKey])) { - // require_once "Zend/Database/Table/Exception.php"; + // require_once "Zend/Db/Table/Exception.php"; throw new Zend_Db_Table_Exception("No reference rule \"$ruleKey\" from table $thisClass to table $tableClassname"); } if ($refMap[$ruleKey][self::REF_TABLE_CLASS] != $tableClassname) { - // require_once "Zend/Database/Table/Exception.php"; + // require_once "Zend/Db/Table/Exception.php"; throw new Zend_Db_Table_Exception("Reference rule \"$ruleKey\" does not reference table $tableClassname"); } return $refMap[$ruleKey]; @@ -481,7 +481,7 @@ abstract class Zend_Db_Table_Abstract return $reference; } } - // require_once "Zend/Database/Table/Exception.php"; + // require_once "Zend/Db/Table/Exception.php"; throw new Zend_Db_Table_Exception("No reference from table $thisClass to table $tableClassname"); } @@ -608,7 +608,7 @@ abstract class Zend_Db_Table_Abstract $db = Zend_Registry::get($db); } if (!$db instanceof Zend_Db_Adapter_Abstract) { - // require_once 'Zend/Database/Table/Exception.php'; + // require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception('Argument must be of type Zend_Db_Adapter_Abstract, or a Registry key where a Zend_Db_Adapter_Abstract object is stored'); } return $db; @@ -703,7 +703,7 @@ abstract class Zend_Db_Table_Abstract $metadataCache = Zend_Registry::get($metadataCache); } if (!$metadataCache instanceof Zend_Cache_Core) { - // require_once 'Zend/Database/Table/Exception.php'; + // require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception('Argument must be of type Zend_Cache_Core, or a Registry key where a Zend_Cache_Core object is stored'); } return $metadataCache; @@ -752,7 +752,7 @@ abstract class Zend_Db_Table_Abstract if (! $this->_db) { $this->_db = self::getDefaultAdapter(); if (!$this->_db instanceof Zend_Db_Adapter_Abstract) { - // require_once 'Zend/Database/Table/Exception.php'; + // require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception('No adapter found for ' . get_class($this)); } } @@ -885,7 +885,7 @@ abstract class Zend_Db_Table_Abstract // if no primary key was specified and none was found in the metadata // then throw an exception. if (empty($this->_primary)) { - // require_once 'Zend/Database/Table/Exception.php'; + // require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception("A table must have a primary key, but none was found for table '{$this->_name}'"); } } else if (!is_array($this->_primary)) { @@ -897,7 +897,7 @@ abstract class Zend_Db_Table_Abstract $cols = $this->_getCols(); if (! array_intersect((array) $this->_primary, $cols) == (array) $this->_primary) { - // require_once 'Zend/Database/Table/Exception.php'; + // require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception("Primary key column(s) (" . implode(',', (array) $this->_primary) . ") are not columns in this table (" @@ -1000,7 +1000,7 @@ abstract class Zend_Db_Table_Abstract } if (!array_key_exists($key, $info)) { - // require_once 'Zend/Database/Table/Exception.php'; + // require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception('There is no table information for the key "' . $key . '"'); } @@ -1015,7 +1015,7 @@ abstract class Zend_Db_Table_Abstract */ public function select($withFromPart = self::SELECT_WITHOUT_FROM_PART) { - // require_once 'Zend/Database/Table/Select.php'; + // require_once 'Zend/Db/Table/Select.php'; $select = new Zend_Db_Table_Select($this); if ($withFromPart == self::SELECT_WITH_FROM_PART) { $select->from($this->info(self::NAME), Zend_Db_Table_Select::SQL_WILDCARD, $this->info(self::SCHEMA)); @@ -1112,7 +1112,7 @@ abstract class Zend_Db_Table_Abstract /** * @see Zend_Db_Table_Exception */ - // require_once 'Zend/Database/Table/Exception.php'; + // require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception('Column "' . $column . '" not found in table.'); } @@ -1292,12 +1292,12 @@ abstract class Zend_Db_Table_Abstract $keyNames = array_values((array) $this->_primary); if (count($args) < count($keyNames)) { - // require_once 'Zend/Database/Table/Exception.php'; + // require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception("Too few columns for the primary key"); } if (count($args) > count($keyNames)) { - // require_once 'Zend/Database/Table/Exception.php'; + // require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception("Too many columns for the primary key"); } @@ -1314,7 +1314,7 @@ abstract class Zend_Db_Table_Abstract if ($numberTerms == 0) { $numberTerms = $keyValuesCount; } else if ($keyValuesCount != $numberTerms) { - // require_once 'Zend/Database/Table/Exception.php'; + // require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception("Missing value(s) for the primary key"); } $keyValues = array_values($keyValues); @@ -1603,7 +1603,7 @@ abstract class Zend_Db_Table_Abstract // require_once 'Zend/Loader.php'; Zend_Loader::loadClass($tableName); } catch (Zend_Exception $e) { - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception($e->getMessage(), $e->getCode(), $e); } } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Exception.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Exception.php index 3bdfe16e02..621462cc54 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Exception.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Exception */ -// require_once 'Zend/Database/Exception.php'; +// require_once 'Zend/Db/Exception.php'; /** * @category Zend diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Row.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Row.php index 01d5c1460f..e6271c8fa4 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Row.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Row.php @@ -24,7 +24,7 @@ /** * @see Zend_Db_Table_Row_Abstract */ -// require_once 'Zend/Database/Table/Row/Abstract.php'; +// require_once 'Zend/Db/Table/Row/Abstract.php'; /** diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Row/Abstract.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Row/Abstract.php index b47403ceff..c5870a751a 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Row/Abstract.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Row/Abstract.php @@ -23,7 +23,7 @@ /** * @see Zend_Db */ -// require_once 'Zend/Database.php'; +// require_once 'Zend/Db.php'; /** * @category Zend @@ -122,7 +122,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg if (isset($config['data'])) { if (!is_array($config['data'])) { - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('Data must be an array'); } $this->_data = $config['data']; @@ -157,7 +157,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg protected function _transformColumn($columnName) { if (!is_string($columnName)) { - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('Specified column is not a string'); } // Perform no transformation by default @@ -175,7 +175,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg { $columnName = $this->_transformColumn($columnName); if (!array_key_exists($columnName, $this->_data)) { - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Specified column \"$columnName\" is not in the row"); } return $this->_data[$columnName]; @@ -193,7 +193,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg { $columnName = $this->_transformColumn($columnName); if (!array_key_exists($columnName, $this->_data)) { - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Specified column \"$columnName\" is not in the row"); } $this->_data[$columnName] = $value; @@ -211,11 +211,11 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg { $columnName = $this->_transformColumn($columnName); if (!array_key_exists($columnName, $this->_data)) { - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Specified column \"$columnName\" is not in the row"); } if ($this->isConnected() && in_array($columnName, $this->_table->info('primary'))) { - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Specified column \"$columnName\" is a primary key and should not be unset"); } unset($this->_data[$columnName]); @@ -342,7 +342,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg $tableClass = get_class($table); if (! $table instanceof $this->_tableClass) { - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("The specified Table is of class $tableClass, expecting class to be instance of $this->_tableClass"); } @@ -352,13 +352,13 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg $info = $this->_table->info(); if ($info['cols'] != array_keys($this->_data)) { - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('The specified Table does not have the same columns as the Row'); } if (! array_intersect((array) $this->_primary, $info['primary']) == (array) $this->_primary) { - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("The specified Table '$tableClass' does not have the same primary key as the Row"); } @@ -451,7 +451,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg * A read-only row cannot be saved. */ if ($this->_readOnly === true) { - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('This row has been marked read-only'); } @@ -509,7 +509,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg * A read-only row cannot be saved. */ if ($this->_readOnly === true) { - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('This row has been marked read-only'); } @@ -598,7 +598,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg * A read-only row cannot be deleted. */ if ($this->_readOnly === true) { - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('This row has been marked read-only'); } @@ -692,7 +692,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg protected function _getTable() { if (!$this->_connected) { - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('Cannot save a Row unless it is connected'); } return $this->_table; @@ -707,7 +707,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg protected function _getPrimaryKey($useDirty = true) { if (!is_array($this->_primary)) { - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("The primary key must be set as an array"); } @@ -718,7 +718,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg $array = array_intersect_key($this->_cleanData, $primary); } if (count($primary) != count($array)) { - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("The specified Table '$this->_tableClass' does not have the same primary key as the Row"); } return $array; @@ -771,7 +771,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg $row = $this->_getTable()->fetchRow($where); if (null === $row) { - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('Cannot refresh row as parent is missing'); } @@ -888,7 +888,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg if ($type == 'object') { $type = get_class($dependentTable); } - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Dependent table must be a Zend_Db_Table_Abstract, but it is $type"); } @@ -944,7 +944,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg if ($type == 'object') { $type = get_class($parentTable); } - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Parent table must be a Zend_Db_Table_Abstract, but it is $type"); } @@ -1012,7 +1012,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg if ($type == 'object') { $type = get_class($intersectionTable); } - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Intersection table must be a Zend_Db_Table_Abstract, but it is $type"); } @@ -1032,7 +1032,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg if ($type == 'object') { $type = get_class($matchTable); } - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Match table must be a Zend_Db_Table_Abstract, but it is $type"); } @@ -1099,7 +1099,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg // require_once 'Zend/Loader.php'; Zend_Loader::loadClass($rowsetClass); } catch (Zend_Exception $e) { - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -1165,7 +1165,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg return $this->findDependentRowset($class, $ruleKey1, $select); } - // require_once 'Zend/Database/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Unrecognized method '$method()'"); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Row/Exception.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Row/Exception.php index 4c11165453..3303d55314 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Row/Exception.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Row/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Table_Exception */ -// require_once 'Zend/Database/Table/Exception.php'; +// require_once 'Zend/Db/Table/Exception.php'; /** * @category Zend diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Rowset.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Rowset.php index f44bb5b4f2..940f0687ea 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Rowset.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Rowset.php @@ -25,7 +25,7 @@ /** * @see Zend_Db_Table_Rowset_Abstract */ -// require_once 'Zend/Database/Table/Rowset/Abstract.php'; +// require_once 'Zend/Db/Table/Rowset/Abstract.php'; /** diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Rowset/Abstract.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Rowset/Abstract.php index 88c49e13d0..b9e5f574e4 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Rowset/Abstract.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Rowset/Abstract.php @@ -310,7 +310,7 @@ abstract class Zend_Db_Table_Rowset_Abstract implements SeekableIterator, Counta { $position = (int) $position; if ($position < 0 || $position >= $this->_count) { - // require_once 'Zend/Database/Table/Rowset/Exception.php'; + // require_once 'Zend/Db/Table/Rowset/Exception.php'; throw new Zend_Db_Table_Rowset_Exception("Illegal index $position"); } $this->_pointer = $position; @@ -340,7 +340,7 @@ abstract class Zend_Db_Table_Rowset_Abstract implements SeekableIterator, Counta { $offset = (int) $offset; if ($offset < 0 || $offset >= $this->_count) { - // require_once 'Zend/Database/Table/Rowset/Exception.php'; + // require_once 'Zend/Db/Table/Rowset/Exception.php'; throw new Zend_Db_Table_Rowset_Exception("Illegal index $offset"); } $this->_pointer = $offset; @@ -382,7 +382,7 @@ abstract class Zend_Db_Table_Rowset_Abstract implements SeekableIterator, Counta try { $row = $this->_loadAndReturnRow($position); } catch (Zend_Db_Table_Rowset_Exception $e) { - // require_once 'Zend/Database/Table/Rowset/Exception.php'; + // require_once 'Zend/Db/Table/Rowset/Exception.php'; throw new Zend_Db_Table_Rowset_Exception('No row could be found at position ' . (int) $position, 0, $e); } @@ -413,7 +413,7 @@ abstract class Zend_Db_Table_Rowset_Abstract implements SeekableIterator, Counta protected function _loadAndReturnRow($position) { if (!isset($this->_data[$position])) { - // require_once 'Zend/Database/Table/Rowset/Exception.php'; + // require_once 'Zend/Db/Table/Rowset/Exception.php'; throw new Zend_Db_Table_Rowset_Exception("Data for provided position does not exist"); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Rowset/Exception.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Rowset/Exception.php index 466d8e723e..7319a38c23 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Rowset/Exception.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Rowset/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Table_Exception */ -// require_once 'Zend/Database/Table/Exception.php'; +// require_once 'Zend/Db/Table/Exception.php'; /** * @category Zend diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Select.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Select.php index afa70b28a9..ed65f19e5d 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Select.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Select.php @@ -25,13 +25,13 @@ /** * @see Zend_Db_Select */ -// require_once 'Zend/Database/Select.php'; +// require_once 'Zend/Db/Select.php'; /** * @see Zend_Db_Table_Abstract */ -// require_once 'Zend/Database/Table/Abstract.php'; +// require_once 'Zend/Db/Table/Abstract.php'; /** @@ -211,7 +211,7 @@ class Zend_Db_Table_Select extends Zend_Db_Select // Check each column to ensure it only references the primary table if ($column) { if (!isset($from[$table]) || $from[$table]['tableName'] != $primary) { - // require_once 'Zend/Database/Table/Select/Exception.php'; + // require_once 'Zend/Db/Table/Select/Exception.php'; throw new Zend_Db_Table_Select_Exception('Select query cannot join with another table'); } } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Select/Exception.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Select/Exception.php index e9301fec11..a243c55d54 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Select/Exception.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Table/Select/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Exception */ -// require_once 'Zend/Database/Select/Exception.php'; +// require_once 'Zend/Db/Select/Exception.php'; /** * @category Zend diff --git a/vendor/bombayworks/zendframework1/library/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php b/vendor/bombayworks/zendframework1/library/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php index 32de14b583..42633a43ce 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php @@ -21,7 +21,7 @@ /** @see Zend_Db_Table */ -// require_once 'Zend/Database/Table.php'; +// require_once 'Zend/Db/Table.php'; /** * @see Zend_Registry diff --git a/vendor/bombayworks/zendframework1/library/Zend/Gdata/App/Extension.php b/vendor/bombayworks/zendframework1/library/Zend/Gdata/App/Extension.php index 24b3ac6e0d..036b83e704 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Gdata/App/Extension.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Gdata/App/Extension.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Base */ -// require_once 'Zend/Gdata/App/ReportBase.php'; +// require_once 'Zend/Gdata/App/Base.php'; /** * Gdata App extensions diff --git a/vendor/bombayworks/zendframework1/library/Zend/Gdata/Gapps/Error.php b/vendor/bombayworks/zendframework1/library/Zend/Gdata/Gapps/Error.php index 1d8fd064e7..881a698fe9 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Gdata/Gapps/Error.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Gdata/Gapps/Error.php @@ -25,7 +25,7 @@ /** * Zend_Gdata_App_Base */ -// require_once 'Zend/Gdata/App/ReportBase.php'; +// require_once 'Zend/Gdata/App/Base.php'; /** * Gdata Gapps Error class. This class is used to represent errors returned diff --git a/vendor/bombayworks/zendframework1/library/Zend/Locale/Data/pt_ST.xml b/vendor/bombayworks/zendframework1/library/Zend/Locale/Data/pt_ST.xml index 8aea2445b0..c4665e704b 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Locale/Data/pt_ST.xml +++ b/vendor/bombayworks/zendframework1/library/Zend/Locale/Data/pt_ST.xml @@ -46,7 +46,7 @@ For terms of use, see http://www.unicode.org/copyright.html <numbers> <currencies> <currency type="STD"> - <symbol>Database</symbol> + <symbol>Db</symbol> </currency> </currencies> </numbers> diff --git a/vendor/bombayworks/zendframework1/library/Zend/Markup/Renderer/Html/Img.php b/vendor/bombayworks/zendframework1/library/Zend/Markup/Renderer/Html/Img.php index bfc376409a..268ea690d0 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Markup/Renderer/Html/Img.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Markup/Renderer/Html/Img.php @@ -23,7 +23,7 @@ /** * @see Zend_Markup_Renderer_Html */ -// require_once 'Zend/Markup/Renderer/ReportHtml.php'; +// require_once 'Zend/Markup/Renderer/Html.php'; /** * @see Zend_Markup_Renderer_Html_HtmlAbstract */ diff --git a/vendor/bombayworks/zendframework1/library/Zend/Markup/Renderer/Html/Url.php b/vendor/bombayworks/zendframework1/library/Zend/Markup/Renderer/Html/Url.php index 8e3315167d..5aa1c00d0f 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Markup/Renderer/Html/Url.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Markup/Renderer/Html/Url.php @@ -23,7 +23,7 @@ /** * @see Zend_Markup_Renderer_Html */ -// require_once 'Zend/Markup/Renderer/ReportHtml.php'; +// require_once 'Zend/Markup/Renderer/Html.php'; /** * @see Zend_Markup_Renderer_Html_HtmlAbstract */ diff --git a/vendor/bombayworks/zendframework1/library/Zend/Markup/Renderer/RendererAbstract.php b/vendor/bombayworks/zendframework1/library/Zend/Markup/Renderer/RendererAbstract.php index 6847dd4b62..b9beac64af 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Markup/Renderer/RendererAbstract.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Markup/Renderer/RendererAbstract.php @@ -23,7 +23,7 @@ /** * @see Zend_config */ -// require_once 'Zend/ConfigInterface.php'; +// require_once 'Zend/Config.php'; /** * @see Zend_Filter */ diff --git a/vendor/bombayworks/zendframework1/library/Zend/Oauth/Client.php b/vendor/bombayworks/zendframework1/library/Zend/Oauth/Client.php index 45be4ef4fd..6023e6909b 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Oauth/Client.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Oauth/Client.php @@ -29,7 +29,7 @@ // require_once 'Zend/Oauth/Http/Utility.php'; /** Zend_Oauth_Config */ -// require_once 'Zend/Oauth/ConfigInterface.php'; +// require_once 'Zend/Oauth/Config.php'; /** * @category Zend diff --git a/vendor/bombayworks/zendframework1/library/Zend/Oauth/Consumer.php b/vendor/bombayworks/zendframework1/library/Zend/Oauth/Consumer.php index bbb65348e3..35f053c477 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Oauth/Consumer.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Oauth/Consumer.php @@ -38,7 +38,7 @@ // require_once 'Zend/Oauth/Token/AuthorizedRequest.php'; /** Zend_Oauth_Config */ -// require_once 'Zend/Oauth/ConfigInterface.php'; +// require_once 'Zend/Oauth/Config.php'; /** * @category Zend diff --git a/vendor/bombayworks/zendframework1/library/Zend/Paginator/Adapter/DbSelect.php b/vendor/bombayworks/zendframework1/library/Zend/Paginator/Adapter/DbSelect.php index 8d8000d545..7fc94b78da 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Paginator/Adapter/DbSelect.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Paginator/Adapter/DbSelect.php @@ -27,12 +27,12 @@ /** * @see Zend_Db */ -// require_once 'Zend/Database.php'; +// require_once 'Zend/Db.php'; /** * @see Zend_Db_Select */ -// require_once 'Zend/Database/Select.php'; +// require_once 'Zend/Db/Select.php'; /** * @category Zend diff --git a/vendor/bombayworks/zendframework1/library/Zend/Pdf.php b/vendor/bombayworks/zendframework1/library/Zend/Pdf.php index b8683d44d6..78d4445d77 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Pdf.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Pdf.php @@ -20,7 +20,7 @@ */ -/** User land classes and interfaces turned on by Zend/ReportPdf.php file inclusion. */ +/** User land classes and interfaces turned on by Zend/Pdf.php file inclusion. */ /** @todo Section should be removed with ZF 2.0 release as obsolete */ /** Zend_Pdf_Page */ @@ -39,7 +39,7 @@ // require_once 'Zend/Pdf/Color/Cmyk.php'; /** Zend_Pdf_Color_Html */ -// require_once 'Zend/Pdf/Color/ReportHtml.php'; +// require_once 'Zend/Pdf/Color/Html.php'; /** Zend_Pdf_Image */ // require_once 'Zend/Pdf/Image.php'; diff --git a/vendor/bombayworks/zendframework1/library/Zend/Pdf/Element/Stream.php b/vendor/bombayworks/zendframework1/library/Zend/Pdf/Element/Stream.php index 56f66b3b54..fbb821800a 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Pdf/Element/Stream.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Pdf/Element/Stream.php @@ -21,7 +21,7 @@ /** Internally used classes */ -// require_once 'Zend/ReportPdf.php'; +// require_once 'Zend/Pdf.php'; /** Zend_Pdf_Element */ diff --git a/vendor/bombayworks/zendframework1/library/Zend/Pdf/Page.php b/vendor/bombayworks/zendframework1/library/Zend/Pdf/Page.php index e7e17dfb13..5144a6b33d 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Pdf/Page.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Pdf/Page.php @@ -306,7 +306,7 @@ class Zend_Pdf_Page extends Zend_Pdf_Canvas_Abstract $this->_dictionary = $this->_objFactory->newObject(new Zend_Pdf_Element_Dictionary()); $this->_dictionary->Type = new Zend_Pdf_Element_Name('Page'); - // require_once 'Zend/ReportPdf.php'; + // require_once 'Zend/Pdf.php'; $this->_dictionary->LastModified = new Zend_Pdf_Element_String(Zend_Pdf::pdfDate()); $this->_dictionary->Resources = new Zend_Pdf_Element_Dictionary(); $this->_dictionary->MediaBox = new Zend_Pdf_Element_Array(); diff --git a/vendor/bombayworks/zendframework1/library/Zend/Pdf/Trailer/Generator.php b/vendor/bombayworks/zendframework1/library/Zend/Pdf/Trailer/Generator.php index 19b1d57fa4..c3b2039e35 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Pdf/Trailer/Generator.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Pdf/Trailer/Generator.php @@ -49,7 +49,7 @@ class Zend_Pdf_Trailer_Generator extends Zend_Pdf_Trailer */ public function getPDFLength() { - // require_once 'Zend/ReportPdf.php'; + // require_once 'Zend/Pdf.php'; return strlen(Zend_Pdf::PDF_HEADER); } @@ -60,7 +60,7 @@ class Zend_Pdf_Trailer_Generator extends Zend_Pdf_Trailer */ public function getPDFString() { - // require_once 'Zend/ReportPdf.php'; + // require_once 'Zend/Pdf.php'; return Zend_Pdf::PDF_HEADER; } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Pdf/UpdateInfoContainer.php b/vendor/bombayworks/zendframework1/library/Zend/Pdf/UpdateInfoContainer.php index 5f9acfc846..0eb81768e3 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Pdf/UpdateInfoContainer.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Pdf/UpdateInfoContainer.php @@ -71,7 +71,7 @@ class Zend_Pdf_UpdateInfoContainer if ($dump !== null) { if (strlen($dump) > 1024) { - // require_once 'Zend/ReportPdf.php'; + // require_once 'Zend/Pdf.php'; $this->_dump = Zend_Pdf::getMemoryManager()->create($dump); } else { $this->_dump = $dump; diff --git a/vendor/bombayworks/zendframework1/library/Zend/Queue/Adapter/Db.php b/vendor/bombayworks/zendframework1/library/Zend/Queue/Adapter/Db.php index cc141a6765..a26d12dfe4 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Queue/Adapter/Db.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Queue/Adapter/Db.php @@ -28,22 +28,22 @@ /** * @see Zend_Db_Select */ -// require_once 'Zend/Database/Select.php'; +// require_once 'Zend/Db/Select.php'; /** * @see Zend_Db */ -// require_once 'Zend/Database.php'; +// require_once 'Zend/Db.php'; /** * @see Zend_Queue_Adapter_Db_Queue */ -// require_once 'Zend/Queue/Adapter/Database/Queue.php'; +// require_once 'Zend/Queue/Adapter/Db/Queue.php'; /** * @see Zend_Queue_Adapter_Db_Message */ -// require_once 'Zend/Queue/Adapter/Database/Message.php'; +// require_once 'Zend/Queue/Adapter/Db/Message.php'; /** * Class for using connecting to a Zend_Db-based queuing system @@ -110,7 +110,7 @@ class Zend_Queue_Adapter_Db extends Zend_Queue_Adapter_AdapterAbstract } /** - * Initialize Database adapter using 'driverOptions' section of the _options array + * Initialize Db adapter using 'driverOptions' section of the _options array * * Throws an exception if the adapter cannot connect to DB. * diff --git a/vendor/bombayworks/zendframework1/library/Zend/Queue/Adapter/Db/Message.php b/vendor/bombayworks/zendframework1/library/Zend/Queue/Adapter/Db/Message.php index ebd655c368..52f36f5232 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Queue/Adapter/Db/Message.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Queue/Adapter/Db/Message.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Table_Abstract */ -// require_once 'Zend/Database/Table/Abstract.php'; +// require_once 'Zend/Db/Table/Abstract.php'; /** * @category Zend diff --git a/vendor/bombayworks/zendframework1/library/Zend/Queue/Adapter/Db/Queue.php b/vendor/bombayworks/zendframework1/library/Zend/Queue/Adapter/Db/Queue.php index 2ce6742563..4aaca01991 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Queue/Adapter/Db/Queue.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Queue/Adapter/Db/Queue.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Table_Abstract */ -// require_once 'Zend/Database/Table/Abstract.php'; +// require_once 'Zend/Db/Table/Abstract.php'; /** * @category Zend diff --git a/vendor/bombayworks/zendframework1/library/Zend/Search/Lucene.php b/vendor/bombayworks/zendframework1/library/Zend/Search/Lucene.php index b73891e173..60ca962e2d 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Search/Lucene.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Search/Lucene.php @@ -24,7 +24,7 @@ /** @todo Section should be removed with ZF 2.0 release as obsolete */ /** Zend_Search_Lucene_Document_Html */ -// require_once 'Zend/Search/Lucene/Document/ReportHtml.php'; +// require_once 'Zend/Search/Lucene/Document/Html.php'; /** Zend_Search_Lucene_Document_Docx */ // require_once 'Zend/Search/Lucene/Document/Docx.php'; diff --git a/vendor/bombayworks/zendframework1/library/Zend/Search/Lucene/Search/Query.php b/vendor/bombayworks/zendframework1/library/Zend/Search/Lucene/Search/Query.php index 2adfa8944e..9a14dfdc36 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Search/Lucene/Search/Query.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Search/Lucene/Search/Query.php @@ -191,7 +191,7 @@ abstract class Zend_Search_Lucene_Search_Query } /** Zend_Search_Lucene_Document_Html */ - // require_once 'Zend/Search/Lucene/Document/ReportHtml.php'; + // require_once 'Zend/Search/Lucene/Document/Html.php'; $doc = Zend_Search_Lucene_Document_Html::loadHTML($inputHTML, false, $defaultEncoding); $highlighter->setDocument($doc); @@ -220,7 +220,7 @@ abstract class Zend_Search_Lucene_Search_Query . iconv($encoding, 'UTF-8//IGNORE', $inputHtmlFragment) . '</body></html>'; /** Zend_Search_Lucene_Document_Html */ - // require_once 'Zend/Search/Lucene/Document/ReportHtml.php'; + // require_once 'Zend/Search/Lucene/Document/Html.php'; $doc = Zend_Search_Lucene_Document_Html::loadHTML($inputHTML); $highlighter->setDocument($doc); diff --git a/vendor/bombayworks/zendframework1/library/Zend/Service/StrikeIron/SalesUseTaxBasic.php b/vendor/bombayworks/zendframework1/library/Zend/Service/StrikeIron/SalesUseTaxBasic.php index ee1c5ef4af..03c0c597ee 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Service/StrikeIron/SalesUseTaxBasic.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Service/StrikeIron/SalesUseTaxBasic.php @@ -21,7 +21,7 @@ */ /** Zend_Service_StrikeIron_Base */ -// require_once 'Zend/Service/StrikeIron/ReportBase.php'; +// require_once 'Zend/Service/StrikeIron/Base.php'; /** * @category Zend diff --git a/vendor/bombayworks/zendframework1/library/Zend/Service/StrikeIron/USAddressVerification.php b/vendor/bombayworks/zendframework1/library/Zend/Service/StrikeIron/USAddressVerification.php index 3dcf3b3195..02c5691d30 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Service/StrikeIron/USAddressVerification.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Service/StrikeIron/USAddressVerification.php @@ -21,7 +21,7 @@ */ /** Zend_Service_StrikeIron_Base */ -// require_once 'Zend/Service/StrikeIron/ReportBase.php'; +// require_once 'Zend/Service/StrikeIron/Base.php'; /** * @category Zend diff --git a/vendor/bombayworks/zendframework1/library/Zend/Service/StrikeIron/ZipCodeInfo.php b/vendor/bombayworks/zendframework1/library/Zend/Service/StrikeIron/ZipCodeInfo.php index 99583731eb..302cf9c825 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Service/StrikeIron/ZipCodeInfo.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Service/StrikeIron/ZipCodeInfo.php @@ -21,7 +21,7 @@ */ /** Zend_Service_StrikeIron_Base */ -// require_once 'Zend/Service/StrikeIron/ReportBase.php'; +// require_once 'Zend/Service/StrikeIron/Base.php'; /** * @category Zend diff --git a/vendor/bombayworks/zendframework1/library/Zend/Session/SaveHandler/DbTable.php b/vendor/bombayworks/zendframework1/library/Zend/Session/SaveHandler/DbTable.php index 85d91e7198..b2cd4643f4 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Session/SaveHandler/DbTable.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Session/SaveHandler/DbTable.php @@ -28,17 +28,17 @@ /** * @see Zend_Db_Table_Abstract */ -// require_once 'Zend/Database/Table/Abstract.php'; +// require_once 'Zend/Db/Table/Abstract.php'; /** * @see Zend_Db_Table_Row_Abstract */ -// require_once 'Zend/Database/Table/Row/Abstract.php'; +// require_once 'Zend/Db/Table/Row/Abstract.php'; /** * @see Zend_Config */ -// require_once 'Zend/ConfigInterface.php'; +// require_once 'Zend/Config.php'; /** * Zend_Session_SaveHandler_DbTable diff --git a/vendor/bombayworks/zendframework1/library/Zend/Test/DbAdapter.php b/vendor/bombayworks/zendframework1/library/Zend/Test/DbAdapter.php index 810b8a9294..cfe01b5f10 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Test/DbAdapter.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Test/DbAdapter.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Adapter_Abstract */ -// require_once "Zend/Database/Adapter/Abstract.php"; +// require_once "Zend/Db/Adapter/Abstract.php"; /** * @see Zend_Test_DbStatement @@ -33,7 +33,7 @@ /** * @see Zend_Db_Profiler */ -// require_once 'Zend/Database/Profiler.php'; +// require_once 'Zend/Db/Profiler.php'; /** * Testing Database Adapter which acts as a stack for SQL Results diff --git a/vendor/bombayworks/zendframework1/library/Zend/Test/DbStatement.php b/vendor/bombayworks/zendframework1/library/Zend/Test/DbStatement.php index 6b8f3f44ee..8eb74cd5af 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Test/DbStatement.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Test/DbStatement.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Statement_Interface */ -// require_once "Zend/Database/Statement/Interface.php"; +// require_once "Zend/Db/Statement/Interface.php"; /** * Testing Database Statement that acts as a stack to SQL resultsets. @@ -305,7 +305,7 @@ class Zend_Test_DbStatement implements Zend_Db_Statement_Interface return false; } else { if(count($row) < $col) { - // require_once "Zend/Database/Statement/Exception.php"; + // require_once "Zend/Db/Statement/Exception.php"; throw new Zend_Db_Statement_Exception( "Column Position '".$col."' is out of bounds." ); diff --git a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/DatabaseTestCase.php b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/DatabaseTestCase.php index 21ab39673d..b920bf2b5c 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/DatabaseTestCase.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/DatabaseTestCase.php @@ -23,27 +23,27 @@ /** * @see Zend_Test_PHPUnit_Db_Operation_Truncate */ -// require_once "Zend/Test/PHPUnit/Database/Operation/Truncate.php"; +// require_once "Zend/Test/PHPUnit/Db/Operation/Truncate.php"; /** * @see Zend_Test_PHPUnit_Db_Operation_Insert */ -// require_once "Zend/Test/PHPUnit/Database/Operation/Insert.php"; +// require_once "Zend/Test/PHPUnit/Db/Operation/Insert.php"; /** * @see Zend_Test_PHPUnit_Db_DataSet_DbTableDataSet */ -// require_once "Zend/Test/PHPUnit/Database/DataSet/DbTableDataSet.php"; +// require_once "Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php"; /** * @see Zend_Test_PHPUnit_Db_DataSet_DbTable */ -// require_once "Zend/Test/PHPUnit/Database/DataSet/DbTable.php"; +// require_once "Zend/Test/PHPUnit/Db/DataSet/DbTable.php"; /** * @see Zend_Test_PHPUnit_Db_DataSet_DbRowset */ -// require_once "Zend/Test/PHPUnit/Database/DataSet/DbRowset.php"; +// require_once "Zend/Test/PHPUnit/Db/DataSet/DbRowset.php"; /** * Generic Testcase for Zend Framework related DbUnit Testing with PHPUnit diff --git a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/Connection.php b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/Connection.php index e82b0828a9..44bef1fa6a 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/Connection.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/Connection.php @@ -23,12 +23,12 @@ /** * @see Zend_Test_PHPUnit_Db_DataSet_QueryTable */ -// require_once "Zend/Test/PHPUnit/Database/DataSet/QueryTable.php"; +// require_once "Zend/Test/PHPUnit/Db/DataSet/QueryTable.php"; /** * @see Zend_Test_PHPUnit_Db_Metadata_Generic */ -// require_once "Zend/Test/PHPUnit/Database/Metadata/Generic.php"; +// require_once "Zend/Test/PHPUnit/Db/Metadata/Generic.php"; /** * Generic Abstraction of Zend_Db Connections in the PHPUnit Database Extension context. diff --git a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php index 9c5de5c5fe..4c4554f0e0 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Table_Rowset_Abstract */ -// require_once "Zend/Database/Table/Rowset/Abstract.php"; +// require_once "Zend/Db/Table/Rowset/Abstract.php"; /** * Use a Zend_Db Rowset as a datatable for assertions with other PHPUnit Database extension tables. @@ -50,7 +50,7 @@ class Zend_Test_PHPUnit_Db_DataSet_DbRowset extends PHPUnit_Extensions_Database_ if($table !== null) { $tableName = $table->info('name'); } else { - // require_once "Zend/Test/PHPUnit/Database/Exception.php"; + // require_once "Zend/Test/PHPUnit/Db/Exception.php"; throw new Zend_Test_PHPUnit_Db_Exception( 'No table name was given to Rowset Table and table name cannot be infered from the table, '. 'because the rowset is disconnected from database.' diff --git a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/DataSet/DbTable.php b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/DataSet/DbTable.php index 9c210f0bfc..b39e12afbe 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/DataSet/DbTable.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/DataSet/DbTable.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Table_Abstract */ -// require_once "Zend/Database/Table/Abstract.php"; +// require_once "Zend/Db/Table/Abstract.php"; /** * Use a Zend_Db_Table for assertions with other PHPUnit Database Extension table types. diff --git a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php index 9bf18ff7bc..7af34e6f31 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php @@ -23,7 +23,7 @@ /** * @see Zend_Test_PHPUnit_Db_DataSet_DbTable */ -// require_once "Zend/Test/PHPUnit/Database/DataSet/DbTable.php"; +// require_once "Zend/Test/PHPUnit/Db/DataSet/DbTable.php"; /** * Aggregate several Zend_Db_Table instances into a dataset. diff --git a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php index d6762ef94e..d6b9b45ddc 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php @@ -23,12 +23,12 @@ /** * @see Zend_Test_PHPUnit_Db_DataSet_QueryTable */ -// require_once "Zend/Test/PHPUnit/Database/DataSet/QueryTable.php"; +// require_once "Zend/Test/PHPUnit/Db/DataSet/QueryTable.php"; /** * @see Zend_Db_Select */ -// require_once "Zend/Database/Select.php"; +// require_once "Zend/Db/Select.php"; /** * Uses several query strings or Zend_Db_Select objects to form a dataset of tables for assertion with other datasets. @@ -50,7 +50,7 @@ class Zend_Test_PHPUnit_Db_DataSet_QueryDataSet extends PHPUnit_Extensions_Datab public function __construct(PHPUnit_Extensions_Database_DB_IDatabaseConnection $databaseConnection) { if( !($databaseConnection instanceof Zend_Test_PHPUnit_Db_Connection) ) { - // require_once "Zend/Test/PHPUnit/Database/Exception.php"; + // require_once "Zend/Test/PHPUnit/Db/Exception.php"; throw new Zend_Test_PHPUnit_Db_Exception("Zend_Test_PHPUnit_Db_DataSet_QueryDataSet only works with Zend_Test_PHPUnit_Db_Connection connections-"); } $this->databaseConnection = $databaseConnection; diff --git a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php index 1acc796cc1..7c216b422a 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php @@ -43,7 +43,7 @@ class Zend_Test_PHPUnit_Db_DataSet_QueryTable extends PHPUnit_Extensions_Databas public function __construct($tableName, $query, PHPUnit_Extensions_Database_DB_IDatabaseConnection $databaseConnection) { if( !($databaseConnection instanceof Zend_Test_PHPUnit_Db_Connection) ) { - // require_once "Zend/Test/PHPUnit/Database/Exception.php"; + // require_once "Zend/Test/PHPUnit/Db/Exception.php"; throw new Zend_Test_PHPUnit_Db_Exception("Zend_Test_PHPUnit_Db_DataSet_QueryTable only works with Zend_Test_PHPUnit_Db_Connection connections-"); } parent::__construct($tableName, $query, $databaseConnection); diff --git a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php index c985680783..09529b3f02 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Adapter_Abstract */ -// require_once "Zend/Database/Adapter/Abstract.php"; +// require_once "Zend/Db/Adapter/Abstract.php"; /** * Generic Metadata accessor for the Zend_Db adapters diff --git a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php index 22b0f6257f..4bc2588d5d 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php @@ -23,7 +23,7 @@ /** * @see Zend_Test_PHPUnit_Db_Connection */ -// require_once "Zend/Test/PHPUnit/Database/Connection.php"; +// require_once "Zend/Test/PHPUnit/Db/Connection.php"; /** * Delete All Operation that can be executed on set up or tear down of a database tester. @@ -44,7 +44,7 @@ class Zend_Test_PHPUnit_Db_Operation_DeleteAll implements PHPUnit_Extensions_Dat public function execute(PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection, PHPUnit_Extensions_Database_DataSet_IDataSet $dataSet) { if(!($connection instanceof Zend_Test_PHPUnit_Db_Connection)) { - // require_once "Zend/Test/PHPUnit/Database/Exception.php"; + // require_once "Zend/Test/PHPUnit/Db/Exception.php"; throw new Zend_Test_PHPUnit_Db_Exception("Not a valid Zend_Test_PHPUnit_Db_Connection instance, ".get_class($connection)." given!"); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/Operation/Insert.php b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/Operation/Insert.php index f2583b81e6..a63741a9fd 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/Operation/Insert.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/Operation/Insert.php @@ -23,7 +23,7 @@ /** * @see Zend_Test_PHPUnit_Db_Connection */ -// require_once "Zend/Test/PHPUnit/Database/Connection.php"; +// require_once "Zend/Test/PHPUnit/Db/Connection.php"; /** * Operation for Inserting on setup or teardown of a database tester. @@ -44,7 +44,7 @@ class Zend_Test_PHPUnit_Db_Operation_Insert implements PHPUnit_Extensions_Databa public function execute(PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection, PHPUnit_Extensions_Database_DataSet_IDataSet $dataSet) { if(!($connection instanceof Zend_Test_PHPUnit_Db_Connection)) { - // require_once "Zend/Test/PHPUnit/Database/Exception.php"; + // require_once "Zend/Test/PHPUnit/Db/Exception.php"; throw new Zend_Test_PHPUnit_Db_Exception("Not a valid Zend_Test_PHPUnit_Db_Connection instance, ".get_class($connection)." given!"); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/Operation/Truncate.php b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/Operation/Truncate.php index ee266c0b33..f2a6a486dd 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/Operation/Truncate.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/Operation/Truncate.php @@ -23,7 +23,7 @@ /** * @see Zend_Test_PHPUnit_Db_Connection */ -// require_once "Zend/Test/PHPUnit/Database/Connection.php"; +// require_once "Zend/Test/PHPUnit/Db/Connection.php"; /** * Operation for Truncating on setup or teardown of a database tester. @@ -46,7 +46,7 @@ class Zend_Test_PHPUnit_Db_Operation_Truncate implements PHPUnit_Extensions_Data public function execute(PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection, PHPUnit_Extensions_Database_DataSet_IDataSet $dataSet) { if(!($connection instanceof Zend_Test_PHPUnit_Db_Connection)) { - // require_once "Zend/Test/PHPUnit/Database/Exception.php"; + // require_once "Zend/Test/PHPUnit/Db/Exception.php"; throw new Zend_Test_PHPUnit_Db_Exception("Not a valid Zend_Test_PHPUnit_Db_Connection instance, ".get_class($connection)." given!"); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/SimpleTester.php b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/SimpleTester.php index e3840372c7..02c0e78b29 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/SimpleTester.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/SimpleTester.php @@ -23,12 +23,12 @@ /** * @see Zend_Test_PHPUnit_Db_Operation_Truncate */ -// require_once "Zend/Test/PHPUnit/Database/Operation/Truncate.php"; +// require_once "Zend/Test/PHPUnit/Db/Operation/Truncate.php"; /** * @see Zend_Test_PHPUnit_Db_Operation_Insert */ -// require_once "Zend/Test/PHPUnit/Database/Operation/Insert.php"; +// require_once "Zend/Test/PHPUnit/Db/Operation/Insert.php"; /** * Simple Tester for Database Tests when the Abstract Test Case cannot be used. @@ -50,7 +50,7 @@ class Zend_Test_PHPUnit_Db_SimpleTester extends PHPUnit_Extensions_Database_Defa public function __construct(PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection) { if(!($connection instanceof Zend_Test_PHPUnit_Db_Connection)) { - // require_once "Zend/Test/PHPUnit/Database/Exception.php"; + // require_once "Zend/Test/PHPUnit/Db/Exception.php"; throw new Zend_Test_PHPUnit_Db_Exception("Not a valid Zend_Test_PHPUnit_Db_Connection instance, ".get_class($connection)." given!"); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/Client/Config.php b/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/Client/Config.php index 5a7b64f0f8..0b1422ceb5 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/Client/Config.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/Client/Config.php @@ -95,7 +95,7 @@ class Zend_Tool_Framework_Client_Config $this->_config = new Zend_Config_Xml($configFilepath, null, array('allowModifications' => true)); break; case '.php': - // require_once 'Zend/ConfigInterface.php'; + // require_once 'Zend/Config.php'; $this->_config = new Zend_Config(include $configFilepath, true); break; default: diff --git a/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/Provider/Signature.php b/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/Provider/Signature.php index 947b1c429a..0bc55e6180 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/Provider/Signature.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/Provider/Signature.php @@ -33,7 +33,7 @@ /** * @see Zend_Tool_Framework_Action_Base */ -// require_once 'Zend/Tool/Framework/Action/ReportBase.php'; +// require_once 'Zend/Tool/Framework/Action/Base.php'; /** * The purpose of Zend_Tool_Framework_Provider_Signature is to derive diff --git a/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/Registry.php b/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/Registry.php index ffbf754cb4..5c50680d5b 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/Registry.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/Registry.php @@ -142,7 +142,7 @@ class Zend_Tool_Framework_Registry implements Zend_Tool_Framework_Registry_Inter public function getConfig() { if ($this->_config === null) { - // require_once 'Zend/Tool/Framework/Client/ConfigInterface.php'; + // require_once 'Zend/Tool/Framework/Client/Config.php'; $this->setConfig(new Zend_Tool_Framework_Client_Config()); } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/System/Action/Create.php b/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/System/Action/Create.php index b3ca0d397a..e015e0b387 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/System/Action/Create.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/System/Action/Create.php @@ -23,7 +23,7 @@ /** * @see Zend_Tool_Framework_Action_Base */ -// require_once 'Zend/Tool/Framework/Action/ReportBase.php'; +// require_once 'Zend/Tool/Framework/Action/Base.php'; /** diff --git a/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/System/Action/Delete.php b/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/System/Action/Delete.php index 1439f70552..8a498145fb 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/System/Action/Delete.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/System/Action/Delete.php @@ -23,7 +23,7 @@ /** * @see Zend_Tool_Framework_Action_Base */ -// require_once 'Zend/Tool/Framework/Action/ReportBase.php'; +// require_once 'Zend/Tool/Framework/Action/Base.php'; /** diff --git a/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/System/Manifest.php b/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/System/Manifest.php index c1daad950f..5a3c829bd3 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/System/Manifest.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/System/Manifest.php @@ -23,7 +23,7 @@ // require_once 'Zend/Tool/Framework/Manifest/ProviderManifestable.php'; // require_once 'Zend/Tool/Framework/Manifest/ActionManifestable.php'; // require_once 'Zend/Tool/Framework/System/Provider/Version.php'; -// require_once 'Zend/Tool/Framework/System/Provider/ConfigInterface.php'; +// require_once 'Zend/Tool/Framework/System/Provider/Config.php'; // require_once 'Zend/Tool/Framework/System/Provider/Phpinfo.php'; // require_once 'Zend/Tool/Framework/System/Provider/Manifest.php'; // require_once 'Zend/Tool/Framework/System/Action/Create.php'; diff --git a/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/System/Provider/Config.php b/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/System/Provider/Config.php index 764c408589..ad026c021f 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/System/Provider/Config.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Tool/Framework/System/Provider/Config.php @@ -27,7 +27,7 @@ /** * @see Zend_Config */ -// require_once "Zend/ConfigInterface.php"; +// require_once "Zend/Config.php"; /** * @see Zend_Config_Writer_Ini diff --git a/vendor/bombayworks/zendframework1/library/Zend/Tool/Project/Provider/DbTable.php b/vendor/bombayworks/zendframework1/library/Zend/Tool/Project/Provider/DbTable.php index 72d905193a..128e519828 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Tool/Project/Provider/DbTable.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Tool/Project/Provider/DbTable.php @@ -160,7 +160,7 @@ class Zend_Tool_Project_Provider_DbTable try { $zendApp->bootstrap('db'); } catch (Zend_Application_Exception $e) { - throw new Zend_Tool_Project_Provider_Exception('Database resource not available, you might need to configure a DbAdapter.'); + throw new Zend_Tool_Project_Provider_Exception('Db resource not available, you might need to configure a DbAdapter.'); return; } diff --git a/vendor/bombayworks/zendframework1/library/Zend/Translate.php b/vendor/bombayworks/zendframework1/library/Zend/Translate.php index 356f82d57f..d6431cbe1e 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Translate.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Translate.php @@ -63,7 +63,9 @@ class Zend_Translate { /** * Generates the standard translation object * - * @param array|Zend_Config $options Options to use + * @param array|Zend_Config|Zend_Translate_Adapter $options Options to use + * @param string|array [$content] Path to content, or content itself + * @param string|Zend_Locale [$locale] * @throws Zend_Translate_Exception */ public function __construct($options = array()) @@ -96,7 +98,9 @@ class Zend_Translate { /** * Sets a new adapter * - * @param array|Zend_Config $options Options to use + * @param array|Zend_Config|Zend_Translate_Adapter $options Options to use + * @param string|array [$content] Path to content, or content itself + * @param string|Zend_Locale [$locale] * @throws Zend_Translate_Exception */ public function setAdapter($options = array()) diff --git a/vendor/bombayworks/zendframework1/library/Zend/Translate/Adapter.php b/vendor/bombayworks/zendframework1/library/Zend/Translate/Adapter.php index 1ac38c081d..a10d43b736 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Translate/Adapter.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Translate/Adapter.php @@ -119,7 +119,9 @@ abstract class Zend_Translate_Adapter { /** * Generates the adapter * - * @param array|Zend_Config $options Translation options for this adapter + * @param string|array|Zend_Config $options Translation options for this adapter + * @param string|array [$content] + * @param string|Zend_Locale [$locale] * @throws Zend_Translate_Exception * @return void */ diff --git a/vendor/bombayworks/zendframework1/library/Zend/Validate/Db/NoRecordExists.php b/vendor/bombayworks/zendframework1/library/Zend/Validate/Db/NoRecordExists.php index bfc4215804..4e89910c65 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Validate/Db/NoRecordExists.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Validate/Db/NoRecordExists.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Db_Abstract */ -// require_once 'Zend/Validate/Database/Abstract.php'; +// require_once 'Zend/Validate/Db/Abstract.php'; /** * Confirms a record does not exist in a table. diff --git a/vendor/bombayworks/zendframework1/library/Zend/Validate/Db/RecordExists.php b/vendor/bombayworks/zendframework1/library/Zend/Validate/Db/RecordExists.php index c2b199c659..7271a10784 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Validate/Db/RecordExists.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Validate/Db/RecordExists.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Db_Abstract */ -// require_once 'Zend/Validate/Database/Abstract.php'; +// require_once 'Zend/Validate/Db/Abstract.php'; /** * Confirms a record exists in a table. diff --git a/vendor/bombayworks/zendframework1/library/Zend/Version.php b/vendor/bombayworks/zendframework1/library/Zend/Version.php index 7fd8956822..8584a09f52 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/Version.php +++ b/vendor/bombayworks/zendframework1/library/Zend/Version.php @@ -32,7 +32,7 @@ final class Zend_Version /** * Zend Framework version identification - see compareVersion() */ - const VERSION = '1.12.10'; + const VERSION = '1.12.11'; /** * The latest stable version Zend Framework available diff --git a/vendor/bombayworks/zendframework1/library/Zend/View/Helper/HeadLink.php b/vendor/bombayworks/zendframework1/library/Zend/View/Helper/HeadLink.php index 0318ee19a3..e3c71199f9 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/View/Helper/HeadLink.php +++ b/vendor/bombayworks/zendframework1/library/Zend/View/Helper/HeadLink.php @@ -32,6 +32,14 @@ * @subpackage Helper * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License + * @method $this appendAlternate($href, $type, $title, $extras) + * @method $this appendStylesheet($href, $media = 'screen', $conditionalStylesheet = false, array $extras = array()) + * @method $this offsetSetAlternate($index, $href, $type, $title, $extras) + * @method $this offsetSetStylesheet($index, $href, $media = 'screen', $conditionalStylesheet = false, array $extras = array()) + * @method $this prependAlternate($href, $type, $title, $extras) + * @method $this prependStylesheet($href, $media = 'screen', $conditionalStylesheet = false, array $extras = array()) + * @method $this setAlternate($href, $type, $title, $extras) + * @method $this setStylesheet($href, $media = 'screen', $conditionalStylesheet = false, array $extras = array()) */ class Zend_View_Helper_HeadLink extends Zend_View_Helper_Placeholder_Container_Standalone { diff --git a/vendor/bombayworks/zendframework1/library/Zend/View/Helper/HeadMeta.php b/vendor/bombayworks/zendframework1/library/Zend/View/Helper/HeadMeta.php index dfa890c5a3..505a3b47d7 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/View/Helper/HeadMeta.php +++ b/vendor/bombayworks/zendframework1/library/Zend/View/Helper/HeadMeta.php @@ -32,6 +32,19 @@ * @subpackage Helper * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License + * @method $this appendHttpEquiv($keyValue, $content, $conditionalHttpEquiv) + * @method $this appendName($keyValue, $content, $conditionalName) + * @method $this appendProperty($property, $content, $modifiers) + * @method $this offsetSetHttpEquiv($index, $keyValue, $content, $conditionalHttpEquiv) + * @method $this offsetSetName($index, $keyValue, $content, $conditionalName) + * @method $this offsetSetProperty($index, $property, $content, $modifiers) + * @method $this prependHttpEquiv($keyValue, $content, $conditionalHttpEquiv) + * @method $this prependName($keyValue, $content, $conditionalName) + * @method $this prependProperty($property, $content, $modifiers) + * @method $this setCharset($charset) + * @method $this setHttpEquiv($keyValue, $content, $modifiers) + * @method $this setName($keyValue, $content, $modifiers) + * @method $this setProperty($property, $content, $modifiers) */ class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_Standalone { diff --git a/vendor/bombayworks/zendframework1/library/Zend/View/Helper/HeadScript.php b/vendor/bombayworks/zendframework1/library/Zend/View/Helper/HeadScript.php index 146bea9203..773268a329 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/View/Helper/HeadScript.php +++ b/vendor/bombayworks/zendframework1/library/Zend/View/Helper/HeadScript.php @@ -31,6 +31,14 @@ * @subpackage Helper * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License + * @method $this appendFile($src, $type = 'text/javascript', array $attrs = array()) + * @method $this appendScript($script, $type = 'text/javascript', array $attrs = array()) + * @method $this offsetSetFile($index, $src, $type = 'text/javascript', array $attrs = array()) + * @method $this offsetSetScript($index, $script, $type = 'text/javascript', array $attrs = array()) + * @method $this prependFile($src, $type = 'text/javascript', array $attrs = array()) + * @method $this prependScript($script, $type = 'text/javascript', array $attrs = array()) + * @method $this setFile($src, $type = 'text/javascript', array $attrs = array()) + * @method $this setScript($script, $type = 'text/javascript', array $attrs = array()) */ class Zend_View_Helper_HeadScript extends Zend_View_Helper_Placeholder_Container_Standalone { diff --git a/vendor/bombayworks/zendframework1/library/Zend/View/Helper/HeadStyle.php b/vendor/bombayworks/zendframework1/library/Zend/View/Helper/HeadStyle.php index 48f06b90b7..edfe9626c8 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/View/Helper/HeadStyle.php +++ b/vendor/bombayworks/zendframework1/library/Zend/View/Helper/HeadStyle.php @@ -31,6 +31,10 @@ * @subpackage Helper * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License + * @method $this appendStyle($content, array $attributes = array()) + * @method $this offsetSetStyle($index, $content, array $attributes = array()) + * @method $this prependStyle($content, array $attributes = array()) + * @method $this setStyle($content, array $attributes = array()) */ class Zend_View_Helper_HeadStyle extends Zend_View_Helper_Placeholder_Container_Standalone { diff --git a/vendor/bombayworks/zendframework1/library/Zend/View/Helper/Navigation.php b/vendor/bombayworks/zendframework1/library/Zend/View/Helper/Navigation.php index 7f5403148a..131b19f012 100644 --- a/vendor/bombayworks/zendframework1/library/Zend/View/Helper/Navigation.php +++ b/vendor/bombayworks/zendframework1/library/Zend/View/Helper/Navigation.php @@ -33,6 +33,10 @@ * @subpackage Helper * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License + * @method Zend_View_Helper_Navigation_Breadcrumbs breadcrumbs + * @method Zend_View_Helper_Navigation_Links links + * @method Zend_View_Helper_Navigation_Menu menu + * @method Zend_View_Helper_Navigation_Sitemap sitemap */ class Zend_View_Helper_Navigation extends Zend_View_Helper_Navigation_HelperAbstract diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 714f1c19a6..42795084cc 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit1f2dbb76b9fe7ee72961841a5a54ab48 +class ComposerAutoloaderInit207af526399948cc5e2e445108bc9b12 { private static $loader; @@ -19,9 +19,9 @@ class ComposerAutoloaderInit1f2dbb76b9fe7ee72961841a5a54ab48 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit1f2dbb76b9fe7ee72961841a5a54ab48', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit207af526399948cc5e2e445108bc9b12', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit1f2dbb76b9fe7ee72961841a5a54ab48', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit207af526399948cc5e2e445108bc9b12', 'loadClassLoader')); $includePaths = require __DIR__ . '/include_paths.php'; array_push($includePaths, get_include_path()); @@ -46,14 +46,14 @@ class ComposerAutoloaderInit1f2dbb76b9fe7ee72961841a5a54ab48 $includeFiles = require __DIR__ . '/autoload_files.php'; foreach ($includeFiles as $file) { - composerRequire1f2dbb76b9fe7ee72961841a5a54ab48($file); + composerRequire207af526399948cc5e2e445108bc9b12($file); } return $loader; } } -function composerRequire1f2dbb76b9fe7ee72961841a5a54ab48($file) +function composerRequire207af526399948cc5e2e445108bc9b12($file) { require $file; } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index a99b741748..283c14fae2 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -272,59 +272,6 @@ ] }, { - "name": "bombayworks/zendframework1", - "version": "v1.12.10", - "version_normalized": "1.12.10.0", - "source": { - "type": "git", - "url": "https://github.com/bombayworks/zendframework1.git", - "reference": "8d28b59c8fe820f6ed2683cc4fad6551a4576432" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/bombayworks/zendframework1/zipball/8d28b59c8fe820f6ed2683cc4fad6551a4576432", - "reference": "8d28b59c8fe820f6ed2683cc4fad6551a4576432", - "shasum": "" - }, - "require": { - "php": ">=5.2.11" - }, - "require-dev": { - "phpunit/dbunit": "1.3.*", - "phpunit/phpunit": "3.7.*" - }, - "time": "2015-01-14 20:01:12", - "bin": [ - "bin/zf.sh", - "bin/zf.php" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.12.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-0": { - "Zend_": "library/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "library/" - ], - "license": [ - "BSD-3-Clause" - ], - "description": "Zend Framework 1", - "homepage": "http://framework.zend.com/", - "keywords": [ - "ZF1", - "framework" - ] - }, - { "name": "patchwork/utf8", "version": "v1.2.1", "version_normalized": "1.2.1.0", @@ -486,5 +433,58 @@ "php", "zip" ] + }, + { + "name": "bombayworks/zendframework1", + "version": "v1.12.11", + "version_normalized": "1.12.11.0", + "source": { + "type": "git", + "url": "https://github.com/bombayworks/zendframework1.git", + "reference": "64447e39d4c7a08ba17d2087a89caab713804d27" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/bombayworks/zendframework1/zipball/64447e39d4c7a08ba17d2087a89caab713804d27", + "reference": "64447e39d4c7a08ba17d2087a89caab713804d27", + "shasum": "" + }, + "require": { + "php": ">=5.2.11" + }, + "require-dev": { + "phpunit/dbunit": "1.3.*", + "phpunit/phpunit": "3.7.*" + }, + "time": "2015-02-11 16:00:41", + "bin": [ + "bin/zf.sh", + "bin/zf.php" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.12.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Zend_": "library/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "library/" + ], + "license": [ + "BSD-3-Clause" + ], + "description": "Zend Framework 1", + "homepage": "http://framework.zend.com/", + "keywords": [ + "ZF1", + "framework" + ] } ] |