Skip to content

Commit 4d39a62

Browse files
committed
minor #1229 Misc. fixes and improvements (javiereguiluz)
This PR was squashed before being merged into the main branch. Discussion ---------- Misc. fixes and improvements Commits ------- 6b8fc85 Misc. fixes and improvements
2 parents c016ffc + 6b8fc85 commit 4d39a62

File tree

8 files changed

+45
-54
lines changed

8 files changed

+45
-54
lines changed

src/Command/AddUserCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
112112
* quite a lot of work. However, if the command is meant to be used by external
113113
* users, this method is a nice way to fall back and prevent errors.
114114
*/
115-
protected function interact(InputInterface $input, OutputInterface $output)
115+
protected function interact(InputInterface $input, OutputInterface $output): void
116116
{
117117
if (null !== $input->getArgument('username') && null !== $input->getArgument('password') && null !== $input->getArgument('email') && null !== $input->getArgument('full-name')) {
118118
return;

src/Command/DeleteUserCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
8585
$this->io = new SymfonyStyle($input, $output);
8686
}
8787

88-
protected function interact(InputInterface $input, OutputInterface $output)
88+
protected function interact(InputInterface $input, OutputInterface $output): void
8989
{
9090
if (null !== $input->getArgument('username')) {
9191
return;

src/Command/ListUsersCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
9797
$allUsers = $this->users->findBy([], ['id' => 'DESC'], $maxResults);
9898

9999
// Doctrine query returns an array of objects and we need an array of plain arrays
100-
$usersAsPlainArrays = array_map(function (User $user) {
100+
$usersAsPlainArrays = array_map(static function (User $user) {
101101
return [
102102
$user->getId(),
103103
$user->getFullName(),

src/DataFixtures/AppFixtures.php

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ private function loadUsers(ObjectManager $manager): void
5858

5959
private function loadTags(ObjectManager $manager): void
6060
{
61-
foreach ($this->getTagData() as $index => $name) {
61+
foreach ($this->getTagData() as $name) {
6262
$tag = new Tag();
6363
$tag->setName($name);
6464

@@ -121,7 +121,7 @@ private function getTagData(): array
121121
];
122122
}
123123

124-
private function getPostData()
124+
private function getPostData(): array
125125
{
126126
$posts = [];
127127
foreach ($this->getPhrases() as $i => $title) {
@@ -193,41 +193,41 @@ private function getRandomText(int $maxLength = 255): string
193193
private function getPostContent(): string
194194
{
195195
return <<<'MARKDOWN'
196-
Lorem ipsum dolor sit amet consectetur adipisicing elit, sed do eiusmod tempor
197-
incididunt ut labore et **dolore magna aliqua**: Duis aute irure dolor in
198-
reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
199-
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia
200-
deserunt mollit anim id est laborum.
201-
202-
* Ut enim ad minim veniam
203-
* Quis nostrud exercitation *ullamco laboris*
204-
* Nisi ut aliquip ex ea commodo consequat
205-
206-
Praesent id fermentum lorem. Ut est lorem, fringilla at accumsan nec, euismod at
207-
nunc. Aenean mattis sollicitudin mattis. Nullam pulvinar vestibulum bibendum.
208-
Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos
209-
himenaeos. Fusce nulla purus, gravida ac interdum ut, blandit eget ex. Duis a
210-
luctus dolor.
211-
212-
Integer auctor massa maximus nulla scelerisque accumsan. *Aliquam ac malesuada*
213-
ex. Pellentesque tortor magna, vulputate eu vulputate ut, venenatis ac lectus.
214-
Praesent ut lacinia sem. Mauris a lectus eget felis mollis feugiat. Quisque
215-
efficitur, mi ut semper pulvinar, urna urna blandit massa, eget tincidunt augue
216-
nulla vitae est.
217-
218-
Ut posuere aliquet tincidunt. Aliquam erat volutpat. **Class aptent taciti**
219-
sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Morbi
220-
arcu orci, gravida eget aliquam eu, suscipit et ante. Morbi vulputate metus vel
221-
ipsum finibus, ut dapibus massa feugiat. Vestibulum vel lobortis libero. Sed
222-
tincidunt tellus et viverra scelerisque. Pellentesque tincidunt cursus felis.
223-
Sed in egestas erat.
224-
225-
Aliquam pulvinar interdum massa, vel ullamcorper ante consectetur eu. Vestibulum
226-
lacinia ac enim vel placerat. Integer pulvinar magna nec dui malesuada, nec
227-
congue nisl dictum. Donec mollis nisl tortor, at congue erat consequat a. Nam
228-
tempus elit porta, blandit elit vel, viverra lorem. Sed sit amet tellus
229-
tincidunt, faucibus nisl in, aliquet libero.
230-
MARKDOWN;
196+
Lorem ipsum dolor sit amet consectetur adipisicing elit, sed do eiusmod tempor
197+
incididunt ut labore et **dolore magna aliqua**: Duis aute irure dolor in
198+
reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
199+
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia
200+
deserunt mollit anim id est laborum.
201+
202+
* Ut enim ad minim veniam
203+
* Quis nostrud exercitation *ullamco laboris*
204+
* Nisi ut aliquip ex ea commodo consequat
205+
206+
Praesent id fermentum lorem. Ut est lorem, fringilla at accumsan nec, euismod at
207+
nunc. Aenean mattis sollicitudin mattis. Nullam pulvinar vestibulum bibendum.
208+
Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos
209+
himenaeos. Fusce nulla purus, gravida ac interdum ut, blandit eget ex. Duis a
210+
luctus dolor.
211+
212+
Integer auctor massa maximus nulla scelerisque accumsan. *Aliquam ac malesuada*
213+
ex. Pellentesque tortor magna, vulputate eu vulputate ut, venenatis ac lectus.
214+
Praesent ut lacinia sem. Mauris a lectus eget felis mollis feugiat. Quisque
215+
efficitur, mi ut semper pulvinar, urna urna blandit massa, eget tincidunt augue
216+
nulla vitae est.
217+
218+
Ut posuere aliquet tincidunt. Aliquam erat volutpat. **Class aptent taciti**
219+
sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Morbi
220+
arcu orci, gravida eget aliquam eu, suscipit et ante. Morbi vulputate metus vel
221+
ipsum finibus, ut dapibus massa feugiat. Vestibulum vel lobortis libero. Sed
222+
tincidunt tellus et viverra scelerisque. Pellentesque tincidunt cursus felis.
223+
Sed in egestas erat.
224+
225+
Aliquam pulvinar interdum massa, vel ullamcorper ante consectetur eu. Vestibulum
226+
lacinia ac enim vel placerat. Integer pulvinar magna nec dui malesuada, nec
227+
congue nisl dictum. Donec mollis nisl tortor, at congue erat consequat a. Nam
228+
tempus elit porta, blandit elit vel, viverra lorem. Sed sit amet tellus
229+
tincidunt, faucibus nisl in, aliquet libero.
230+
MARKDOWN;
231231
}
232232

233233
private function getRandomTags(): array

src/Entity/User.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,18 +174,12 @@ public function eraseCredentials(): void
174174
// $this->plainPassword = null;
175175
}
176176

177-
/**
178-
* {@inheritdoc}
179-
*/
180177
public function __serialize(): array
181178
{
182179
// add $this->salt too if you don't use Bcrypt or Argon2i
183180
return [$this->id, $this->username, $this->password];
184181
}
185182

186-
/**
187-
* {@inheritdoc}
188-
*/
189183
public function __unserialize(array $data): void
190184
{
191185
// add $this->salt too if you don't use Bcrypt or Argon2i

src/EventSubscriber/CommentNotificationSubscriber.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace App\EventSubscriber;
1313

14-
use App\Entity\Comment;
1514
use App\Event\CommentCreatedEvent;
1615
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
1716
use Symfony\Component\Mailer\MailerInterface;
@@ -48,7 +47,6 @@ public static function getSubscribedEvents(): array
4847

4948
public function onCommentCreated(CommentCreatedEvent $event): void
5049
{
51-
/** @var Comment $comment */
5250
$comment = $event->getComment();
5351
$post = $comment->getPost();
5452

src/Repository/PostRepository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ private function extractSearchTerms(string $searchQuery): array
9090
$terms = array_unique($searchQuery->split(' '));
9191

9292
// ignore the search terms that are too short
93-
return array_filter($terms, function ($term) {
93+
return array_filter($terms, static function ($term) {
9494
return 2 <= $term->length();
9595
});
9696
}

src/Twig/SourceCodeExtension.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use function Symfony\Component\String\u;
1515
use Twig\Environment;
1616
use Twig\Extension\AbstractExtension;
17-
use Twig\Template;
1817
use Twig\TemplateWrapper;
1918
use Twig\TwigFunction;
2019

@@ -31,7 +30,7 @@ class SourceCodeExtension extends AbstractExtension
3130
{
3231
private $controller;
3332

34-
public function setController(?callable $controller)
33+
public function setController(?callable $controller): void
3534
{
3635
$this->controller = $controller;
3736
}
@@ -120,16 +119,16 @@ private function unindentCode(string $code): string
120119
{
121120
$codeLines = u($code)->split("\n");
122121

123-
$indentedOrBlankLines = array_filter($codeLines, function ($lineOfCode) {
122+
$indentedOrBlankLines = array_filter($codeLines, static function ($lineOfCode) {
124123
return u($lineOfCode)->isEmpty() || u($lineOfCode)->startsWith(' ');
125124
});
126125

127126
$codeIsIndented = \count($indentedOrBlankLines) === \count($codeLines);
128127
if ($codeIsIndented) {
129-
$unindentedLines = array_map(function ($lineOfCode) {
128+
$unindentedLines = array_map(static function ($lineOfCode) {
130129
return u($lineOfCode)->after(' ');
131130
}, $codeLines);
132-
$code = u("\n")->join($unindentedLines);
131+
$code = u("\n")->join($unindentedLines)->toString();
133132
}
134133

135134
return $code;

0 commit comments

Comments
 (0)