X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FfileOpPerfTest.php;h=4b6c619414f11850f1e3e2df3d46da1455d233c0;hb=99a2b401ffd3acab91e051d5161bac6a9f95c42a;hp=feb927ef2dc47e6b2ec4c34ca5347c8df38d07cc;hpb=592637225a4d5db5abcdc288d838c160284eef08;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/fileOpPerfTest.php b/maintenance/fileOpPerfTest.php
index feb927ef2d..4b6c619414 100644
--- a/maintenance/fileOpPerfTest.php
+++ b/maintenance/fileOpPerfTest.php
@@ -42,8 +42,6 @@ class TestFileOpPerformance extends Maintenance {
 	}
 
 	public function execute() {
-		Profiler::setInstance( new ProfilerSimpleText( array() ) ); // clear
-
 		$backend = FileBackendGroup::singleton()->get( $this->getOption( 'b1' ) );
 		$this->doPerfTest( $backend );
 
@@ -51,20 +49,17 @@ class TestFileOpPerformance extends Maintenance {
 			$backend = FileBackendGroup::singleton()->get( $this->getOption( 'b2' ) );
 			$this->doPerfTest( $backend );
 		}
-
-		Profiler::instance()->setTemplated( true );
-		// NOTE: as of MW1.21, $profiler->logData() is called implicitly by doMaintenance.php.
 	}
 
 	protected function doPerfTest( FileBackend $backend ) {
-		$ops1 = array();
-		$ops2 = array();
-		$ops3 = array();
-		$ops4 = array();
-		$ops5 = array();
+		$ops1 = [];
+		$ops2 = [];
+		$ops3 = [];
+		$ops4 = [];
+		$ops5 = [];
 
 		$baseDir = 'mwstore://' . $backend->getName() . '/testing-cont1';
-		$backend->prepare( array( 'dir' => $baseDir ) );
+		$backend->prepare( [ 'dir' => $baseDir ] );
 
 		$dirname = $this->getOption( 'srcdir' );
 		$dir = opendir( $dirname );
@@ -76,14 +71,14 @@ class TestFileOpPerformance extends Maintenance {
 			if ( $file[0] != '.' ) {
 				$this->output( "Using '$dirname/$file' in operations.\n" );
 				$dst = $baseDir . '/' . wfBaseName( $file );
-				$ops1[] = array( 'op' => 'store',
-					'src' => "$dirname/$file", 'dst' => $dst, 'overwrite' => 1 );
-				$ops2[] = array( 'op' => 'copy',
-					'src' => "$dst", 'dst' => "$dst-1", 'overwrite' => 1 );
-				$ops3[] = array( 'op' => 'move',
-					'src' => $dst, 'dst' => "$dst-2", 'overwrite' => 1 );
-				$ops4[] = array( 'op' => 'delete', 'src' => "$dst-1" );
-				$ops5[] = array( 'op' => 'delete', 'src' => "$dst-2" );
+				$ops1[] = [ 'op' => 'store',
+					'src' => "$dirname/$file", 'dst' => $dst, 'overwrite' => 1 ];
+				$ops2[] = [ 'op' => 'copy',
+					'src' => "$dst", 'dst' => "$dst-1", 'overwrite' => 1 ];
+				$ops3[] = [ 'op' => 'move',
+					'src' => $dst, 'dst' => "$dst-2", 'overwrite' => 1 ];
+				$ops4[] = [ 'op' => 'delete', 'src' => "$dst-1" ];
+				$ops5[] = [ 'op' => 'delete', 'src' => "$dst-2" ];
 			}
 			if ( count( $ops1 ) >= $this->getOption( 'maxfiles', 20 ) ) {
 				break; // enough
@@ -94,7 +89,7 @@ class TestFileOpPerformance extends Maintenance {
 
 		$method = $this->hasOption( 'quick' ) ? 'doQuickOperations' : 'doOperations';
 
-		$opts = array( 'force' => 1 );
+		$opts = [ 'force' => 1 ];
 		if ( $this->hasOption( 'parallelize' ) ) {
 			$opts['parallelize'] = ( $this->getOption( 'parallelize' ) === 'true' );
 		}