Merge "[FileBackend] Tweaked TempFSFile::bind() to handle __get()."

diff --combined tests/phpunit/includes/filerepo/FileBackendTest.php
index 2303c78,bdb5c42..f159d5d
--- 1/tests/phpunit/includes/filerepo/FileBackendTest.php
--- 2/tests/phpunit/includes/filerepo/FileBackendTest.php
+++ b/tests/phpunit/includes/filerepo/FileBackendTest.php
@@@ -10,7 -10,7 +10,7 @@@ class FileBackendTest extends MediaWiki
        private $filesToPrune = array();
        private static $backendToUse;
  
 -      function setUp() {
 +      protected function setUp() {
                global $wgFileBackends;
                parent::setUp();
                $tmpPrefix = wfTempDir() . '/filebackend-unittest-' . time() . '-' . mt_rand();
@@@ -50,7 -50,7 +50,7 @@@
                        'parallelize' => 'implicit',
                        'backends'    => array(
                                array(
 -                                      'name'          => 'localmutlitesting1',
 +                                      'name'          => 'localmultitesting1',
                                        'class'         => 'FSFileBackend',
                                        'lockManager'   => 'nullLockManager',
                                        'containerPaths' => array(
@@@ -59,7 -59,7 +59,7 @@@
                                        'isMultiMaster' => false
                                ),
                                array(
 -                                      'name'          => 'localmutlitesting2',
 +                                      'name'          => 'localmultitesting2',
                                        'class'         => 'FSFileBackend',
                                        'lockManager'   => 'nullLockManager',
                                        'containerPaths' => array(
@@@ -72,7 -72,7 +72,7 @@@
                $this->filesToPrune = array();
        }
  
 -      private function baseStorePath() {
 +      private static function baseStorePath() {
                return 'mwstore://localtesting';
        }
  
@@@ -183,7 -183,7 +183,7 @@@
                        "FileBackend::extensionFromPath on path '$path'" );
        }
  
 -      function provider_testExtensionFromPath() {
 +      public static function provider_testExtensionFromPath() {
                return array(
                        array( 'mwstore://backend/container/path.txt', 'txt' ),
                        array( 'mwstore://backend/container/path.svg.png', 'png' ),
@@@ -248,11 -248,11 +248,11 @@@
                $this->assertBackendPathsConsistent( array( $dest ) );
        }
  
 -      public function provider_testStore() {
 +      public static function provider_testStore() {
                $cases = array();
  
                $tmpName = TempFSFile::factory( "unittests_", 'txt' )->getPath();
 -              $toPath = $this->baseStorePath() . '/unittest-cont1/e/fun/obj1.txt';
 +              $toPath = self::baseStorePath() . '/unittest-cont1/e/fun/obj1.txt';
                $op = array( 'op' => 'store', 'src' => $tmpName, 'dst' => $toPath );
                $cases[] = array(
                        $op, // operation
@@@ -337,11 -337,11 +337,11 @@@
                $this->assertBackendPathsConsistent( array( $source, $dest ) );
        }
  
 -      public function provider_testCopy() {
 +      public static function provider_testCopy() {
                $cases = array();
  
 -              $source = $this->baseStorePath() . '/unittest-cont1/e/file.txt';
 -              $dest = $this->baseStorePath() . '/unittest-cont2/a/fileMoved.txt';
 +              $source = self::baseStorePath() . '/unittest-cont1/e/file.txt';
 +              $dest = self::baseStorePath() . '/unittest-cont2/a/fileMoved.txt';
  
                $op = array( 'op' => 'copy', 'src' => $source, 'dst' => $dest );
                $cases[] = array(
@@@ -428,11 -428,11 +428,11 @@@
                $this->assertBackendPathsConsistent( array( $source, $dest ) );
        }
  
 -      public function provider_testMove() {
 +      public static function provider_testMove() {
                $cases = array();
  
 -              $source = $this->baseStorePath() . '/unittest-cont1/e/file.txt';
 -              $dest = $this->baseStorePath() . '/unittest-cont2/a/fileMoved.txt';
 +              $source = self::baseStorePath() . '/unittest-cont1/e/file.txt';
 +              $dest = self::baseStorePath() . '/unittest-cont2/a/fileMoved.txt';
  
                $op = array( 'op' => 'move', 'src' => $source, 'dst' => $dest );
                $cases[] = array(
@@@ -515,10 -515,10 +515,10 @@@
                $this->assertBackendPathsConsistent( array( $source ) );
        }
  
 -      public function provider_testDelete() {
 +      public static function provider_testDelete() {
                $cases = array();
  
 -              $source = $this->baseStorePath() . '/unittest-cont1/e/myfacefile.txt';
 +              $source = self::baseStorePath() . '/unittest-cont1/e/myfacefile.txt';
  
                $op = array( 'op' => 'delete', 'src' => $source );
                $cases[] = array(
@@@ -611,10 -611,10 +611,10 @@@
        /**
         * @dataProvider provider_testCreate
         */
 -      public function provider_testCreate() {
 +      public static function provider_testCreate() {
                $cases = array();
  
 -              $dest = $this->baseStorePath() . '/unittest-cont2/a/myspacefile.txt';
 +              $dest = self::baseStorePath() . '/unittest-cont2/a/myspacefile.txt';
  
                $op = array( 'op' => 'create', 'content' => 'test test testing', 'dst' => $dest );
                $cases[] = array(
@@@ -678,7 -678,7 +678,7 @@@
        private function doTestDoQuickOperations() {
                $backendName = $this->backendClass();
  
 -              $base = $this->baseStorePath();
 +              $base = self::baseStorePath();
                $files = array(
                        "$base/unittest-cont1/e/fileA.a",
                        "$base/unittest-cont1/e/fileB.a",
@@@ -800,16 -800,16 +800,16 @@@
                $rand = mt_rand( 0, 2000000000 ) . time();
                $dest = wfTempDir() . "/randomfile!$rand.txt";
                $srcs = array(
 -                      $this->baseStorePath() . '/unittest-cont1/e/file1.txt',
 -                      $this->baseStorePath() . '/unittest-cont1/e/file2.txt',
 -                      $this->baseStorePath() . '/unittest-cont1/e/file3.txt',
 -                      $this->baseStorePath() . '/unittest-cont1/e/file4.txt',
 -                      $this->baseStorePath() . '/unittest-cont1/e/file5.txt',
 -                      $this->baseStorePath() . '/unittest-cont1/e/file6.txt',
 -                      $this->baseStorePath() . '/unittest-cont1/e/file7.txt',
 -                      $this->baseStorePath() . '/unittest-cont1/e/file8.txt',
 -                      $this->baseStorePath() . '/unittest-cont1/e/file9.txt',
 -                      $this->baseStorePath() . '/unittest-cont1/e/file10.txt'
 +                      self::baseStorePath() . '/unittest-cont1/e/file1.txt',
 +                      self::baseStorePath() . '/unittest-cont1/e/file2.txt',
 +                      self::baseStorePath() . '/unittest-cont1/e/file3.txt',
 +                      self::baseStorePath() . '/unittest-cont1/e/file4.txt',
 +                      self::baseStorePath() . '/unittest-cont1/e/file5.txt',
 +                      self::baseStorePath() . '/unittest-cont1/e/file6.txt',
 +                      self::baseStorePath() . '/unittest-cont1/e/file7.txt',
 +                      self::baseStorePath() . '/unittest-cont1/e/file8.txt',
 +                      self::baseStorePath() . '/unittest-cont1/e/file9.txt',
 +                      self::baseStorePath() . '/unittest-cont1/e/file10.txt'
                );
                $content = array(
                        'egfage',
@@@ -911,7 -911,7 +911,7 @@@
        function provider_testGetFileStat() {
                $cases = array();
  
 -              $base = $this->baseStorePath();
 +              $base = self::baseStorePath();
                $cases[] = array( "$base/unittest-cont1/e/b/z/some_file.txt", "some file contents", true );
                $cases[] = array( "$base/unittest-cont1/e/b/some-other_file.txt", "", true );
                $cases[] = array( "$base/unittest-cont1/e/b/some-diff_file.txt", null, false );
@@@ -966,7 -966,7 +966,7 @@@
        function provider_testGetFileContents() {
                $cases = array();
  
 -              $base = $this->baseStorePath();
 +              $base = self::baseStorePath();
                $cases[] = array( "$base/unittest-cont1/e/b/z/some_file.txt", "some file contents" );
                $cases[] = array( "$base/unittest-cont1/e/b/some-other_file.txt", "more file contents" );
                $cases[] = array(
@@@ -1026,12 -1026,15 +1026,15 @@@
                        $this->assertNotEquals( false, $contents, "Local copy of $source exists ($backendName)." );
                        $this->assertEquals( $content[0], $contents, "Local copy of $source is correct ($backendName)." );
                }
+ 
+               $obj = new stdClass();
+               $tmpFile->bind( $obj );
        }
  
        function provider_testGetLocalCopy() {
                $cases = array();
  
 -              $base = $this->baseStorePath();
 +              $base = self::baseStorePath();
                $cases[] = array( "$base/unittest-cont1/e/a/z/some_file.txt", "some file contents" );
                $cases[] = array( "$base/unittest-cont1/e/a/some-other_file.txt", "more file contents" );
                $cases[] = array( "$base/unittest-cont1/e/a/\$odd&.txt", "test file contents" );
@@@ -1097,7 -1100,7 +1100,7 @@@
        function provider_testGetLocalReference() {
                $cases = array();
  
 -              $base = $this->baseStorePath();
 +              $base = self::baseStorePath();
                $cases[] = array( "$base/unittest-cont1/e/a/z/some_file.txt", "some file contents" );
                $cases[] = array( "$base/unittest-cont1/e/a/some-other_file.txt", "more file contents" );
                $cases[] = array( "$base/unittest-cont1/e/a/\$odd&.txt", "test file contents" );
@@@ -1124,7 -1127,7 +1127,7 @@@
        }
  
        function provider_testPrepareAndClean() {
 -              $base = $this->baseStorePath();
 +              $base = self::baseStorePath();
                return array(
                        array( "$base/unittest-cont1/e/a/z/some_file1.txt", true ),
                        array( "$base/unittest-cont2/a/z/some_file2.txt", true ),
@@@ -1172,7 -1175,7 +1175,7 @@@
        private function doTestRecursiveClean() {
                $backendName = $this->backendClass();
  
 -              $base = $this->baseStorePath();
 +              $base = self::baseStorePath();
                $dirs = array(
                        "$base/unittest-cont1/e/a",
                        "$base/unittest-cont1/e/a/b",
@@@ -1226,7 -1229,7 +1229,7 @@@
        }
  
        private function doTestDoOperations() {
 -              $base = $this->baseStorePath();
 +              $base = self::baseStorePath();
  
                $fileA = "$base/unittest-cont1/e/a/b/fileA.txt";
                $fileAContents = '3tqtmoeatmn4wg4qe-mg3qt3 tq';
@@@ -1312,7 -1315,7 +1315,7 @@@
  
        // concurrency orientated
        private function doTestDoOperationsPipeline() {
 -              $base = $this->baseStorePath();
 +              $base = self::baseStorePath();
  
                $fileAContents = '3tqtmoeatmn4wg4qe-mg3qt3 tq';
                $fileBContents = 'g-jmq3gpqgt3qtg q3GT ';
@@@ -1410,7 -1413,7 +1413,7 @@@
        }
  
        private function doTestDoOperationsFailing() {
 -              $base = $this->baseStorePath();
 +              $base = self::baseStorePath();
  
                $fileA = "$base/unittest-cont2/a/b/fileA.txt";
                $fileAContents = '3tqtmoeatmn4wg4qe-mg3qt3 tq';
@@@ -1485,7 -1488,7 +1488,7 @@@
  
        private function doTestGetFileList() {
                $backendName = $this->backendClass();
 -              $base = $this->baseStorePath();
 +              $base = self::baseStorePath();
  
                // Should have no errors
                $iter = $this->backend->getFileList( array( 'dir' => "$base/unittest-cont-notexists" ) );
@@@ -1642,7 -1645,7 +1645,7 @@@
        private function doTestGetDirectoryList() {
                $backendName = $this->backendClass();
  
 -              $base = $this->baseStorePath();
 +              $base = self::baseStorePath();
                $files = array(
                        "$base/unittest-cont1/e/test1.txt",
                        "$base/unittest-cont1/e/test2.txt",
@@@ -1893,7 -1896,7 +1896,7 @@@
                foreach ( $this->filesToPrune as $file ) {
                        @unlink( $file );
                }
 -              $containers = array( 'unittest-cont1', 'unittest-cont2', 'unittest-cont3' );
 +              $containers = array( 'unittest-cont1', 'unittest-cont2' );
                foreach ( $containers as $container ) {
                        $this->deleteFiles( $container );
                }
@@@ -1901,11 -1904,12 +1904,11 @@@
        }
  
        private function deleteFiles( $container ) {
 -              $base = $this->baseStorePath();
 +              $base = self::baseStorePath();
                $iter = $this->backend->getFileList( array( 'dir' => "$base/$container" ) );
                if ( $iter ) {
                        foreach ( $iter as $file ) {
 -                              $this->backend->delete( array( 'src' => "$base/$container/$file" ),
 -                                      array( 'force' => 1, 'nonLocking' => 1 ) );
 +                              $this->backend->quickDelete( array( 'src' => "$base/$container/$file" ) );
                        }
                }
                $this->backend->clean( array( 'dir' => "$base/$container", 'recursive' => 1 ) );
@@@ -1921,4 -1925,8 +1924,4 @@@
        function assertGoodStatus( $status, $msg ) {
                $this->assertEquals( print_r( array(), 1 ), print_r( $status->errors, 1 ), $msg );
        }
 -
 -      function tearDown() {
 -              parent::tearDown();
 -      }
  }