adding grumphp, php-cs-fixer, fixing style

.gitignore

@@ -1,3 +1,5 @@
 /vendor
 /composer.lock
-/clover.xml
+/clover.xml
+.php_cs.cache
+/tests/Zend/Db/Table/_files/cachefiles/*

.php_cs

@@ -0,0 +1,22 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->exclude('vendor')
+    ->files()
+    ->in(__DIR__)
+;
+
+return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PSR2' => true,
+        '@PHPUnit60Migration:risky' => true,
+        'binary_operator_spaces' => ['align_double_arrow' => true, 'align_equals' => true],
+        'single_quote' => true,
+        'array_syntax' => ['syntax' => 'long'],
+        'concat_space' => ['spacing' => 'one'],
+        'psr0' => true
+    ])
+    ->setUsingCache(true)
+    ->setFinder($finder);
+;

.travis.yml

@@ -20,6 +20,7 @@ install:
 
 stages:
   - test
+  - style check
   - phpstan analysis
   - test with coverage
 
@@ -36,6 +37,11 @@ jobs:
   allow_failures:
     - php: nightly
   include:
+    - stage: style check
+      php: 7.1
+      env: TMPDIR=/tmp USE_XDEBUG=false
+      script:
+        - composer style-check
     - stage: phpstan analysis
       php: 7.1
       env: TMPDIR=/tmp USE_XDEBUG=false

composer.json

@@ -42,7 +42,10 @@
     "require-dev": {
         "phpunit/phpunit": "^6.0",
         "phpstan/phpstan": "^0.9.2",
-        "jetbrains/phpstorm-stubs": "dev-phpstan"
+        "jetbrains/phpstorm-stubs": "dev-phpstan",
+        "friendsofphp/php-cs-fixer": "^2.11",
+        "maglnet/composer-require-checker": "^0.1.6 | ^0.2.1",
+        "phpro/grumphp": "^0.14.0"
     },
     "include-path": [
         "src/"
@@ -54,8 +57,16 @@
         "process-timeout": 600
     },
     "scripts": {
-        "test": "phpunit ./tests",
-        "test-with-coverage": "phpunit --coverage-clover=clover.xml ./tests",
-        "phpstan": "phpstan analyze -l1 -c phpstan.neon --no-progress ./src --ansi"
+        "test": "phpunit",
+        "test-with-coverage": "phpunit --coverage-clover=clover.xml",
+        "phpstan": "phpstan analyze -l1 -c phpstan.neon --no-progress ./ --ansi",
+        "style-check": "php-cs-fixer fix --dry-run -vv"
+    },
+    "suggest": {
+        "ext-PDO": "For PDO DB adapters",
+        "ext-mysqli": "For mysqli DB adapters",
+        "ext-oci8": "For Oracle DB adapters",
+        "ext-sqlsrv": "For SQL Server DB adapters",
+        "ext-ibm_db2": "For IBM DB2 DB adapters"
     }
 }

grumphp.yml.dist

@@ -0,0 +1,17 @@
+# grumphp.yml
+parameters:
+    tasks:
+        composer:
+            strict: true
+        composer_require_checker:
+            config_file: require-checker-config.json
+        phpcsfixer2:
+            allow_risky: true
+            config: .php_cs
+        phpstan:
+            level: 1
+            configuration: phpstan.neon
+        phpunit:
+            metadata:
+                priority: 100
+            always_execute: true

phpstan.neon

@@ -1,8 +1,11 @@
 parameters:
+    excludes_analyse:
+        - %rootDir%/../../../tests/*
+        - %rootDir%/../../../vendor/*
     bootstrap: %rootDir%/../../../phpstan-bootstrap.php
     ignoreErrors:
         - '#Zend_Db_.+_Exception::__construct\(\) does not call parent constructor from Zend_.*Exception\.#'
         - '#Zend_Db_Profiler_Firebug::__construct\(\) does not call parent constructor from Zend_Db_Profiler\.#'
         - '#Call to an undefined method Zend_Db_Statement::_bindParam\(\)\.#'
         - '#Call to an undefined method Zend_Db_Statement::_execute\(\)\.#'
-        - '#Variable \$.+ might not be defined\.#'
+        - '#Variable \$.+ might not be defined\.#'

phpunit-bootstrap.php

@@ -8,8 +8,8 @@
      * the native Mysqli adapters, but the other properties are shared between the
      * two MySQL-related Zend_Db adapters.
      */
