Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed StoredFile constructor to only load metadata when passing in an ID.

Browse source 
Added a test for StoredFile::loadMetadata().
This commit is contained in:
paul.baranowski 2010-11-15 15:58:48 -05:00
parent eafd10a669
commit fc8c964d52
2 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
backend/StoredFile.php
View file

@ -432,8 +432,17 @@ class StoredFile {
if (empty($this->gunid)) { if (empty($this->gunid)) {
$this->gunid = StoredFile::generateGunid(); $this->gunid = StoredFile::generateGunid();
} }
$this->exists = is_file($this->filepath) && is_readable($this->filepath); else {
$this->md = $this->loadMetadata(); $this->md = $this->loadMetadata();
$this->exists = is_file($this->filepath) && is_readable($this->filepath);
}
}
/**
* For testing only, do not use.
*/
public function __setGunid($p_guid) {
$this->gunid = $p_guid;
} }
/** /**

10
backend/tests/StoredFileTests.php
View file

@ -62,8 +62,16 @@ class StoredFileTest extends PHPUnit_TestCase {
$this->fail("StoredFile not created correctly. id = ".$id); $this->fail("StoredFile not created correctly. id = ".$id);
return; return;
} }
}
$f = new StoredFile();
$f->__setGunid($storedFile->getGunid());
$f->loadMetadata();
if (!is_array($md = $f->getMetadata())) {
$this->fail("Unable to load metadata.");
return;
}
//var_dump($md);
}
} }
?> ?>