From 291a3d1fb60c53f7d603025a51fe57c11a1aad81 Mon Sep 17 00:00:00 2001
From: Dongsheng Cai <dongsheng@moodle.com>
Date: Tue, 22 May 2012 15:00:49 +0800
Subject: [PATCH] MDL-33149 stored_file::repository should be private

---
 lib/filestorage/stored_file.php             | 2 +-
 lib/filestorage/tests/file_storage_test.php | 2 +-
 lib/tests/filelib_test.php                  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/filestorage/stored_file.php b/lib/filestorage/stored_file.php
index 6423d6b3e45..d5bea66f3d9 100644
--- a/lib/filestorage/stored_file.php
+++ b/lib/filestorage/stored_file.php
@@ -47,7 +47,7 @@ class stored_file {
     /** @var string location of content files */
     private $filedir;
     /** @var repository repository plugin instance */
-    public $repository;
+    private $repository;
 
     /**
      * Constructor, this constructor should be called ONLY from the file_storage class!
diff --git a/lib/filestorage/tests/file_storage_test.php b/lib/filestorage/tests/file_storage_test.php
index 5f70959c17d..24529f5f7fe 100644
--- a/lib/filestorage/tests/file_storage_test.php
+++ b/lib/filestorage/tests/file_storage_test.php
@@ -183,7 +183,7 @@ class filestoragelib_testcase extends advanced_testcase {
         $ref = $fs->pack_reference($filerecord);
         $newstoredfile = $fs->create_file_from_reference($newfilerecord, $userrepository->id, $ref);
         $this->assertInstanceOf('stored_file', $newstoredfile);
-        $this->assertEquals($userrepository->id, $newstoredfile->repository->id);
+        $this->assertEquals($userrepository->id, $newstoredfile->get_repository_id());
         $this->assertEquals($originalfile->get_contenthash(), $newstoredfile->get_contenthash());
         $this->assertEquals($originalfile->get_filesize(), $newstoredfile->get_filesize());
         $this->assertRegExp('#' . $filename. '$#', $newstoredfile->get_reference_details());
diff --git a/lib/tests/filelib_test.php b/lib/tests/filelib_test.php
index ee743e8055e..36207ade16c 100644
--- a/lib/tests/filelib_test.php
+++ b/lib/tests/filelib_test.php
@@ -151,7 +151,7 @@ class filelib_testcase extends advanced_testcase {
         // create a file reference
         $fileref = $fs->create_file_from_reference($filerefrecord, $userrepository->id, $userfileref);
         $this->assertInstanceOf('stored_file', $fileref);
-        $this->assertEquals($userrepository->id, $fileref->repository->id);
+        $this->assertEquals($userrepository->id, $fileref->get_repository_id());
         $this->assertEquals($userfile->get_contenthash(), $fileref->get_contenthash());
         $this->assertEquals($userfile->get_filesize(), $fileref->get_filesize());
         $this->assertRegExp('#' . $userfile->get_filename(). '$#', $fileref->get_reference_details());
@@ -249,7 +249,7 @@ class filelib_testcase extends advanced_testcase {
         // create a file reference
         $fileref = $fs->create_file_from_reference($filerecord, $userrepository->id, $userfileref);
         $this->assertInstanceOf('stored_file', $fileref);
-        $this->assertEquals($userrepository->id, $fileref->repository->id);
+        $this->assertEquals($userrepository->id, $fileref->get_repository_id());
         $this->assertEquals($userfile->get_contenthash(), $fileref->get_contenthash());
         $this->assertEquals($userfile->get_filesize(), $fileref->get_filesize());
         $this->assertRegExp('#' . $userfile->get_filename(). '$#', $fileref->get_reference_details());