diff --git a/src/DataTables/Column/RevertLogColumn.php b/src/DataTables/Column/RevertLogColumn.php index 43b0d3c2..51009741 100644 --- a/src/DataTables/Column/RevertLogColumn.php +++ b/src/DataTables/Column/RevertLogColumn.php @@ -49,7 +49,6 @@ class RevertLogColumn extends AbstractColumn public function render($value, $context) { - $revertable = true; if ( $context instanceof CollectionElementDeleted || ($context instanceof ElementDeletedLogEntry && $context->hasOldDataInformations()) diff --git a/src/DataTables/PartsDataTable.php b/src/DataTables/PartsDataTable.php index 34dc669e..dda3829c 100644 --- a/src/DataTables/PartsDataTable.php +++ b/src/DataTables/PartsDataTable.php @@ -329,8 +329,6 @@ final class PartsDataTable implements DataTableTypeInterface private function buildCriteria(QueryBuilder $builder, array $options): void { - $em = $builder->getEntityManager(); - if (isset($options['category'])) { $category = $options['category']; $list = $this->treeBuilder->typeToNodesList(Category::class, $category); diff --git a/src/EventSubscriber/EventLoggerSubscriber.php b/src/EventSubscriber/EventLoggerSubscriber.php index 1a80188f..f737c98b 100644 --- a/src/EventSubscriber/EventLoggerSubscriber.php +++ b/src/EventSubscriber/EventLoggerSubscriber.php @@ -163,7 +163,7 @@ class EventLoggerSubscriber implements EventSubscriber */ public function hasFieldRestrictions(AbstractDBElement $element): bool { - foreach (static::FIELD_BLACKLIST as $class => $blacklist) { + foreach (array_keys(static::FIELD_BLACKLIST) as $class) { if (is_a($element, $class)) { return true; } diff --git a/src/EventSubscriber/LogoutOnDisabledUserListener.php b/src/EventSubscriber/LogoutOnDisabledUserListener.php index 81829d59..7b1d07f7 100644 --- a/src/EventSubscriber/LogoutOnDisabledUserListener.php +++ b/src/EventSubscriber/LogoutOnDisabledUserListener.php @@ -53,8 +53,6 @@ use Symfony\Component\Security\Core\Security; final class LogoutOnDisabledUserListener implements EventSubscriberInterface { private $security; - private $translator; - private $flashBag; private $urlGenerator; public function __construct(Security $security, UrlGeneratorInterface $urlGenerator) diff --git a/src/Form/Part/OrderdetailType.php b/src/Form/Part/OrderdetailType.php index bc84ef1f..8e326402 100644 --- a/src/Form/Part/OrderdetailType.php +++ b/src/Form/Part/OrderdetailType.php @@ -69,9 +69,6 @@ class OrderdetailType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options): void { - /** @var Orderdetail $orderdetail */ - $orderdetail = $builder->getData(); - $builder->add('supplierpartnr', TextType::class, [ 'label' => 'orderdetails.edit.supplierpartnr', 'attr' => [ diff --git a/src/Form/Permissions/PermissionsType.php b/src/Form/Permissions/PermissionsType.php index 0c1b3e00..8df1f647 100644 --- a/src/Form/Permissions/PermissionsType.php +++ b/src/Form/Permissions/PermissionsType.php @@ -86,7 +86,7 @@ class PermissionsType extends AbstractType { $groups = $this->perm_structure['groups']; - foreach ($groups as $key => $group) { + foreach (array_keys($groups) as $key) { $builder->add($key, PermissionGroupType::class, [ 'group_name' => $key, 'mapped' => false, diff --git a/src/Form/Type/CurrencyEntityType.php b/src/Form/Type/CurrencyEntityType.php index 4e955316..e5d85600 100644 --- a/src/Form/Type/CurrencyEntityType.php +++ b/src/Form/Type/CurrencyEntityType.php @@ -102,7 +102,7 @@ class CurrencyEntityType extends StructuralEntityType $level -= $parent->getLevel() - 1; } - $tmp = str_repeat('   ', $choice->getLevel()); //Use 3 spaces for intendation + $tmp = str_repeat('   ', $level); //Use 3 spaces for intendation if (empty($choice->getIsoCode())) { $tmp .= htmlspecialchars($choice->getName()); } else { diff --git a/src/Form/Type/StructuralEntityType.php b/src/Form/Type/StructuralEntityType.php index 73454038..51d8ff6c 100644 --- a/src/Form/Type/StructuralEntityType.php +++ b/src/Form/Type/StructuralEntityType.php @@ -272,7 +272,7 @@ class StructuralEntityType extends AbstractType $level -= $parent->getLevel() - 1; } - $tmp = str_repeat('   ', $choice->getLevel()); //Use 3 spaces for intendation + $tmp = str_repeat('   ', $level); //Use 3 spaces for intendation $tmp .= htmlspecialchars($choice->getName()); return $tmp; diff --git a/src/Helpers/Trees/TreeViewNodeState.php b/src/Helpers/Trees/TreeViewNodeState.php index f15b2904..6f22967a 100644 --- a/src/Helpers/Trees/TreeViewNodeState.php +++ b/src/Helpers/Trees/TreeViewNodeState.php @@ -46,11 +46,6 @@ use JsonSerializable; final class TreeViewNodeState implements JsonSerializable { - /** - * @var bool|null - */ - private $checked = null; - /** * @var bool|null */ diff --git a/src/Migrations/Version1.php b/src/Migrations/Version1.php index f27581a6..37dfb8b7 100644 --- a/src/Migrations/Version1.php +++ b/src/Migrations/Version1.php @@ -41,7 +41,7 @@ final class Version1 extends AbstractMigration try { //Check if we can use this migration method: $version = (int) $this->connection->fetchColumn("SELECT keyValue AS version FROM `internal` WHERE `keyName` = 'dbVersion'"); - $this->skipIf(true, 'Old Part-DB Database detected! Continue with upgrade...'); + $this->skipIf($version > 0, 'Old Part-DB Database detected! Continue with upgrade...'); } catch (DBALException $dBALException) { //when the table was not found, we can proceed, because we have an empty DB! } diff --git a/src/Repository/DBElementRepository.php b/src/Repository/DBElementRepository.php index ae7a9da9..9c3e8b4f 100644 --- a/src/Repository/DBElementRepository.php +++ b/src/Repository/DBElementRepository.php @@ -44,7 +44,8 @@ class DBElementRepository extends EntityRepository ->setParameter(1, $element->getID()) ->getQuery(); - $p = $q->execute(); + //Do the renaming + $q->execute(); $this->setField($element, 'id', $new_id); } diff --git a/src/Security/EntityListeners/ElementPermissionListener.php b/src/Security/EntityListeners/ElementPermissionListener.php index 80e51aa1..bf796e57 100644 --- a/src/Security/EntityListeners/ElementPermissionListener.php +++ b/src/Security/EntityListeners/ElementPermissionListener.php @@ -142,7 +142,6 @@ class ElementPermissionListener return; } - $em = $eventArgs->getEntityManager(); $unitOfWork = $eventArgs->getEntityManager()->getUnitOfWork(); $reflectionClass = new ReflectionClass($element); diff --git a/src/Services/EntityURLGenerator.php b/src/Services/EntityURLGenerator.php index 0f54e960..652ea14e 100644 --- a/src/Services/EntityURLGenerator.php +++ b/src/Services/EntityURLGenerator.php @@ -383,7 +383,7 @@ class EntityURLGenerator //Check if we have an direct mapping for the given class if (! array_key_exists($class, $map)) { //Check if we need to check inheritance by looping through our map - foreach ($map as $key => $value) { + foreach (array_keys($map) as $key) { if (is_a($entity, $key)) { return $map[$key]; } diff --git a/src/Services/LogSystem/EventCommentHelper.php b/src/Services/LogSystem/EventCommentHelper.php index 04d8ce0a..472293ee 100644 --- a/src/Services/LogSystem/EventCommentHelper.php +++ b/src/Services/LogSystem/EventCommentHelper.php @@ -31,7 +31,7 @@ class EventCommentHelper public function __construct() { - $message = null; + $this->message = null; } /** diff --git a/src/Services/LogSystem/EventUndoHelper.php b/src/Services/LogSystem/EventUndoHelper.php index a9714f17..ccc64ed9 100644 --- a/src/Services/LogSystem/EventUndoHelper.php +++ b/src/Services/LogSystem/EventUndoHelper.php @@ -37,7 +37,7 @@ class EventUndoHelper public function __construct() { - $undone_event = null; + $this->undone_event = null; $this->mode = self::MODE_UNDO; } diff --git a/src/Services/Parameters/ParameterExtractor.php b/src/Services/Parameters/ParameterExtractor.php index 64903ee5..4a37314b 100644 --- a/src/Services/Parameters/ParameterExtractor.php +++ b/src/Services/Parameters/ParameterExtractor.php @@ -69,7 +69,7 @@ class ParameterExtractor $matches = []; \preg_match($regex, $input, $matches); if (! empty($matches)) { - [$raw, $name, $value] = $matches; + [, $name, $value] = $matches; $value = trim($value); //Dont allow empty names or values (these are a sign of an invalid extracted string) diff --git a/src/Twig/LastUserExtension.php b/src/Twig/LastUserExtension.php index 524e8bad..b116f512 100644 --- a/src/Twig/LastUserExtension.php +++ b/src/Twig/LastUserExtension.php @@ -30,12 +30,10 @@ use Twig\TwigFunction; class LastUserExtension extends AbstractExtension { - private $em; private $repo; public function __construct(EntityManagerInterface $em) { - $this->em = $em; $this->repo = $em->getRepository(AbstractLogEntry::class); } diff --git a/tests/Controller/AdminPages/AbstractAdminControllerTest.php b/tests/Controller/AdminPages/AbstractAdminControllerTest.php index 76e6d07f..41f5b7bc 100644 --- a/tests/Controller/AdminPages/AbstractAdminControllerTest.php +++ b/tests/Controller/AdminPages/AbstractAdminControllerTest.php @@ -87,7 +87,7 @@ abstract class AbstractAdminControllerTest extends WebTestCase $client->catchExceptions(false); //Test read/list access by access /new overview page - $crawler = $client->request('GET', static::$base_path.'/new'); + $client->request('GET', static::$base_path.'/new'); $this->assertFalse($client->getResponse()->isRedirect()); $this->assertSame($read, $client->getResponse()->isSuccessful(), 'Controller was not successful!'); $this->assertSame($read, ! $client->getResponse()->isForbidden(), 'Permission Checking not working!'); @@ -112,7 +112,7 @@ abstract class AbstractAdminControllerTest extends WebTestCase } //Test read/list access by access /new overview page - $crawler = $client->request('GET', static::$base_path.'/1'); + $client->request('GET', static::$base_path.'/1'); $this->assertFalse($client->getResponse()->isRedirect()); $this->assertSame($read, $client->getResponse()->isSuccessful(), 'Controller was not successful!'); $this->assertSame($read, ! $client->getResponse()->isForbidden(), 'Permission Checking not working!'); @@ -148,7 +148,7 @@ abstract class AbstractAdminControllerTest extends WebTestCase } //Test read/list access by access /new overview page - $crawler = $client->request('DELETE', static::$base_path.'/7'); + $client->request('DELETE', static::$base_path.'/7'); //Page is redirected to '/new', when delete was successful $this->assertSame($delete, $client->getResponse()->isRedirect(static::$base_path.'/new'));