hotline #41683 fix tests + right imports

library/Class/Bib.php

@@ -269,7 +269,7 @@ class Class_Bib extends Storm_Model_Abstract {
                                   'closed_on_holidays' => true],
 
     $_fixed_id = true,
-    $file_uploaded = false,
+    $_file_uploaded = false,
     $_uploadHandler;
 
   public function __construct() {
@@ -760,16 +760,15 @@ class Class_Bib extends Storm_Model_Abstract {
   public function isReceivedFile() {
     if (!$this->_isFileInRequest('photo'))
       return true;
-    if ($this->file_uploaded)
-      return $this->file_uploaded;
-    return $this->file_uploaded=$this->receiveFile();
+
+    if ($this->_file_uploaded)
+      return $this->_file_uploaded;
+    return $this->_file_uploaded = $this->receiveFile();
   }
 
 
   protected function _isFileInRequest($name) {
-    if (!array_key_exists($name, $_FILES))
-      return false;
-    return true;
+    return array_key_exists($name, $_FILES);
   }
 
 
@@ -788,7 +787,7 @@ class Class_Bib extends Storm_Model_Abstract {
   public function validate() {
     $this->checkAttribute('photo',
                           $this->isReceivedFile('photo'),
-                          implode(',',array_unique($this->getErrors())));
+                          implode(',', array_unique($this->getErrors())));
   }
 
 

library/Class/FileProperty.php

@@ -48,9 +48,6 @@ class Class_FileProperty {
     if (!$this->_isInRequest())
       return true;
 
-    if ($this->_hasErrorCodeOnFile())
-      return false;
-
     if ($this->_isFileEmpty())
       return true;
 
@@ -63,14 +60,6 @@ class Class_FileProperty {
   }
 
 
-  protected function _hasErrorCodeOnFile() {
-    return
-      array_key_exists('error', $_FILES[$this->_name])
-      &&
-      (UPLOAD_ERR_NO_FILE !== $_FILES[$this->_name]['error']);
-  }
-
-
   protected function _isInRequest() {
     return array_key_exists($this->_name, $_FILES);
   }

library/Class/WebService/BibNumerique/Dilicom/Book.php

@@ -21,6 +21,7 @@
 
 
 class Class_WebService_BibNumerique_Dilicom_Book extends Class_WebService_BibNumerique_RessourceNumerique {
+  use Trait_Translator;
   protected
     $_isbn,
     $_subtitle,
@@ -69,7 +70,7 @@ class Class_WebService_BibNumerique_Dilicom_Book extends Class_WebService_BibNum
       ->setISBN($this->_isbn)
       ->setSousTitre($this->_subtitle)
       ->addEditor($this->getEditeur())
-      ->setDroits(Class_Album::RIGHT_OTHER_KEY)
+      ->setDroits($this->_('Tous droits réservés'))
       ->setItems($this->_items);
     array_map([$album, 'addCollection'], $this->_collections);
   }

tests/application/modules/admin/controllers/BibControllerTest.php

@@ -537,7 +537,7 @@ class BibControllerWithAdminBibEditAnnecyPostWithVisibiliteZeroAndSomeItemsTest
 
 class BibControllerWithAdminBibEditAnnecyUploadPhotoTest extends BibControllerWithAdminBibTestCase {
   public function setUp() {
-    unset($_FILES['photo']);
+    $_FILES = [];
     parent::setUp();
     $this->fixture('Class_Cosmogramme_Integration',
                    ['id' => 5,
@@ -557,7 +557,7 @@ class BibControllerWithAdminBibEditAnnecyUploadPhotoTest extends BibControllerWi
   }
 
   public function tearDown() {
-    unset($_FILES['photo']);
+    $_FILES = [];
     parent::tearDown();
   }
 
@@ -576,7 +576,7 @@ class BibControllerWithAdminBibEditAnnecyUploadPhotoTest extends BibControllerWi
                         'name' => 'photo.png',
                         'type' => 'image/png',
                         'tmp_name' => 'toto.png',
-                        'error' => 0];
+                        'error' => UPLOAD_ERR_OK];
 
 
     $this->postDispatchBib();
@@ -591,7 +591,7 @@ class BibControllerWithAdminBibEditAnnecyUploadPhotoTest extends BibControllerWi
                         'name' => 'photo.png',
                         'type' => 'image/png',
                         'tmp_name' => 'toto.png',
-                        'error' => 0];
+                        'error' => UPLOAD_ERR_OK];
 
 
     $this->postDispatchBib();
@@ -605,7 +605,7 @@ class BibControllerWithAdminBibEditAnnecyUploadPhotoTest extends BibControllerWi
                         'name' => 'photo.png',
                         'type' => 'image/png',
                         'tmp_name' => 'toto.png',
-                        'error' => 0];
+                        'error' => UPLOAD_ERR_OK];
     $this->postDispatchBib();
     $this->assertXPathContentContains('//ul[@class="errors"]//li',
                                       'La taille du fichier ne doit pas excéder 250ko');
@@ -618,7 +618,7 @@ class BibControllerWithAdminBibEditAnnecyUploadPhotoTest extends BibControllerWi
                         'name' => 'photo.png',
                         'type' => 'image/png',
                         'tmp_name' => 'toto.png',
-                        'error' => 0];
+                        'error' => UPLOAD_ERR_OK];
 
     $this->postDispatchBib();
     $this->assertXPathContentContains('//ul[@class="errors"]//li',
@@ -632,11 +632,12 @@ class BibControllerWithAdminBibEditAnnecyUploadPhotoTest extends BibControllerWi
                         'name' => 'photo.png',
                         'type' => 'image/png',
                         'tmp_name' => 'toto.png',
-                        'error' => 3];
+                        'error' => UPLOAD_ERR_PARTIAL];
 
     $this->postDispatchBib();
     $this->assertXPathContentContains('//ul[@class="errors"]//li',
-                                      'Le fichier n\'a pu être téléchargé complètement');
+                                      'Le fichier n\'a pu être téléchargé complètement',
+                                      $this->_response->getBody());
   }
 
 
@@ -646,7 +647,7 @@ class BibControllerWithAdminBibEditAnnecyUploadPhotoTest extends BibControllerWi
                         'name' => 'photo.txt',
                         'type' => 'image/txt',
                         'tmp_name' => 'toto.txt',
-                        'error' => 0];
+                        'error' => UPLOAD_ERR_OK];
 
     $this->postDispatchBib();
     $this->assertXPathContentContains('//ul[@class="errors"]//li',

tests/library/Class/AlbumTest.php

@@ -273,7 +273,7 @@ class AlbumHarlockReceivingFileTest extends AlbumHarlockFileUploadHandlerTestCas
   /** @test */
   public function withUploadErrorOnHandlerShouldReturnFalse() {
     $_FILES['fichier']['size'] = 1;
-    unset($_FILES['fichier']['error']);
+    $_FILES['fichier']['error'] = UPLOAD_ERR_OK;
 
     $this->_handler
       ->expects($this->once())

tests/library/Class/WebService/Dilicom/PNBOffersParserTest.php

@@ -102,6 +102,15 @@ class DilicomPNBOfferParserTest extends DilicomPNBOfferParserTestCase {
   }
 
 
+  /**
+   * @depends firstAlbumShouldBePlusJamaisSansElle
+   * @test
+   */
+  public function firstAlbumRightsShouldBe($album) {
+    $this->assertEquals('Tous droits réservés',
+                        $album->getDroits());
+  }
+
   /**
    * @depends firstAlbumShouldBePlusJamaisSansElle
    * @test