E_STRICT, require PHP 5

pear · Nov 20, 2014 · f0a2929 · f0a2929
1 parent 06bd409
commit f0a2929
Show file tree

Hide file tree

Showing 22 changed files with 42 additions and 41 deletions.
diff --git a/DB.php b/DB.php
@@ -5,7 +5,7 @@
 /**
  * Database independent query interface
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
  * LICENSE: This source file is subject to version 3.0 of the PHP license
  * that is available through the world-wide-web at the following URI:
@@ -431,7 +431,7 @@
  */
 class DB
 {
-    // {{{ &factory()
+    // {{{ factory()
 
     /**
      * Create a new DB object for the specified database type but don't
@@ -444,7 +444,7 @@ class DB
      *
      * @see DB_common::setOption()
      */
-    function &factory($type, $options = false)
+    public static function factory($type, $options = false)
     {
         if (!is_array($options)) {
             $options = array('persistent' => $options);
@@ -480,7 +480,7 @@ function &factory($type, $options = false)
     }
 
     // }}}
-    // {{{ &connect()
+    // {{{ connect()
 
     /**
      * Create a new DB object including a connection to the specified database
@@ -495,7 +495,7 @@ function &factory($type, $options = false)
      *     'portability' => DB_PORTABILITY_ALL,
      * );
      *
-     * $db =& DB::connect($dsn, $options);
+     * $db = DB::connect($dsn, $options);
      * if (PEAR::isError($db)) {
      *     die($db->getMessage());
      * }
@@ -515,7 +515,7 @@ function &factory($type, $options = false)
      *
      * @uses DB::parseDSN(), DB_common::setOption(), PEAR::isError()
      */
-    function &connect($dsn, $options = array())
+    public static function connect($dsn, $options = array())
     {
         $dsninfo = DB::parseDSN($dsn);
         $type = $dsninfo['phptype'];
@@ -590,7 +590,7 @@ function apiVersion()
      *
      * @return bool  whether $value is DB_Error object
      */
-    function isError($value)
+    public static function isError($value)
     {
         return is_object($value) && is_a($value, 'DB_Error');		
     }
@@ -605,7 +605,7 @@ function isError($value)
      *
      * @return bool  whether $value is a DB_<driver> object
      */
-    function isConnection($value)
+    public static function isConnection($value)
     {
         return (is_object($value) &&
                 is_subclass_of($value, 'db_common') &&
@@ -626,7 +626,7 @@ function isConnection($value)
      *
      * @return boolean  whether $query is a data manipulation query
      */
-    function isManip($query)
+    public static function isManip($query)
     {
         $manips = 'INSERT|UPDATE|DELETE|REPLACE|'
                 . 'CREATE|DROP|'
@@ -650,7 +650,7 @@ function isManip($query)
      * @return string  the error message or false if the error code was
      *                  not recognized
      */
-    function errorMessage($value)
+    public static function errorMessage($value)
     {
         static $errorMessages;
         if (!isset($errorMessages)) {
@@ -731,7 +731,7 @@ function errorMessage($value)
      *  + username: User name for login
      *  + password: Password for login
      */
-    function parseDSN($dsn)
+    public static function parseDSN($dsn)
     {
         $parsed = array(
             'phptype'  => false,
@@ -860,7 +860,7 @@ function parseDSN($dsn)
      * @param boolean true to hide the password, false to include it
      * @return string
      */
-    function getDSNString($dsn, $hidePassword) {
+    public static function getDSNString($dsn, $hidePassword) {
         /* Calling parseDSN will ensure that we have all the array elements
          * defined, and means that we deal with strings and array in the same
          * manner. */

diff --git a/DB/common.php b/DB/common.php
@@ -5,7 +5,7 @@
 /**
  * Contains the DB_common base class
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
  * LICENSE: This source file is subject to version 3.0 of the PHP license
  * that is available through the world-wide-web at the following URI:

diff --git a/DB/dbase.php b/DB/dbase.php
@@ -6,7 +6,7 @@
  * The PEAR DB driver for PHP's dbase extension
  * for interacting with dBase databases
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
  * LICENSE: This source file is subject to version 3.0 of the PHP license
  * that is available through the world-wide-web at the following URI:

diff --git a/DB/fbsql.php b/DB/fbsql.php
@@ -6,7 +6,7 @@
  * The PEAR DB driver for PHP's fbsql extension
  * for interacting with FrontBase databases
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
  * LICENSE: This source file is subject to version 3.0 of the PHP license
  * that is available through the world-wide-web at the following URI:

diff --git a/DB/ibase.php b/DB/ibase.php
@@ -9,7 +9,7 @@
  * While this class works with PHP 4, PHP's InterBase extension is
  * unstable in PHP 4.  Use PHP 5.
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
  * LICENSE: This source file is subject to version 3.0 of the PHP license
  * that is available through the world-wide-web at the following URI:

diff --git a/DB/ifx.php b/DB/ifx.php
@@ -6,7 +6,7 @@
  * The PEAR DB driver for PHP's ifx extension
  * for interacting with Informix databases
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
  * LICENSE: This source file is subject to version 3.0 of the PHP license
  * that is available through the world-wide-web at the following URI:

diff --git a/DB/msql.php b/DB/msql.php
@@ -10,7 +10,7 @@
  * 4.3.11 and 5.0.4.  Make sure your version of PHP meets or exceeds
  * those versions.
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
  * LICENSE: This source file is subject to version 3.0 of the PHP license
  * that is available through the world-wide-web at the following URI:

diff --git a/DB/mssql.php b/DB/mssql.php
@@ -6,7 +6,7 @@
  * The PEAR DB driver for PHP's mssql extension
  * for interacting with Microsoft SQL Server databases
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
  * LICENSE: This source file is subject to version 3.0 of the PHP license
  * that is available through the world-wide-web at the following URI:

diff --git a/DB/mysql.php b/DB/mysql.php
@@ -6,7 +6,7 @@
  * The PEAR DB driver for PHP's mysql extension
  * for interacting with MySQL databases
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
  * LICENSE: This source file is subject to version 3.0 of the PHP license
  * that is available through the world-wide-web at the following URI:
@@ -778,7 +778,7 @@ function quoteIdentifier($str)
     /**
      * @deprecated  Deprecated in release 1.6.0
      */
-    function quote($str)
+    function quote($str = null)
     {
         return $this->quoteSmart($str);
     }

diff --git a/DB/mysqli.php b/DB/mysqli.php
@@ -6,7 +6,7 @@
  * The PEAR DB driver for PHP's mysqli extension
  * for interacting with MySQL databases
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
  * LICENSE: This source file is subject to version 3.0 of the PHP license
  * that is available through the world-wide-web at the following URI:

diff --git a/DB/oci8.php b/DB/oci8.php
@@ -6,7 +6,7 @@
  * The PEAR DB driver for PHP's oci8 extension
  * for interacting with Oracle databases
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
  * LICENSE: This source file is subject to version 3.0 of the PHP license
  * that is available through the world-wide-web at the following URI:

diff --git a/DB/odbc.php b/DB/odbc.php
@@ -6,7 +6,7 @@
  * The PEAR DB driver for PHP's odbc extension
  * for interacting with databases via ODBC connections
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
  * LICENSE: This source file is subject to version 3.0 of the PHP license
  * that is available through the world-wide-web at the following URI:
@@ -487,7 +487,7 @@ function quoteIdentifier($str)
      * @deprecated  Deprecated in release 1.6.0
      * @internal
      */
-    function quote($str)
+    function quote($str = null)
     {
         return $this->quoteSmart($str);
     }

diff --git a/DB/pgsql.php b/DB/pgsql.php
@@ -6,7 +6,7 @@
  * The PEAR DB driver for PHP's pgsql extension
  * for interacting with PostgreSQL databases
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
  * LICENSE: This source file is subject to version 3.0 of the PHP license
  * that is available through the world-wide-web at the following URI:
@@ -472,7 +472,7 @@ function freeResult($result)
      * @deprecated  Deprecated in release 1.6.0
      * @internal
      */
-    function quote($str)
+    function quote($str = null)
     {
         return $this->quoteSmart($str);
     }

diff --git a/DB/sqlite.php b/DB/sqlite.php
@@ -6,7 +6,7 @@
  * The PEAR DB driver for PHP's sqlite extension
  * for interacting with SQLite databases
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
  * LICENSE: This source file is subject to version 3.0 of the PHP license
  * that is available through the world-wide-web at the following URI:

diff --git a/DB/storage.php b/DB/storage.php
@@ -5,7 +5,7 @@
 /**
  * Provides an object interface to a table row
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
  * LICENSE: This source file is subject to version 3.0 of the PHP license
  * that is available through the world-wide-web at the following URI:

diff --git a/DB/sybase.php b/DB/sybase.php
@@ -6,7 +6,7 @@
  * The PEAR DB driver for PHP's sybase extension
  * for interacting with Sybase databases
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
  * LICENSE: This source file is subject to version 3.0 of the PHP license
  * that is available through the world-wide-web at the following URI:

diff --git a/package.xml b/package.xml
@@ -38,7 +38,7 @@ extension, but it can&apos;t be used
 interchangeably because dbase doesn&apos;t
 support many standard DBMS features.
 
-DB is compatible with both PHP 4 and PHP 5.
+DB is compatible with PHP 5.
 
  </description>
  <lead>
@@ -65,17 +65,18 @@ DB is compatible with both PHP 4 and PHP 5.
   <email>cox@idecnet.com</email>
   <active>no</active>
  </developer>
- <date>xxx</date>
+ <date>2014-11-20</date>
  <version>
-  <release>1.7.15</release>
-  <api>1.7.15</api>
+  <release>1.8.0</release>
+  <api>1.8.0</api>
  </version>
  <stability>
   <release>stable</release>
   <api>stable</api>
  </stability>
  <license uri="http://www.php.net/license">PHP License</license>
  <notes>
+* E_STRICT compliance, require PHP 5.
 * Fix array to string conversion in connect() when class does not exist.
  </notes>
  <contents>
@@ -193,7 +194,7 @@ DB is compatible with both PHP 4 and PHP 5.
  <dependencies>
   <required>
    <php>
-    <min>4.2.0</min>
+    <min>5.0.0</min>
    </php>
    <pearinstaller>
     <min>1.4.0b1</min>

diff --git a/tests/db_error2.phpt b/tests/db_error2.phpt
@@ -59,7 +59,7 @@ $e = $dbh->raiseError("return testing error");
 print strtolower($e->toString()) . "\n";
 
 print "global default: ";
-PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, "myfunc2");
+@PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, "myfunc2");
 $e = $dbh->raiseError("global default test");
 
 $dbh->setErrorHandling(PEAR_ERROR_PRINT);

diff --git a/tests/driver/01connect.phpt b/tests/driver/01connect.phpt
@@ -64,7 +64,7 @@ foreach ($test_array_dsn as $key => $value) {
     }
 }
 
-$dbha =& DB::connect($test_array_dsn, $options);
+$dbha = DB::connect($test_array_dsn, $options);
 check_dbh($dbha, '$dbha');
 
 

diff --git a/tests/driver/connect.inc b/tests/driver/connect.inc
@@ -38,7 +38,7 @@ if ($dbms == 'mssql') {
     ini_set('mssql.textsize', 4096);
 }
 
-$dbh =& DB::connect($dsn, $options);
+$dbh = DB::connect($dsn, $options);
 if (DB::isError($dbh)) {
     die('connect.inc: ' . $dbh->toString());
 }
diff --git a/tests/driver/multiconnect.php b/tests/driver/multiconnect.php
@@ -3,7 +3,7 @@
 /**
  * Tests the various ways DB's connect() function operates
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
  * LICENSE: This source file is subject to version 3.0 of the PHP license
  * that is available through the world-wide-web at the following URI:

diff --git a/tests/sequences.inc b/tests/sequences.inc
@@ -115,9 +115,9 @@ if (!DB::isError($d)) {
 // 5) test that the sequence is handled right when the table is empty
 
 // Backend with real sequences may don't like that
-PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
+@PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
 $dbh->query('DELETE FROM test_seq');
-PEAR::popErrorHandling();
+@PEAR::popErrorHandling();
 $e = $dbh->nextID('test');
 if (DB::isError($d)) {
     print 'e: ' . $d->getDebugInfo() . "\n\n";