Fixed coding style.

This commit is contained in:
Jan Böhmer 2020-03-15 13:56:31 +01:00
parent 24939f2342
commit fd61c8d9e2
129 changed files with 962 additions and 1091 deletions

View file

@ -90,7 +90,7 @@ class EntityColumn extends AbstractColumn
/** @var AbstractDBElement|null $entity */
$entity = $this->accessor->getValue($context, $options['property']);
if ($entity !== null) {
if (null !== $entity) {
if (null !== $entity->getID()) {
return sprintf(
'<a href="%s">%s</a>',
@ -101,6 +101,7 @@ class EntityColumn extends AbstractColumn
return sprintf('<i>%s</i>', $value);
}
return '';
};
});

View file

@ -1,4 +1,7 @@
<?php
declare(strict_types=1);
/**
* This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
*
@ -20,16 +23,11 @@
namespace App\DataTables\Column;
use Omines\DataTablesBundle\Column\AbstractColumn;
use Symfony\Component\OptionsResolver\OptionsResolver;
class IconLinkColumn extends AbstractColumn
{
/**
* @inheritDoc
*/
public function normalize($value)
{
return $value;
@ -39,11 +37,11 @@ class IconLinkColumn extends AbstractColumn
{
parent::configureOptions($resolver);
$resolver->setDefaults([
'icon' => 'fas fa-fw fa-edit',
'title' => null,
'href' => null,
'disabled' => false,
]);
'icon' => 'fas fa-fw fa-edit',
'title' => null,
'href' => null,
'disabled' => false,
]);
$resolver->setAllowedTypes('title', ['null', 'string', 'callable']);
$resolver->setAllowedTypes('icon', ['null', 'string', 'callable']);
@ -60,7 +58,7 @@ class IconLinkColumn extends AbstractColumn
$title = $this->getTitle($value, $context);
$disabled = $this->getDisabled($value, $context);
if ($href !== null) {
if (null !== $href) {
return sprintf(
'<a class="btn btn-primary btn-sm %s" href="%s" title="%s"><i class="%s"></i></a>',
$disabled ? 'disabled' : '',
@ -70,7 +68,7 @@ class IconLinkColumn extends AbstractColumn
);
}
return "";
return '';
}
protected function getDisabled($value, $context): bool
@ -82,6 +80,7 @@ class IconLinkColumn extends AbstractColumn
if (is_callable($provider)) {
return call_user_func($provider, $value, $context);
}
return false;
}
@ -123,4 +122,4 @@ class IconLinkColumn extends AbstractColumn
return null;
}
}
}

View file

@ -80,6 +80,7 @@ class LogEntryTargetColumn extends AbstractColumn
public function configureOptions(OptionsResolver $resolver)
{
parent::configureOptions($resolver);
return $this;
}

View file

@ -112,6 +112,7 @@ class PartAttachmentsColumn extends AbstractColumn
public function configureOptions(OptionsResolver $resolver)
{
parent::configureOptions($resolver);
return $this;
}
}

View file

@ -1,4 +1,7 @@
<?php
declare(strict_types=1);
/**
* This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
*
@ -20,8 +23,6 @@
namespace App\DataTables\Column;
use App\Entity\LogSystem\AbstractLogEntry;
use App\Entity\LogSystem\CollectionElementDeleted;
use App\Entity\LogSystem\ElementCreatedLogEntry;
use App\Entity\LogSystem\ElementDeletedLogEntry;
@ -41,9 +42,6 @@ class RevertLogColumn extends AbstractColumn
$this->security = $security;
}
/**
* @inheritDoc
*/
public function normalize($value)
{
return $value;
@ -68,7 +66,7 @@ class RevertLogColumn extends AbstractColumn
return '';
}
$disabled = !$this->security->isGranted('revert_element', $context->getTargetClass());
$disabled = ! $this->security->isGranted('revert_element', $context->getTargetClass());
$tmp = '<div class="btn-group btn-group-sm">';
$tmp .= sprintf(
@ -90,4 +88,4 @@ class RevertLogColumn extends AbstractColumn
return $tmp;
}
}
}