Hotline#22882: RT Fix.

library/ZendAfi/View/Helper/RenderLieu.php

@@ -24,12 +24,30 @@ class ZendAfi_View_Helper_RenderLieu extends Zend_View_Helper_HtmlElement {
 		if (!$lieu)
 			return '';
 
-		$adresse = nl2br($lieu->getAdresse()) . '<br/>' . $lieu->getCodePostal() . ' ' . $lieu->getVille() . '<br />' . $lieu->getTelephone() . '<br />' . $lieu->getMail();
+
+		$adresse = array();
+
+		if (nl2br($lieu->getAdresse()))
+			$adresse[] = nl2br($lieu->getAdresse());
+
+		if ($lieu->getCodePostal())
+			$adresse[] = $lieu->getCodePostal();
+
+		if ($lieu->getVille())
+			$adresse[] = $lieu->getVille();
+
+		if ($lieu->getTelephone())
+			$adresse[] = $lieu->getTelephone();
+
+		if ($lieu->getMail())
+			$adresse[] = $lieu->getMail();
+
+		$adresse_str = implode('<br />', $adresse);
 
 		return sprintf('<div class="lieu">%s %s <p>%s</p></div>',
 									 $this->view->mapForLieu($lieu, $map_options),
 									 $lieu->getLibelle(),
-									 $adresse);
+									 $adresse_str);
 	}
 }
 

tests/library/ZendAfi/View/Helper/RenderLieuTest.php

@@ -38,16 +38,20 @@ class ZendAfi_View_Helper_RenderLieuTest extends ViewHelperTestCase {
 
 	/** @test */
 	public function withLieuShouldRenderEmail() {
-		$this->assertContains('toto@example.com', $this->_helper->renderLieu(Class_Lieu::getLoader()
-																																				 ->newInstanceWithId(4)
-																																				 ->setMail('toto@example.com')));
+		$this->assertContains('toto@example.com', $this->_helper->renderLieu($this->fixture(
+																																												'Class_Lieu',
+																																												['id' => 4,
+																																												 'libelle' => 'Mon lieu',
+																																												 'mail' => 'toto@example.com'])));
 	}
 
 	/** @test */
 	public function withLieuShouldRenderPhoneNumber() {
-		$this->assertContains('010203040506', $this->_helper->renderLieu(Class_Lieu::getLoader()
-																																		 ->newInstanceWithId(4)
-																																		 ->setTelephone('010203040506')));
+		$this->assertContains('010203040506', $this->_helper->renderLieu($this->fixture(
+																																										'Class_Lieu',
+																																										['id' => 4,
+																																										 'libelle' => 'Mon lieu',
+																																										 'telephone' => '010203040506'])));
 	}