SF.net SVN: phpwiki:[11086] trunk/lib/pear
vargenau--- via phpwiki-checkins <[email protected]> Sun, 09 Feb 2025 18:59:39 +0000
| Newsgroups | gmane.comp.web.wiki.phpwiki.checkins |
|---|---|
| Message-ID | <[email protected]> |
Revision: 11086
http://sourceforge.net/p/phpwiki/code/11086
Author: vargenau
Date: 2025-02-09 18:59:38 +0000 (Sun, 09 Feb 2025)
Log Message:
-----------
Revert r11085
Modified Paths:
--------------
trunk/lib/pear/Cache/Application.php
trunk/lib/pear/Cache/Cache.php
trunk/lib/pear/Cache/Container/db.php
trunk/lib/pear/Cache/Container/dbx.php
trunk/lib/pear/Cache/Container/file.php
trunk/lib/pear/Cache/Container/imgfile.php
trunk/lib/pear/Cache/Container/mdb.php
trunk/lib/pear/Cache/Container/msession.php
trunk/lib/pear/Cache/Container/phplib.php
trunk/lib/pear/Cache/Container/shm.php
trunk/lib/pear/Cache/Container/trifile.php
trunk/lib/pear/Cache/Container.php
trunk/lib/pear/Cache/Error.php
trunk/lib/pear/Cache/Function.php
trunk/lib/pear/Cache/Graphics.php
trunk/lib/pear/Cache/HTTP_Request.php
trunk/lib/pear/Cache/Output.php
trunk/lib/pear/Cache/OutputCompression.php
trunk/lib/pear/Cache.php
trunk/lib/pear/DB/common.php
trunk/lib/pear/DB/dbase.php
trunk/lib/pear/DB/fbsql.php
trunk/lib/pear/DB/ibase.php
trunk/lib/pear/DB/ifx.php
trunk/lib/pear/DB/msql.php
trunk/lib/pear/DB/mssql.php
trunk/lib/pear/DB/mysql.php
trunk/lib/pear/DB/mysqli.php
trunk/lib/pear/DB/oci8.php
trunk/lib/pear/DB/odbc.php
trunk/lib/pear/DB/pgsql.php
trunk/lib/pear/DB/sqlite.php
trunk/lib/pear/DB/sqlite3.php
trunk/lib/pear/DB/storage.php
trunk/lib/pear/DB/sybase.php
trunk/lib/pear/DB.php
trunk/lib/pear/JSON.php
trunk/lib/pear/PEAR.php
Modified: trunk/lib/pear/Cache/Application.php
===================================================================
--- trunk/lib/pear/Cache/Application.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/Cache/Application.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -15,6 +15,8 @@
// +----------------------------------------------------------------------+
// | Authors: Richard Heyes <[email protected]> |
// +----------------------------------------------------------------------+
+//
+// $Id: Application.php 178289 2005-01-26 09:47:28Z dufuz $
require_once 'lib/pear/Cache.php';
@@ -21,7 +23,7 @@
// Application level variables
//
// Purpose
-// Variables that are persistent across all user sessions,
+// Variables that are persisent across all user sessions,
// not just a specific user ala normal sessions.
//
// Usage:
@@ -76,8 +78,8 @@
var $registered_vars;
/**
- * @param string $container Name of container class
- * @param array $container_options Array with container class options
+ * @param string Name of container class
+ * @param array Array with container class options
*/
function __construct($container = 'file', $container_options = array('cache_dir' => '/tmp/', 'filename_prefix' => 'cache_'), $id = 'application_var', $group = 'application_cache')
{
@@ -122,8 +124,8 @@
*
* Registers a variable to be stored.
*
- * @param string $varname Name of variable to register
- * @param mixed $data Optional data to store
+ * @param string Name of variable to register
+ * @param mixed Optional data to store
*/
function register($varname, $data = null)
{
@@ -139,7 +141,7 @@
*
* Unregisters a variable from being stored.
*
- * @param string $varname Name of variable to unregister
+ * @param string Name of variable to unregister
*/
function unregister($varname)
{
Modified: trunk/lib/pear/Cache/Cache.php
===================================================================
--- trunk/lib/pear/Cache/Cache.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/Cache/Cache.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -15,6 +15,8 @@
// | Authors: Ulf Wendel <[email protected]> |
// | Sebastian Bergmann <[email protected]> |
// +----------------------------------------------------------------------+
+//
+// $Id: Cache.php 267047 2008-10-07 08:58:46Z dufuz $
require_once 'lib/pear/PEAR.php';
require_once 'lib/pear/Cache/Error.php';
@@ -26,7 +28,7 @@
* cache script runs. The idea behind the cache is quite simple. If you have
* the same input parameters for whatever tasks/algorithm you use you'll
* usually get the same output. So why not caching templates, functions calls,
-* graphic generation etc. Caching certain actions e.g. XSLT transformations
+* graphic generation etc. Caching certain actions e.g. XSLT tranformations
* saves you lots of time.
*
* The design of the cache reminds of PHPLibs session implementation. A
@@ -57,6 +59,7 @@
* bad circumstances (especially with the file container)
*
* @author Ulf Wendel <[email protected]>
+* @version $Id: Cache.php 267047 2008-10-07 08:58:46Z dufuz $
* @package Cache
* @access public
*/
@@ -120,8 +123,8 @@
/**
*
- * @param string $container Name of container class
- * @param array $container_options Array with container class options
+ * @param string Name of container class
+ * @param array Array with container class options
*/
function __construct($container, $container_options = '')
{
@@ -154,7 +157,7 @@
/**
* Enables or disables caching.
*
- * @param boolean $state The new caching state.
+ * @param boolean The new caching state.
* @access public
*/
function setCaching($state)
@@ -165,8 +168,8 @@
/**
* Returns the requested dataset it if exists and is not expired
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return mixed cached data or null on failure
* @access public
*/
@@ -185,10 +188,10 @@
/**
* Stores the given data in the cache.
*
- * @param string $id dataset ID used as cache identifier
- * @param mixed $data data to cache
- * @param integer $expires lifetime of the cached data in seconds - 0 for endless
- * @param string $group cache group
+ * @param string dataset ID used as cache identifier
+ * @param mixed data to cache
+ * @param integer lifetime of the cached data in seconds - 0 for endless
+ * @param string cache group
* @return boolean
* @access public
*/
@@ -203,11 +206,11 @@
/**
* Stores a dataset with additional userdefined data.
*
- * @param string $id dataset ID
- * @param mixed $cachedata data to store
- * @param string $userdata additional userdefined data
- * @param mixed $expires userdefined expire date
- * @param string $group cache group
+ * @param string dataset ID
+ * @param mixed data to store
+ * @param string additional userdefined data
+ * @param mixed userdefined expire date
+ * @param string cache group
* @return boolean
* @throws Cache_Error
* @access public
@@ -224,8 +227,8 @@
/**
* Loads the given ID from the cache.
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return mixed cached data or null on failure
* @access public
*/
@@ -240,8 +243,8 @@
/**
* Returns the userdata field of a cached data set.
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return string userdata
* @access public
* @see extSave()
@@ -257,8 +260,8 @@
/**
* Removes the specified dataset from the cache.
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return boolean
* @access public
*/
@@ -273,7 +276,7 @@
/**
* Flushes the cache - removes all data from it
*
- * @param string $group cache group, if empty all groups will be flashed
+ * @param string cache group, if empty all groups will be flashed
* @return integer number of removed datasets
*/
function flush($group = 'default')
@@ -289,8 +292,8 @@
*
* Note: this does not say that the cached data is not expired!
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return boolean
* @access public
*/
@@ -305,9 +308,9 @@
/**
* Checks if a dataset is expired
*
- * @param string $id dataset ID
- * @param string $group cache group
- * @param integer $max_age maximum age for the cached data in seconds - 0 for endless
+ * @param string dataset ID
+ * @param string cache group
+ * @param integer maximum age for the cached data in seconds - 0 for endless
* If the cached data is older but the given lifetime it will
* be removed from the cache. You don't have to provide this
* argument if you call isExpired(). Every dataset knows
@@ -330,7 +333,7 @@
* This is a quick but dirty hack to get a "unique" ID for a any kind of variable.
* ID clashes might occur from time to time although they are extreme unlikely!
*
- * @param mixed $variable variable to generate a ID for
+ * @param mixed variable to generate a ID for
* @return string "unique" ID
* @access public
*/
@@ -343,7 +346,7 @@
/**
* Calls the garbage collector of the storage object with a certain probability
*
- * @param boolean $force Force a garbage collection run?
+ * @param boolean Force a garbage collection run?
* @see $gc_probability, $gc_time
*/
function garbageCollection($force = false)
Modified: trunk/lib/pear/Cache/Container/db.php
===================================================================
--- trunk/lib/pear/Cache/Container/db.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/Cache/Container/db.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -16,6 +16,8 @@
// | Sebastian Bergmann <[email protected]> |
// | Chuck Hagenbuch <[email protected]> |
// +----------------------------------------------------------------------+
+//
+// $Id: db.php 178288 2005-01-26 09:42:30Z dufuz $
require_once 'lib/pear/DB.php';
require_once 'lib/pear/Cache/Container.php';
@@ -27,7 +29,7 @@
* the tables shown. As far as I know there's no large binary
* type in SQL-92 or SQL-99. Postgres seems to lack any
* BLOB or TEXT type, for MS-SQL you could use IMAGE, don't know
-* about other databases. Please add suggestions for other databases to
+* about other databases. Please add sugestions for other databases to
* the inline docs.
*
* The field 'changed' has no meaning for the Cache itself. It's just there
@@ -50,6 +52,7 @@
* )
*
* @author Sebastian Bergmann <[email protected]>
+* @version $Id: db.php 178288 2005-01-26 09:42:30Z dufuz $
* @package Cache
*/
class Cache_Container_db extends Cache_Container
Modified: trunk/lib/pear/Cache/Container/dbx.php
===================================================================
--- trunk/lib/pear/Cache/Container/dbx.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/Cache/Container/dbx.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -14,7 +14,10 @@
// +----------------------------------------------------------------------+
// | Authors: Christian Stocker <[email protected]> |
// +----------------------------------------------------------------------+
+//
+// $Id: dbx.php 268860 2008-11-12 14:56:26Z clockwerx $
+
require_once 'lib/pear/Cache/Container.php';
/**
@@ -24,7 +27,7 @@
* the tables shown. As far as I know there's no large binary
* type in SQL-92 or SQL-99. Postgres seems to lack any
* BLOB or TEXT type, for MS-SQL you could use IMAGE, don't know
-* about other databases. Please add suggestions for other databases to
+* about other databases. Please add sugestions for other databases to
* the inline docs.
*
* The field 'changed' has no meaning for the Cache itself. It's just there
@@ -47,6 +50,7 @@
* )
*
* @author Christian Stocker <[email protected]>
+* @version $Id: dbx.php 268860 2008-11-12 14:56:26Z clockwerx $
* @package Cache
*/
class Cache_Container_dbx extends Cache_Container
Modified: trunk/lib/pear/Cache/Container/file.php
===================================================================
--- trunk/lib/pear/Cache/Container/file.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/Cache/Container/file.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -15,6 +15,8 @@
// | Authors: Ulf Wendel <[email protected]> |
// | Sebastian Bergmann <[email protected]> |
// +----------------------------------------------------------------------+
+//
+// $Id: file.php 293864 2010-01-23 03:49:21Z clockwerx $
require_once 'lib/pear/Cache/Container.php';
@@ -22,6 +24,7 @@
* Stores cache contents in a file.
*
* @author Ulf Wendel <[email protected]>
+* @version $Id: file.php 293864 2010-01-23 03:49:21Z clockwerx $
*/
class Cache_Container_file extends Cache_Container
{
@@ -49,14 +52,14 @@
* Filename prefix for cache files.
*
* You can use the filename prefix to implement a "domain" based cache or just
- * to give the files a more descriptive name. The word "domain" is borrowed from
- * a user authentication system. One user id (cached dataset with the ID x)
- * may exist in different domains (different filename prefix). You might want
+ * to give the files a more descriptive name. The word "domain" is borroed from
+ * a user authentification system. One user id (cached dataset with the ID x)
+ * may exists in different domains (different filename prefix). You might want
* to use this to have different cache values for a production, development and
* quality assurance system. If you want the production cache not to be influenced
* by the quality assurance activities, use different filename prefixes for them.
*
- * I personally don't think that you'll never need this, but 640kb happened to be
+ * I personally don't think that you'll never need this, but 640kb happend to be
* not enough, so... you know what I mean. If you find a useful application of the
* feature please update this inline doc.
*
@@ -93,9 +96,9 @@
var $max_userdata_linelength = 257;
/**
- * Creates the cache directory if necessary
+ * Creates the cache directory if neccessary
*
- * @param array $options Config options: ["cache_dir" => ..., "filename_prefix" => ...]
+ * @param array Config options: ["cache_dir" => ..., "filename_prefix" => ...]
*/
function __construct($options = '')
{
@@ -119,7 +122,7 @@
$this->entries = array();
$this->group_dirs = array();
- } // end func constructor
+ } // end func contructor
function fetch($id, $group)
{
@@ -131,7 +134,7 @@
if (!file_exists($file)) {
return array(null, null, null);
}
- // retrieve the content
+ // retrive the content
if (!($fh = @fopen($file, 'rb'))) {
return new Cache_Error("Can't access cache file '$file'. Check access rights and path.", __FILE__, __LINE__);
}
@@ -252,11 +255,11 @@
* Garbage collection for files is a rather "expensive", "long time"
* operation. All files in the cache directory have to be examined which
* means that they must be opened for reading, the expiration date has to be
- * read from them and if necessary they have to be unlinked (removed).
+ * read from them and if neccessary they have to be unlinked (removed).
* If you have a user comment for a good default gc probability please add it to
* to the inline docs.
*
- * @param integer $maxlifetime Maximum lifetime in seconds of an no longer used/touched entry
+ * @param integer Maximum lifetime in seconds of an no longer used/touched entry
* @throws Cache_Error
*/
function garbageCollection($maxlifetime)
@@ -292,8 +295,8 @@
/**
* Does the recursive gc procedure, protected.
*
- * @param integer $maxlifetime Maximum lifetime in seconds of an no longer used/touched entry
- * @param string $dir directory to examine - don't sets this parameter, it's used for a
+ * @param integer Maximum lifetime in seconds of an no longer used/touched entry
+ * @param string directory to examine - don't sets this parameter, it's used for a
* recursive function call!
* @throws Cache_Error
*/
@@ -342,8 +345,8 @@
/**
* Returns the filename for the specified id.
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return string full filename with the path
* @access public
*/
@@ -370,7 +373,7 @@
/**
* Deletes a directory and all files in it.
*
- * @param string $dir directory
+ * @param string directory
* @return integer number of removed files
* @throws Cache_Error
*/
Modified: trunk/lib/pear/Cache/Container/imgfile.php
===================================================================
--- trunk/lib/pear/Cache/Container/imgfile.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/Cache/Container/imgfile.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -22,6 +22,7 @@
* Stores cache contents in a file.
*
* @author Ulf Wendel <[email protected]>
+* @version
*/
class Cache_Container_file extends Cache_Container {
@@ -68,7 +69,7 @@
/**
* Creates the cache directory if neccessary
*
- * @param array $options Config options: ["cache_dir" => ..., "filename_prefix" => ...]
+ * @param array Config options: ["cache_dir" => ..., "filename_prefix" => ...]
*/
function __construct($options = '') {
if (is_array($options))
@@ -218,7 +219,7 @@
* If you have a user comment for a good default gc probability please add it to
* to the inline docs.
*
- * @param integer $maxlifetime Maximum lifetime in seconds of an no longer used/touched entry
+ * @param integer Maximum lifetime in seconds of an no longer used/touched entry
* @throws Cache_Error
*/
function garbageCollection($maxlifetime) {
@@ -252,8 +253,8 @@
/**
* Does the recursive gc procedure, protected.
*
- * @param integer $maxlifetime Maximum lifetime in seconds of an no longer used/touched entry
- * @param string $dir directory to examine - don't sets this parameter, it's used for a
+ * @param integer Maximum lifetime in seconds of an no longer used/touched entry
+ * @param string directory to examine - don't sets this parameter, it's used for a
* recursive function call!
* @throws Cache_Error
*/
@@ -314,8 +315,8 @@
/**
* Returns the filename for the specified id.
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return string full filename with the path
* @access public
*/
@@ -338,7 +339,7 @@
/**
* Deletes a directory and all files in it.
*
- * @param string $dir directory
+ * @param string directory
* @return integer number of removed files
* @throws Cache_Error
*/
Modified: trunk/lib/pear/Cache/Container/mdb.php
===================================================================
--- trunk/lib/pear/Cache/Container/mdb.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/Cache/Container/mdb.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -17,6 +17,8 @@
// +----------------------------------------------------------------------+
// | Author: Lorenzo Alberton <l.alberton at quipo.it> |
// +----------------------------------------------------------------------+
+//
+// $Id: mdb.php 174777 2004-12-15 09:09:33Z dufuz $
require_once 'lib/pear/MDB.php';
require_once 'lib/pear/Cache/Container.php';
@@ -59,6 +61,7 @@
* ------------------------------------------
*
* @author Lorenzo Alberton <l.alberton at quipo.it>
+* @version $Id: mdb.php 174777 2004-12-15 09:09:33Z dufuz $
* @package Cache
*/
class Cache_Container_mdb extends Cache_Container
@@ -81,7 +84,7 @@
/**
* Constructor
*
- * @param mixed $options Array with connection info or dsn string
+ * @param mixed Array with connection info or dsn string
*/
function __construct($options)
{
@@ -99,8 +102,8 @@
/**
* Fetch in the db the data that matches input parameters
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return mixed dataset value or null/Cache_Error on failure
* @access public
*/
@@ -179,11 +182,11 @@
* If dataset_ID already exists, overwrite it with new data,
* else insert data in a new record.
*
- * @param string $id dataset ID
- * @param mixed $data data to be cached
- * @param integer $expires expiration time
- * @param string $group cache group
- * @param string $userdata userdata
+ * @param string dataset ID
+ * @param mixed data to be cached
+ * @param integer expiration time
+ * @param string cache group
+ * @param string userdata
* @access public
*/
function save($id, $data, $expires, $group, $userdata)
@@ -253,8 +256,8 @@
/**
* Removes a dataset from the database
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
*/
function remove($id, $group)
{
@@ -275,7 +278,7 @@
* Remove all cached data for a certain group, or empty
* the cache table if no group is specified.
*
- * @param string $group cache group
+ * @param string cache group
*/
function flush($group = '')
{
@@ -298,8 +301,8 @@
/**
* Check if a dataset ID/group exists.
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return boolean
*/
function idExists($id, $group)
@@ -324,7 +327,7 @@
/**
* Garbage collector.
*
- * @param int $maxlifetime maxlifetime
+ * @param int maxlifetime
*/
function garbageCollection($maxlifetime)
{
Modified: trunk/lib/pear/Cache/Container/msession.php
===================================================================
--- trunk/lib/pear/Cache/Container/msession.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/Cache/Container/msession.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -14,6 +14,8 @@
// +----------------------------------------------------------------------+
// | Authors: Ulf Wendel <[email protected]> |
// +----------------------------------------------------------------------+
+//
+// $Id: msession.php 178289 2005-01-26 09:47:28Z dufuz $
require_once 'lib/pear/Cache/Container.php';
@@ -23,6 +25,7 @@
* WARNING: experimental, untested
*
* @author Ulf Wendel <[email protected]>
+* @version $Id: msession.php 178289 2005-01-26 09:47:28Z dufuz $
*/
class Cache_Container_msession extends Cache_Container
{
@@ -196,7 +199,7 @@
*
* Note: garbage collection should cause lot's of network traffic.
*
- * @param integer $maxlifetime Maximum lifetime in seconds of an no longer used/touched entry
+ * @param integer Maximum lifetime in seconds of an no longer used/touched entry
* @throws Cache_Error
*/
function garbageCollection($maxlifetime)
Modified: trunk/lib/pear/Cache/Container/phplib.php
===================================================================
--- trunk/lib/pear/Cache/Container/phplib.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/Cache/Container/phplib.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -15,6 +15,8 @@
// | Authors: Ulf Wendel <[email protected]> |
// | Sebastian Bergmann <[email protected]> |
// +----------------------------------------------------------------------+
+//
+// $Id: phplib.php 174777 2004-12-15 09:09:33Z dufuz $
require_once 'lib/pear/Cache/Container.php';
@@ -25,7 +27,7 @@
* the tables shown. As far as I know there's no large binary
* type in SQL-92 or SQL-99. Postgres seems to lack any
* BLOB or TEXT type, for MS-SQL you could use IMAGE, don't know
-* about other databases. Please add suggestions for other databases to
+* about other databases. Please add sugestions for other databases to
* the inline docs.
*
* The field 'changed' is used by the garbage collection. Depending on
@@ -48,6 +50,7 @@
*
*
* @author Ulf Wendel <[email protected]>, Sebastian Bergmann <[email protected]>
+* @version $Id: phplib.php 174777 2004-12-15 09:09:33Z dufuz $
* @package Cache
* @see save()
*/
@@ -101,7 +104,7 @@
/**
* Creates an instance of a phplib db class to use it for storage.
*
- * @param mixed $options If empty the object tries to used the
+ * @param mixed If empty the object tries to used the
* preconfigured class variables. If given it
* must be an array with:
* db_class => name of the DB class to use
Modified: trunk/lib/pear/Cache/Container/shm.php
===================================================================
--- trunk/lib/pear/Cache/Container/shm.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/Cache/Container/shm.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -15,6 +15,8 @@
// | Authors: Ulf Wendel <[email protected]> |
// | Sebastian Bergmann <[email protected]> |
// +----------------------------------------------------------------------+
+//
+// $Id: shm.php 186977 2005-05-25 10:00:41Z dufuz $
require_once 'lib/pear/Cache/Container.php';
@@ -27,6 +29,7 @@
* caching algorithm using PHP.
*
* @author Ulf Wendel <[email protected]>
+* @version $Id: shm.php 186977 2005-05-25 10:00:41Z dufuz $
* @package Cache
*/
class Cache_Container_shm extends Cache_Container
@@ -101,7 +104,7 @@
/**
* Creates a shared memory container
*
- * @param array $options shm_key, sem_key, shm_size, sem_perm, shm_perm
+ * @param array shm_key, sem_key, shm_size, sem_perm, shm_perm
*/
function __construct($options = '')
{
Modified: trunk/lib/pear/Cache/Container/trifile.php
===================================================================
--- trunk/lib/pear/Cache/Container/trifile.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/Cache/Container/trifile.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -16,6 +16,8 @@
// | Sebastian Bergmann <[email protected]> |
// | Ian Eure <[email protected]> |
// +----------------------------------------------------------------------+
+//
+// $Id: trifile.php 184642 2005-04-18 19:05:01Z dufuz $
require_once 'lib/pear/Cache/Container/file.php';
Modified: trunk/lib/pear/Cache/Container.php
===================================================================
--- trunk/lib/pear/Cache/Container.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/Cache/Container.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -16,6 +16,8 @@
// | Sebastian Bergmann <[email protected]> |
// | Christian Stocker <[email protected]> |
// +----------------------------------------------------------------------+
+//
+// $Id: Container.php 293863 2010-01-23 03:46:52Z clockwerx $
require_once 'lib/pear/Cache/Error.php';
@@ -37,6 +39,7 @@
* not recommended!
*
* @author Ulf Wendel <[email protected]>
+* @version $Id: Container.php 293863 2010-01-23 03:46:52Z clockwerx $
* @package Cache
* @access public
* @abstract
@@ -45,7 +48,7 @@
{
/**
- * Flag indicating whether to preload datasets.
+ * Flag indicating wheter to preload datasets.
*
* See the class description for more details.
*
@@ -126,7 +129,7 @@
/**
- * Options that can be set in every derived class using its constructor.
+ * Options that can be set in every derived class using it's constructor.
*
* @var array
*/
@@ -136,8 +139,8 @@
/**
* Loads a dataset from the cache.
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return mixed dataset value or null on failure
* @access public
*/
@@ -162,8 +165,8 @@
/**
* Returns the userdata field of a cached data set.
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return string userdata
* @access public
*/
@@ -188,9 +191,9 @@
/**
* Checks if a dataset is expired.
*
- * @param string $id dataset ID
- * @param string $group cache group
- * @param integer $max_age maximum age timestamp
+ * @param string dataset ID
+ * @param string cache group
+ * @param integer maximum age timestamp
* @return boolean
* @access public
*/
@@ -233,8 +236,8 @@
/**
* Checks if a dataset is cached.
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return boolean
*/
function isCached($id, $group)
@@ -255,8 +258,8 @@
/**
* Fetches a dataset from the storage medium.
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return array format: [expire date, cached data, user data]
* @throws Cache_Error
* @abstract
@@ -269,11 +272,11 @@
/**
* Stores a dataset.
*
- * @param string $id dataset ID
- * @param mixed $data data to store
- * @param mixed $expire userdefined expire date
- * @param string $group cache group
- * @param string $userdata additional userdefined data
+ * @param string dataset ID
+ * @param mixed data to store
+ * @param mixed userdefined expire date
+ * @param string cache group
+ * @param string additional userdefined data
* @return boolean
* @throws Cache_Error
* @access public
@@ -290,8 +293,8 @@
/**
* Removes a dataset.
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return boolean
* @access public
* @abstract
@@ -305,7 +308,7 @@
/**
* Flushes the cache - removes all caches datasets from the cache.
*
- * @param string $group If a cache group is given only the group will be flushed
+ * @param string If a cache group is given only the group will be flushed
* @return integer Number of removed datasets, -1 on failure
* @access public
* @abstract
@@ -319,8 +322,8 @@
/**
* Checks if a dataset exists.
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return boolean
* @access public
* @abstract
@@ -347,8 +350,8 @@
/**
* Does a speculative preload of a dataset
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return boolean
*/
function preload($id, $group)
@@ -378,13 +381,13 @@
* Flushes the internal preload buffer.
*
* save(), remove() and flush() must call this method
- * to prevent differences between the preloaded values and
+ * to preevent differences between the preloaded values and
* the real cache contents.
*
- * @param string $id dataset ID, if left out the preloaded values will be flushed.
+ * @param string dataset ID, if left out the preloaded values will be flushed.
* If given the preloaded values will only be flushed if they are
* equal to the given id and group
- * @param string $group cache group
+ * @param string cache group
* @see preload()
*/
function flushPreload($id = '', $group = 'default')
@@ -403,8 +406,8 @@
/**
* Imports the requested datafields as object variables if allowed
*
- * @param array $requested List of fields to be imported as object variables
- * @param array $allowed List of allowed datafields
+ * @param array List of fields to be imported as object variables
+ * @param array List of allowed datafields
*/
function setOptions($requested, $allowed)
{
@@ -418,7 +421,7 @@
/**
* Encodes the data for the storage container.
*
- * @return mixed data to encode
+ * @var mixed data to encode
*/
function encode($data)
{
@@ -433,7 +436,7 @@
/**
* Decodes the data from the storage container.
*
- * @return mixed
+ * @var mixed
*/
function decode($data)
{
@@ -448,7 +451,7 @@
/**
* Translates human readable/relative times in unixtime
*
- * @param mixed $expires can be in the following formats:
+ * @param mixed can be in the following formats:
* human readable : yyyymmddhhmm[ss]] eg: 20010308095100
* relative in seconds (1) : +xx eg: +10
* relative in seconds (2) : x < 946681200 eg: 10
@@ -468,10 +471,10 @@
} elseif ($expires < 100000000000) {
//if integer is < 100000000000 (= in 3140 years),
// it must be an absolut unixtime
- // (since the "human-readable" definition asks for a higher number)
+ // (since the "human readable" definition asks for a higher number)
return $expires;
} else {
- // else it's "human-readable";
+ // else it's "human readable";
$year = substr($expires, 0, 4);
$month = substr($expires, 4, 2);
$day = substr($expires, 6, 2);
Modified: trunk/lib/pear/Cache/Error.php
===================================================================
--- trunk/lib/pear/Cache/Error.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/Cache/Error.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -14,6 +14,8 @@
// +----------------------------------------------------------------------+
// | Authors: Ulf Wendel <[email protected]> |
// +----------------------------------------------------------------------+
+//
+// $Id: Error.php 174777 2004-12-15 09:09:33Z dufuz $
require_once 'lib/pear/PEAR.php';
@@ -36,9 +38,9 @@
/**
* Creates an cache error object.
*
- * @param string $msg error message
- * @param string $file file where the error occurred
- * @param string $line line number where the error occurred
+ * @param string error message
+ * @param string file where the error occured
+ * @param string linenumber where the error occured
*/
function __construct($msg, $file = __FILE__, $line = __LINE__) {
Modified: trunk/lib/pear/Cache/Function.php
===================================================================
--- trunk/lib/pear/Cache/Function.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/Cache/Function.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -14,6 +14,8 @@
// +----------------------------------------------------------------------+
// | Authors: Sebastian Bergmann <[email protected]> |
// +----------------------------------------------------------------------+
+//
+// $Id: Function.php 174777 2004-12-15 09:09:33Z dufuz $
require_once 'lib/pear/Cache.php';
@@ -63,6 +65,7 @@
* @module Function_Cache
* @modulegroup Function_Cache
* @package Cache
+* @version $Revision: 174777 $
* @access public
*/
class Cache_Function extends Cache
@@ -72,9 +75,9 @@
/**
* Constructor
*
- * @param string $container Name of container class
- * @param array $container_options Array with container class options
- * @param integer $expires Number of seconds for which to cache
+ * @param string Name of container class
+ * @param array Array with container class options
+ * @param integer Number of seconds for which to cache
*/
function __construct($container = 'file',
$container_options = array('cache_dir' => '.',
Modified: trunk/lib/pear/Cache/Graphics.php
===================================================================
--- trunk/lib/pear/Cache/Graphics.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/Cache/Graphics.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -14,6 +14,8 @@
// +----------------------------------------------------------------------+
// | Authors: Ulf Wendel <[email protected]> |
// +----------------------------------------------------------------------+
+//
+// $Id: Graphics.php 178289 2005-01-26 09:47:28Z dufuz $
require_once 'lib/pear/Cache.php';
@@ -64,6 +66,7 @@
* the output buffer. Modify it if required!
*
* @author Ulf Wendel <[email protected]>
+* @version $Id: Graphics.php 178289 2005-01-26 09:47:28Z dufuz $
* @package Cache
*/
class Cache_Graphics extends Cache
@@ -114,7 +117,7 @@
/**
* Mapping from supported image type to a ImageType() constant.
*
- * Refer to the PHP manual for more information on ImageType()
+ * Referr to the PHP manual for more informations on ImageType()
*
* @var array
* @link http://www.php.net/ImageType
@@ -139,13 +142,13 @@
* Returns the content of a cached image file.
*
* This function can be used to send the image directly to the browser.
- * Make sure that you send a correspondding header before sending the image itself.
+ * Make sure that you send a correspondending header before sending the image itself.
*
* Always try to get the image from the cache before you compute it. See
* the class docs for an example.
*
- * @param string $id Image-ID
- * @param string $format Image type: gif, jpg, png, wbmp
+ * @param string Image-ID
+ * @param string Image type: gif, jpg, png, wbmp
* @return string Image file contents if a cached file exists otherwise an empty string
* @see cacheImage()
*/
@@ -162,8 +165,8 @@
* Always try to get the image from the cache before you compute it. See
* the class docs for an example.
*
- * @param string $id Image-ID
- * @param string $format Image type: gif, jpg, png, wbmp
+ * @param string Image-ID
+ * @param string Image type: gif, jpg, png, wbmp
* @return array [ full path to the image file, image url ]
* @throw Cache_Error
* @see cacheImageLink()
@@ -183,18 +186,18 @@
/**
* Create an image from the given image handler, cache it and return the file content.
*
- * Always try to retrieve the image from the cache before you compute it.
+ * Always try to retrive the image from the cache before you compute it.
*
* Warning: this function uses the output buffer. If you expect collisions
* modify the code.
*
- * @param string $id Image-ID. Used as a part of the cache filename.
+ * @param string Image-ID. Used as a part of the cache filename.
* Use md5() to generate a "unique" ID for your image
* based on characteristic values such as the color, size etc.
- * @param string $img Image handler to create the image from.
- * @param string $format Image type: gif, jpg, png, wbmp. Also used as filename suffix.
+ * @param string Image handler to create the image from.
+ * @param string Image type: gif, jpg, png, wbmp. Also used as filename suffix.
* If an unsupported type is requested the functions tries to
- * fall back to a supported type before throwing an exception.
+ * fallback to a supported type before throwing an exeption.
* @return string Image content returned by ImageGIF/...
* @throws Cache_Error
* @access public
@@ -253,15 +256,15 @@
/**
* Create an image from the given image handler, cache it and return a url and the file path of the image.
*
- * Always try to retrieve the image from the cache before you compute it.
+ * Always try to retrive the image from the cache before you compute it.
*
- * @param string $id Image-ID. Used as a part of the cache filename.
+ * @param string Image-ID. Used as a part of the cache filename.
* Use md5() to generate a "unique" ID for your image
* based on characteristic values such as the color, size etc.
- * @param string $img Image handler to create the image from.
- * @param string $format Image type: gif, jpg, png, wbmp. Also used as filename suffix.
+ * @param string Image handler to create the image from.
+ * @param string Image type: gif, jpg, png, wbmp. Also used as filename suffix.
* If an unsupported type is requested the functions tries to
- * fall back to a supported type before throwing an exception.
+ * fallback to a supported type before throwing an exeption.
* @return array [ full path to the image file, image url ]
* @throws Cache_Error
* @access public
@@ -313,8 +316,8 @@
* Make sure that the URL matches the cache directory,
* otherwise you'll get broken links.
*
- * @param string $cache_url
- * @access public
+ * @param string
+ * @access public
* @see setCacheDir()
*/
function setCacheURL($cache_url)
@@ -330,8 +333,8 @@
/**
* Sets the directory where to cache generated Images
*
- * @param string $cache_dir
- * @access public
+ * @param string
+ * @access public
* @see setCacheURL()
*/
function setCacheDir($cache_dir)
Modified: trunk/lib/pear/Cache/HTTP_Request.php
===================================================================
--- trunk/lib/pear/Cache/HTTP_Request.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/Cache/HTTP_Request.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -14,6 +14,8 @@
// +----------------------------------------------------------------------+
// | Authors: Fabien MARTY <[email protected]> |
// +----------------------------------------------------------------------+
+//
+// $Id: HTTP_Request.php 174777 2004-12-15 09:09:33Z dufuz $
require_once 'lib/pear/Cache.php';
require_once 'lib/pear/HTTP/Request.php';
@@ -32,9 +34,9 @@
* You want to get news from another site through RSS remote files. But you
* don't want to access to to the remote site at every time you display
* its news on your site. Because, if the remote site is down or slow...
-* So you need a class which makes a local cache copy of the remote file.
+* So you you need a class which makes a local cache copy of the remote file.
* Every x hours, the cache is updated. But if the remote site is down, the
-* local cache copy is kept (you can also get error messages if you want).
+* local cache copy is keeped (you can also get error messages if you want).
*
* So you need this class!
*
@@ -54,6 +56,7 @@
* ?>
*
* @author Fabien MARTY <[email protected]>
+* @version $Id: HTTP_Request.php 174777 2004-12-15 09:09:33Z dufuz $
* @package Cache
*/
Modified: trunk/lib/pear/Cache/Output.php
===================================================================
--- trunk/lib/pear/Cache/Output.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/Cache/Output.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -16,6 +16,8 @@
// | Christian Stocker <[email protected]> |
// | Vinai Kopp <[email protected]> |
// +----------------------------------------------------------------------+
+//
+// $Id: Output.php 178289 2005-01-26 09:47:28Z dufuz $
require_once 'lib/pear/Cache.php';
@@ -26,9 +28,9 @@
* output can increase the overall speed dramatically, especially if you use
* a Shared Memory storage container.
*
-* As you can see in the example the usage is extremely simple. To cache a script
+* As you can see in the example the usage is extemely simple. To cache a script
* simple put some few lines of code in front of your script and some at the end.
-* A preferable place for this are the auto_prepend and auto_append files (=> php.ini).
+* A preferrable place for this are the auto_prepend and auto_append files (=> php.ini).
*
* Usage example:
*
@@ -88,6 +90,7 @@
* Have fun!
*
* @authors Ulf Wendel <[email protected]>
+* @version $ID: $
* @package Cache
* @access public
*/
@@ -122,8 +125,8 @@
/**
* starts the output buffering and returns an empty string or returns the cached output from the cache.
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return string
* @access public
*/
@@ -183,8 +186,8 @@
* Sends the data to the user.
* This is for compatibility with OutputCompression
*
- * @param string $content
- * @access public
+ * @param string
+ * @access public
*/
function printContent($content = '')
{
Modified: trunk/lib/pear/Cache/OutputCompression.php
===================================================================
--- trunk/lib/pear/Cache/OutputCompression.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/Cache/OutputCompression.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -19,7 +19,7 @@
require_once 'lib/pear/Cache/Output.php';
/**
-* Cache using Output Buffering and content (gz) compression.
+* Cache using Output Buffering and contnet (gz) compression.
** Usage example:
*
* // place this somewhere in a central config file
@@ -50,6 +50,7 @@
*
* Based upon a case study from Christian Stocker and inspired by jpcache.
*
+* @version $Id: OutputCompression.php 178289 2005-01-26 09:47:28Z dufuz $
* @author Ulf Wendel <[email protected]>, Christian Stocker <[email protected]>
* @access public
* @package Cache
@@ -80,9 +81,9 @@
/**
* Sets the storage details and the content encoding used (if not autodetection)
*
- * @param string $container Name of container class
- * @param array $container_options Array with container class options
- * @param string $encoding content encoding mode - auto => test which encoding the user accepts
+ * @param string Name of container class
+ * @param array Array with container class options
+ * @param string content encoding mode - auto => test which encoding the user accepts
*/
function __construct($container, $container_options = '', $encoding = 'auto')
{
@@ -173,8 +174,8 @@
/**
* Sends the compressed data to the user.
*
- * @param string $content
- * @access public
+ * @param string
+ * @access public
*/
function printContent($content = '')
{
@@ -218,7 +219,7 @@
/**
* Sets the encoding to be used.
*
- * @param string $encoding "auto" means autodetect for every client
+ * @param string "auto" means autodetect for every client
* @access public
* @see $encoding
*/
@@ -259,7 +260,7 @@
* Import variables from special namespaces.
*
* @access private
- * @param string $variable Type of variable (server, session, post)
+ * @param string Type of variable (server, session, post)
* @return array
*/
function &_importGlobalVariable($variable)
Modified: trunk/lib/pear/Cache.php
===================================================================
--- trunk/lib/pear/Cache.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/Cache.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -27,7 +27,7 @@
* cache script runs. The idea behind the cache is quite simple. If you have
* the same input parameters for whatever tasks/algorithm you use you'll
* usually get the same output. So why not caching templates, functions calls,
-* graphic generation etc. Caching certain actions e.g. XSLT transformations
+* graphic generation etc. Caching certain actions e.g. XSLT tranformations
* saves you lots of time.
*
* The design of the cache reminds of PHPLibs session implementation. A
@@ -121,8 +121,8 @@
/**
*
- * @param string $container Name of container class
- * @param array $container_options Array with container class options
+ * @param string Name of container class
+ * @param array Array with container class options
*/
function __construct($container, $container_options = '')
{
@@ -155,7 +155,7 @@
/**
* Enables or disables caching.
*
- * @param boolean $state The new caching state.
+ * @param boolean The new caching state.
* @access public
*/
function setCaching($state)
@@ -166,8 +166,8 @@
/**
* Returns the requested dataset it if exists and is not expired
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return mixed cached data or NULL on failure
* @access public
*/
@@ -184,10 +184,10 @@
/**
* Stores the given data in the cache.
*
- * @param string $id dataset ID used as cache identifier
- * @param mixed $data data to cache
- * @param integer $expires lifetime of the cached data in seconds - 0 for endless
- * @param string $group cache group
+ * @param string dataset ID used as cache identifier
+ * @param mixed data to cache
+ * @param integer lifetime of the cached data in seconds - 0 for endless
+ * @param string cache group
* @return boolean
* @access public
*/
@@ -201,11 +201,11 @@
/**
* Stores a dataset without additional userdefined data.
*
- * @param string $id dataset ID
- * @param mixed $cachedata data to store
- * @param string $userdata additional userdefined data
- * @param mixed $expires userdefined expire date
- * @param string $group cache group
+ * @param string dataset ID
+ * @param mixed data to store
+ * @param string additional userdefined data
+ * @param mixed userdefined expire date
+ * @param string cache group
* @return boolean
* @throws Cache_Error
* @access public
@@ -221,8 +221,8 @@
/**
* Loads the given ID from the cache.
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return mixed cached data or NULL on failure
* @access public
*/
@@ -236,8 +236,8 @@
/**
* Returns the userdata field of a cached data set.
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return string userdata
* @access public
* @see extSave()
@@ -252,8 +252,8 @@
/**
* Removes the specified dataset from the cache.
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return boolean
* @access public
*/
@@ -267,7 +267,7 @@
/**
* Flushes the cache - removes all data from it
*
- * @param string $group cache group, if empty all groups will be flashed
+ * @param string cache group, if empty all groups will be flashed
* @return integer number of removed datasets
*/
function flush($group = 'default') {
@@ -282,8 +282,8 @@
*
* Note: this does not say that the cached data is not expired!
*
- * @param string $id dataset ID
- * @param string $group cache group
+ * @param string dataset ID
+ * @param string cache group
* @return boolean
* @access public
*/
@@ -297,9 +297,9 @@
/**
* Checks if a dataset is expired
*
- * @param string $id dataset ID
- * @param string $group cache group
- * @param integer $max_age maximum age for the cached data in seconds - 0 for endless
+ * @param string dataset ID
+ * @param string cache group
+ * @param integer maximum age for the cached data in seconds - 0 for endless
* If the cached data is older but the given lifetime it will
* be removed from the cache. You don't have to provide this
* argument if you call isExpired(). Every dataset knows
@@ -321,7 +321,7 @@
* This is a quick but dirty hack to get a "unique" ID for a any kind of variable.
* ID clashes might occur from time to time although they are extreme unlikely!
*
- * @param mixed $variable variable to generate a ID for
+ * @param mixed variable to generate a ID for
* @return string "unique" ID
* @access public
*/
@@ -333,7 +333,7 @@
/**
* Calls the garbage collector of the storage object with a certain probability
*
- * @param boolean $force Force a garbage collection run?
+ * @param boolean Force a garbage collection run?
* @see $gc_probability, $gc_time
*/
function garbageCollection($force = false) {
Modified: trunk/lib/pear/DB/common.php
===================================================================
--- trunk/lib/pear/DB/common.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/DB/common.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -430,8 +430,8 @@
* </li>
* <li>
* other (including strings and numeric strings) ->
- * the data with single quotes escaped by preceding
- * single quotes, backslashes are escaped by preceding
+ * the data with single quotes escaped by preceeding
+ * single quotes, backslashes are escaped by preceeding
* backslashes, then the whole string is encapsulated
* between single quotes
* </li>
@@ -467,7 +467,7 @@
* Formats a boolean value for use within a query in a locale-independent
* manner.
*
- * @param boolean $boolean the boolean value to be quoted.
+ * @param boolean the boolean value to be quoted.
* @return string the quoted string.
* @see DB_common::quoteSmart()
* @since Method available since release 1.7.8.
@@ -483,7 +483,7 @@
* Formats a float value for use within a query in a locale-independent
* manner.
*
- * @param float $float the float value to be quoted.
+ * @param float the float value to be quoted.
* @return string the quoted string.
* @see DB_common::quoteSmart()
* @since Method available since release 1.7.8.
@@ -543,7 +543,7 @@
* DB_FETCHMODE_OBJECT mode is selected.
* If no class is specified by default a cast
* to object from the assoc array row will be
- * done. There is also the possibility to use
+ * done. There is also the posibility to use
* and extend the 'DB_row' class.
*
* @see DB_FETCHMODE_ORDERED, DB_FETCHMODE_ASSOC, DB_FETCHMODE_OBJECT
@@ -842,7 +842,7 @@
// {{{ autoPrepare()
/**
- * Automatically generates an insert or update query and pass it to prepare()
+ * Automaticaly generates an insert or update query and pass it to prepare()
*
* @param string $table the table name
* @param array $table_fields the array of field names
@@ -870,7 +870,7 @@
// {{{ autoExecute()
/**
- * Automatically generates an insert or update query and call prepare()
+ * Automaticaly generates an insert or update query and call prepare()
* and execute() with it
*
* @param string $table the table name
@@ -883,7 +883,7 @@
* include the "WHERE" keyword.
*
* @return mixed a new DB_result object for successful SELECT queries
- * or DB_OK for successful data manipulation queries.
+ * or DB_OK for successul data manipulation queries.
* A DB_Error object on failure.
*
* @uses DB_common::autoPrepare(), DB_common::execute()
@@ -925,7 +925,7 @@
* NOTES:
* - This belongs more to a SQL Builder class, but this is a simple
* facility.
- * - Be careful! If you don't give a $where param with an UPDATE
+ * - Be carefull! If you don't give a $where param with an UPDATE
* query, all the records of the table will be updated!
*
* @param string $table the table name
@@ -1004,7 +1004,7 @@
* parameters or 1 placeholder per array element.
*
* @return mixed a new DB_result object for successful SELECT queries
- * or DB_OK for successful data manipulation queries.
+ * or DB_OK for successul data manipulation queries.
* A DB_Error object on failure.
*
* {@internal ibase and oci8 have their own execute() methods.}}
@@ -1204,7 +1204,7 @@
* parameters or 1 placeholder per array element.
*
* @return mixed a new DB_result object for successful SELECT queries
- * or DB_OK for successful data manipulation queries.
+ * or DB_OK for successul data manipulation queries.
* A DB_Error object on failure.
*
* @see DB_result, DB_common::prepare(), DB_common::execute()
@@ -1239,7 +1239,7 @@
* Generates and executes a LIMIT query
*
* @param string $query the query
- * @param int $from the row to start to fetching (0 = the first row)
+ * @param intr $from the row to start to fetching (0 = the first row)
* @param int $count the numbers of rows to fetch
* @param mixed $params array, string or numeric data to be used in
* execution of the statement. Quantity of items
@@ -1248,7 +1248,7 @@
* parameters or 1 placeholder per array element.
*
* @return mixed a new DB_result object for successful SELECT queries
- * or DB_OK for successful data manipulation queries.
+ * or DB_OK for successul data manipulation queries.
* A DB_Error object on failure.
*/
function &limitQuery($query, $from, $count, $params = array())
@@ -1746,7 +1746,7 @@
/**
* Determines the number of rows in a query result
*
- * @param resource $result the query result identifier produced by PHP
+ * @param resource $result the query result idenifier produced by PHP
*
* @return int the number of rows. A DB_Error object on failure.
*/
@@ -1759,7 +1759,7 @@
// {{{ affectedRows()
/**
- * Determines the number of rows affected by a data manipulation query
+ * Determines the number of rows affected by a data maniuplation query
*
* 0 is returned for queries that don't manipulate data.
*
@@ -1800,7 +1800,7 @@
* Returns the next free id in a sequence
*
* @param string $seq_name name of the sequence
- * @param boolean $ondemand when true, the sequence is automatically
+ * @param boolean $ondemand when true, the seqence is automatically
* created if it does not exist
*
* @return int the next id number in the sequence.
@@ -1882,23 +1882,23 @@
*
* Basically a wrapper for PEAR::raiseError without the message string.
*
- * @param mixed $code integer error code, or a PEAR error object (all
+ * @param mixed integer error code, or a PEAR error object (all
* other parameters are ignored if this parameter is
* an object
- * @param int $mode error mode, see PEAR_Error docs
- * @param mixed $options if error mode is PEAR_ERROR_TRIGGER, this is the
+ * @param int error mode, see PEAR_Error docs
+ * @param mixed if error mode is PEAR_ERROR_TRIGGER, this is the
* error level (E_USER_NOTICE etc). If error mode is
* PEAR_ERROR_CALLBACK, this is the callback function,
* either as a function name, or as an array of an
* object and method name. For other error modes this
* parameter is ignored.
- * @param string $userinfo extra debug information. Defaults to the last
+ * @param string extra debug information. Defaults to the last
* query and native error code.
- * @param mixed $nativecode native error code, integer or string depending the
+ * @param mixed native error code, integer or string depending the
* backend
- * @param mixed $dummy1 dummy parameter for E_STRICT compatibility with
+ * @param mixed dummy parameter for E_STRICT compatibility with
* PEAR::raiseError
- * @param mixed $dummy2 dummy parameter for E_STRICT compatibility with
+ * @param mixed dummy parameter for E_STRICT compatibility with
* PEAR::raiseError
*
* @return object the PEAR_Error object
@@ -2196,7 +2196,7 @@
* Sets (or unsets) a flag indicating that the next query will be a
* manipulation query, regardless of the usual DB::isManip() heuristics.
*
- * @param boolean $manip true to set the flag overriding the isManip() behaviour,
+ * @param boolean true to set the flag overriding the isManip() behaviour,
* false to clear it and fall back onto isManip()
*
* @return void
@@ -2216,7 +2216,7 @@
* account the _next_query_manip flag and sets the _last_query_manip flag
* (and resets _next_query_manip) according to the result.
*
- * @param string $query The query to check.
+ * @param string The query to check.
*
* @return boolean true if the query is a manipulation query, false
* otherwise
Modified: trunk/lib/pear/DB/dbase.php
===================================================================
--- trunk/lib/pear/DB/dbase.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/DB/dbase.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -354,11 +354,13 @@
* DB_result::numCols() instead. It can't be declared "protected"
* because DB_result is a separate object.
*
+ * @param resource $result PHP's query result resource
+ *
* @return int the number of columns. A DB_Error object on failure.
*
* @see DB_result::numCols()
*/
- function numCols()
+ function numCols($foo)
{
return @dbase_numfields($this->connection);
}
@@ -373,11 +375,13 @@
* DB_result::numRows() instead. It can't be declared "protected"
* because DB_result is a separate object.
*
+ * @param resource $result PHP's query result resource
+ *
* @return int the number of rows. A DB_Error object on failure.
*
* @see DB_result::numRows()
*/
- function numRows()
+ function numRows($foo)
{
return @dbase_numrecords($this->connection);
}
@@ -389,7 +393,7 @@
* Formats a boolean value for use within a query in a locale-independent
* manner.
*
- * @param boolean $boolean the boolean value to be quoted.
+ * @param boolean the boolean value to be quoted.
* @return string the quoted string.
* @see DB_common::quoteSmart()
* @since Method available since release 1.7.8.
Modified: trunk/lib/pear/DB/fbsql.php
===================================================================
--- trunk/lib/pear/DB/fbsql.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/DB/fbsql.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -212,7 +212,7 @@
/**
* Sends a query to the database server
*
- * @param string $query the SQL query string
+ * @param string the SQL query string
*
* @return mixed + a PHP result resrouce for successful SELECT queries
* + the DB_OK constant for other successful queries
@@ -240,7 +240,7 @@
/**
* Move the internal fbsql result pointer to the next available result
*
- * @param $result valid fbsql result resource
+ * @param a valid fbsql result resource
*
* @access public
*
@@ -422,7 +422,7 @@
// {{{ affectedRows()
/**
- * Determines the number of rows affected by a data manipulation query
+ * Determines the number of rows affected by a data maniuplation query
*
* 0 is returned for queries that don't manipulate data.
*
@@ -445,7 +445,7 @@
* Returns the next free id in a sequence
*
* @param string $seq_name name of the sequence
- * @param boolean $ondemand when true, the sequence is automatically
+ * @param boolean $ondemand when true, the seqence is automatically
* created if it does not exist
*
* @return int the next id number in the sequence.
@@ -558,7 +558,7 @@
* Formats a boolean value for use within a query in a locale-independent
* manner.
*
- * @param boolean $boolean the boolean value to be quoted.
+ * @param boolean the boolean value to be quoted.
* @return string the quoted string.
* @see DB_common::quoteSmart()
* @since Method available since release 1.7.8.
@@ -574,7 +574,7 @@
* Formats a float value for use within a query in a locale-independent
* manner.
*
- * @param float $float the float value to be quoted.
+ * @param float the float value to be quoted.
* @return string the quoted string.
* @see DB_common::quoteSmart()
* @since Method available since release 1.7.8.
Modified: trunk/lib/pear/DB/ibase.php
===================================================================
--- trunk/lib/pear/DB/ibase.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/DB/ibase.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -267,7 +267,7 @@
/**
* Sends a query to the database server
*
- * @param string $query the SQL query string
+ * @param string the SQL query string
*
* @return mixed + a PHP result resrouce for successful SELECT queries
* + the DB_OK constant for other successful queries
@@ -331,7 +331,7 @@
/**
* Move the internal ibase result pointer to the next available result
*
- * @param $result valid fbsql result resource
+ * @param a valid fbsql result resource
*
* @access public
*
@@ -427,7 +427,7 @@
// {{{ affectedRows()
/**
- * Determines the number of rows affected by a data manipulation query
+ * Determines the number of rows affected by a data maniuplation query
*
* 0 is returned for queries that don't manipulate data.
*
Modified: trunk/lib/pear/DB/ifx.php
===================================================================
--- trunk/lib/pear/DB/ifx.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/DB/ifx.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -236,7 +236,7 @@
/**
* Sends a query to the database server
*
- * @param string $query the SQL query string
+ * @param string the SQL query string
*
* @return mixed + a PHP result resrouce for successful SELECT queries
* + the DB_OK constant for other successful queries
@@ -287,7 +287,7 @@
/**
* Move the internal ifx result pointer to the next available result
*
- * @param $result valid fbsql result resource
+ * @param a valid fbsql result resource
*
* @access public
*
@@ -302,7 +302,7 @@
// {{{ affectedRows()
/**
- * Determines the number of rows affected by a data manipulation query
+ * Determines the number of rows affected by a data maniuplation query
*
* 0 is returned for queries that don't manipulate data.
*
Modified: trunk/lib/pear/DB/msql.php
===================================================================
--- trunk/lib/pear/DB/msql.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/DB/msql.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -234,7 +234,7 @@
/**
* Sends a query to the database server
*
- * @param string $query the SQL query string
+ * @param string the SQL query string
*
* @return mixed + a PHP result resrouce for successful SELECT queries
* + the DB_OK constant for other successful queries
@@ -266,7 +266,7 @@
/**
* Move the internal msql result pointer to the next available result
*
- * @param $result valid fbsql result resource
+ * @param a valid fbsql result resource
*
* @access public
*
@@ -406,7 +406,7 @@
// {{{ affected()
/**
- * Determines the number of rows affected by a data manipulation query
+ * Determines the number of rows affected by a data maniuplation query
*
* 0 is returned for queries that don't manipulate data.
*
@@ -536,7 +536,7 @@
* Formats a float value for use within a query in a locale-independent
* manner.
*
- * @param float $float the float value to be quoted.
+ * @param float the float value to be quoted.
* @return string the quoted string.
* @see DB_common::quoteSmart()
* @since Method available since release 1.7.8.
Modified: trunk/lib/pear/DB/mssql.php
===================================================================
--- trunk/lib/pear/DB/mssql.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/DB/mssql.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -266,7 +266,7 @@
/**
* Sends a query to the database server
*
- * @param string $query the SQL query string
+ * @param string the SQL query string
*
* @return mixed + a PHP result resrouce for successful SELECT queries
* + the DB_OK constant for other successful queries
@@ -304,7 +304,7 @@
/**
* Move the internal mssql result pointer to the next available result
*
- * @param $result valid fbsql result resource
+ * @param a valid fbsql result resource
*
* @access public
*
@@ -505,7 +505,7 @@
// {{{ affectedRows()
/**
- * Determines the number of rows affected by a data manipulation query
+ * Determines the number of rows affected by a data maniuplation query
*
* 0 is returned for queries that don't manipulate data.
*
@@ -669,7 +669,10 @@
/**
* Produces a DB_Error object regarding the current problem
*
- * @param null $code
+ * @param int $errno if the error is being manually raised pass a
+ * DB_ERROR* constant here. If this isn't passed
+ * the error information gathered from the DBMS.
+ *
* @return object the DB_Error object
*
* @see DB_common::raiseError(),
@@ -938,7 +941,7 @@
if (!is_array($array)) {
$array = array($value);
} elseif (!in_array($value, $array)) {
- $array[] = $value;
+ array_push($array, $value);
}
}
Modified: trunk/lib/pear/DB/mysql.php
===================================================================
--- trunk/lib/pear/DB/mysql.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/DB/mysql.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -296,7 +296,7 @@
* mysql_unbuffered_query() set the "result_buffering" option to 0 using
* setOptions(). This option was added in Release 1.7.0.
*
- * @param string $query the SQL query string
+ * @param string the SQL query string
*
* @return mixed + a PHP result resrouce for successful SELECT queries
* + the DB_OK constant for other successful queries
@@ -344,7 +344,7 @@
*
* This method has not been implemented yet.
*
- * @param a $result valid sql result resource
+ * @param a valid sql result resource
*
* @return false
*/
@@ -554,7 +554,7 @@
// {{{ affectedRows()
/**
- * Determines the number of rows affected by a data manipulation query
+ * Determines the number of rows affected by a data maniuplation query
*
* 0 is returned for queries that don't manipulate data.
*
Modified: trunk/lib/pear/DB/mysqli.php
===================================================================
--- trunk/lib/pear/DB/mysqli.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/DB/mysqli.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -380,7 +380,7 @@
/**
* Sends a query to the database server
*
- * @param string $query the SQL query string
+ * @param string the SQL query string
*
* @return mixed + a PHP result resrouce for successful SELECT queries
* + the DB_OK constant for other successful queries
@@ -638,7 +638,7 @@
// {{{ affectedRows()
/**
- * Determines the number of rows affected by a data manipulation query
+ * Determines the number of rows affected by a data maniuplation query
*
* 0 is returned for queries that don't manipulate data.
*
Modified: trunk/lib/pear/DB/oci8.php
===================================================================
--- trunk/lib/pear/DB/oci8.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/DB/oci8.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -303,7 +303,7 @@
* ocisetprefetch(), see the "result_buffering" option in setOptions().
* This option was added in Release 1.7.0.
*
- * @param string $query the SQL query string
+ * @param string the SQL query string
*
* @return mixed + a PHP result resrouce for successful SELECT queries
* + the DB_OK constant for other successful queries
@@ -342,7 +342,7 @@
/**
* Move the internal oracle result pointer to the next available result
*
- * @param a $result valid oci8 result resource
+ * @param a valid oci8 result resource
*
* @access public
*
@@ -712,7 +712,7 @@
*/
function autoCommit($onoff = false)
{
- $this->autocommit = (bool)$onoff;
+ $this->autocommit = (bool)$onoff;;
return DB_OK;
}
@@ -754,7 +754,7 @@
// {{{ affectedRows()
/**
- * Determines the number of rows affected by a data manipulation query
+ * Determines the number of rows affected by a data maniuplation query
*
* 0 is returned for queries that don't manipulate data.
*
@@ -1137,7 +1137,7 @@
* Formats a float value for use within a query in a locale-independent
* manner.
*
- * @param float $float the float value to be quoted.
+ * @param float the float value to be quoted.
* @return string the quoted string.
* @see DB_common::quoteSmart()
* @since Method available since release 1.7.8.
Modified: trunk/lib/pear/DB/odbc.php
===================================================================
--- trunk/lib/pear/DB/odbc.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/DB/odbc.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -249,7 +249,7 @@
/**
* Sends a query to the database server
*
- * @param string $query the SQL query string
+ * @param string the SQL query string
*
* @return mixed + a PHP result resrouce for successful SELECT queries
* + the DB_OK constant for other successful queries
@@ -279,7 +279,7 @@
/**
* Move the internal odbc result pointer to the next available result
*
- * @param $result valid fbsql result resource
+ * @param a valid fbsql result resource
*
* @access public
*
@@ -398,7 +398,7 @@
// {{{ affectedRows()
/**
- * Determines the number of rows affected by a data manipulation query
+ * Determines the number of rows affected by a data maniuplation query
*
* 0 is returned for queries that don't manipulate data.
*
Modified: trunk/lib/pear/DB/pgsql.php
===================================================================
--- trunk/lib/pear/DB/pgsql.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/DB/pgsql.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -311,7 +311,7 @@
/**
* Sends a query to the database server
*
- * @param string $query the SQL query string
+ * @param string the SQL query string
*
* @return mixed + a PHP result resrouce for successful SELECT queries
* + the DB_OK constant for other successful queries
@@ -375,7 +375,7 @@
/**
* Move the internal pgsql result pointer to the next available result
*
- * @param $result valid fbsql result resource
+ * @param a valid fbsql result resource
*
* @access public
*
@@ -471,7 +471,7 @@
* Formats a boolean value for use within a query in a locale-independent
* manner.
*
- * @param boolean $boolean the boolean value to be quoted.
+ * @param boolean the boolean value to be quoted.
* @return string the quoted string.
* @see DB_common::quoteSmart()
* @since Method available since release 1.7.8.
@@ -630,7 +630,7 @@
// {{{ affectedRows()
/**
- * Determines the number of rows affected by a data manipulation query
+ * Determines the number of rows affected by a data maniuplation query
*
* 0 is returned for queries that don't manipulate data.
*
@@ -1097,7 +1097,7 @@
* account the _next_query_manip flag and sets the _last_query_manip flag
* (and resets _next_query_manip) according to the result.
*
- * @param string $query The query to check.
+ * @param string The query to check.
*
* @return boolean true if the query is a manipulation query, false
* otherwise
Modified: trunk/lib/pear/DB/sqlite.php
===================================================================
--- trunk/lib/pear/DB/sqlite.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/DB/sqlite.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -273,7 +273,7 @@
* It is automatically turned on when connecting to the database.
* Make sure your scripts don't turn it off.
*
- * @param string $query the SQL query string
+ * @param string the SQL query string
*
* @return mixed + a PHP result resrouce for successful SELECT queries
* + the DB_OK constant for other successful queries
@@ -468,7 +468,7 @@
// {{{ affected()
/**
- * Determines the number of rows affected by a data manipulation query
+ * Determines the number of rows affected by a data maniuplation query
*
* 0 is returned for queries that don't manipulate data.
*
Modified: trunk/lib/pear/DB/sqlite3.php
===================================================================
--- trunk/lib/pear/DB/sqlite3.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/DB/sqlite3.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -273,7 +273,7 @@
* It is automatically turned on when connecting to the database.
* Make sure your scripts don't turn it off.
*
- * @param string $query the SQL query string
+ * @param string the SQL query string
*
* @return mixed + a PHP SQLite3Result object for successful SELECT queries
* + the DB_OK constant for other successful queries
@@ -485,7 +485,7 @@
// {{{ affected()
/**
- * Determines the number of rows affected by a data manipulation query
+ * Determines the number of rows affected by a data maniuplation query
*
* 0 is returned for queries that don't manipulate data.
*
Modified: trunk/lib/pear/DB/storage.php
===================================================================
--- trunk/lib/pear/DB/storage.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/DB/storage.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -402,7 +402,7 @@
/**
* Fetch an attribute value.
*
- * @param string $property attribute name
+ * @param string attribute name
*
* @return attribute contents, or null if the attribute name is
* unknown
Modified: trunk/lib/pear/DB/sybase.php
===================================================================
--- trunk/lib/pear/DB/sybase.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/DB/sybase.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -241,7 +241,7 @@
/**
* Sends a query to the database server
*
- * @param string $query the SQL query string
+ * @param string the SQL query string
*
* @return mixed + a PHP result resrouce for successful SELECT queries
* + the DB_OK constant for other successful queries
@@ -282,7 +282,7 @@
/**
* Move the internal sybase result pointer to the next available result
*
- * @param $result valid sybase result resource
+ * @param a valid sybase result resource
*
* @access public
*
@@ -428,7 +428,7 @@
// {{{ affectedRows()
/**
- * Determines the number of rows affected by a data manipulation query
+ * Determines the number of rows affected by a data maniuplation query
*
* 0 is returned for queries that don't manipulate data.
*
@@ -536,7 +536,7 @@
* Formats a float value for use within a query in a locale-independent
* manner.
*
- * @param float $float the float value to be quoted.
+ * @param float the float value to be quoted.
* @return string the quoted string.
* @see DB_common::quoteSmart()
* @since Method available since release 1.7.8.
@@ -898,7 +898,7 @@
if (!is_array($array)) {
$array = array($value);
} elseif (!in_array($value, $array)) {
- $array[] = $value;
+ array_push($array, $value);
}
}
Modified: trunk/lib/pear/DB.php
===================================================================
--- trunk/lib/pear/DB.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/DB.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -61,7 +61,7 @@
define('DB_ERROR_CONSTRAINT', -3);
/**
- * An identifier in the query refers to a non-existent object
+ * An identifier in the query refers to a non-existant object
*/
define('DB_ERROR_NOT_FOUND', -4);
@@ -126,12 +126,12 @@
define('DB_ERROR_CANNOT_DROP', -17);
/**
- * An identifier in the query refers to a non-existent table
+ * An identifier in the query refers to a non-existant table
*/
define('DB_ERROR_NOSUCHTABLE', -18);
/**
- * An identifier in the query refers to a non-existent column
+ * An identifier in the query refers to a non-existant column
*/
define('DB_ERROR_NOSUCHFIELD', -19);
@@ -457,7 +457,7 @@
*
* @see DB_common::setOption()
*/
- public static function factory(string $type, $options = false)
+ public static function factory($type, $options = false)
{
if (!is_array($options)) {
$options = array('persistent' => $options);
@@ -528,7 +528,7 @@
*
* @uses DB::parseDSN(), DB_common::setOption(), PEAR::isError()
*/
- public static function connect($dsn, array $options = array())
+ public static function connect($dsn, $options = array())
{
$dsninfo = DB::parseDSN($dsn);
$type = $dsninfo['phptype'];
@@ -639,7 +639,7 @@
*
* @return boolean whether $query is a data manipulation query
*/
- public static function isManip(string $query)
+ public static function isManip($query)
{
$manips = 'INSERT|UPDATE|DELETE|REPLACE|'
. 'CREATE|DROP|'
@@ -663,7 +663,7 @@
* @return string the error message or false if the error code was
* not recognized
*/
- public static function errorMessage(int $value)
+ public static function errorMessage($value)
{
static $errorMessages;
if (!isset($errorMessages)) {
@@ -747,7 +747,7 @@
* + username: User name for login
* + password: Password for login
*/
- public static function parseDSN(string $dsn)
+ public static function parseDSN($dsn)
{
$parsed = array(
'phptype' => false,
@@ -876,8 +876,8 @@
/**
* Returns the given DSN in a string format suitable for output.
*
- * @param array|string $dsn the DSN to parse and format
- * @param boolean $hidePassword true to hide the password, false to include it
+ * @param array|string the DSN to parse and format
+ * @param boolean true to hide the password, false to include it
* @return string
*/
public static function getDSNString($dsn, $hidePassword) {
@@ -1125,11 +1125,11 @@
*
* @param object &$dbh the DB object reference
* @param resource $result the result resource id
- * @param array $options an associative array with result options
+ * @param array $options an associative array with result options
*
* @return void
*/
- function __construct(object &$dbh, $result, array $options = array())
+ function __construct(&$dbh, $result, $options = array())
{
$this->autofree = $dbh->options['autofree'];
$this->dbh = &$dbh;
@@ -1152,7 +1152,7 @@
*
* @return void
*/
- function setOption(string $key, $value = null)
+ function setOption($key, $value = null)
{
switch ($key) {
case 'limit_from':
@@ -1185,7 +1185,7 @@
* right trim the data
*
* @param int $fetchmode the constant indicating how to format the data
- * @param int|null $rownum the row number to fetch (index starts at 0)
+ * @param int $rownum the row number to fetch (index starts at 0)
*
* @return mixed an array or object containing the row's data,
* NULL when the end of the result set is reached
@@ -1193,7 +1193,7 @@
*
* @see DB_common::setOption(), DB_common::setFetchMode()
*/
- function &fetchRow(int $fetchmode = DB_FETCHMODE_DEFAULT, int $rownum = null)
+ function &fetchRow($fetchmode = DB_FETCHMODE_DEFAULT, $rownum = null)
{
if ($fetchmode === DB_FETCHMODE_DEFAULT) {
$fetchmode = $this->fetchmode;
@@ -1267,8 +1267,8 @@
* right trim the data
*
* @param array &$arr the variable where the data should be placed
- * @param int $fetchmode the constant indicating how to format the data
- * @param int|null $rownum the row number to fetch (index starts at 0)
+ * @param int $fetchmode the constant indicating how to format the data
+ * @param int $rownum the row number to fetch (index starts at 0)
*
* @return mixed DB_OK if a row is processed, NULL when the end of the
* result set is reached or a DB_Error object on failure
@@ -1275,7 +1275,7 @@
*
* @see DB_common::setOption(), DB_common::setFetchMode()
*/
- function fetchInto(array &$arr, int $fetchmode = DB_FETCHMODE_DEFAULT, int $rownum = null)
+ function fetchInto(&$arr, $fetchmode = DB_FETCHMODE_DEFAULT, $rownum = null)
{
if ($fetchmode === DB_FETCHMODE_DEFAULT) {
$fetchmode = $this->fetchmode;
@@ -1498,7 +1498,7 @@
/**
* The constructor places a row's data into properties of this object
*
- * @param array $arr the array containing the row's data
+ * @param array the array containing the row's data
*
* @return void
*/
Modified: trunk/lib/pear/JSON.php
===================================================================
--- trunk/lib/pear/JSON.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/JSON.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -50,6 +50,7 @@
* @author Matt Knapp <mdknapp[at]gmail[dot]com>
* @author Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
* @copyright 2005 Michal Migurski
+ * @version CVS: $Id: JSON.php 305040 2010-11-02 23:19:03Z alan_k $
* @license http://www.opensource.org/licenses/bsd-license.php
* @link http://pear.php.net/pepr/pepr-proposal-show.php?id=198
*/
@@ -720,9 +721,9 @@
}
}
- $stk[] = array('what' => SERVICES_JSON_SLICE,
- 'where' => 0,
- 'delim' => false);
+ array_push($stk, array('what' => SERVICES_JSON_SLICE,
+ 'where' => 0,
+ 'delim' => false));
$chrs = $this->substr8($str, 1, -1);
$chrs = $this->reduce_string($chrs);
@@ -750,12 +751,12 @@
// found a comma that is not inside a string, array, etc.,
// OR we've reached the end of the character list
$slice = $this->substr8($chrs, $top['where'], ($c - $top['where']));
- $stk[] = array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false);
+ array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
//print("Found split at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
if (reset($stk) == SERVICES_JSON_IN_ARR) {
// we are in an array, so just push an element onto the stack
- $arr[] = $this->decode($slice);
+ array_push($arr, $this->decode($slice));
} elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
// we are in an object, so figure
@@ -789,7 +790,7 @@
} elseif ((($chrs[$c] == '"') || ($chrs[$c] == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
// found a quote, and we are not inside a string
- $stk[] = array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs[$c]);
+ array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs[$c]));
//print("Found start of string at {$c}\n");
} elseif (($chrs[$c] == $top['delim']) &&
@@ -804,7 +805,7 @@
} elseif (($chrs[$c] == '[') &&
in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
// found a left-bracket, and we are in an array, object, or slice
- $stk[] = array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false);
+ array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
//print("Found start of array at {$c}\n");
} elseif (($chrs[$c] == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
@@ -815,7 +816,7 @@
} elseif (($chrs[$c] == '{') &&
in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
// found a left-brace, and we are in an array, object, or slice
- $stk[] = array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false);
+ array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
//print("Found start of object at {$c}\n");
} elseif (($chrs[$c] == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
@@ -826,7 +827,7 @@
} elseif (($substr_chrs_c_2 == '/*') &&
in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
// found a comment start, and we are in an array, object, or slice
- $stk[] = array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false);
+ array_push($stk, array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false));
$c++;
//print("Found start of comment at {$c}\n");
@@ -873,8 +874,8 @@
/**
* Calculates length of string in bytes
- * @param string $str
- * @return integer length
+ * @param string
+ * @return integer length
*/
function strlen8( $str )
{
@@ -886,9 +887,9 @@
/**
* Returns part of a string, interpreting $start and $length as number of bytes.
- * @param string $string
- * @param integer $start start
- * @param integer $length length
+ * @param string
+ * @param integer start
+ * @param integer length
* @return integer length
*/
function substr8( $string, $start, $length=false )
Modified: trunk/lib/pear/PEAR.php
===================================================================
--- trunk/lib/pear/PEAR.php 2025-02-09 18:37:38 UTC (rev 11085)
+++ trunk/lib/pear/PEAR.php 2025-02-09 18:59:38 UTC (rev 11086)
@@ -49,7 +49,9 @@
$GLOBALS['_PEAR_shutdown_funcs'] = array();
$GLOBALS['_PEAR_error_handler_stack'] = array();
-@ini_set('track_errors', true);
+if(function_exists('ini_set')) {
+ @ini_set('track_errors', true);
+}
/**
* Base class for other PEAR classes. Provides rudimentary
@@ -75,7 +77,7 @@
* @author Greg Beaver <[email protected]>
* @copyright 1997-2006 The PHP Group
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.10.15
+ * @version Release: 1.10.16
* @link http://pear.php.net/package/PEAR
* @see PEAR_Error
* @since Class available since PHP 4.0.2
@@ -199,7 +201,7 @@
* but is included for forward compatibility, so subclass
* destructors should always call it.
*
- * See the note in the class description about output from
+ * See the note in the class desciption about output from
* destructors.
*
* @access public
@@ -405,9 +407,9 @@
function expectError($code = '*')
{
if (is_array($code)) {
- $this->_expected_errors[] = $code;
+ array_push($this->_expected_errors, $code);
} else {
- $this->_expected_errors[] = array($code);
+ array_push($this->_expected_errors, array($code));
}
return count($this->_expected_errors);
}
@@ -426,7 +428,7 @@
/**
* This method checks unsets an error code if available
*
- * @param mixed $error_code error code
+ * @param mixed error code
* @return bool true if the error code was unset, false otherwise
* @access private
* @since PHP 4.3.0
@@ -845,7 +847,7 @@
* @author Gregory Beaver <[email protected]>
* @copyright 1997-2006 The PHP Group
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.10.15
+ * @version Release: 1.10.16
* @link http://pear.php.net/manual/en/core.pear.pear-error.php
* @see PEAR::raiseError(), PEAR::throwError()
* @since Class available since PHP 4.0.2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.