@@ -64,7 +64,7 @@  | 
                                                    ||
| 64 | 64 |      { | 
                                                        
| 65 | 65 | $variableApi = $this->getMockBuilder(VariableApiInterface::class)->getMock();  | 
                                                        
| 66 | 66 |          $variableApi->method('getSystemVar')->willReturnCallback( | 
                                                        
| 67 | -            function ($string, $default) use ($htmlEntities, $outputFilter) { | 
                                                        |
| 67 | +            function($string, $default) use ($htmlEntities, $outputFilter) { | 
                                                        |
| 68 | 68 |                  switch ($string) { | 
                                                        
| 69 | 69 | case 'outputfilter':  | 
                                                        
| 70 | 70 | return $outputFilter;  | 
                                                        
@@ -41,8 +41,8 @@  | 
                                                    ||
| 41 | 41 | |
| 42 | 42 | $qb = $this->getEntityManager()->createQueryBuilder();  | 
                                                        
| 43 | 43 | $qb->delete($this->mainEntityClass, 'tbl')  | 
                                                        
| 44 | -           ->where('tbl.bundle = :bundle') | 
                                                        |
| 45 | -           ->setParameter('bundle', $bundleName); | 
                                                        |
| 44 | +            ->where('tbl.bundle = :bundle') | 
                                                        |
| 45 | +            ->setParameter('bundle', $bundleName); | 
                                                        |
| 46 | 46 | $query = $qb->getQuery();  | 
                                                        
| 47 | 47 | $query->execute();  | 
                                                        
| 48 | 48 | }  | 
                                                        
@@ -390,7 +390,7 @@  | 
                                                    ||
| 390 | 390 | ksort($menuCategories);  | 
                                                        
| 391 | 391 | $fullTemplateName = $mode . '.' . $template;  | 
                                                        
| 392 | 392 | |
| 393 | -        return $this->render("@ZikulaAdminModule/AdminInterface/${fullTemplateName}.html.twig", [ | 
                                                        |
| 393 | +        return $this->render("@ZikulaAdminModule/AdminInterface/${fulltemplatename}.html.twig", [ | 
                                                        |
| 394 | 394 |              'adminMenu' => ('categories' === $mode) ? $menuCategories : $menuModules, | 
                                                        
| 395 | 395 | 'mode' => $mode,  | 
                                                        
| 396 | 396 | 'caller' => $caller  | 
                                                        
@@ -332,7 +332,7 @@  | 
                                                    ||
| 332 | 332 | ->setDefaults([  | 
                                                        
| 333 | 333 | // define class for underlying data (required for embedding forms)  | 
                                                        
| 334 | 334 | 'data_class' => RouteEntity::class,  | 
                                                        
| 335 | -                'empty_data' => function (FormInterface $form) { | 
                                                        |
| 335 | +                'empty_data' => function(FormInterface $form) { | 
                                                        |
| 336 | 336 | return $this->entityFactory->createRoute();  | 
                                                        
| 337 | 337 | },  | 
                                                        
| 338 | 338 | 'error_mapping' => [  | 
                                                        
@@ -61,7 +61,8 @@  | 
                                                    ||
| 61 | 61 |                          $parent = $menuItemRepository->find($request->request->get('parent')); | 
                                                        
| 62 | 62 | $menuItemEntity->setParent($parent);  | 
                                                        
| 63 | 63 | $menuItemEntity->setRoot($parent->getRoot());  | 
                                                        
| 64 | -                    } elseif (empty($parentId) && $request->request->has('after')) { // sibling of top-level child | 
                                                        |
| 64 | +                    } elseif (empty($parentId) && $request->request->has('after')) { | 
                                                        |
| 65 | +// sibling of top-level child  | 
                                                        |
| 65 | 66 | /** @var MenuItemEntity $sibling */  | 
                                                        
| 66 | 67 |                          $sibling = $menuItemRepository->find($request->request->get('after')); | 
                                                        
| 67 | 68 | $menuItemEntity->setParent($sibling->getParent());  | 
                                                        
@@ -51,8 +51,8 @@  | 
                                                    ||
| 51 | 51 | // the following process should be unnecessary because cascade = all but MySQL 5.7 not working with that (#3726)  | 
                                                        
| 52 | 52 | $qb = $this->_em->createQueryBuilder();  | 
                                                        
| 53 | 53 | $qb->delete(UserAttributeEntity::class, 'a')  | 
                                                        
| 54 | -           ->where('a.user = :userId') | 
                                                        |
| 55 | -           ->setParameter('userId', $user->getUid()); | 
                                                        |
| 54 | +            ->where('a.user = :userId') | 
                                                        |
| 55 | +            ->setParameter('userId', $user->getUid()); | 
                                                        |
| 56 | 56 | $query = $qb->getQuery();  | 
                                                        
| 57 | 57 | $query->execute();  | 
                                                        
| 58 | 58 | // end of theoretically unrequired process  | 
                                                        
@@ -91,7 +91,7 @@  | 
                                                    ||
| 91 | 91 | public function gc(string $level, int $inactiveMinutes, int $days): void  | 
                                                        
| 92 | 92 |      { | 
                                                        
| 93 | 93 | $inactive = new DateTime();  | 
                                                        
| 94 | -        $inactive->modify("-${inactiveMinutes} minutes"); | 
                                                        |
| 94 | +        $inactive->modify("-${inactiveminutes} minutes"); | 
                                                        |
| 95 | 95 | $daysOld = new DateTime();  | 
                                                        
| 96 | 96 |          $daysOld->modify("-${days} days"); | 
                                                        
| 97 | 97 | |
@@ -80,7 +80,8 @@  | 
                                                    ||
| 80 | 80 | $parent = $categoryRepository->find($parentId);  | 
                                                        
| 81 | 81 | $category->setParent($parent);  | 
                                                        
| 82 | 82 | $category->setRoot($parent->getRoot());  | 
                                                        
| 83 | -                    } elseif (empty($parentId) && $request->request->has('after')) { // sibling of top-level child | 
                                                        |
| 83 | +                    } elseif (empty($parentId) && $request->request->has('after')) { | 
                                                        |
| 84 | +// sibling of top-level child  | 
                                                        |
| 84 | 85 | /** @var CategoryEntity $sibling */  | 
                                                        
| 85 | 86 |                          $sibling = $categoryRepository->find($request->request->get('after')); | 
                                                        
| 86 | 87 | $category->setParent($sibling->getParent());  | 
                                                        
@@ -48,7 +48,7 @@  | 
                                                    ||
| 48 | 48 | }  | 
                                                        
| 49 | 49 | $regId = $categoryAssignment->getCategoryRegistryId();  | 
                                                        
| 50 | 50 | $catId = $categoryAssignment->getCategory()->getId();  | 
                                                        
| 51 | -            $hasAccess = $this->permissionApi->hasPermission('ZikulaCategoriesModule:PropertyId:CategoryId', "${regId}::${catId}", $permLevel); | 
                                                        |
| 51 | +            $hasAccess = $this->permissionApi->hasPermission('ZikulaCategoriesModule:PropertyId:CategoryId', "${regid}::${catid}", $permLevel); | 
                                                        |
| 52 | 52 |              if ($requireAccessForAll && !$hasAccess) { | 
                                                        
| 53 | 53 | return false;  | 
                                                        
| 54 | 54 | }  |