diff --git a/VERSIONS_WIP/141924 b/VERSIONS_WIP/141924
new file mode 100644
index 0000000000000000000000000000000000000000..fff2282c2d2c07d8ff8f2ea845358637abeebbf6
--- /dev/null
+++ b/VERSIONS_WIP/141924
@@ -0,0 +1 @@
+ - ticket #141924 : Correction du patch de migration de base de données 340 qui pouvait échouer
\ No newline at end of file
diff --git a/library/Class/Users.php b/library/Class/Users.php
index 12227b0c39aa2da35ac50f4509968de7699f9c8a..f8476a68875833c5d511676f6bb5f4d3405acb47 100644
--- a/library/Class/Users.php
+++ b/library/Class/Users.php
@@ -514,8 +514,6 @@ class Class_Users extends Storm_Model_Abstract {
'id_panier_courant' => 0,
'settings' => '',
'statut' => 0,
- 'disable_newsletter' => 0,
- 'last_login' => '',
'id_int_bib' => null];
public static function currentUserId() {
diff --git a/library/ZendAfi/Form/Admin/User.php b/library/ZendAfi/Form/Admin/User.php
index 04d1a0e021c8789fcd662c08aa2096ac9edfb55d..c10e95867870123e0f182bcd1aac349fc6855f8e 100644
--- a/library/ZendAfi/Form/Admin/User.php
+++ b/library/ZendAfi/Form/Admin/User.php
@@ -28,7 +28,7 @@ class ZendAfi_Form_Admin_User extends ZendAfi_Form {
$user = ((isset($datas['id_user'])) && ($user = Class_Users::find($datas['id_user'])))
? $user
- : new Class_Users();
+ : Class_Users::newInstance(['last_login' => 0]);
$form->setUser($user);
$form->buildElements();
@@ -299,4 +299,4 @@ class ZendAfi_Form_Admin_User extends ZendAfi_Form {
return $this;
}
}
-?>
\ No newline at end of file
+?>
diff --git a/tests/application/modules/AbstractControllerTestCase.php b/tests/application/modules/AbstractControllerTestCase.php
index 27b1811fa952ce992664c56cd8cef33b56f6069b..3f041ba0b648733b9d7c79ceb6d25cd8b8555c24 100644
--- a/tests/application/modules/AbstractControllerTestCase.php
+++ b/tests/application/modules/AbstractControllerTestCase.php
@@ -96,6 +96,7 @@ abstract class AbstractControllerTestCase extends Zend_Test_PHPUnit_ControllerTe
->setRoleLevel($account->ROLE_LEVEL)
->setIdSite($account->ID_SITE)
->setDateMaj('')
+ ->setLastLogin(0)
->setDisableNewsletter(0);
ZendAfi_Auth::getInstance()->getStorage()->write($account);
diff --git a/tests/application/modules/admin/controllers/NewsletterControllerTest.php b/tests/application/modules/admin/controllers/NewsletterControllerTest.php
index f501ec50a62282873dce33067b2791ab2b5ecbfd..8a80f9ef0b8ee9bd97ccfb037735faa06b84fcb6 100644
--- a/tests/application/modules/admin/controllers/NewsletterControllerTest.php
+++ b/tests/application/modules/admin/controllers/NewsletterControllerTest.php
@@ -1300,31 +1300,38 @@ abstract class Admin_NewsletterControllerEditSubcsribersSearchTestCase
$newsletter = Class_Newsletter::find(1);
$newsletter
- ->subscribeToDedicatedGroup($this->_laurent = $this->fixture('Class_Users',
- ['id' => 566,
- 'login' => 'laurent',
- 'mail' => 'laurent@nomail.org',
- 'password' => '677']));
-
- $this->_pat = $this->fixture('Class_Users',
+ ->subscribeToDedicatedGroup($this->_laurent = $this->fixture(Class_Users::class,
+ ['id' => 566,
+ 'login' => 'laurent',
+ 'mail' => 'laurent@nomail.org',
+ 'last_login' => 0,
+ 'disable_newsletter' => 0,
+ 'password' => '677']));
+
+ $this->_pat = $this->fixture(Class_Users::class,
['id' => 3232,
'login' => 'pat',
- 'password' => '8890']);
+ 'last_login' => 0,
+ 'password' => '8890',
+ 'disable_newsletter' => 0]);
- $this->_hdl = $this->fixture('Class_Users',
+ $this->_hdl = $this->fixture(Class_Users::class,
['id' => 1111,
'login' => 'hdl',
'password' => '0986',
'mail' => 'hdl@exemple.com',
+ 'last_login' => 0,
'disable_newsletter' => 1
]);
$newsletter
- ->subscribeToDedicatedGroup($this->_ghislo = $this->fixture('Class_Users',
- ['id' => 444,
- 'login' => 'ghislo',
- 'password' => '8989',
- 'mail' => 'g@serv.eur.fr']))
+ ->subscribeToDedicatedGroup($this->_ghislo = $this->fixture(Class_Users::class,
+ ['id' => 444,
+ 'login' => 'ghislo',
+ 'password' => '8989',
+ 'last_login' => 0,
+ 'disable_newsletter' => 0,
+ 'mail' => 'g@serv.eur.fr']))
->unsubscribeUser($this->_ghislo);
$sql = $this->mock()
@@ -1349,7 +1356,7 @@ class Admin_NewsletterControllerEditSubcsribersSearchAllSubscriptionTest
public function setUp() {
parent::setUp();
- $this->onLoaderOfModel('Class_Users')
+ $this->onLoaderOfModel(Class_Users::class)
->whenCalled('findAllBy')
->with(['order' => 'nom asc',
'limitPage' => [1, 20]])
@@ -2095,4 +2102,4 @@ class Admin_NewsletterControllerShowStatusActionTest
}
$this->fail('should have 404 error');
}
-}
\ No newline at end of file
+}
diff --git a/tests/application/modules/admin/controllers/UsersControllerTest.php b/tests/application/modules/admin/controllers/UsersControllerTest.php
index 9d1e2cc936a602325242a29bda4183838d1ebea3..15ddf79602b850521a5c808487f576c104ba9dc9 100644
--- a/tests/application/modules/admin/controllers/UsersControllerTest.php
+++ b/tests/application/modules/admin/controllers/UsersControllerTest.php
@@ -49,33 +49,34 @@ abstract class UsersControllerWithMarcusTestCase extends AbstractControllerTestC
'libelle' => 'mybib',
'id_zone' => 1]);
- $this->marcus = $this->fixture('Class_Users', ['id' => 10,
- 'prenom' => 'Marcus',
- 'nom' => 'Miller',
- 'login' => 'mmiller',
- 'mail'=> 'marcus@gmail.com',
- 'pseudo' => 'mimi',
- 'password' => 'mysecret',
- 'role_level' => ZendAfi_Acl_AdminControllerRoles::ABONNE_SIGB,
- 'idabon' => '00123',
- 'id_site' => 100,
- 'ordreabon' => 1,
- 'date_debut' => '19-07-2009',
- 'date_fin' => '19-07-2010',
- 'telephone' => '01 23 45 67 89',
- 'mobile' => '06 23 45 67 89',
- 'adresse' => '34 avenue Funk',
- 'code_postal' => '99000',
- 'ville' => 'Jazz City',
- 'subscription_type' => '10;Jazzman',
- 'last_login' => null,
- 'civilite' => Class_Users::CIVILITE_MONSIEUR]);
+ $this->marcus = $this->fixture(Class_Users::class,
+ ['id' => 10,
+ 'prenom' => 'Marcus',
+ 'nom' => 'Miller',
+ 'login' => 'mmiller',
+ 'mail'=> 'marcus@gmail.com',
+ 'pseudo' => 'mimi',
+ 'password' => 'mysecret',
+ 'role_level' => ZendAfi_Acl_AdminControllerRoles::ABONNE_SIGB,
+ 'idabon' => '00123',
+ 'id_site' => 100,
+ 'ordreabon' => 1,
+ 'date_debut' => '19-07-2009',
+ 'date_fin' => '19-07-2010',
+ 'telephone' => '01 23 45 67 89',
+ 'mobile' => '06 23 45 67 89',
+ 'adresse' => '34 avenue Funk',
+ 'code_postal' => '99000',
+ 'ville' => 'Jazz City',
+ 'subscription_type' => '10;Jazzman',
+ 'last_login' => null,
+ 'civilite' => Class_Users::CIVILITE_MONSIEUR]);
$this->marcus->setFicheSIGB(['type_comm' => 0])
->setUserGroups([$group_vodeclic,$group_referent])
->setIntBib($this->fixture('Class_IntBib', ['id' => 100, 'comm_sigb' => 0]));
- $this->user_loader = $this->onLoaderOfModel('Class_Users');
+ $this->user_loader = $this->onLoaderOfModel(Class_Users::class);
}
@@ -112,18 +113,20 @@ class UsersControllerIndexTest extends UsersControllerWithMarcusTestCase {
->with('select distinct(id_user) as id from notices_avis')
->answers([2233, 987398]));
- $user = $this->fixture('Class_Users',
+ $user = $this->fixture(Class_Users::class,
['id' => 1,
'login' => 'tom',
'password' => 'rom',
- 'role_level' => ZendAfi_Acl_AdminControllerRoles::SUPER_ADMIN]);
+ 'role_level' => ZendAfi_Acl_AdminControllerRoles::SUPER_ADMIN,
+ 'last_login' => 0]);
- $francis = $this->fixture('Class_Users',
+ $francis = $this->fixture(Class_Users::class,
['id' => 57,
'login' => 'francis',
- 'password' => 'francis']);
+ 'password' => 'francis',
+ 'last_login' => 0]);
- $this->onLoaderOfModel('Class_Users')
+ $this->onLoaderOfModel(Class_Users::class)
->whenCalled('isCurrentUserCanAccesBackend')
->answers(false)
@@ -801,16 +804,16 @@ class UsersControllerReferentIndexTest extends UsersControllerWithMarcusTestCase
public function setUp() {
parent::setUp();
- $this->fixture('Class_Users', ['id' => 345,
+ $this->fixture(Class_Users::class, ['id' => 345,
'login' => 'roger',
'date_maj' => '',
'password' => 'roger']);
- $this->fixture('Class_Users', ['id' => 346,
+ $this->fixture(Class_Users::class, ['id' => 346,
'login' => 'norbert',
'date_maj' => '',
'password' => 'norbert']);
- $user = $this->fixture('Class_Users',
+ $user = $this->fixture(Class_Users::class,
['id' => 2,
'login' => 'referent',
'password' => 'referent',
@@ -971,7 +974,7 @@ abstract class Admin_UsersControllerEditAdminTestCase extends Admin_AbstractCont
['id' => 13,
'libelle' => 'shadow']);
- $this->_admin = $this->fixture('Class_Users',
+ $this->_admin = $this->fixture(Class_Users::class,
['id' => 10,
'login' => 'Terminator',
'password' => 'How do you want it ?',
@@ -1156,7 +1159,7 @@ class UsersControllerEditSuperAdminTest extends Admin_AbstractControllerTestCase
public function setUp() {
parent::setUp();
- $this->fixture('Class_Users',
+ $this->fixture(Class_Users::class,
['id' => 1,
'login' => 'admin',
'password' => 'admin',
@@ -1189,7 +1192,7 @@ class Admin_UsersControllerChangeAdminSkinActionTest extends Admin_AbstractContr
'libelle' => 'Multimedia'])
->addRight(Class_UserGroup::RIGHT_ACCES_VODECLIC);
- $redac = $this->fixture('Class_Users',
+ $redac = $this->fixture(Class_Users::class,
['id' => 5,
'login' => 'rédacteur',
'password' => 'msmdp',
@@ -1225,7 +1228,7 @@ class Admin_UsersControllerChangeRoleLevelOfUserInMyBibAsAdminBibTest extends Ad
public function setUp() {
parent::setUp();
- $adminbib = $this->fixture('Class_Users',
+ $adminbib = $this->fixture(Class_Users::class,
['id' => 5,
'login' => 'adminbib',
'password' => 'secret',
@@ -1240,7 +1243,7 @@ class Admin_UsersControllerChangeRoleLevelOfUserInMyBibAsAdminBibTest extends Ad
ZendAfi_Auth::getInstance()->logUser($adminbib);
- $this->fixture('Class_Users',
+ $this->fixture(Class_Users::class,
['id' => 3,
'login' => 'userbib',
'password' => 'secret',
@@ -1287,23 +1290,26 @@ class UsersControllerWithAdminPortalTest extends Admin_AbstractControllerTestCas
public function setUp() {
parent::setUp();
- $this->fixture('Class_Users',
+ $this->fixture(Class_Users::class,
['id' => 1,
'login' => 'tom',
'password' => 'rom',
+ 'last_login' => 0,
'role_level' => ZendAfi_Acl_AdminControllerRoles::SUPER_ADMIN]);
- $this->fixture('Class_Users',
+ $this->fixture(Class_Users::class,
['id' => 3,
'login' => 'tum',
'password' => 'rum',
+ 'last_login' => 0,
'role_level' => ZendAfi_Acl_AdminControllerRoles::ADMIN_PORTAIL]);
$admin = $this
- ->fixture('Class_Users',
+ ->fixture(Class_Users::class,
['id' => 2,
'login' => 'tim',
'password' => 'rim',
+ 'last_login' => 0,
'role_level' => ZendAfi_Acl_AdminControllerRoles::ADMIN_PORTAIL,
'avis' => [$this->fixture('Class_AvisNotice',
['id' => 33,
@@ -1317,7 +1323,7 @@ class UsersControllerWithAdminPortalTest extends Admin_AbstractControllerTestCas
ZendAfi_Auth::getInstance()->logUser($admin);
- $this->onLoaderOfModel('Class_Users')
+ $this->onLoaderOfModel(Class_Users::class)
->whenCalled('findAllBy')
->with(['where' => '(role_level <= ' . ZendAfi_Acl_AdminControllerRoles::ADMIN_PORTAIL . ')',
'order' => 'prenom desc',
@@ -1444,7 +1450,6 @@ abstract class UsersControllerDoubleTestCase extends Admin_AbstractControllerTes
'idabon' => '100',
'ordreabon' => '18',
'doublon' => '3']
-
])
->whenCalled('fetchOne')
@@ -1507,59 +1512,65 @@ abstract class UsersControllerDoubleTestCase extends Admin_AbstractControllerTes
Zend_Registry::set('sql', $mock_sql);
- $this->fixture('Class_Users',
+ $this->fixture(Class_Users::class,
['id' => 2,
'login' => 'Ret',
'password' => 'urn',
'role_level' => ZendAfi_Acl_AdminControllerRoles::ABONNE_SIGB,
'id_site' => 1,
'idabon' => '49',
+ 'last_login' => 0,
'ordreabon' => 1]);
- $this->fixture('Class_Users',
+ $this->fixture(Class_Users::class,
['id' => 29,
'login' => 'Ret',
'password' => 'urn',
'role_level' => ZendAfi_Acl_AdminControllerRoles::ABONNE_SIGB,
'id_site' => 1,
'idabon' => '49',
+ 'last_login' => 0,
'ordreabon' => 1]);
- $this->fixture('Class_Users',
+ $this->fixture(Class_Users::class,
['id' => 123,
'login' => 'Ret',
'password' => 'urn',
'role_level' => ZendAfi_Acl_AdminControllerRoles::ABONNE_SIGB,
'id_site' => 1,
'idabon' => '49',
+ 'last_login' => 0,
'ordreabon' => 2,
'last_login' => '2020-10-04']);
- $this->fixture('Class_Users',
+ $this->fixture(Class_Users::class,
['id' => 25,
'login' => 'Ret',
'password' => 'urn',
'role_level' => ZendAfi_Acl_AdminControllerRoles::ABONNE_SIGB,
'id_site' => 1,
'idabon' => '89',
+ 'last_login' => 0,
'ordreabon' => 18]);
- $this->fixture('Class_Users',
+ $this->fixture(Class_Users::class,
['id' => 654,
'login' => 'Ret',
'password' => 'urn',
'role_level' => ZendAfi_Acl_AdminControllerRoles::ABONNE_SIGB,
'id_site' => 1,
'idabon' => '89',
+ 'last_login' => 0,
'ordreabon' => 18]);
- $this->fixture('Class_Users',
+ $this->fixture(Class_Users::class,
['id' => 655,
'login' => 'Ret',
'password' => 'urn',
'role_level' => ZendAfi_Acl_AdminControllerRoles::ABONNE_SIGB,
'id_site' => 1,
'idabon' => '89',
+ 'last_login' => 0,
'ordreabon' => 18]);
$this->createUsersWithStatusDifferentAndSameNames(89, [100,101,102], [0,1,1]);
@@ -1582,7 +1593,7 @@ abstract class UsersControllerDoubleTestCase extends Admin_AbstractControllerTes
protected function createUsersWithEmptyValidityDate() {
- $this->fixture('Class_Users',
+ $this->fixture(Class_Users::class,
['id' => 110,
'nom' => 'Abatzi',
'prenom' => 'rita',
@@ -1593,9 +1604,10 @@ abstract class UsersControllerDoubleTestCase extends Admin_AbstractControllerTes
'role_level' => ZendAfi_Acl_AdminControllerRoles::ABONNE_SIGB,
'id_site' => 1,
'idabon' => 100,
+ 'last_login' => 0,
'ordreabon' => 18]);
- $this->fixture('Class_Users',
+ $this->fixture(Class_Users::class,
['id' => 111,
'nom' => 'Abatzi',
'prenom' => 'rita',
@@ -1606,6 +1618,7 @@ abstract class UsersControllerDoubleTestCase extends Admin_AbstractControllerTes
'role_level' => ZendAfi_Acl_AdminControllerRoles::ABONNE_SIGB,
'id_site' => 1,
'idabon' => 100,
+ 'last_login' => 0,
'ordreabon' => 18]);
$this->fixture('Class_PanierNotice',
@@ -1617,7 +1630,7 @@ abstract class UsersControllerDoubleTestCase extends Admin_AbstractControllerTes
protected function createUsersWithStatusDifferentAndSameNames($id_abon, $ids, $status) {
- $this->fixture('Class_Users',
+ $this->fixture(Class_Users::class,
['id' => $ids[0],
'nom' => 'test',
'prenom' => 'test',
@@ -1628,9 +1641,10 @@ abstract class UsersControllerDoubleTestCase extends Admin_AbstractControllerTes
'role_level' => ZendAfi_Acl_AdminControllerRoles::ABONNE_SIGB,
'id_site' => 1,
'idabon' => $id_abon,
+ 'last_login' => 0,
'ordreabon' => 18]);
- $this->fixture('Class_Users',
+ $this->fixture(Class_Users::class,
['id' => $ids[1],
'nom' => 'test',
'prenom' => 'test',
@@ -1641,9 +1655,10 @@ abstract class UsersControllerDoubleTestCase extends Admin_AbstractControllerTes
'role_level' => ZendAfi_Acl_AdminControllerRoles::ABONNE_SIGB,
'id_site' => 1,
'idabon' => $id_abon,
+ 'last_login' => 0,
'ordreabon' => 18]);
- $this->fixture('Class_Users',
+ $this->fixture(Class_Users::class,
['id' => $ids[2],
'nom' => 'test',
'prenom' => 'test',
@@ -1654,6 +1669,7 @@ abstract class UsersControllerDoubleTestCase extends Admin_AbstractControllerTes
'role_level' => ZendAfi_Acl_AdminControllerRoles::ABONNE_SIGB,
'id_site' => 1,
'idabon' => $id_abon,
+ 'last_login' => 0,
'ordreabon' => 18]);
$this->fixture('Class_PanierNotice',
@@ -2035,7 +2051,7 @@ abstract class UsersControllerMassDeleteTestCase extends Admin_AbstractControlle
public function setUp() {
parent::setUp();
- $this->onLoaderOfModel('Class_Users')
+ $this->onLoaderOfModel(Class_Users::class)
->whenCalled('countBy')
->with(['role_level' => 2,
'statut' => 1,
@@ -2133,7 +2149,7 @@ class UsersControllerMassDeleteRunTest extends UsersControllerMassDeleteTestCase
class UsersControllerMassDeleteRunStepWithOneUserTest extends UsersControllerMassDeleteTestCase {
public function setUp() {
parent::setUp();
- $this->fixture('Class_Users',
+ $this->fixture(Class_Users::class,
['id' => 999,
'login' => 'junchiro',
'password' => 'makoto',
@@ -2187,7 +2203,7 @@ class UsersControllerMassDeleteRunStepMatchingCurrentUserTest
public function setUp() {
parent::setUp();
ZendAfi_Auth::getInstance()
- ->logUser($this->fixture('Class_Users',
+ ->logUser($this->fixture(Class_Users::class,
['id' => 78789,
'login' => 'admin',
'password' => 'admin',
@@ -2224,10 +2240,11 @@ class UsersControllerMassDeleteRunStepMatchingSuperAdminUserTest
public function setUp() {
parent::setUp();
- $this->fixture('Class_Users', ['id' => 78789,
- 'login' => 'super',
- 'password' => 'admin',
- 'role_level' => ZendAfi_Acl_AdminControllerRoles::SUPER_ADMIN]);
+ $this->fixture(Class_Users::class,
+ ['id' => 78789,
+ 'login' => 'super',
+ 'password' => 'admin',
+ 'role_level' => ZendAfi_Acl_AdminControllerRoles::SUPER_ADMIN]);
Class_Users::getLoader()
->whenCalled('countBy')
diff --git a/tests/application/modules/opac/controllers/NewsletterControllerTest.php b/tests/application/modules/opac/controllers/NewsletterControllerTest.php
index 2b7cb759787d5841bd484cd55872344a88fe3c4a..2829712ca0af3200dc328c1af8cc2c1e43b1089a 100644
--- a/tests/application/modules/opac/controllers/NewsletterControllerTest.php
+++ b/tests/application/modules/opac/controllers/NewsletterControllerTest.php
@@ -28,25 +28,28 @@ abstract class NewsletterControllerTestCase extends AbstractControllerTestCase {
public function setUp() {
parent::setUp();
- $this->_harlock = $this->fixture('Class_Users',
+ $this->_harlock = $this->fixture(Class_Users::class,
['id' => 23,
'login' => 'harlock',
'password' => 'free/terra',
+ 'last_login' => 0,
'mail' => 'c.harlock@arcadia.net']);
- $this->_junior = $this->fixture('Class_Users',
+ $this->_junior = $this->fixture(Class_Users::class,
['id' => 24,
'login' => 'junior',
'password' => 'free/software',
+ 'last_login' => 0,
'mail' => 'c.harlock@arcadia.net']);
- $this->_procyon = $this->fixture('Class_Users',
+ $this->_procyon = $this->fixture(Class_Users::class,
['id' => 25,
'login' => 'procyon',
'password' => 'free the golgoth',
+ 'last_login' => 0,
'mail' => 'procyon@research-center.net']);
- $this->_newsletter = $this->fixture('Class_Newsletter',
+ $this->_newsletter = $this->fixture(Class_Newsletter::class,
['id' => 34,
'mail_subject' => 'Dernieres nouvelles',
'titre' => 'Last news']);
diff --git a/tests/db/UpgradeDBTest.php b/tests/db/UpgradeDBTest.php
index 23ede4c39d70162ff5bbb8ede043e34d71442b1a..75954e740712bb4a3ad12fae15d3ef2ee202bf74 100644
--- a/tests/db/UpgradeDBTest.php
+++ b/tests/db/UpgradeDBTest.php
@@ -1952,10 +1952,13 @@ class UpgradeDB_339_Test extends UpgradeDBTestCase {
+
class UpgradeDB_340_Test extends UpgradeDBTestCase {
public function prepare() {
try {
$this->query('update bib_admin_users set password="pass" where id_user=1');
+ $this->dropFieldFrom('bib_admin_users', 'last_login');
+ $this->dropFieldFrom('bib_admin_users', 'disable_newsletter');
} catch(Exception $e) {}
}
diff --git a/tests/scenarios/Become/BecomeTest.php b/tests/scenarios/Become/BecomeTest.php
index 758cf4fbc14cabacb71e56481231a3903cecdc5c..d719f1df7b0d6302928b27d1feb0a6998bc300bb 100644
--- a/tests/scenarios/Become/BecomeTest.php
+++ b/tests/scenarios/Become/BecomeTest.php
@@ -261,10 +261,11 @@ class BecomeUsersControllerWithSuperAdminTest extends Admin_AbstractControllerTe
parent::setUp();
ZendAfi_Auth::getInstance()
- ->logUser($this->fixture('Class_Users',
+ ->logUser($this->fixture(Class_Users::class,
['id' => 1,
'login' => 'tom',
'password' => 'rom',
+ 'last_login' => 0,
'role_level' => ZendAfi_Acl_AdminControllerRoles::SUPER_ADMIN]));
$this->dispatch('/admin/users/index', true);
diff --git a/tests/scenarios/DriveCheckOut/DriveCheckoutAdminControllerTest.php b/tests/scenarios/DriveCheckOut/DriveCheckoutAdminControllerTest.php
index 5d182ad5337a8cd8b3ca0b466df6aeac55ae06a3..d4866705555cbb9cf8548242e6cabb4e55fede0a 100644
--- a/tests/scenarios/DriveCheckOut/DriveCheckoutAdminControllerTest.php
+++ b/tests/scenarios/DriveCheckOut/DriveCheckoutAdminControllerTest.php
@@ -61,20 +61,22 @@ abstract class DriveCheckOutAdminControllerTestCase extends Admin_AbstractContro
'enable_drive' => false]);
- $emilie = $this->fixture('Class_Users',
+ $emilie = $this->fixture(Class_Users::class,
['id' => 2,
'login' => 'emilie',
'password' => 'secret',
'role_level' => ZendAfi_Acl_AdminControllerRoles::ABONNE_SIGB,
'idabon' => 'A121',
+ 'last_login' => 0,
'bib' => $lib_hotel_dieu]);
- $bernard = $this->fixture('Class_Users',
+ $bernard = $this->fixture(Class_Users::class,
['id' => 3,
'login' => 'bernard',
'password' => 'secret',
'role_level' => ZendAfi_Acl_AdminControllerRoles::ABONNE_SIGB,
'idabon' => 'A123',
+ 'last_login' => 0,
'bib' => $lib_hotel_dieu]);
@@ -124,12 +126,13 @@ abstract class DriveCheckOutAdminControllerTestCase extends Admin_AbstractContro
->setTitre('Dupont à Dole')
];
- $maurice = $this->fixture('Class_Users',
+ $maurice = $this->fixture(Class_Users::class,
['id' => 4,
'login' => 'maurice',
'password' => 'secret',
'role_level' => ZendAfi_Acl_AdminControllerRoles::ABONNE_SIGB,
'idabon' => 'A124',
+ 'last_login' => 0,
'bib' => $lib_hotel_dieu])
->setFicheSigb(['type_comm' => Class_IntBib::COM_NANOOK,
'fiche' => (new Class_WebService_SIGB_Emprunteur(4, 'Maurice'))
@@ -688,4 +691,4 @@ class DriveCheckoutAdminControllerPlanPostNewCheckoutForMauriceHotelDieuOnMayNin
public function pageShouldNotifyCheckoutSaved() {
$this->assertFlashMessengerContentContains('Retrait planifié pour maurice, le 19 mai 10:00, Hotel-Dieu');
}
-}
\ No newline at end of file
+}
diff --git a/tests/scenarios/RendezVous/UsergroupAgendaAdminTest.php b/tests/scenarios/RendezVous/UsergroupAgendaAdminTest.php
index b5f137ec653d9bb9b46c6b9d14c783ce63ff35b2..eacf967dba014ad08a72ab01869db22cdfe79062 100644
--- a/tests/scenarios/RendezVous/UsergroupAgendaAdminTest.php
+++ b/tests/scenarios/RendezVous/UsergroupAgendaAdminTest.php
@@ -559,12 +559,13 @@ class UsergroupAgendaAdminUserSelectActionTest extends UsergroupAgendaAdminModoP
public function setUp() {
parent::setUp();
- $this->fixture('Class_Users',
+ $this->fixture(Class_Users::class,
['id' => 35,
'login' => 'padawan',
'id_site' => 4,
'idabon' => 1234,
'password' => 's3cr3t \o/',
+ 'last_login' => 0,
'role_level' => ZendAfi_Acl_AdminControllerRoles::ABONNE_SIGB]);
$this->dispatch('/admin/usergroup-agenda/user-select');
@@ -652,18 +653,19 @@ class UsergroupAgendaAdminEditActionTest
public function setUp() {
parent::setUp();
- $this->fixture('Class_Users',
+ $this->fixture(Class_Users::class,
['id' => 35,
'login' => 'padawan',
'id_site' => 4,
'idabon' => 1234,
'password' => 's3cr3t \o/',
+ 'last_login' => 0,
'role_level' => ZendAfi_Acl_AdminControllerRoles::ABONNE_SIGB]);
- $this->fixture('Class_UserGroup_Agenda',
+ $this->fixture(Class_UserGroup_Agenda::class,
['id'=> 45,
'libelle'=> 'MonAgenda',
- 'model_class' => 'Class_RendezVous',
+ 'model_class' => Class_RendezVous::class,
'users' => [Class_Users::find(35)]]);
$this->dispatch('/admin/usergroup-agenda/edit/id/45');