From: addshore <addshorewiki@gmail.com>
Date: Sun, 3 Apr 2016 09:19:48 +0000 (+0300)
Subject: Remove usages of CdbCompat class alises
X-Git-Tag: 1.31.0-rc.0~7389^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations//%22%24printurl/%22?a=commitdiff_plain;h=2ac621beb7aefcb516dfbeba0f8e3044ff35f55b;p=lhc%2Fweb%2Fwiklou.git

Remove usages of CdbCompat class alises

Change-Id: Id7223689f135c3ce3e4193f8c724b52d3f39dfd5
---

diff --git a/includes/cache/localisation/LCStoreCDB.php b/includes/cache/localisation/LCStoreCDB.php
index 386ef8cf5d..2c3f58fed7 100644
--- a/includes/cache/localisation/LCStoreCDB.php
+++ b/includes/cache/localisation/LCStoreCDB.php
@@ -17,6 +17,9 @@
  *
  * @file
  */
+use Cdb\Exception;
+use Cdb\Reader;
+use Cdb\Writer;
 
 /**
  * LCStore implementation which stores data as a collection of CDB files in the
@@ -32,10 +35,10 @@
  */
 class LCStoreCDB implements LCStore {
 
-	/** @var CdbReader[] */
+	/** @var Reader[] */
 	private $readers;
 
-	/** @var CdbWriter */
+	/** @var Writer */
 	private $writer;
 
 	/** @var string Current language code */
@@ -61,8 +64,8 @@ class LCStoreCDB implements LCStore {
 			$this->readers[$code] = false;
 			if ( file_exists( $fileName ) ) {
 				try {
-					$this->readers[$code] = CdbReader::open( $fileName );
-				} catch ( CdbException $e ) {
+					$this->readers[$code] = Reader::open( $fileName );
+				} catch ( Exception $e ) {
 					wfDebug( __METHOD__ . ": unable to open cdb file for reading\n" );
 				}
 			}
@@ -74,8 +77,8 @@ class LCStoreCDB implements LCStore {
 			$value = false;
 			try {
 				$value = $this->readers[$code]->get( $key );
-			} catch ( CdbException $e ) {
-				wfDebug( __METHOD__ . ": CdbException caught, error message was "
+			} catch ( Exception $e ) {
+				wfDebug( __METHOD__ . ": \Cdb\Exception caught, error message was "
 					. $e->getMessage() . "\n" );
 			}
 			if ( $value === false ) {
@@ -100,8 +103,8 @@ class LCStoreCDB implements LCStore {
 		}
 
 		try {
-			$this->writer = CdbWriter::open( $this->getFileName( $code ) );
-		} catch ( CdbException $e ) {
+			$this->writer = Writer::open( $this->getFileName( $code ) );
+		} catch ( Exception $e ) {
 			throw new MWException( $e->getMessage() );
 		}
 		$this->currentLang = $code;
@@ -111,7 +114,7 @@ class LCStoreCDB implements LCStore {
 		// Close the writer
 		try {
 			$this->writer->close();
-		} catch ( CdbException $e ) {
+		} catch ( Exception $e ) {
 			throw new MWException( $e->getMessage() );
 		}
 		$this->writer = null;
@@ -125,7 +128,7 @@ class LCStoreCDB implements LCStore {
 		}
 		try {
 			$this->writer->set( $key, serialize( $value ) );
-		} catch ( CdbException $e ) {
+		} catch ( Exception $e ) {
 			throw new MWException( $e->getMessage() );
 		}
 	}