Skip to content

Commit 79c710b

Browse files
committed
minor #1339 Remove unecessary code (alamirault)
This PR was merged into the 1.0-dev branch. Discussion ---------- Remove unecessary code Hello, I found some places were there is unused variables, unused argument or unnecessary check . As is my first PR on this repository, let me know if I miss something ! Commits ------- 12cf21c Remove unecessary code
2 parents 59db45a + 12cf21c commit 79c710b

File tree

8 files changed

+12
-20
lines changed

8 files changed

+12
-20
lines changed

src/DependencyInjection/CompilerPass/SetDoctrineAnnotatedPrefixesPass.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public function process(ContainerBuilder $container): void
4545

4646
if ($arguments[0] instanceof Definition) {
4747
$class = $arguments[0]->getClass();
48-
$namespace = substr($class, 0, strrpos($class, '\\'));
4948

5049
$id = sprintf('.%d_doctrine_metadata_driver~%s', $i, ContainerBuilder::hash($arguments));
5150
$container->setDefinition($id, $arguments[0]);

src/Maker/MakeAuthenticator.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ function ($answer) {
153153

154154
$interactiveSecurityHelper = new InteractiveSecurityHelper();
155155
$command->addOption('firewall-name', null, InputOption::VALUE_OPTIONAL);
156-
$input->setOption('firewall-name', $firewallName = $interactiveSecurityHelper->guessFirewallName($io, $securityData));
156+
$input->setOption('firewall-name', $interactiveSecurityHelper->guessFirewallName($io, $securityData));
157157

158158
$command->addOption('entry-point', null, InputOption::VALUE_OPTIONAL);
159159

@@ -279,7 +279,6 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
279279
$securityYamlUpdated,
280280
$input->getArgument('authenticator-type'),
281281
$input->getArgument('authenticator-class'),
282-
$securityData,
283282
$input->hasArgument('user-class') ? $input->getArgument('user-class') : null,
284283
$input->hasArgument('logout-setup') ? $input->getArgument('logout-setup') : false,
285284
$supportRememberMe,
@@ -415,7 +414,7 @@ private function generateFormLoginFiles(string $controllerClass, string $userNam
415414
);
416415
}
417416

418-
private function generateNextMessage(bool $securityYamlUpdated, string $authenticatorType, string $authenticatorClass, array $securityData, $userClass, bool $logoutSetup, bool $supportRememberMe, bool $alwaysRememberMe): array
417+
private function generateNextMessage(bool $securityYamlUpdated, string $authenticatorType, string $authenticatorClass, $userClass, bool $logoutSetup, bool $supportRememberMe, bool $alwaysRememberMe): array
419418
{
420419
$nextTexts = ['Next:'];
421420
$nextTexts[] = '- Customize your new authenticator.';
@@ -449,7 +448,7 @@ private function generateNextMessage(bool $securityYamlUpdated, string $authenti
449448
private function userClassHasEncoder(array $securityData, string $userClass): bool
450449
{
451450
$userNeedsEncoder = false;
452-
$hashersData = $securityData['security']['encoders'] ?? $securityData['security']['encoders'] ?? [];
451+
$hashersData = $securityData['security']['encoders'] ?? [];
453452

454453
foreach ($hashersData as $userClassWithEncoder => $encoder) {
455454
if ($userClass === $userClassWithEncoder || is_subclass_of($userClass, $userClassWithEncoder) || class_implements($userClass, $userClassWithEncoder)) {

src/Maker/MakeRegistrationForm.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,9 @@ public function interact(InputInterface $input, ConsoleStyle $io, Command $comma
178178

179179
if ($io->confirm('Do you want to automatically authenticate the user after registration?')) {
180180
$this->interactAuthenticatorQuestions(
181-
$input,
182181
$io,
183182
$interactiveSecurityHelper,
184-
$securityData,
185-
$command
183+
$securityData
186184
);
187185
}
188186

@@ -192,7 +190,7 @@ public function interact(InputInterface $input, ConsoleStyle $io, Command $comma
192190
}
193191
}
194192

195-
private function interactAuthenticatorQuestions(InputInterface $input, ConsoleStyle $io, InteractiveSecurityHelper $interactiveSecurityHelper, array $securityData, Command $command): void
193+
private function interactAuthenticatorQuestions(ConsoleStyle $io, InteractiveSecurityHelper $interactiveSecurityHelper, array $securityData): void
196194
{
197195
$firewallsData = $securityData['security']['firewalls'] ?? [];
198196
$firewallName = $interactiveSecurityHelper->guessFirewallName(

src/Maker/MakeResetPassword.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
326326
$generator->writeChanges();
327327

328328
$this->writeSuccessMessage($io);
329-
$this->successMessage($input, $io, $requestClassNameDetails->getFullName());
329+
$this->successMessage($io, $requestClassNameDetails->getFullName());
330330
}
331331

332332
private function setBundleConfig(ConsoleStyle $io, Generator $generator, string $repositoryClassFullName): void
@@ -379,7 +379,7 @@ private function setBundleConfig(ConsoleStyle $io, Generator $generator, string
379379
$generator->dumpFile($path, $manipulator->getContents());
380380
}
381381

382-
private function successMessage(InputInterface $input, ConsoleStyle $io, string $requestClassName): void
382+
private function successMessage(ConsoleStyle $io, string $requestClassName): void
383383
{
384384
$closing[] = 'Next:';
385385
$closing[] = sprintf(' 1) Run <fg=yellow>"%s make:migration"</> to generate a migration for the new <fg=yellow>"%s"</> entity.', CliOutputHelper::getCommandPrefix(), $requestClassName);

src/Maker/MakeStimulusController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ private function askForNextValue(ConsoleStyle $io, array $values, bool $isFirstV
175175
// convert to snake case for simplicity
176176
$snakeCasedField = Str::asSnakeCase($valueName);
177177

178-
if ('_id' === $suffix = substr($snakeCasedField, -3)) {
178+
if ('_id' === substr($snakeCasedField, -3)) {
179179
$defaultType = 'Number';
180180
} elseif (str_starts_with($snakeCasedField, 'is_')) {
181181
$defaultType = 'Boolean';

src/Security/SecurityConfigUpdater.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function updateForUserClass(string $yamlSource, UserClassConfiguration $u
6060
$this->updateProviders($userConfig, $userClass);
6161

6262
if ($userConfig->hasPassword()) {
63-
$this->updatePasswordHashers($userConfig, $userClass);
63+
$this->updatePasswordHashers($userClass);
6464
}
6565

6666
$contents = $this->manipulator->getContents();
@@ -243,7 +243,7 @@ private function updateProviders(UserClassConfiguration $userConfig, string $use
243243
$this->manipulator->setData($newData);
244244
}
245245

246-
private function updatePasswordHashers(UserClassConfiguration $userConfig, string $userClass): void
246+
private function updatePasswordHashers(string $userClass): void
247247
{
248248
$newData = $this->manipulator->getData();
249249

src/Util/YamlSourceManipulator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ private function updateData(array $newData)
226226
// Edge case: if the last item on a multi-line array has a comment,
227227
// we want to move to the end of the line, beyond that comment
228228
if (\count($currentData) < \count($newData) && $this->isCurrentArrayMultiline()) {
229-
$this->advanceBeyondMultilineArrayLastItem($currentData, $newData);
229+
$this->advanceBeyondMultilineArrayLastItem();
230230
}
231231

232232
if (0 === $this->indentationForDepths[$this->depth] && $this->depth > 1) {
@@ -534,7 +534,7 @@ private function advanceBeyondEndOfPreviousKey($key)
534534
$this->advanceCurrentPosition($this->getEndOfPreviousKeyPosition($key));
535535
}
536536

537-
private function advanceBeyondMultilineArrayLastItem(array $currentData, array $newData)
537+
private function advanceBeyondMultilineArrayLastItem()
538538
{
539539
$this->log('Trying to advance beyond the last item in a multiline array');
540540
$this->advanceBeyondWhitespace();

src/Validator.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,6 @@ public static function validatePropertyName(string $name): string
158158

159159
public static function validateDoctrineFieldName(string $name, ManagerRegistry|LegacyManagerRegistry $registry): string
160160
{
161-
if (!$registry instanceof ManagerRegistry && !$registry instanceof LegacyManagerRegistry) {
162-
throw new \InvalidArgumentException(sprintf('Argument 2 to %s::validateDoctrineFieldName must be an instance of %s, %s passed.', __CLASS__, ManagerRegistry::class, \is_object($registry) ? $registry::class : \gettype($registry)));
163-
}
164-
165161
// check reserved words
166162
if ($registry->getConnection()->getDatabasePlatform()->getReservedKeywordsList()->isKeyword($name)) {
167163
throw new \InvalidArgumentException(sprintf('Name "%s" is a reserved word.', $name));

0 commit comments

Comments
 (0)