Skip to content

Commit 2a3e831

Browse files
bidi47bidi47
committed
fixed psalm issues
1 parent e6c3e64 commit 2a3e831

File tree

13 files changed

+34
-8
lines changed

13 files changed

+34
-8
lines changed

‎config/autoload/doctrine.global.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
use Doctrine\ORM\EntityManager;
66
use Doctrine\ORM\EntityManagerInterface;
77
use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
8-
use Frontend\App\Resolver\EntityListenerResolver;
98
use Ramsey\Uuid\Doctrine\UuidBinaryOrderedTimeType;
109
use Ramsey\Uuid\Doctrine\UuidBinaryType;
1110
use Ramsey\Uuid\Doctrine\UuidType;
@@ -23,28 +22,28 @@
2322
],
2423
],
2524
'doctrine' => [
26-
'connection' => [
25+
'connection' => [
2726
'orm_default' => [
2827
'doctrine_mapping_types' => [
2928
UuidBinaryType::NAME => 'binary',
3029
UuidBinaryOrderedTimeType::NAME => 'binary',
3130
],
3231
],
3332
],
34-
'driver' => [
33+
'driver' => [
3534
// default metadata driver, aggregates all other drivers into a single one.
3635
// Override `orm_default` only if you know what you're doing
3736
'orm_default' => [
3837
'class' => MappingDriverChain::class,
3938
'drivers' => [],
4039
],
4140
],
42-
'types' => [
41+
'types' => [
4342
UuidType::NAME => UuidType::class,
4443
UuidBinaryType::NAME => UuidBinaryType::class,
4544
UuidBinaryOrderedTimeType::NAME => UuidBinaryOrderedTimeType::class,
4645
],
47-
'fixtures' => getcwd() . '/data/doctrine/fixtures',
46+
'fixtures' => getcwd() . '/data/doctrine/fixtures',
4847
],
4948
'resultCacheLifetime' => 600,
5049
];

‎src/Contact/src/Controller/ContactController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ public function formAction(): ResponseInterface
6666
$this->messenger->addError('Missing recaptcha');
6767
return new RedirectResponse($request->getUri(), 303);
6868
}
69-
7069
$data['subject'] = $data['subject'] ?: $this->config['application']['name'] . ' Contact';
7170
$form->setData($data);
7271
if ($form->isValid()) {
72+
/** @var array $dataForm */
7373
$dataForm = $form->getData();
7474
$result = $this->messageService->processMessage($dataForm);
7575

‎src/Contact/src/Form/ContactForm.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
use Laminas\Form\Element\Text;
1111
use Laminas\Form\Element\Textarea;
1212
use Laminas\Form\Form;
13+
use Laminas\Form\FormInterface;
1314
use Laminas\InputFilter\InputFilterInterface;
1415

16+
/** @template-extends Form<FormInterface> */
1517
class ContactForm extends Form
1618
{
1719
protected InputFilterInterface $inputFilter;

‎src/User/src/Controller/AccountController.php‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@ public function requestResetPasswordAction(): ResponseInterface
134134
return new RedirectResponse($this->getRequest()->getUri(), 303);
135135
}
136136

137-
$user = $this->userService->findOneBy(['identity' => $form->getData()['identity']]);
137+
/** @var array $data */
138+
$data = $form->getData();
139+
$user = $this->userService->findOneBy(['identity' => $data['identity']]);
138140
if (! $user instanceof User) {
139141
$this->messenger->addInfo(Message::MAIL_SENT_RESET_PASSWORD, 'request-reset');
140142
return new RedirectResponse($this->getRequest()->getUri());
@@ -201,10 +203,12 @@ public function resetPasswordAction(): ResponseInterface
201203
return new RedirectResponse($this->getRequest()->getUri(), 303);
202204
}
203205

206+
/** @var array $data */
207+
$data = $form->getData();
204208
try {
205209
$this->userService->updateUser(
206210
$resetPasswordRequest->markAsCompleted()->getUser(),
207-
$form->getData()
211+
$data
208212
);
209213
$this->debugBar->stackData();
210214
} catch (Exception $exception) {
@@ -299,6 +303,7 @@ public function detailsAction(): ResponseInterface
299303
if (RequestMethodInterface::METHOD_POST === $this->request->getMethod()) {
300304
$form->setData($this->request->getParsedBody());
301305
if ($form->isValid()) {
306+
/** @var array $userData */
302307
$userData = $form->getData();
303308
try {
304309
$this->userService->updateUser($user, $userData);
@@ -363,6 +368,7 @@ public function changePasswordAction(): ResponseInterface
363368
if (RequestMethodInterface::METHOD_POST === $this->request->getMethod()) {
364369
$form->setData($this->request->getParsedBody());
365370
if ($form->isValid()) {
371+
/** @var array $userData */
366372
$userData = $form->getData();
367373
try {
368374
$this->userService->updateUser($user, $userData);
@@ -416,6 +422,7 @@ public function deleteAccountAction(): ResponseInterface
416422
if (RequestMethodInterface::METHOD_POST === $this->request->getMethod()) {
417423
$form->setData($this->request->getParsedBody());
418424
if ($form->isValid()) {
425+
/** @var array $userData */
419426
$userData = $form->getData();
420427
try {
421428
$this->userService->updateUser($user, $userData);

‎src/User/src/Controller/UserController.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public function loginAction(): ResponseInterface
7676
if ($form->isValid()) {
7777
/** @var AuthenticationAdapter $adapter */
7878
$adapter = $this->authenticationService->getAdapter();
79+
/** @var array $data */
7980
$data = $form->getData();
8081
$adapter->setIdentity($data['identity'])->setCredential($data['password']);
8182
$authResult = $this->authenticationService->authenticate();
@@ -146,6 +147,7 @@ public function registerAction(): ResponseInterface
146147
if (RequestMethodInterface::METHOD_POST === $this->getRequest()->getMethod()) {
147148
$form->setData($this->getRequest()->getParsedBody());
148149
if ($form->isValid()) {
150+
/** @var array $userData */
149151
$userData = $form->getData();
150152
try {
151153
/** @var User $user */

‎src/User/src/Form/LoginForm.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
use Laminas\Form\Element\Password;
1010
use Laminas\Form\Element\Submit;
1111
use Laminas\Form\Form;
12+
use Laminas\Form\FormInterface;
1213
use Laminas\InputFilter\InputFilterInterface;
1314

15+
/** @template-extends Form<FormInterface> */
1416
class LoginForm extends Form
1517
{
1618
protected InputFilterInterface $inputFilter;

‎src/User/src/Form/ProfileDeleteForm.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
use Frontend\User\InputFilter\ProfileDeleteInputFilter;
99
use Laminas\Form\Element\Submit;
1010
use Laminas\Form\Form;
11+
use Laminas\Form\FormInterface;
1112
use Laminas\InputFilter\InputFilterInterface;
1213

14+
/** @template-extends Form<FormInterface> */
1315
class ProfileDeleteForm extends Form
1416
{
1517
protected InputFilterInterface $inputFilter;

‎src/User/src/Form/ProfileDetailsForm.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
use Frontend\User\InputFilter\UserDetailInputFilter;
99
use Laminas\Form\Element\Submit;
1010
use Laminas\Form\Form;
11+
use Laminas\Form\FormInterface;
1112
use Laminas\InputFilter\InputFilter;
1213
use Laminas\InputFilter\InputFilterInterface;
1314

15+
/** @template-extends Form<FormInterface> */
1416
class ProfileDetailsForm extends Form
1517
{
1618
protected InputFilterInterface $inputFilter;

‎src/User/src/Form/ProfilePasswordForm.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
use Laminas\Form\Element\Password;
99
use Laminas\Form\Element\Submit;
1010
use Laminas\Form\Form;
11+
use Laminas\Form\FormInterface;
1112
use Laminas\InputFilter\InputFilterInterface;
1213

14+
/** @template-extends Form<FormInterface> */
1315
class ProfilePasswordForm extends Form
1416
{
1517
protected InputFilterInterface $inputFilter;

‎src/User/src/Form/RegisterForm.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111
use Laminas\Form\Element\Password;
1212
use Laminas\Form\Element\Submit;
1313
use Laminas\Form\Form;
14+
use Laminas\Form\FormInterface;
1415
use Laminas\InputFilter\InputFilterInterface;
1516

17+
/** @template-extends Form<FormInterface> */
1618
class RegisterForm extends Form
1719
{
1820
protected InputFilterInterface $inputFilter;

0 commit comments

Comments
 (0)