From cdd37110bbf4fb674ce57df32f39c260911966dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= <bburnichon@alchemy.fr>
Date: Tue, 29 Mar 2016 16:48:29 +0200
Subject: [PATCH] Remove useless interface

---
 lib/classes/caption/interface.php | 22 ----------------------
 lib/classes/caption/record.php    | 21 ++++++---------------
 2 files changed, 6 insertions(+), 37 deletions(-)
 delete mode 100644 lib/classes/caption/interface.php

diff --git a/lib/classes/caption/interface.php b/lib/classes/caption/interface.php
deleted file mode 100644
index 477b24e6ba..0000000000
--- a/lib/classes/caption/interface.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/*
- * This file is part of Phraseanet
- *
- * (c) 2005-2016 Alchemy
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Alchemy\Phrasea\Application;
-use Alchemy\Phrasea\SearchEngine\SearchEngineInterface;
-use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
-
-interface caption_interface
-{
-
-    public function __construct(Application $app, \record_adapter $record, databox $databox);
-
-    public function get_highlight_fields($highlight = '', Array $grep_fields = null, SearchEngineInterface $searchEngine = null, $includeBusiness = false, SearchEngineOptions $options = null);
-}
diff --git a/lib/classes/caption/record.php b/lib/classes/caption/record.php
index 1457fd1faa..516e2b6fc2 100644
--- a/lib/classes/caption/record.php
+++ b/lib/classes/caption/record.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * This file is part of Phraseanet
  *
@@ -14,18 +13,13 @@ use Alchemy\Phrasea\Model\Serializer\CaptionSerializer;
 use Alchemy\Phrasea\SearchEngine\SearchEngineInterface;
 use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
 
-class caption_record implements caption_interface, cache_cacheableInterface
+class caption_record implements cache_cacheableInterface
 {
     /**
      * @var array
      */
     protected $fields;
 
-    /**
-     * @var int
-     */
-    protected $sbas_id;
-
     /**
      * @var record_adapter
      */
@@ -44,7 +38,6 @@ class caption_record implements caption_interface, cache_cacheableInterface
     public function __construct(Application $app, \record_adapter $record, databox $databox)
     {
         $this->app = $app;
-        $this->sbas_id = $record->getDataboxId();
         $this->record = $record;
         $this->databox = $databox;
     }
@@ -81,13 +74,11 @@ FROM metadatas m INNER JOIN metadatas_structure s ON s.id = m.meta_struct_id
 WHERE m.record_id = :record_id
 ORDER BY s.sorter ASC
 SQL;
-            $stmt = $this->databox->get_connection()->prepare($sql);
-            $stmt->execute([':record_id' => $this->record->getRecordId()]);
-            $fields = $stmt->fetchAll(PDO::FETCH_ASSOC);
-            $stmt->closeCursor();
-            if ($fields) {
-                $this->set_data_to_cache($fields);
-            }
+            $fields = $this->databox->get_connection()
+                ->executeQuery($sql, [':record_id' => $this->record->getRecordId()])
+                ->fetchAll(PDO::FETCH_ASSOC);
+
+            $this->set_data_to_cache($fields);
         }
 
         $rec_fields = array();