From 6c47b05efc5341242e57840a217e415b0f6b3f54 Mon Sep 17 00:00:00 2001
From: Alex Arnaud <alex.arnaud@biblibre.com>
Date: Fri, 13 Feb 2015 12:06:03 +0100
Subject: [PATCH] Fix merge issues
---
library/ZendAfi/Form/Album.php | 4 ++--
tests/library/Class/PanierNoticeTest.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/library/ZendAfi/Form/Album.php b/library/ZendAfi/Form/Album.php
index f89b9afe932..c3d7f4f6adc 100644
--- a/library/ZendAfi/Form/Album.php
+++ b/library/ZendAfi/Form/Album.php
@@ -160,7 +160,7 @@ class ZendAfi_Form_Album extends ZendAfi_Form {
'size' => 20])
->addElement('text', 'provenance', ['label' => $this->_('Provenance'),
- 'style' => 'width:440px;'])
+ 'style' => 'width:440px;',
'size' => 75])
->addElement('text', 'duration', ['label' => $this->_('Durée totale'),
@@ -177,7 +177,7 @@ class ZendAfi_Form_Album extends ZendAfi_Form {
'rubrique' => 'nature_doc'])
->addElement('text', 'distributor', ['label' => $this->_('Distributeur'),
- 'style' => 'width:440px;'])
+ 'style' => 'width:440px;',
'size' => 75])
diff --git a/tests/library/Class/PanierNoticeTest.php b/tests/library/Class/PanierNoticeTest.php
index 9db9b2eb8e5..cc4fc133e86 100644
--- a/tests/library/Class/PanierNoticeTest.php
+++ b/tests/library/Class/PanierNoticeTest.php
@@ -181,7 +181,7 @@ class PanierNoticeWithThreeNoticesTest extends ModelTestCase {
/** @test */
public function numberOfNoticesShouldBeThree() {
- $this->assertEquals(3, $this->fictions->numberOfNotices());
+ $this->assertEquals(3, Class_PanierNotice::Find(4)->numberOfNotices());
}
/** @test */
--
GitLab