Skip to content
Snippets Groups Projects
Commit dae698b1 authored by Arthur Suzuki's avatar Arthur Suzuki
Browse files

Merge branch 'hotline#182642_fix_get_abonnement' into 'master'

[RTip] hotline#182642: protect _getAbonnement from deleted/null membership

See merge request !4786
parents 0b1b84f3 26d12148
Branches
Tags
1 merge request!4786[RTok] hotline#182642: protect _getAbonnement from deleted/null membership
Pipeline #24462 passed with stage
in 26 minutes and 51 seconds
- correctif #182642 : Compte lecteur : correction d'une erreur 500 lors de la consultation du compte lecteur lorsqu'un abonnement a été supprimé.
\ No newline at end of file
......@@ -55,7 +55,7 @@ class Class_User_Membership extends Storm_Model_Abstract {
$_belongs_to = ['user' => ['model' => Class_Users::class,
'referenced_in' => 'user_id'],
'membership' => ['model' => Class_Membership::class,
'referenced_in' => 'membership_id']
'referenced_in' => 'membership_id']
],
$_default_attribute_values = ['id' => 0,
......
......@@ -136,9 +136,10 @@ class Intonation_View_User_Informations extends ZendAfi_View_Helper_BaseHelper {
protected function _getAbonnements(array $user_memberships) :string {
return implode('',array_map(
function ($user_membership){
$membership_libelle = $user_membership
->getMembership()
->getLibelle();
$membership_libelle = ($membership = $user_membership->getMembership())
? $membership->getLibelle()
: '' ;
$date_string = $this->_(' du %s',
Class_Date::human($user_membership->getStartDate()));
$date_string .= ($user_membership->getEndDate())
......
......@@ -2218,6 +2218,12 @@ class TemplatesDispatchAbonneUserMembershipTest extends TemplatesIntonationAccou
'start_date' => '2019-01-01',
'end_date' => '']);
$this->fixture(Class_User_Membership::class,
['id' => 4,
'membership_id' => 666,
'user' => $user,
'start_date' => '2019-01-01',
'end_date' => '']);
Class_User_Membership::setTimesource(new TimeSourceForTest('2017-01-31'));
$this->_buildTemplateProfil(['id'=>1]);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment