Change some properties from protected to private

lib/classes/record/adapter.php

@@ -36,35 +36,6 @@ use Symfony\Component\HttpFoundation\File\File as SymfoFile;
 
 class record_adapter implements RecordInterface, cache_cacheableInterface
 {
-    protected $xml;
-    protected $base_id;
-    protected $collection_id;
-    protected $record_id;
-    protected $mime;
-    protected $number;
-    protected $status;
-    protected $subdefs;
-    protected $type;
-    protected $sha256;
-    protected $grouping;
-    protected $duration;
-    /** @var databox */
-    protected $databox;
-    /** @var DateTime */
-    protected $creation_date;
-    /** @var string */
-    protected $original_name;
-    /** @var array */
-    protected $technical_datas;
-    /** @var caption_record */
-    protected $caption_record;
-    /** @var string */
-    protected $uuid;
-    /** @var DateTime */
-    protected $modification_date;
-    /** @var Application */
-    protected $app;
-
     const CACHE_ORIGINAL_NAME = 'originalname';
     const CACHE_TECHNICAL_DATAS = 'technical_datas';
     const CACHE_MIME = 'mime';
@@ -74,6 +45,32 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
     const CACHE_GROUPING = 'grouping';
     const CACHE_STATUS = 'status';
 
+    private $base_id;
+    private $collection_id;
+    private $record_id;
+    private $mime;
+    private $number;
+    private $status;
+    private $subdefs;
+    private $type;
+    private $sha256;
+    private $grouping;
+    private $duration;
+    /** @var databox */
+    private $databox;
+    /** @var DateTime */
+    private $creation_date;
+    /** @var string */
+    private $original_name;
+    /** @var array */
+    private $technical_data;
+    /** @var string */
+    private $uuid;
+    /** @var DateTime */
+    private $modification_date;
+    /** @var Application */
+    protected $app;
+
     /**
      * @param Application $app
      * @param integer     $sbas_id
@@ -596,11 +593,11 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
      */
     public function get_technical_infos($data = false)
     {
-        if (!$this->technical_datas) {
+        if (!$this->technical_data) {
             try {
-                $this->technical_datas = $this->get_data_from_cache(self::CACHE_TECHNICAL_DATAS);
+                $this->technical_data = $this->get_data_from_cache(self::CACHE_TECHNICAL_DATAS);
             } catch (\Exception $e) {
-                $this->technical_datas = [];
+                $this->technical_data = [];
                 $connbas = $this->get_databox()->get_connection();
                 $sql = 'SELECT name, value FROM technical_datas WHERE record_id = :record_id';
                 $stmt = $connbas->prepare($sql);
@@ -611,30 +608,30 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
                 foreach ($rs as $row) {
                     switch (true) {
                         case preg_match('/[0-9]?\.[0-9]+/', $row['value']):
-                            $this->technical_datas[$row['name']] = (float) $row['value'];
+                            $this->technical_data[$row['name']] = (float) $row['value'];
                             break;
                         case ctype_digit($row['value']):
-                            $this->technical_datas[$row['name']] = (int) $row['value'];
+                            $this->technical_data[$row['name']] = (int) $row['value'];
                             break;
                         default:
-                            $this->technical_datas[$row['name']] = $row['value'];
+                            $this->technical_data[$row['name']] = $row['value'];
                             break;
                     }
                 }
-                $this->set_data_to_cache($this->technical_datas, self::CACHE_TECHNICAL_DATAS);
+                $this->set_data_to_cache($this->technical_data, self::CACHE_TECHNICAL_DATAS);
                 unset($e);
             }
         }
 
         if ($data) {
-            if (isset($this->technical_datas[$data])) {
+            if (isset($this->technical_data[$data])) {
-                return $this->technical_datas[$data];
+                return $this->technical_data[$data];
             } else {
                 return false;
             }
         }
 
-        return $this->technical_datas;
+        return $this->technical_data;
     }
 
     /**
@@ -982,8 +979,6 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
             $caption_field_value = caption_Field_Value::create($this->app, $databox_field, $this, $params['value'], $vocab, $vocab_id);
         }
 
-        $this->caption_record = null;
-
         return $this;
     }
 
@@ -1013,9 +1008,6 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
             $this->set_metadata($param, $this->databox);
         }
 
-        $this->xml = null;
-        $this->caption_record = null;
-
         $xml = new DOMDocument();
         $xml->loadXML($this->app['serializer.caption']->serialize($this->get_caption(), CaptionSerializer::SERIALIZE_XML, true));
 

lib/classes/record/exportElement.php

@@ -83,7 +83,7 @@ class record_exportElement extends record_adapter
 
         $sd = $this->get_subdefs();
 
-        $sbas_id = phrasea::sbasFromBas($this->app, $this->base_id);
+        $sbas_id = phrasea::sbasFromBas($this->app, $this->get_base_id());
 
         $subdefgroups = $this->app->findDataboxById($sbas_id)->get_subdef_structure();
 
@@ -118,18 +118,18 @@ class record_exportElement extends record_adapter
 
         $query = $this->app['phraseanet.user-query'];
 
-        $masters = $query->on_base_ids([$this->base_id])
+        $masters = $query->on_base_ids([$this->get_base_id()])
                 ->who_have_right(['order_master'])
                 ->execute()->get_results();
 
-        $go_cmd = (count($masters) > 0 && $this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base($this->base_id, 'cancmd'));
+        $go_cmd = (count($masters) > 0 && $this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base($this->get_base_id(), 'cancmd'));
 
         $orderable['document'] = false;
         $downloadable['document'] = false;
 
         if (isset($sd['document']) && is_file($sd['document']->get_pathfile())) {
             if ($go_dl['document'] === true) {
-                if ($this->app->getAclForUser($this->app->getAuthenticatedUser())->is_restricted_download($this->base_id)) {
+                if ($this->app->getAclForUser($this->app->getAuthenticatedUser())->is_restricted_download($this->get_base_id())) {
                     $this->remain_hd --;
                     if ($this->remain_hd >= 0) {
                         $localizedLabel = $this->app->trans('document original');
@@ -183,7 +183,7 @@ class record_exportElement extends record_adapter
                 if (isset($sd[$name]) && $sd[$name]->is_physically_present()) {
                     if ($class == 'document') {
 
-                        if ($this->app->getAclForUser($this->app->getAuthenticatedUser())->is_restricted_download($this->base_id)) {
+                        if ($this->app->getAclForUser($this->app->getAuthenticatedUser())->is_restricted_download($this->get_base_id())) {
                             $this->remain_hd --;
                             if ($this->remain_hd >= 0)
                                 $downloadable[$name] = [

lib/classes/record/preview.php

@@ -277,7 +277,7 @@ class record_preview extends record_adapter
         switch ($this->env) {
 
             case "RESULT":
-                $this->title .= $this->app->trans('resultat numero %number%', ['%number%' => '<span id="current_result_n">' . ($this->number + 1) . '</span> : ']);
+                $this->title .= $this->app->trans('resultat numero %number%', ['%number%' => '<span id="current_result_n">' . ($this->get_number() + 1) . '</span> : ']);
                 $this->title .= parent::get_title($highlight, $searchEngine);
                 break;
             case "BASK":