Skip to content

Commit

Permalink
Update code style (sulu#323)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander-schranz authored Apr 1, 2022
1 parent 8fc1492 commit 082800f
Show file tree
Hide file tree
Showing 92 changed files with 248 additions and 664 deletions.
4 changes: 2 additions & 2 deletions Admin/DynamicListAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function configureViews(ViewCollection $viewCollection): void

$action = 'form-list';
if ($counter > 1) {
$action .= '-' . str_replace('_', '-', $key);
$action .= '-' . \str_replace('_', '-', $key);
}

$name = $parent . '.' . $action . '-key';
Expand Down Expand Up @@ -99,7 +99,7 @@ public function configureViews(ViewCollection $viewCollection): void
}

if (isset($config['template'])) {
$view->setTabCondition(sprintf('template == "%s"', $config['template']));
$view->setTabCondition(\sprintf('template == "%s"', $config['template']));
}

$view->addRequestParameters($requestParameters);
Expand Down
25 changes: 8 additions & 17 deletions Admin/FormAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@

class FormAdmin extends Admin
{
const LIST_VIEW = 'sulu_form.list';
const LIST_VIEW_DATA = 'sulu_form.edit_form.data';
const ADD_FORM_VIEW = 'sulu_form.add_form';
const ADD_FORM_DETAILS_VIEW = 'sulu_form.add_form.details';
const EDIT_FORM_VIEW = 'sulu_form.edit_form';
const EDIT_FORM_DETAILS_VIEW = 'sulu_form.edit_form.details';
public const LIST_VIEW = 'sulu_form.list';
public const LIST_VIEW_DATA = 'sulu_form.edit_form.data';
public const ADD_FORM_VIEW = 'sulu_form.add_form';
public const ADD_FORM_DETAILS_VIEW = 'sulu_form.add_form.details';
public const EDIT_FORM_VIEW = 'sulu_form.edit_form';
public const EDIT_FORM_DETAILS_VIEW = 'sulu_form.edit_form.details';

/**
* @var SecurityCheckerInterface
Expand Down Expand Up @@ -60,9 +60,6 @@ public function __construct(
$this->webspaceManager = $webspaceManager;
}

/**
* {@inheritdoc}
*/
public function configureNavigationItems(NavigationItemCollection $navigationItemCollection): void
{
if ($this->securityChecker->hasPermission('sulu.form.forms', PermissionTypes::VIEW)) {
Expand All @@ -75,13 +72,10 @@ public function configureNavigationItems(NavigationItemCollection $navigationIte
}
}

/**
* {@inheritdoc}
*/
public function configureViews(ViewCollection $viewCollection): void
{
$formLocales = array_values(
array_map(
$formLocales = \array_values(
\array_map(
function(Localization $localization) {
return $localization->getLocale();
},
Expand Down Expand Up @@ -163,9 +157,6 @@ function(Localization $localization) {
);
}

/**
* {@inheritdoc}
*/
public function getSecurityContexts()
{
return [
Expand Down
20 changes: 10 additions & 10 deletions Command/FormGeneratorCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int

/** @var non-empty-array<string> $locales */
$locales = $this->webspaceManager->getAllLocales();
$form->setDefaultLocale(current($locales));
$form->setDefaultLocale(\current($locales));

foreach ($locales as $locale) {
$formTranslation = $form->getTranslation($locale, true);
Expand Down Expand Up @@ -233,7 +233,7 @@ private function addField(
): void {
$formField = $form->getField($fieldKey) ?: new FormField();
$formField->setForm($form);
$formField->setDefaultLocale(current($locales));
$formField->setDefaultLocale(\current($locales));
$formField->setRequired($required);
$formField->setType($fieldType);
$formField->setWidth($width);
Expand All @@ -242,7 +242,7 @@ private function addField(

foreach ($locales as $locale) {
$formFieldTranslation = $formField->getTranslation($locale, true);
$formFieldTranslation->setTitle(ucfirst($fieldType));
$formFieldTranslation->setTitle(\ucfirst($fieldType));
$formFieldTranslation->setOptions($options);
}

Expand Down Expand Up @@ -270,13 +270,13 @@ private function loadTestForm(): ?Form
private function getChoices(): string
{
return
'Choice 1' . PHP_EOL .
'Choice 2' . PHP_EOL .
'Choice 3' . PHP_EOL .
'Choice 4' . PHP_EOL .
'Choice 5' . PHP_EOL .
'Choice 6' . PHP_EOL .
'Choice 7' . PHP_EOL
'Choice 1' . \PHP_EOL .
'Choice 2' . \PHP_EOL .
'Choice 3' . \PHP_EOL .
'Choice 4' . \PHP_EOL .
'Choice 5' . \PHP_EOL .
'Choice 6' . \PHP_EOL .
'Choice 7' . \PHP_EOL
;
}
}
12 changes: 0 additions & 12 deletions Configuration/FormConfiguration.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,25 +51,16 @@ public function __construct(string $locale)
$this->locale = $locale;
}

/**
* {@inheritdoc}
*/
public function getLocale(): string
{
return $this->locale;
}

/**
* {@inheritdoc}
*/
public function getAdminMailConfiguration(): ?MailConfigurationInterface
{
return $this->adminMailConfiguration;
}

/**
* {@inheritdoc}
*/
public function getWebsiteMailConfiguration(): ?MailConfigurationInterface
{
return $this->websiteMailConfiguration;
Expand Down Expand Up @@ -103,9 +94,6 @@ public function setWebsiteMailConfiguration(MailConfigurationInterface $websiteM
return $this;
}

/**
* {@inheritdoc}
*/
public function getFileFields(): array
{
return $this->fileFields;
Expand Down
18 changes: 9 additions & 9 deletions Configuration/FormConfigurationFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public function buildByDynamic(Dynamic $dynamic): FormConfigurationInterface
public function buildByType(AbstractType $type, $formData, string $locale, array $attributes): FormConfigurationInterface
{
$config = $this->create($locale);
$config->setFileFields(array_fill_keys($type->getFileFields(), $type->getCollectionId()));
$config->setFileFields(\array_fill_keys($type->getFileFields(), $type->getCollectionId()));

$attributes['form'] = [
'data' => $formData,
Expand Down Expand Up @@ -196,17 +196,17 @@ private function buildAdminMailConfigurationByDynamic(Dynamic $dynamic): ?MailCo
$email = $this->getEmail($receiver->getEmail(), $receiver->getName());

if (MailConfigurationInterface::TYPE_TO == $receiver->getType()) {
$toList = array_merge($toList, $email);
$toList = \array_merge($toList, $email);
} elseif (MailConfigurationInterface::TYPE_CC == $receiver->getType()) {
$ccList = array_merge($ccList, $email);
$ccList = \array_merge($ccList, $email);
} elseif (MailConfigurationInterface::TYPE_BCC == $receiver->getType()) {
$bccList = array_merge($bccList, $email);
$bccList = \array_merge($bccList, $email);
}
}

$adminMailConfiguration->setTo(array_filter($toList));
$adminMailConfiguration->setCc(array_filter($ccList));
$adminMailConfiguration->setBcc(array_filter($bccList));
$adminMailConfiguration->setTo(\array_filter($toList));
$adminMailConfiguration->setCc(\array_filter($ccList));
$adminMailConfiguration->setBcc(\array_filter($bccList));

if ($translation->getReplyTo()) {
$adminMailConfiguration->setReplyTo($this->getEmailFromDynamic($dynamic));
Expand Down Expand Up @@ -272,7 +272,7 @@ private function getFileFieldsByDynamic(Dynamic $dynamic): array

$fields = $form->getFieldsByType(Dynamic::TYPE_ATTACHMENT);

if (0 === count($fields)) {
if (0 === \count($fields)) {
return [];
}

Expand Down Expand Up @@ -323,7 +323,7 @@ private function getTemplateAttributesFromDynamic(Dynamic $dynamic): array
private function getEmailFromDynamic(Dynamic $dynamic): ?array
{
$emails = $dynamic->getFieldsByType(Dynamic::TYPE_EMAIL);
$email = reset($emails);
$email = \reset($emails);

return $this->getEmail($email);
}
Expand Down
33 changes: 0 additions & 33 deletions Configuration/MailConfiguration.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,11 @@ public function __construct(string $locale)
$this->locale = $locale;
}

/**
* {@inheritdoc}
*/
public function getLocale(): string
{
return $this->locale;
}

/**
* {@inheritdoc}
*/
public function getSubject(): ?string
{
return $this->subject;
Expand All @@ -99,9 +93,6 @@ public function setSubject(?string $subject): self
return $this;
}

/**
* {@inheritdoc}
*/
public function getFrom()
{
return $this->from;
Expand All @@ -119,9 +110,6 @@ public function setFrom($from): self
return $this;
}

/**
* {@inheritdoc}
*/
public function getTo()
{
return $this->to;
Expand All @@ -139,9 +127,6 @@ public function setTo($to): self
return $this;
}

/**
* {@inheritdoc}
*/
public function getCc()
{
return $this->cc;
Expand All @@ -159,9 +144,6 @@ public function setCc($cc): self
return $this;
}

/**
* {@inheritdoc}
*/
public function getBcc()
{
return $this->bcc;
Expand All @@ -179,9 +161,6 @@ public function setBcc($bcc): self
return $this;
}

/**
* {@inheritdoc}
*/
public function getReplyTo()
{
return $this->replyTo;
Expand All @@ -199,9 +178,6 @@ public function setReplyTo($replyTo): self
return $this;
}

/**
* {@inheritdoc}
*/
public function getAddAttachments(): bool
{
return $this->addAttachments;
Expand All @@ -217,9 +193,6 @@ public function setAddAttachments(bool $addAttachments): self
return $this;
}

/**
* {@inheritdoc}
*/
public function getTemplate(): string
{
return $this->template;
Expand All @@ -232,9 +205,6 @@ public function setTemplate(string $template): self
return $this;
}

/**
* {@inheritdoc}
*/
public function getPlainTextTemplate(): ?string
{
return $this->plainTextTemplate;
Expand All @@ -250,9 +220,6 @@ public function setPlainTextTemplate(?string $plainTextTemplate): self
return $this;
}

/**
* {@inheritdoc}
*/
public function getTemplateAttributes(): array
{
return $this->templateAttributes;
Expand Down
6 changes: 3 additions & 3 deletions Configuration/MailConfigurationInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
*/
interface MailConfigurationInterface
{
const TYPE_TO = 'to';
const TYPE_CC = 'cc';
const TYPE_BCC = 'bcc';
public const TYPE_TO = 'to';
public const TYPE_CC = 'cc';
public const TYPE_BCC = 'bcc';

public function getLocale(): string;

Expand Down
4 changes: 0 additions & 4 deletions Content/Types/SingleFormSelection.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ public function __construct(
}

/**
* {@inheritdoc}
*
* @return FormView|null
*/
public function getContentData(PropertyInterface $property)
Expand Down Expand Up @@ -119,8 +117,6 @@ private function loadShadowForm(PropertyInterface $property, int $id, string $ty
}

/**
* {@inheritdoc}
*
* @return mixed[]
*/
public function getViewData(PropertyInterface $property)
Expand Down
10 changes: 5 additions & 5 deletions Controller/DynamicController.php
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ public function cgetAction(Request $request): Response
$entries = $this->dynamicListFactory->build($entries, $view);

// avoid total request when entries < limit
if (count($entries) == $limit) {
if (\count($entries) == $limit) {
$total = $this->dynamicRepository->countByFilters($filters);
} else {
// calculate total
$total = count($entries) + $offset;
$total = \count($entries) + $offset;
}

// create list representation
Expand All @@ -131,7 +131,7 @@ public function deleteAction(Request $request, int $id): Response
{
$dynamic = $this->dynamicRepository->find($id);

$attachments = array_filter(array_values($dynamic->getFieldsByType(Dynamic::TYPE_ATTACHMENT)));
$attachments = \array_filter(\array_values($dynamic->getFieldsByType(Dynamic::TYPE_ATTACHMENT)));

foreach ($attachments as $mediaIds) {
foreach ($mediaIds as $mediaId) {
Expand Down Expand Up @@ -164,10 +164,10 @@ protected function getFilters(Request $request): array
'fromDate' => $request->get('fromDate'),
'toDate' => $request->get('toDate'),
'search' => $request->get('search'),
'searchFields' => array_filter(explode(',', $request->get('searchFields', ''))),
'searchFields' => \array_filter(\explode(',', $request->get('searchFields', ''))),
];

return array_filter($filters);
return \array_filter($filters);
}

protected function loadForm(Request $request): Form
Expand Down
Loading

0 comments on commit 082800f

Please sign in to comment.