-    defined('TESTS_ZEND_DB_ADAPTER_PDO_MYSQL_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_PDO_MYSQL_ENABLED',  true);
-    defined('TESTS_ZEND_DB_ADAPTER_MYSQLI_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_MYSQLI_ENABLED',  true);
+    defined('TESTS_ZEND_DB_ADAPTER_PDO_MYSQL_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_PDO_MYSQL_ENABLED', true);
+    defined('TESTS_ZEND_DB_ADAPTER_MYSQLI_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_MYSQLI_ENABLED', true);
     defined('TESTS_ZEND_DB_ADAPTER_MYSQL_USERNAME') || define('TESTS_ZEND_DB_ADAPTER_MYSQL_USERNAME', 'travis');
     defined('TESTS_ZEND_DB_ADAPTER_MYSQL_PASSWORD') || define('TESTS_ZEND_DB_ADAPTER_MYSQL_PASSWORD', '');
     defined('TESTS_ZEND_DB_ADAPTER_MYSQL_DATABASE') || define('TESTS_ZEND_DB_ADAPTER_MYSQL_DATABASE', 'zftest');
@@ -19,12 +19,12 @@
      *
      * Username and password are irrelevant for SQLite.
      */
-    defined('TESTS_ZEND_DB_ADAPTER_PDO_SQLITE_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_PDO_SQLITE_ENABLED',  true);
+    defined('TESTS_ZEND_DB_ADAPTER_PDO_SQLITE_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_PDO_SQLITE_ENABLED', true);
 
     /**
      * Zend_Db_Adapter_Pdo_Pgsql
      */
-    defined('TESTS_ZEND_DB_ADAPTER_PDO_PGSQL_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_PDO_PGSQL_ENABLED',  true);
+    defined('TESTS_ZEND_DB_ADAPTER_PDO_PGSQL_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_PDO_PGSQL_ENABLED', true);
     defined('TESTS_ZEND_DB_ADAPTER_PDO_PGSQL_USERNAME') || define('TESTS_ZEND_DB_ADAPTER_PDO_PGSQL_USERNAME', 'postgres');
     defined('TESTS_ZEND_DB_ADAPTER_PDO_PGSQL_PASSWORD') || define('TESTS_ZEND_DB_ADAPTER_PDO_PGSQL_PASSWORD', '');
     defined('TESTS_ZEND_DB_ADAPTER_PDO_PGSQL_DATABASE') || define('TESTS_ZEND_DB_ADAPTER_PDO_PGSQL_DATABASE', 'zftest');
@@ -37,8 +37,8 @@
  * the native Mysqli adapters, but the other properties are shared between the
  * two MySQL-related Zend_Db adapters.
  */
-defined('TESTS_ZEND_DB_ADAPTER_PDO_MYSQL_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_PDO_MYSQL_ENABLED',  false);
-defined('TESTS_ZEND_DB_ADAPTER_MYSQLI_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_MYSQLI_ENABLED',  false);
+defined('TESTS_ZEND_DB_ADAPTER_PDO_MYSQL_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_PDO_MYSQL_ENABLED', false);
+defined('TESTS_ZEND_DB_ADAPTER_MYSQLI_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_MYSQLI_ENABLED', false);
 defined('TESTS_ZEND_DB_ADAPTER_MYSQL_HOSTNAME') || define('TESTS_ZEND_DB_ADAPTER_MYSQL_HOSTNAME', '127.0.0.1');
 defined('TESTS_ZEND_DB_ADAPTER_MYSQL_USERNAME') || define('TESTS_ZEND_DB_ADAPTER_MYSQL_USERNAME', null);
 defined('TESTS_ZEND_DB_ADAPTER_MYSQL_PASSWORD') || define('TESTS_ZEND_DB_ADAPTER_MYSQL_PASSWORD', null);
@@ -50,7 +50,7 @@
  *
  * Username and password are irrelevant for SQLite.
  */
