hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-14 21:43:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Logger is now required for generating subdefs

Browse Source
This commit is contained in:
Romain Neutron
2012-05-24 16:21:13 +02:00
parent f6c7acd837
commit d0f9794bfb
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/record/Interface.class.php
View File

@@ -100,7 +100,7 @@ interface record_Interface
public function delete();
public function generate_subdefs(databox $databox, Logger $logger = null, Array $wanted_subdefs = null);
public function generate_subdefs(databox $databox, Logger $logger, Array $wanted_subdefs = null);
public function log_view($log_id, $referrer, $gv_sit);

2
lib/classes/record/adapter.class.php
View File

@@ -1655,7 +1655,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
* @param array $wanted_subdefs An array of subdef names
* @return \record_adapter
*/
public function generate_subdefs(databox $databox, Logger $logger = null, Array $wanted_subdefs = null)
public function generate_subdefs(databox $databox, Logger $logger, Array $wanted_subdefs = null)
{
$subdefs = $databox->get_subdef_structure()->getSubdefGroup($this->get_type());

5
tests/media/media_subdefTest.php
View File

@@ -29,8 +29,11 @@ class media_subdefTest extends \PhraseanetPHPUnitAbstract
$file = new Alchemy\Phrasea\Border\File(\MediaVorus\MediaVorus::guess(new \SplFileInfo(__DIR__ . "/../testfiles/iphone_pic.jpg")), self::$collection);
$logger = new \Monolog\Logger('test');
$logger->pushHandler(new \Monolog\Handler\NullHandler());
self::$recordonbleu = record_adapter::createFromFile($file);
self::$recordonbleu->generate_subdefs(self::$recordonbleu->get_databox());
self::$recordonbleu->generate_subdefs(self::$recordonbleu->get_databox(), $logger);
foreach (self::$recordonbleu->get_subdefs() as $subdef) {