From c9cd428acc96e31d7074dc43bada14c4f7b1c5bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= Date: Fri, 10 Jul 2015 11:43:51 +0200 Subject: [PATCH] Use of old PDO singleton. Also fixup test suite to check behaviour of set_mime (only setter) --- lib/classes/record/adapter.php | 2 +- tests/classes/record/adapterTest.php | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/classes/record/adapter.php b/lib/classes/record/adapter.php index 37b0cd18df..587c0f2ae8 100644 --- a/lib/classes/record/adapter.php +++ b/lib/classes/record/adapter.php @@ -246,7 +246,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface throw new \Exception(sprintf('Unrecognized mime type %s', $mime)); } - $connection = connection::getPDOConnection($this->app, $this->get_sbas_id()); + $connection = $this->databox->get_connection(); $sql = 'UPDATE record SET mime = :mime WHERE record_id = :record_id'; $stmt = $connection->prepare($sql); diff --git a/tests/classes/record/adapterTest.php b/tests/classes/record/adapterTest.php index ac6d271ee8..1028900dde 100644 --- a/tests/classes/record/adapterTest.php +++ b/tests/classes/record/adapterTest.php @@ -207,6 +207,19 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase $this->assertRegExp('/image\/\w+/', self::$DI['record_1']->get_mime()); } + public function testSetMimeType() + { + /** @var record_adapter $record_1 */ + $record_1 = self::$DI['record_1']; + + $oldMime = $record_1->get_mime(); + $record_1->set_mime('foo/bar'); + $this->assertEquals('foo/bar', $record_1->get_mime()); + + $record_1->set_mime($oldMime); + $this->assertEquals($oldMime, $record_1->get_mime()); + } + public function testGet_status() { $this->assertRegExp('/[01]{32}/', self::$DI['record_1']->get_status());