diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Push.php b/lib/Alchemy/Phrasea/Controller/Prod/Push.php index 593903f9a2..10165a46e4 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Push.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Push.php @@ -549,15 +549,15 @@ class Push implements ControllerProviderInterface $user = $app['manipulator.user']->getRepository()->createUser($email, $password, $email); - $user->set_firstname($request->request->get('firstname')) - ->set_lastname($request->request->get('lastname')); + $user->setFirstName($request->request->get('firstname')) + ->setLastName($request->request->get('lastname')); if ($request->request->get('company')) - $user->set_company($request->request->get('company')); + $user->setCompany($request->request->get('company')); if ($request->request->get('job')) - $user->set_company($request->request->get('job')); + $user->setCompany($request->request->get('job')); if ($request->request->get('form_geonameid')) - $user->set_geonameid($request->request->get('form_geonameid')); + $user->setGeonanameId($request->request->get('form_geonameid')); $result['message'] = $app->trans('User successfully created'); $result['success'] = true; diff --git a/lib/Alchemy/Phrasea/Controller/Root/Account.php b/lib/Alchemy/Phrasea/Controller/Root/Account.php index 6fc69828ed..6e62109455 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/Account.php +++ b/lib/Alchemy/Phrasea/Controller/Root/Account.php @@ -94,7 +94,7 @@ class Account implements ControllerProviderInterface $user = $app['authentication']->getUser(); if ($app['auth.password-encoder']->isPasswordValid($user->getPassword(), $data['oldPassword'], $user->getNonce())) { - $user->set_password($data['password']); + $user->setPassword($data['password']); $app->addFlash('success', $app->trans('login::notification: Mise a jour du mot de passe avec succes')); return $app->redirectPath('account'); @@ -180,7 +180,7 @@ class Account implements ControllerProviderInterface try { $datas = $app['tokens']->helloToken($token); $user = $app['manipulator.user']->getRepository()->find((int) $datas['usr_id']); - $user->set_email($datas['datas']); + $user->setEmail($datas['datas']); $app['tokens']->removeToken($token); $app->addFlash('success', $app->trans('admin::compte-utilisateur: L\'email a correctement ete mis a jour')); @@ -375,17 +375,17 @@ class Account implements ControllerProviderInterface $app['phraseanet.appbox']->get_connection()->beginTransaction(); $app['authentication']->getUser() - ->set_gender($request->request->get("form_gender")) - ->set_firstname($request->request->get("form_firstname")) - ->set_lastname($request->request->get("form_lastname")) - ->set_address($request->request->get("form_address")) - ->set_zip($request->request->get("form_zip")) - ->set_tel($request->request->get("form_phone")) - ->set_fax($request->request->get("form_fax")) - ->set_job($request->request->get("form_activity")) - ->set_company($request->request->get("form_company")) - ->set_position($request->request->get("form_function")) - ->set_geonameid($request->request->get("form_geonameid")) + ->setGender($request->request->get("form_gender")) + ->setFirstName($request->request->get("form_firstname")) + ->setLastName($request->request->get("form_lastname")) + ->setAddress($request->request->get("form_address")) + ->setZipCode($request->request->get("form_zip")) + ->setPhone($request->request->get("form_phone")) + ->setFax($request->request->get("form_fax")) + ->setJob($request->request->get("form_activity")) + ->setCompany($request->request->get("form_company")) + ->setActivity($request->request->get("form_function")) + ->setGeonanameId($request->request->get("form_geonameid")) ->set_mail_notifications((bool) $request->request->get("mail_notifications")); $ftpCredential = $app['authentication']->getUser()->getFtpCredential(); diff --git a/lib/Alchemy/Phrasea/Controller/Root/Login.php b/lib/Alchemy/Phrasea/Controller/Root/Login.php index e4303d29a3..81ee839325 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/Login.php +++ b/lib/Alchemy/Phrasea/Controller/Root/Login.php @@ -365,19 +365,19 @@ class Login implements ControllerProviderInterface $user = $app['manipulator.user']->createUser($data['login'], $data['password'], $data['email'], false); - foreach ([ - 'gender' => 'set_gender', - 'firstname' => 'set_firstname', - 'lastname' => 'set_lastname', - 'address' => 'set_address', - 'zipcode' => 'set_zip', - 'tel' => 'set_tel', - 'fax' => 'set_fax', - 'job' => 'set_job', - 'company' => 'set_company', - 'position' => 'set_position', - 'geonameid' => 'set_geonameid', - ] as $property => $method) { + foreach (array( + 'gender' => 'setGender', + 'firstname' => 'setFirstName', + 'lastname' => 'setLastName', + 'address' => 'setAddress', + 'zipcode' => 'setZipCode', + 'tel' => 'setPhone', + 'fax' => 'setFax', + 'job' => 'setJob', + 'company' => 'setCompany', + 'position' => 'setActivity', + 'geonameid' => 'setGeonanameId', + ) as $property => $method) { if (isset($data[$property])) { call_user_func([$user, $method], $data[$property]); } @@ -425,7 +425,7 @@ class Login implements ControllerProviderInterface $app['events-manager']->trigger('__REGISTER_AUTOREGISTER__', $params); $app['events-manager']->trigger('__REGISTER_APPROVAL__', $params); - $user->set_mail_locked(true); + $user->setMailLocked(true); try { $this->sendAccountUnlockEmail($app, $user); @@ -570,7 +570,7 @@ class Login implements ControllerProviderInterface } $app['tokens']->removeToken($code); - $user->set_mail_locked(false); + $user->setMailLocked(false); try { $receiver = Receiver::fromUser($user); @@ -621,7 +621,7 @@ class Login implements ControllerProviderInterface $datas = $app['tokens']->helloToken($token); $user = $app['manipulator.user']->getRepository()->find($datas['usr_id']); - $user->set_password($data['password']); + $user->setPassword($data['password']); $app['tokens']->removeToken($token); @@ -882,7 +882,7 @@ class Login implements ControllerProviderInterface $session = $app['authentication']->openAccount($user); if ($user->getLocale() != $app['locale']) { - $user->set_locale($app['locale']); + $user->setLocale($app['locale']); } $width = $height = null; diff --git a/lib/Alchemy/Phrasea/Helper/User/Edit.php b/lib/Alchemy/Phrasea/Helper/User/Edit.php index 6ced3a7aa5..b9be6b1b53 100644 --- a/lib/Alchemy/Phrasea/Helper/User/Edit.php +++ b/lib/Alchemy/Phrasea/Helper/User/Edit.php @@ -595,18 +595,18 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper $old_email = $user->getEmail(); - $user->set_firstname($parm['first_name']) - ->set_lastname($parm['last_name']) - ->set_gender($parm['gender']) - ->set_email($parm['email']) - ->set_address($parm['address']) - ->set_zip($parm['zip']) - ->set_geonameid($parm['geonameid']) - ->set_position($parm['function']) - ->set_job($parm['activite']) - ->set_company($parm['company']) - ->set_tel($parm['telephone']) - ->set_fax($parm['fax']); + $user->setFirstName($parm['first_name']) + ->setLastName($parm['last_name']) + ->setGender($parm['gender']) + ->setEmail($parm['email']) + ->setAddress($parm['address']) + ->setZipCode($parm['zip']) + ->setGeonanameId($parm['geonameid']) + ->setActivity($parm['function']) + ->setJob($parm['activite']) + ->setCompany($parm['company']) + ->setPhone($parm['telephone']) + ->setFax($parm['fax']); $new_email = $user->getEmail(); diff --git a/lib/Alchemy/Phrasea/Helper/User/Manage.php b/lib/Alchemy/Phrasea/Helper/User/Manage.php index f71c3c2d6e..b7f82675af 100644 --- a/lib/Alchemy/Phrasea/Helper/User/Manage.php +++ b/lib/Alchemy/Phrasea/Helper/User/Manage.php @@ -178,7 +178,7 @@ class Manage extends Helper } if ($validateMail) { - $createdUser->set_mail_locked(true); + $createdUser->setMailLocked(true); if ($receiver) { $expire = new \DateTime('+3 days'); @@ -208,7 +208,7 @@ class Manage extends Helper } $created_user = $this->app['manipulator.user']->getRepository()->find($name, \random::generatePassword(16)); - $created_user->set_template($this->app['authentication']->getUser()); + $created_user->setModel($this->app['authentication']->getUser()); $this->usr_id = $this->app['authentication']->getUser()->getId(); return $created_user; diff --git a/lib/classes/ACL.php b/lib/classes/ACL.php index a1f9d844f2..a1ca6011de 100644 --- a/lib/classes/ACL.php +++ b/lib/classes/ACL.php @@ -392,7 +392,7 @@ class ACL implements cache_cacheableInterface $this->apply_template_time_limits($template_user, $base_ids); - $this->user->set_last_template($template_user); + $this->user->setLastModel($template_user); return $this; } diff --git a/lib/classes/module/console/systemMailCheck.php b/lib/classes/module/console/systemMailCheck.php index 6fad295118..135cd80c18 100644 --- a/lib/classes/module/console/systemMailCheck.php +++ b/lib/classes/module/console/systemMailCheck.php @@ -87,7 +87,7 @@ class module_console_systemMailCheck extends Command throw new Exception('Invalid user'); } - $tmp_user->set_email(null); + $tmp_user->setEmail(null); unset($users[$id]); } catch (Exception $e) { diff --git a/tests/Alchemy/Tests/Phrasea/Authentication/AccountCreatorTest.php b/tests/Alchemy/Tests/Phrasea/Authentication/AccountCreatorTest.php index f83737820b..c3b308fc92 100644 --- a/tests/Alchemy/Tests/Phrasea/Authentication/AccountCreatorTest.php +++ b/tests/Alchemy/Tests/Phrasea/Authentication/AccountCreatorTest.php @@ -64,11 +64,11 @@ class AccountCreatorTest extends \PhraseanetTestCase { $random = self::$DI['app']['tokens']; $template1 = self::$DI['app']['manipulator.user']->createUser('template' . $random->generatePassword(), $random->generatePassword()); - $template1->set_template(self::$DI['user']); + $template1->setModel(self::$DI['user']); $template2 = self::$DI['app']['manipulator.user']->createUser('template' . $random->generatePassword(), $random->generatePassword()); - $template2->set_template(self::$DI['user']); + $template2->setModel(self::$DI['user']); $template3 = self::$DI['app']['manipulator.user']->createUser('template' . $random->generatePassword(), $random->generatePassword()); - $template3->set_template(self::$DI['user']); + $template3->setModel(self::$DI['user']); $templates = array($template1, $template2); $extra = array($template3); diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php index 7f848f30ad..53fe688a61 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php @@ -238,7 +238,7 @@ class UsersTest extends \PhraseanetAuthenticatedWebTestCase public function testRouteApplyTp() { $template = self::$DI['app']['manipulator.user']->createUser(uniqid('template_'), "test"); - $template->set_template(self::$DI['user']); + $template->setModel(self::$DI['user']); $user = self::$DI['app']['manipulator.user']->createUser(uniqid('user_'), "test"); diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Root/AccountTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/AccountTest.php index 9443690daf..c42c893582 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Root/AccountTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/AccountTest.php @@ -65,7 +65,7 @@ class AccountTest extends \PhraseanetAuthenticatedWebTestCase $this->assertEquals('/account/', $response->headers->get('location')); $this->assertEquals('new_email@email.com', self::$DI['user']->getEmail()); - self::$DI['user']->set_email('noone@example.com'); + self::$DI['user']->setEmail('noone@example.com'); try { self::$DI['app']['tokens']->helloToken($token); $this->fail('Token has not been removed'); @@ -123,7 +123,7 @@ class AccountTest extends \PhraseanetAuthenticatedWebTestCase public function testPostResetMailBadEmail() { $password = \random::generatePassword(); - self::$DI['app']['authentication']->getUser()->set_password($password); + self::$DI['app']['authentication']->getUser()->setPassword($password); self::$DI['client']->request('POST', '/account/reset-email/', array( 'form_password' => $password, 'form_email' => "invalid#!&&@@email.x", @@ -143,7 +143,7 @@ class AccountTest extends \PhraseanetAuthenticatedWebTestCase public function testPostResetMailEmailNotIdentical() { $password = \random::generatePassword(); - self::$DI['app']['authentication']->getUser()->set_password($password); + self::$DI['app']['authentication']->getUser()->setPassword($password); self::$DI['client']->request('POST', '/account/reset-email/', array( 'form_password' => $password, 'form_email' => 'email1@email.com', @@ -165,7 +165,7 @@ class AccountTest extends \PhraseanetAuthenticatedWebTestCase $this->mockNotificationDeliverer('Alchemy\Phrasea\Notification\Mail\MailRequestEmailUpdate'); $password = \random::generatePassword(); - self::$DI['app']['authentication']->getUser()->set_password($password); + self::$DI['app']['authentication']->getUser()->setPassword($password); self::$DI['client']->request('POST', '/account/reset-email/', array( 'form_password' => $password, 'form_email' => 'email1@email.com', @@ -370,7 +370,7 @@ class AccountTest extends \PhraseanetAuthenticatedWebTestCase */ public function testPostRenewPasswordBadArguments($oldPassword, $password, $passwordConfirm) { - self::$DI['app']['authentication']->getUser()->set_password($oldPassword); + self::$DI['app']['authentication']->getUser()->setPassword($oldPassword); $crawler = self::$DI['client']->request('POST', '/account/reset-password/', array( 'password' => array( @@ -407,7 +407,7 @@ class AccountTest extends \PhraseanetAuthenticatedWebTestCase { $password = \random::generatePassword(); - self::$DI['app']['authentication']->getUser()->set_password($password); + self::$DI['app']['authentication']->getUser()->setPassword($password); $crawler = self::$DI['client']->request('POST', '/account/reset-password/', array( 'password' => array( @@ -427,7 +427,7 @@ class AccountTest extends \PhraseanetAuthenticatedWebTestCase { $password = \random::generatePassword(); - self::$DI['app']['authentication']->getUser()->set_password($password); + self::$DI['app']['authentication']->getUser()->setPassword($password); self::$DI['client']->request('POST', '/account/reset-password/', array( 'password' => array( diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php index f1609dde08..e17f30b3b2 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php @@ -186,7 +186,7 @@ class LoginTest extends \PhraseanetAuthenticatedWebTestCase $email = $this->generateEmail(); $token = self::$DI['app']['tokens']->getUrlToken(\random::TYPE_EMAIL, self::$DI['user']->getId(), null, $email); - self::$DI['user']->set_mail_locked(false); + self::$DI['user']->setMailLocked(false); self::$DI['client']->request('GET', '/login/register-confirm/', array('code' => $token)); $response = self::$DI['client']->getResponse(); @@ -208,7 +208,7 @@ class LoginTest extends \PhraseanetAuthenticatedWebTestCase $appboxRegister = new \appbox_register(self::$DI['app']['phraseanet.appbox']); $token = self::$DI['app']['tokens']->getUrlToken(\random::TYPE_EMAIL, self::$DI['user']->getId(), null, $email); - self::$DI['user']->set_mail_locked(true); + self::$DI['user']->setMailLocked(true); $this->deleteRequest(); $appboxRegister->add_request(self::$DI['user'], self::$DI['collection']); self::$DI['client']->request('GET', '/login/register-confirm/', array('code' => $token)); @@ -233,7 +233,7 @@ class LoginTest extends \PhraseanetAuthenticatedWebTestCase $email = $this->generateEmail(); $token = self::$DI['app']['tokens']->getUrlToken(\random::TYPE_EMAIL, $user->getId(), null, $email); - $user->set_mail_locked(true); + $user->setMailLocked(true); $this->deleteRequest(); @@ -1136,8 +1136,8 @@ class LoginTest extends \PhraseanetAuthenticatedWebTestCase $password = \random::generatePassword(); $login = self::$DI['app']['authentication']->getUser()->getLogin(); - self::$DI['app']['authentication']->getUser()->set_password($password); - self::$DI['app']['authentication']->getUser()->set_mail_locked(false); + self::$DI['app']['authentication']->getUser()->setPassword($password); + self::$DI['app']['authentication']->getUser()->setMailLocked(false); $this->logout(self::$DI['app']); @@ -1161,8 +1161,8 @@ class LoginTest extends \PhraseanetAuthenticatedWebTestCase $password = \random::generatePassword(); $login = self::$DI['app']['authentication']->getUser()->getLogin(); - self::$DI['app']['authentication']->getUser()->set_password($password); - self::$DI['app']['authentication']->getUser()->set_mail_locked(false); + self::$DI['app']['authentication']->getUser()->setPassword($password); + self::$DI['app']['authentication']->getUser()->setMailLocked(false); $this->logout(self::$DI['app']); @@ -1208,7 +1208,7 @@ class LoginTest extends \PhraseanetAuthenticatedWebTestCase $password = \random::generatePassword(); $login = self::$DI['app']['authentication']->getUser()->getLogin(); - self::$DI['app']['authentication']->getUser()->set_password($password); + self::$DI['app']['authentication']->getUser()->setPassword($password); $this->logout(self::$DI['app']); @@ -1340,7 +1340,7 @@ class LoginTest extends \PhraseanetAuthenticatedWebTestCase { $this->logout(self::$DI['app']); $password = \random::generatePassword(); - self::$DI['user']->set_mail_locked(true); + self::$DI['user']->setMailLocked(true); self::$DI['client']->request('POST', '/login/authenticate/', array( 'login' => self::$DI['user']->getLogin(), 'password' => $password, @@ -1350,7 +1350,7 @@ class LoginTest extends \PhraseanetAuthenticatedWebTestCase $this->assertTrue(self::$DI['client']->getResponse()->isRedirect()); $this->assertEquals('/login/', self::$DI['client']->getResponse()->headers->get('location')); $this->assertFalse(self::$DI['app']['authentication']->isAuthenticated()); - self::$DI['user']->set_mail_locked(false); + self::$DI['user']->setMailLocked(false); } public function testAuthenticateWithProvider() diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/AuthenticationManagerServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/AuthenticationManagerServiceProviderTest.php index 8fff667bd6..f90573738e 100644 --- a/tests/Alchemy/Tests/Phrasea/Core/Provider/AuthenticationManagerServiceProviderTest.php +++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/AuthenticationManagerServiceProviderTest.php @@ -156,9 +156,9 @@ class AuthenticationManagerServiceProviderTest extends ServiceProviderTestCase $random = $app['tokens']; $template1 = $user = self::$DI['app']['manipulator.user']->createUser('template' . $random->generatePassword(), $random->generatePassword()); - $template1->set_template(self::$DI['user']); + $template1->setModel(self::$DI['user']); $template2 = self::$DI['app']['manipulator.user']->createUser('template' . $random->generatePassword(), $random->generatePassword()); - $template2->set_template(self::$DI['user']); + $template2->setModel(self::$DI['user']); $app['conf']->set(['authentication', 'auto-create'], ['templates' => [$template1->get_id(), $template2->get_login()]]); diff --git a/tests/classes/ACLTest.php b/tests/classes/ACLTest.php index 2da0e44806..85ebec8c49 100644 --- a/tests/classes/ACLTest.php +++ b/tests/classes/ACLTest.php @@ -81,7 +81,7 @@ class ACLTest extends \PhraseanetAuthenticatedTestCase public function testApply_model() { $template = self::$DI['app']['manipulator.user']->createUser('test_phpunit2', 'blabla2', 'test2@example.com'); - $template->set_template(self::$DI['user']); + $template->setModel(self::$DI['user']); $base_ids = array(); foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) { @@ -112,7 +112,7 @@ class ACLTest extends \PhraseanetAuthenticatedTestCase public function testApply_model_with_time_limit() { $template = self::$DI['app']['manipulator.user']->createUser('test_phpunit2', 'blabla2', 'test2@example.com'); - $template->set_template(self::$DI['user']); + $template->setModel(self::$DI['user']); $base_ids = array(); foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) { diff --git a/tests/classes/PhraseanetPHPUnitAbstract.php b/tests/classes/PhraseanetPHPUnitAbstract.php index 8ae098e3a7..04f680459a 100644 --- a/tests/classes/PhraseanetPHPUnitAbstract.php +++ b/tests/classes/PhraseanetPHPUnitAbstract.php @@ -107,7 +107,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase self::generateRecords($application); - self::$DI['user']->set_email('valid@phraseanet.com'); + self::$DI['user']->setEmail('valid@phraseanet.com'); self::$updated = true; } diff --git a/tests/classes/userTest.php b/tests/classes/userTest.php index ad4c24a51a..81a2cf4b85 100644 --- a/tests/classes/userTest.php +++ b/tests/classes/userTest.php @@ -8,18 +8,17 @@ class userTest extends \PhraseanetTestCase { $this->assertNull(self::$DI['app']['manipulator.user']->getRepository()->findByEmail(null)); try { - self::$DI['user']->set_email(null); + self::$DI['user']->setEmail(null); $this->assertNull(self::$DI['app']['manipulator.user']->getRepository()->findByEmail(null)); - self::$DI['user']->set_email(''); + self::$DI['user']->setEmail(''); $this->assertNull(self::$DI['app']['manipulator.user']->getRepository()->findByEmail(null)); - self::$DI['user']->set_email('noone@example.com'); + self::$DI['user']->setEmail('noone@example.com'); $this->assertEquals(self::$DI['user'], self::$DI['app']['manipulator.user']->getRepository()->findByEmail('noone@example.com')); } catch (Exception $e) { $this->fail($e->getMessage()); } try { - - self::$DI['user']->set_email('noonealt1@example.com'); + self::$DI['user']->setEmail('noonealt1@example.com'); $this->fail('A user already got this address'); } catch (Exception $e) {