Throw an exception if Parser::disableCache is called before mOutput initialized ...

[lhc/web/wiklou.git] / includes / Cdb_PHP.php

diff --git a/includes/Cdb_PHP.php b/includes/Cdb_PHP.php
index 70dccdf..aaaf33a 100644 (file)
--- a/includes/Cdb_PHP.php
+++ b/includes/Cdb_PHP.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This is a port of D.J. Bernstein's CDB to PHP. It's based on the copy that 
+ * This is a port of D.J. Bernstein's CDB to PHP. It's based on the copy that
  * appears in PHP 5.3. Changes are:
  *    * Error returns replaced with exceptions
  *    * Exception thrown if sizes or offsets are between 2GB and 4GB
@@ -16,6 +16,10 @@ class CdbFunctions {
        /**
         * Take a modulo of a signed integer as if it were an unsigned integer.
         * $b must be less than 0x40000000 and greater than 0
+        *
+        * @param $a
+        * @param $b
+        *
         * @return int
         */
        public static function unsignedMod( $a, $b ) {
@@ -46,8 +50,9 @@ class CdbFunctions {
 
        /**
         * The CDB hash function.
-        * 
+        *
         * @param $s
+        *
         * @return
         */
        public static function hash( $s ) {
@@ -57,7 +62,7 @@ class CdbFunctions {
                        // Do a 32-bit sum
                        // Inlined here for speed
                        $sum = ($h & 0x3fffffff) + ($h5 & 0x3fffffff);
-                       $h = 
+                       $h =
                                (
                                        ( $sum & 0x40000000 ? 1 : 0 )
                                        + ( $h & 0x80000000 ? 2 : 0 )
@@ -99,8 +104,11 @@ class CdbReader_PHP extends CdbReader {
        var $dpos;
 
        /* initialized if cdb_findnext() returns 1 */
-       var $dlen; 
+       var $dlen;
 
+       /**
+        * @param $fileName string
+        */
        function __construct( $fileName ) {
                $this->handle = fopen( $fileName, 'rb' );
                if ( !$this->handle ) {
@@ -116,6 +124,10 @@ class CdbReader_PHP extends CdbReader {
                unset( $this->handle );
        }
 
+       /**
+        * @param $key
+        * @return bool|string
+        */
        public function get( $key ) {
                // strval is required
                if ( $this->find( strval( $key ) ) ) {
@@ -248,8 +260,11 @@ class CdbWriter_PHP extends CdbWriter {
        var $handle, $realFileName, $tmpFileName;
 
        var $hplist;
-       var $numEntries, $pos;
+       var $numentries, $pos;
 
+       /**
+        * @param $fileName string
+        */
        function __construct( $fileName ) {
                $this->realFileName = $fileName;
                $this->tmpFileName = $fileName . '.tmp.' . mt_rand( 0, 0x7fffffff );
@@ -327,6 +342,11 @@ class CdbWriter_PHP extends CdbWriter {
                $this->pos = $newpos;
        }
 
+       /**
+        * @param $keylen
+        * @param $datalen
+        * @param $h
+        */
        protected function addend( $keylen, $datalen, $h ) {
                $this->hplist[] = array(
                        'h' => $h,
@@ -355,6 +375,9 @@ class CdbWriter_PHP extends CdbWriter {
                $this->write( $buf );
        }
 
+       /**
+        * @throws MWException
+        */
        protected function finish() {
                // Hack for DBA cross-check
                $this->hplist = array_reverse( $this->hplist );
@@ -374,7 +397,7 @@ class CdbWriter_PHP extends CdbWriter {
                }
 
                // Excessively clever and indulgent code to simultaneously fill $packedTables
-               // with the packed hashtables, and adjust the elements of $starts 
+               // with the packed hashtables, and adjust the elements of $starts
                // to actually point to the starts instead of the ends.
                $packedTables = array_fill( 0, $this->numentries, false );
                foreach ( $this->hplist as $item ) {
@@ -399,7 +422,7 @@ class CdbWriter_PHP extends CdbWriter {
                        // is taken.
                        for ( $u = 0; $u < $count; ++$u ) {
                                $hp = $packedTables[$starts[$i] + $u];
-                               $where = CdbFunctions::unsignedMod( 
+                               $where = CdbFunctions::unsignedMod(
                                        CdbFunctions::unsignedShiftRight( $hp['h'], 8 ), $len );
                                while ( $hashtable[$where]['p'] )
                                        if ( ++$where == $len )
@@ -409,7 +432,7 @@ class CdbWriter_PHP extends CdbWriter {
 
                        // Write the hashtable
                        for ( $u = 0; $u < $len; ++$u ) {
-                               $buf = pack( 'vvV', 
+                               $buf = pack( 'vvV',
                                        $hashtable[$u]['h'] & 0xffff,
                                        CdbFunctions::unsignedShiftRight( $hashtable[$u]['h'], 16 ),
                                        $hashtable[$u]['p'] );