X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FOracleInstaller.php;h=659a1d7cc6628fc12d6a07fc3ced9315f94fd18a;hb=9d78fc2c872daf0eed70a1d63a09cc5b34711d0f;hp=14683d6c46d43a07aa77f8c511840a4008338335;hpb=6c9a2923fe1ee3a65cb027be5e781772f2b12fbd;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/OracleInstaller.php b/includes/installer/OracleInstaller.php
index 14683d6c46..659a1d7cc6 100644
--- a/includes/installer/OracleInstaller.php
+++ b/includes/installer/OracleInstaller.php
@@ -21,6 +21,7 @@
  * @ingroup Deployment
  */
 
+use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\DBConnectionError;
 
 /**
@@ -45,7 +46,8 @@ class OracleInstaller extends DatabaseInstaller {
 		'_InstallUser' => 'SYSTEM',
 	];
 
-	public $minimumVersion = '9.0.1'; // 9iR1
+	public static $minimumVersion = '9.0.1'; // 9iR1
+	protected static $notMiniumumVerisonMessage = 'config-oracle-old';
 
 	protected $connError = null;
 
@@ -152,49 +154,41 @@ class OracleInstaller extends DatabaseInstaller {
 		}
 
 		/**
-		 * @var $conn Database
+		 * @var Database $conn
 		 */
 		$conn = $status->value;
 
 		// Check version
-		$version = $conn->getServerVersion();
-		if ( version_compare( $version, $this->minimumVersion ) < 0 ) {
-			return Status::newFatal( 'config-oracle-old', $this->minimumVersion, $version );
-		}
+		$status->merge( static::meetsMinimumRequirement( $conn->getServerVersion() ) );
 
 		return $status;
 	}
 
 	public function openConnection() {
-		$status = Status::newGood();
-		try {
-			$db = new DatabaseOracle(
-				$this->getVar( 'wgDBserver' ),
-				$this->getVar( '_InstallUser' ),
-				$this->getVar( '_InstallPassword' ),
-				$this->getVar( '_InstallDBname' ),
-				0,
-				$this->getVar( 'wgDBprefix' )
-			);
-			$status->value = $db;
-		} catch ( DBConnectionError $e ) {
-			$this->connError = $e->db->lastErrno();
-			$status->fatal( 'config-connection-error', $e->getMessage() );
-		}
-
-		return $status;
+		return $this->doOpenConnection();
 	}
 
 	public function openSYSDBAConnection() {
+		return $this->doOpenConnection( DatabaseOracle::DBO_SYSDBA );
+	}
+
+	/**
+	 * @param int $flags
+	 * @return Status Status with DatabaseOracle or null as the value
+	 */
+	private function doOpenConnection( $flags = 0 ) {
 		$status = Status::newGood();
 		try {
-			$db = new DatabaseOracle(
-				$this->getVar( 'wgDBserver' ),
-				$this->getVar( '_InstallUser' ),
-				$this->getVar( '_InstallPassword' ),
-				$this->getVar( '_InstallDBname' ),
-				DBO_SYSDBA,
-				$this->getVar( 'wgDBprefix' )
+			$db = Database::factory(
+				'oracle',
+				[
+					'host' => $this->getVar( 'wgDBserver' ),
+					'user' => $this->getVar( '_InstallUser' ),
+					'password' => $this->getVar( '_InstallPassword' ),
+					'dbname' => $this->getVar( '_InstallDBname' ),
+					'tablePrefix' => $this->getVar( 'wgDBprefix' ),
+					'flags' => $flags
+				]
 			);
 			$status->value = $db;
 		} catch ( DBConnectionError $e ) {
@@ -336,11 +330,11 @@ class OracleInstaller extends DatabaseInstaller {
 	 * @return bool Whether the connection string is valid.
 	 */
 	public static function checkConnectStringFormat( $connect_string ) {
-		// @@codingStandardsIgnoreStart Long lines with regular expressions.
+		// phpcs:disable Generic.Files.LineLength
 		// @todo Very long regular expression. Make more readable?
 		$isValid = preg_match( '/^[[:alpha:]][\w\-]*(?:\.[[:alpha:]][\w\-]*){0,2}$/', $connect_string ); // TNS name
 		$isValid |= preg_match( '/^(?:\/\/)?[\w\-\.]+(?::[\d]+)?(?:\/(?:[\w\-\.]+(?::(pooled|dedicated|shared))?)?(?:\/[\w\-\.]+)?)?$/', $connect_string ); // EZConnect
-		// @@codingStandardsIgnoreEnd
+		// phpcs:enable
 		return (bool)$isValid;
 	}
 }