From: addshore <addshorewiki@gmail.com>
Date: Fri, 14 Mar 2014 18:13:06 +0000 (+0100)
Subject: Remove assignment in conditon in phpunit.php
X-Git-Tag: 1.31.0-rc.0~16619
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=3b3806d27a02b487cca53d965c8052ed2a92e373;p=lhc%2Fweb%2Fwiklou.git

Remove assignment in conditon in phpunit.php

Change-Id: I817af3cf5344d9ffe2a66048f6d32835712ba11c
---

diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php
index 039cabbd7f..1aa2b4d15b 100755
--- a/tests/phpunit/phpunit.php
+++ b/tests/phpunit/phpunit.php
@@ -6,8 +6,6 @@
  * @file
  */
 
-/* Configuration */
-
 // Set a flag which can be used to detect when other scripts have been entered through this entry point or not
 define( 'MW_PHPUNIT_TEST', true );
 
@@ -16,7 +14,7 @@ require_once dirname( dirname( __DIR__ ) ) . "/maintenance/Maintenance.php";
 
 class PHPUnitMaintClass extends Maintenance {
 
-	function __construct() {
+	public function __construct() {
 		parent::__construct();
 		$this->addOption( 'with-phpunitdir',
 			'Directory to include PHPUnit from, for example when using a git fetchout from upstream. Path will be prepended to PHP `include_path`.',
@@ -72,7 +70,8 @@ class PHPUnitMaintClass extends Maintenance {
 		}
 
 		# --with-phpunitdir let us override the default PHPUnit version
-		if ( $phpunitDir = $this->getOption( 'with-phpunitdir' ) ) {
+		if ( $this->hasOption( 'with-phpunitdir' ) ) {
+			$phpunitDir = $this->getOption( 'with-phpunitdir' );
 			# Sanity checks
 			if ( !is_dir( $phpunitDir ) ) {
 				$this->error( "--with-phpunitdir should be set to an existing directory", 1 );
@@ -83,8 +82,7 @@ class PHPUnitMaintClass extends Maintenance {
 
 			# Now prepends provided PHPUnit directory
 			$this->output( "Will attempt loading PHPUnit from `$phpunitDir`\n" );
-			set_include_path( $phpunitDir
-				. PATH_SEPARATOR . get_include_path() );
+			set_include_path( $phpunitDir . PATH_SEPARATOR . get_include_path() );
 
 			# Cleanup $args array so the option and its value do not
 			# pollute PHPUnit