-defined('TESTS_ZEND_DB_ADAPTER_PDO_SQLITE_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_PDO_SQLITE_ENABLED',  false);
+defined('TESTS_ZEND_DB_ADAPTER_PDO_SQLITE_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_PDO_SQLITE_ENABLED', false);
 defined('TESTS_ZEND_DB_ADAPTER_PDO_SQLITE_DATABASE') || define('TESTS_ZEND_DB_ADAPTER_PDO_SQLITE_DATABASE', ':memory:');
 
 /**
@@ -60,7 +60,7 @@
  * comes with PHP does not work.  See user comments at
  * http://us2.php.net/manual/en/ref.mssql.php
  */
-defined('TESTS_ZEND_DB_ADAPTER_PDO_MSSQL_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_PDO_MSSQL_ENABLED',  false);
+defined('TESTS_ZEND_DB_ADAPTER_PDO_MSSQL_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_PDO_MSSQL_ENABLED', false);
 defined('TESTS_ZEND_DB_ADAPTER_PDO_MSSQL_HOSTNAME') || define('TESTS_ZEND_DB_ADAPTER_PDO_MSSQL_HOSTNAME', '127.0.0.1');
 defined('TESTS_ZEND_DB_ADAPTER_PDO_MSSQL_USERNAME') || define('TESTS_ZEND_DB_ADAPTER_PDO_MSSQL_USERNAME', null);
 defined('TESTS_ZEND_DB_ADAPTER_PDO_MSSQL_PASSWORD') || define('TESTS_ZEND_DB_ADAPTER_PDO_MSSQL_PASSWORD', null);
@@ -70,7 +70,7 @@
 /**
  * Zend_Db_Adapter_Pdo_Pgsql
  */
-defined('TESTS_ZEND_DB_ADAPTER_PDO_PGSQL_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_PDO_PGSQL_ENABLED',  false);
+defined('TESTS_ZEND_DB_ADAPTER_PDO_PGSQL_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_PDO_PGSQL_ENABLED', false);
 defined('TESTS_ZEND_DB_ADAPTER_PDO_PGSQL_HOSTNAME') || define('TESTS_ZEND_DB_ADAPTER_PDO_PGSQL_HOSTNAME', '127.0.0.1');
 defined('TESTS_ZEND_DB_ADAPTER_PDO_PGSQL_USERNAME') || define('TESTS_ZEND_DB_ADAPTER_PDO_PGSQL_USERNAME', null);
 defined('TESTS_ZEND_DB_ADAPTER_PDO_PGSQL_PASSWORD') || define('TESTS_ZEND_DB_ADAPTER_PDO_PGSQL_PASSWORD', null);
@@ -83,21 +83,21 @@
  * the native Oracle adapter, but the other properties are shared between the
  * two Oracle-related Zend_Db adapters.
  */
-defined('TESTS_ZEND_DB_ADAPTER_PDO_OCI_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_PDO_OCI_ENABLED',  false);
-defined('TESTS_ZEND_DB_ADAPTER_ORACLE_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_ORACLE_ENABLED',  false);
+defined('TESTS_ZEND_DB_ADAPTER_PDO_OCI_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_PDO_OCI_ENABLED', false);
+defined('TESTS_ZEND_DB_ADAPTER_ORACLE_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_ORACLE_ENABLED', false);
 defined('TESTS_ZEND_DB_ADAPTER_ORACLE_HOSTNAME') || define('TESTS_ZEND_DB_ADAPTER_ORACLE_HOSTNAME', '127.0.0.1');
 defined('TESTS_ZEND_DB_ADAPTER_ORACLE_USERNAME') || define('TESTS_ZEND_DB_ADAPTER_ORACLE_USERNAME', null);
 defined('TESTS_ZEND_DB_ADAPTER_ORACLE_PASSWORD') || define('TESTS_ZEND_DB_ADAPTER_ORACLE_PASSWORD', null);
-defined('TESTS_ZEND_DB_ADAPTER_ORACLE_SID') || define('TESTS_ZEND_DB_ADAPTER_ORACLE_SID',      'xe');
+defined('TESTS_ZEND_DB_ADAPTER_ORACLE_SID') || define('TESTS_ZEND_DB_ADAPTER_ORACLE_SID', 'xe');
 
 /**
  * Zend_Db_Adapter_Db2 and Zend_Db_Adapter_Pdo_Ibm
  * There are separate properties to enable tests for the PDO_IBM adapter and
  * the native DB2 adapter, but the other properties are shared between the
  * two related Zend_Db adapters.
  */
