From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Tue, 7 Dec 2010 22:33:37 +0000 (+0000)
Subject: Don't use dirname when you already have a directory.
X-Git-Tag: 1.31.0-rc.0~33455
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=7f9465a8565ccb3b3e87da2626aeacc5b101c2df;p=lhc%2Fweb%2Fwiklou.git

Don't use dirname when you already have a directory.
---

diff --git a/maintenance/tests/phpunit/includes/api/ApiUploadTest.php b/maintenance/tests/phpunit/includes/api/ApiUploadTest.php
index 1135d5727f..a2da6f8927 100644
--- a/maintenance/tests/phpunit/includes/api/ApiUploadTest.php
+++ b/maintenance/tests/phpunit/includes/api/ApiUploadTest.php
@@ -258,7 +258,7 @@ class ApiUploadTest extends ApiTestCase {
 			$this->markTestIncomplete( $e->getMessage() );
 		}
 
-		$filePaths = $randomImageGenerator->writeImages( 1, $extension, dirname( wfTempDir() ) );
+		$filePaths = $randomImageGenerator->writeImages( 1, $extension, wfTempDir() );
 		$filePath = $filePaths[0];
 		$fileSize = filesize( $filePath );
 		$fileName = basename( $filePath );
@@ -266,6 +266,7 @@ class ApiUploadTest extends ApiTestCase {
 		$this->deleteFileByFileName( $fileName );
 		$this->deleteFileByContent( $filePath );
 
+
 		if (! $this->fakeUploadFile( 'file', $fileName, $mimeType, $filePath ) ) {
 			$this->markTestIncomplete( "Couldn't upload file!\n" );
 		}
@@ -354,7 +355,7 @@ class ApiUploadTest extends ApiTestCase {
 			$this->markTestIncomplete( $e->getMessage() );
 		}
 
-		$filePaths = $randomImageGenerator->writeImages( 2, $extension, dirname( wfTempDir() ) );
+		$filePaths = $randomImageGenerator->writeImages( 2, $extension, wfTempDir() );
 		// we'll reuse this filename
 		$fileName = basename( $filePaths[0] );
 
@@ -427,7 +428,7 @@ class ApiUploadTest extends ApiTestCase {
 		catch ( Exception $e ) {
 			$this->markTestIncomplete( $e->getMessage() );
 		}
-		$filePaths = $randomImageGenerator->writeImages( 1, $extension, dirname( wfTempDir() ) );
+		$filePaths = $randomImageGenerator->writeImages( 1, $extension, wfTempDir() );
 		$fileNames[0] = basename( $filePaths[0] );
 		$fileNames[1] = "SameContentAs" . $fileNames[0];
 
@@ -511,7 +512,7 @@ class ApiUploadTest extends ApiTestCase {
 			$this->markTestIncomplete( $e->getMessage() );
 		}
 
-		$filePaths = $randomImageGenerator->writeImages( 1, $extension, dirname( wfTempDir() ) );
+		$filePaths = $randomImageGenerator->writeImages( 1, $extension, wfTempDir() );
 		$filePath = $filePaths[0];
 		$fileSize = filesize( $filePath );
 		$fileName = basename( $filePath );