From d33a1d0dcc74bdafad76ed9cf6daa2e23298374a 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:53 +0200
Subject: [PATCH] PHPCS fixing

---
 lib/classes/record/adapter.php | 21 +++++++++----------
 tests/classes/ACLTest.php      | 38 ++++++++++++++++++++--------------
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/lib/classes/record/adapter.php b/lib/classes/record/adapter.php
index 88c7b3d0a1..6ffe84179e 100644
--- a/lib/classes/record/adapter.php
+++ b/lib/classes/record/adapter.php
@@ -21,10 +21,6 @@ use Alchemy\Phrasea\Core\Event\Record\RecordEvents;
 use Alchemy\Phrasea\Core\Event\Record\StatusChangedEvent;
 use Alchemy\Phrasea\Core\PhraseaTokens;
 use Alchemy\Phrasea\Filesystem\FilesystemService;
-use Alchemy\Phrasea\Media\ArrayTechnicalDataSet;
-use Alchemy\Phrasea\Media\FloatTechnicalData;
-use Alchemy\Phrasea\Media\IntegerTechnicalData;
-use Alchemy\Phrasea\Media\StringTechnicalData;
 use Alchemy\Phrasea\Media\TechnicalData;
 use Alchemy\Phrasea\Media\TechnicalDataSet;
 use Alchemy\Phrasea\Metadata\Tag\TfBasename;
@@ -1375,8 +1371,9 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
 
         $ftodel = [];
         foreach ($this->get_subdefs() as $subdef) {
-            if (!$subdef->is_physically_present())
+            if (!$subdef->is_physically_present()) {
                 continue;
+            }
 
             if ($subdef->get_name() === 'thumbnail') {
                 $this->app['phraseanet.thumb-symlinker']->unlink($subdef->getRealPath());
@@ -1384,11 +1381,13 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
 
             $ftodel[] = $subdef->getRealPath();
             $watermark = $subdef->getWatermarkRealPath();
-            if (file_exists($watermark))
+            if (file_exists($watermark)) {
                 $ftodel[] = $watermark;
+            }
             $stamp = $subdef->getStampRealPath();
-            if (file_exists($stamp))
+            if (file_exists($stamp)) {
                 $ftodel[] = $stamp;
+            }
         }
 
         $origcoll = $this->collection_id;
@@ -1518,16 +1517,16 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
 
     public function delete_data_from_cache($option = null)
     {
-        switch ($option) {
+        switch ($option)
+        {
             case self::CACHE_STATUS:
                 $this->status = null;
                 break;
             case self::CACHE_SUBDEFS:
                 $this->subdefs = null;
                 break;
-            default:
-                break;
         }
+
         $databox = $this->getDatabox();
 
         $databox->delete_data_from_cache($this->get_cache_key($option));
@@ -1558,7 +1557,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
 
     /**
      * @todo de meme avec stories
-     * @return Array
+     * @return \Alchemy\Phrasea\Model\Entities\Basket[]
      */
     public function get_container_baskets(EntityManager $em, User $user)
     {
diff --git a/tests/classes/ACLTest.php b/tests/classes/ACLTest.php
index e259569347..47db1c4d6a 100644
--- a/tests/classes/ACLTest.php
+++ b/tests/classes/ACLTest.php
@@ -29,22 +29,30 @@ class ACLTest extends \PhraseanetTestCase
         $this->assertTrue($this->object->has_status_access_to_record(self::$DI['record_1']));
     }
 
-    public function testHasAccesToRecordStatus()
+    public function testHasAccessToRecordStatus()
     {
-        self::$DI['record_1']->set_binary_status(str_repeat('0', 32));
-        $this->object->set_masks_on_base(self::$DI['record_1']->get_base_id(), '10000', '10000', '0', '0');
-        self::$DI['record_1']->set_binary_status('10000');
-        $this->assertFalse($this->object->has_status_access_to_record(self::$DI['record_1']));
-        self::$DI['record_1']->set_binary_status('00000');
-        $this->assertTrue($this->object->has_status_access_to_record(self::$DI['record_1']));
-        $this->object->set_masks_on_base(self::$DI['record_1']->get_base_id(), '10000', '10000', '10000', '10000');
-        $this->assertFalse($this->object->has_status_access_to_record(self::$DI['record_1']));
-        self::$DI['record_1']->set_binary_status('10000');
-        $this->assertTrue($this->object->has_status_access_to_record(self::$DI['record_1']));
-        $this->object->set_masks_on_base(self::$DI['record_1']->get_base_id(), '0', '0', '0', '0');
-        $this->assertTrue($this->object->has_status_access_to_record(self::$DI['record_1']));
-        self::$DI['record_1']->set_binary_status(str_repeat('0', 32));
-        $this->assertTrue($this->object->has_status_access_to_record(self::$DI['record_1']));
+        $record1 = $this->getRecord1();
+
+        $record1->set_binary_status(str_repeat('0', 32));
+        $this->object->set_masks_on_base($record1->getBaseId(), '10000', '10000', '0', '0');
+
+        $record1->set_binary_status('10000');
+        $this->assertFalse($this->object->has_status_access_to_record($record1));
+
+        $record1->set_binary_status('00000');
+        $this->assertTrue($this->object->has_status_access_to_record($record1));
+
+        $this->object->set_masks_on_base($record1->getBaseId(), '10000', '10000', '10000', '10000');
+        $this->assertFalse($this->object->has_status_access_to_record($record1));
+
+        $record1->set_binary_status('10000');
+        $this->assertTrue($this->object->has_status_access_to_record($record1));
+
+        $this->object->set_masks_on_base($record1->getBaseId(), '0', '0', '0', '0');
+        $this->assertTrue($this->object->has_status_access_to_record($record1));
+
+        $record1->set_binary_status(str_repeat('0', 32));
+        $this->assertTrue($this->object->has_status_access_to_record($record1));
     }
 
     public function testHasAccesToRecordFailsOnBase()