diff --git a/lib/classes/record/Interface.class.php b/lib/classes/record/Interface.class.php index 80e1735260..f8e540be0b 100644 --- a/lib/classes/record/Interface.class.php +++ b/lib/classes/record/Interface.class.php @@ -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); diff --git a/lib/classes/record/adapter.class.php b/lib/classes/record/adapter.class.php index c483710472..a002e5df78 100644 --- a/lib/classes/record/adapter.class.php +++ b/lib/classes/record/adapter.class.php @@ -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()); diff --git a/tests/media/media_subdefTest.php b/tests/media/media_subdefTest.php index b9a539d026..9f42952fea 100644 --- a/tests/media/media_subdefTest.php +++ b/tests/media/media_subdefTest.php @@ -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) {