-defined('TESTS_ZEND_DB_ADAPTER_PDO_IBM_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_PDO_IBM_ENABLED',  false);
-defined('TESTS_ZEND_DB_ADAPTER_DB2_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_DB2_ENABLED',  false);
+defined('TESTS_ZEND_DB_ADAPTER_PDO_IBM_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_PDO_IBM_ENABLED', false);
+defined('TESTS_ZEND_DB_ADAPTER_DB2_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_DB2_ENABLED', false);
 defined('TESTS_ZEND_DB_ADAPTER_DB2_HOSTNAME') || define('TESTS_ZEND_DB_ADAPTER_DB2_HOSTNAME', '127.0.0.1');
 defined('TESTS_ZEND_DB_ADAPTER_DB2_PORT') || define('TESTS_ZEND_DB_ADAPTER_DB2_PORT', 50000);
 defined('TESTS_ZEND_DB_ADAPTER_DB2_USERNAME') || define('TESTS_ZEND_DB_ADAPTER_DB2_USERNAME', null);
@@ -110,7 +110,7 @@
  * username and password
  *
  */
-defined('TESTS_ZEND_DB_ADAPTER_SQLSRV_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_SQLSRV_ENABLED',  false);
+defined('TESTS_ZEND_DB_ADAPTER_SQLSRV_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_SQLSRV_ENABLED', false);
 defined('TESTS_ZEND_DB_ADAPTER_SQLSRV_HOSTNAME') || define('TESTS_ZEND_DB_ADAPTER_SQLSRV_HOSTNAME', 'localhost\SQLEXPRESS');
 defined('TESTS_ZEND_DB_ADAPTER_SQLSRV_USERNAME') || define('TESTS_ZEND_DB_ADAPTER_SQLSRV_USERNAME', null);
 defined('TESTS_ZEND_DB_ADAPTER_SQLSRV_PASSWORD') || define('TESTS_ZEND_DB_ADAPTER_SQLSRV_PASSWORD', null);

phpunit.xml.dist

@@ -10,6 +10,11 @@
     <php>
         <includePath>./tests</includePath>
     </php>
+    <testsuites>
+        <testsuite name="default">
+            <directory>./tests</directory>
+        </testsuite>
+    </testsuites>
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">./src</directory>

require-checker-config.json

@@ -0,0 +1,22 @@
+{
+  "symbol-whitelist" : [
+    "null", "true", "false",
+    "static", "self", "parent",
+    "array", "string", "int", "float", "bool", "iterable", "callable", "void", "object",
+    "PDO", "PDOException",
+    "db2_prepare", "db2_stmt_errormsg", "db2_stmt_error", "DB2_PARAM_IN", "DB2_CHAR", "db2_bind_param", "db2_free_stmt",
+    "db2_num_fields", "db2_execute", "db2_field_name", "db2_fetch_array", "db2_fetch_assoc", "db2_fetch_both", "db2_fetch_object", "db2_num_rows",
+    "DB2_AUTOCOMMIT_ON", "DB2_CASE_NATURAL", "DB2_CASE_UPPER", "DB2_CASE_LOWER", "DB2_I5_NAMING_ON", "DB2_I5_NAMING_OFF",
+    "db2_conn_errormsg", "db2_conn_error", "db2_close", "DB2_AUTOCOMMIT_OFF", "db2_autocommit", "db2_escape_string",
+    "db2_server_info", "db2_tables", "db2_commit", "db2_rollback",
+    "oci_parse", "oci_error", "SQLT_CHR", "oci_bind_by_name", "oci_free_statement", "oci_num_fields", "oci_execute", "oci_field_name",
+    "OCI_RETURN_LOBS", "oci_fetch_array", "OCI_NUM", "OCI_RETURN_NULLS", "OCI_ASSOC", "OCI_BOTH", "oci_fetch_object",
+    "OCI_FETCHSTATEMENT_BY_ROW", "OCI_FETCHSTATEMENT_BY_COLUMN", "oci_fetch_all", "oci_fetch", "oci_result", "oci_num_rows",
+    "OCI_COMMIT_ON_SUCCESS", "oci_close", "OCI_DEFAULT", "oci_commit", "oci_rollback", "OCI_DESCRIBE_ONLY", "oci_server_version",
+    "sqlsrv_prepare", "sqlsrv_errors", "sqlsrv_free_stmt", "sqlsrv_num_fields", "sqlsrv_query", "sqlsrv_fetch_array",
+    "SQLSRV_FETCH_ASSOC", "sqlsrv_fetch", "sqlsrv_get_field", "sqlsrv_fetch_object", "sqlsrv_field_metadata", "sqlsrv_next_result",
+    "sqlsrv_rows_affected", "sqlsrv_connect", "SQLSRV_TXN_READ_COMMITTED", "SQLSRV_TXN_READ_UNCOMMITTED", "SQLSRV_TXN_REPEATABLE_READ",
+    "SQLSRV_TXN_SNAPSHOT", "SQLSRV_TXN_SERIALIZABLE", "sqlsrv_close", "sqlsrv_begin_transaction", "sqlsrv_commit", "sqlsrv_rollback", "sqlsrv_server_info",
+    "mysqli_init", "mysqli_options", "mysqli_real_connect", "mysqli_connect_errno", "mysqli_connect_error", "mysqli_set_charset", "mysqli"
+  ]
+}

