X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Finstaller%2FPostgresInstaller.php;h=a1a80612ab193ec6102efe7559d194daf16fd855;hp=16b47e2869dd3deb202522746320adfe6ab58f2b;hb=e5ef0fd0c6607dd34f6dee69d716b159662a0a34;hpb=708f51c2c60b970549f463776faa38318fd11d21

diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php
index 16b47e2869..a1a80612ab 100644
--- a/includes/installer/PostgresInstaller.php
+++ b/includes/installer/PostgresInstaller.php
@@ -47,7 +47,7 @@ class PostgresInstaller extends DatabaseInstaller {
 	];
 
 	public static $minimumVersion = '9.2';
-	protected static $notMiniumumVerisonMessage = 'config-postgres-old';
+	protected static $notMinimumVerisonMessage = 'config-postgres-old';
 	public $maxRoleSearchDepth = 5;
 
 	protected $pgConns = [];
@@ -119,13 +119,13 @@ class PostgresInstaller extends DatabaseInstaller {
 			return $status;
 		}
 		/**
-		 * @var $conn Database
+		 * @var Database $conn
 		 */
 		$conn = $status->value;
 
 		// Check version
 		$version = $conn->getServerVersion();
-		$status = static::meetsMinimumRequirement( $conn->getServerVersion() );
+		$status = static::meetsMinimumRequirement( $version );
 		if ( !$status->isOK() ) {
 			return $status;
 		}
@@ -190,7 +190,7 @@ class PostgresInstaller extends DatabaseInstaller {
 
 		if ( $status->isOK() ) {
 			/**
-			 * @var $conn Database
+			 * @var Database $conn
 			 */
 			$conn = $status->value;
 			$conn->clearFlag( DBO_TRX );
@@ -242,7 +242,7 @@ class PostgresInstaller extends DatabaseInstaller {
 				$status = $this->openPgConnection( 'create-schema' );
 				if ( $status->isOK() ) {
 					/**
-					 * @var $conn Database
+					 * @var Database $conn
 					 */
 					$conn = $status->value;
 					$safeRole = $conn->addIdentifierQuotes( $this->getVar( 'wgDBuser' ) );
@@ -296,7 +296,7 @@ class PostgresInstaller extends DatabaseInstaller {
 			return false;
 		}
 		/**
-		 * @var $conn Database
+		 * @var Database $conn
 		 */
 		$conn = $status->value;
 		$superuser = $this->getVar( '_InstallUser' );
@@ -443,11 +443,11 @@ class PostgresInstaller extends DatabaseInstaller {
 			}
 			// Recursively search each member of the group to see if the target
 			// is a member of it, up to the given maximum depth.
-			if ( $maxDepth > 0 ) {
-				if ( $this->isRoleMember( $conn, $targetMember, $row->member, $maxDepth - 1 ) ) {
-					// Found member of member
-					return true;
-				}
+			if ( $maxDepth > 0 &&
+				$this->isRoleMember( $conn, $targetMember, $row->member, $maxDepth - 1 )
+			) {
+				// Found member of member
+				return true;
 			}
 		}
 
@@ -645,7 +645,7 @@ class PostgresInstaller extends DatabaseInstaller {
 			return $status;
 		}
 		/**
-		 * @var $conn Database
+		 * @var Database $conn
 		 */
 		$conn = $status->value;