src/Zend/Db.php

@@ -101,75 +101,75 @@ class Zend_Db
      * }
      * var_export($const);
      */
-    const ATTR_AUTOCOMMIT = 0;
-    const ATTR_CASE = 8;
-    const ATTR_CLIENT_VERSION = 5;
-    const ATTR_CONNECTION_STATUS = 7;
-    const ATTR_CURSOR = 10;
-    const ATTR_CURSOR_NAME = 9;
-    const ATTR_DRIVER_NAME = 16;
-    const ATTR_ERRMODE = 3;
+    const ATTR_AUTOCOMMIT          = 0;
+    const ATTR_CASE                = 8;
+    const ATTR_CLIENT_VERSION      = 5;
+    const ATTR_CONNECTION_STATUS   = 7;
+    const ATTR_CURSOR              = 10;
+    const ATTR_CURSOR_NAME         = 9;
+    const ATTR_DRIVER_NAME         = 16;
+    const ATTR_ERRMODE             = 3;
     const ATTR_FETCH_CATALOG_NAMES = 15;
-    const ATTR_FETCH_TABLE_NAMES = 14;
-    const ATTR_MAX_COLUMN_LEN = 18;
-    const ATTR_ORACLE_NULLS = 11;
-    const ATTR_PERSISTENT = 12;
-    const ATTR_PREFETCH = 1;
-    const ATTR_SERVER_INFO = 6;
-    const ATTR_SERVER_VERSION = 4;
-    const ATTR_STATEMENT_CLASS = 13;
-    const ATTR_STRINGIFY_FETCHES = 17;
-    const ATTR_TIMEOUT = 2;
-    const CASE_LOWER = 2;
-    const CASE_NATURAL = 0;
-    const CASE_UPPER = 1;
-    const CURSOR_FWDONLY = 0;
-    const CURSOR_SCROLL = 1;
-    const ERR_ALREADY_EXISTS = NULL;
-    const ERR_CANT_MAP = NULL;
-    const ERR_CONSTRAINT = NULL;
-    const ERR_DISCONNECTED = NULL;
-    const ERR_MISMATCH = NULL;
-    const ERR_NO_PERM = NULL;
-    const ERR_NONE = '00000';
-    const ERR_NOT_FOUND = NULL;
-    const ERR_NOT_IMPLEMENTED = NULL;
-    const ERR_SYNTAX = NULL;
-    const ERR_TRUNCATED = NULL;
-    const ERRMODE_EXCEPTION = 2;
-    const ERRMODE_SILENT = 0;
-    const ERRMODE_WARNING = 1;
-    const FETCH_ASSOC = 2;
-    const FETCH_BOTH = 4;
-    const FETCH_BOUND = 6;
-    const FETCH_CLASS = 8;
-    const FETCH_CLASSTYPE = 262144;
-    const FETCH_COLUMN = 7;
-    const FETCH_FUNC = 10;
-    const FETCH_GROUP = 65536;
-    const FETCH_INTO = 9;
-    const FETCH_LAZY = 1;
-    const FETCH_NAMED = 11;
-    const FETCH_NUM = 3;
-    const FETCH_OBJ = 5;
-    const FETCH_ORI_ABS = 4;
-    const FETCH_ORI_FIRST = 2;
-    const FETCH_ORI_LAST = 3;
-    const FETCH_ORI_NEXT = 0;
-    const FETCH_ORI_PRIOR = 1;
-    const FETCH_ORI_REL = 5;
-    const FETCH_SERIALIZE = 524288;
-    const FETCH_UNIQUE = 196608;
-    const NULL_EMPTY_STRING = 1;
-    const NULL_NATURAL = 0;
-    const NULL_TO_STRING = NULL;
-    const PARAM_BOOL = 5;
-    const PARAM_INPUT_OUTPUT = -2147483648;
-    const PARAM_INT = 1;
-    const PARAM_LOB = 3;
-    const PARAM_NULL = 0;
-    const PARAM_STMT = 4;
-    const PARAM_STR = 2;
+    const ATTR_FETCH_TABLE_NAMES   = 14;
+    const ATTR_MAX_COLUMN_LEN      = 18;
+    const ATTR_ORACLE_NULLS        = 11;
+    const ATTR_PERSISTENT          = 12;
+    const ATTR_PREFETCH            = 1;
+    const ATTR_SERVER_INFO         = 6;
+    const ATTR_SERVER_VERSION      = 4;
+    const ATTR_STATEMENT_CLASS     = 13;
+    const ATTR_STRINGIFY_FETCHES   = 17;
+    const ATTR_TIMEOUT             = 2;
+    const CASE_LOWER               = 2;
+    const CASE_NATURAL             = 0;
+    const CASE_UPPER               = 1;
+    const CURSOR_FWDONLY           = 0;
+    const CURSOR_SCROLL            = 1;
+    const ERR_ALREADY_EXISTS       = null;
+    const ERR_CANT_MAP             = null;
+    const ERR_CONSTRAINT           = null;
+    const ERR_DISCONNECTED         = null;
+    const ERR_MISMATCH             = null;
+    const ERR_NO_PERM              = null;
+    const ERR_NONE                 = '00000';
+    const ERR_NOT_FOUND            = null;
+    const ERR_NOT_IMPLEMENTED      = null;
+    const ERR_SYNTAX               = null;
+    const ERR_TRUNCATED            = null;
+    const ERRMODE_EXCEPTION        = 2;
+    const ERRMODE_SILENT           = 0;
+    const ERRMODE_WARNING          = 1;
+    const FETCH_ASSOC              = 2;
+    const FETCH_BOTH               = 4;
+    const FETCH_BOUND              = 6;
+    const FETCH_CLASS              = 8;
+    const FETCH_CLASSTYPE          = 262144;
+    const FETCH_COLUMN             = 7;
+    const FETCH_FUNC               = 10;
+    const FETCH_GROUP              = 65536;
+    const FETCH_INTO               = 9;
+    const FETCH_LAZY               = 1;
+    const FETCH_NAMED              = 11;
+    const FETCH_NUM                = 3;
+    const FETCH_OBJ                = 5;
+    const FETCH_ORI_ABS            = 4;
+    const FETCH_ORI_FIRST          = 2;
+    const FETCH_ORI_LAST           = 3;
+    const FETCH_ORI_NEXT           = 0;
+    const FETCH_ORI_PRIOR          = 1;
+    const FETCH_ORI_REL            = 5;
+    const FETCH_SERIALIZE          = 524288;
+    const FETCH_UNIQUE             = 196608;
+    const NULL_EMPTY_STRING        = 1;
+    const NULL_NATURAL             = 0;
+    const NULL_TO_STRING           = null;
+    const PARAM_BOOL               = 5;
+    const PARAM_INPUT_OUTPUT       = -2147483648;
+    const PARAM_INT                = 1;
+    const PARAM_LOB                = 3;
+    const PARAM_NULL               = 0;
+    const PARAM_STMT               = 4;
+    const PARAM_STR                = 2;
 
     /**
      * Factory for Zend_Db_Adapter_Abstract classes.
@@ -269,5 +269,4 @@ public static function factory($adapter, $config = array())
 
         return $dbAdapter;
     }
-
 }