@@ -294,7 +294,7 @@ |
||
294 | 294 | * @param string $context Usage context (allowed values: controllerAction, api, actionHandler, block, contentType) |
295 | 295 | * @param array $args Additional arguments |
296 | 296 | * |
297 | - * @return array List of template variables to be assigned |
|
297 | + * @return string List of template variables to be assigned |
|
298 | 298 | */ |
299 | 299 | public function addTemplateParameters($objectType = '', array $parameters = [], $context = '', array $args = []) |
300 | 300 | { |
@@ -319,7 +319,7 @@ |
||
319 | 319 | -----------------sha1sums----------------- |
320 | 320 | $zipSha1 $name.zip |
321 | 321 | $tarSha1 $name.tar.gz |
322 | -CHECKSUM; |
|
322 | +checksum; |
|
323 | 323 | file_put_contents("$name-checksum.txt", $checksum); |
324 | 324 | $progress->advance(); |
325 | 325 |
@@ -70,7 +70,8 @@ |
||
70 | 70 | $parent = $repo->find($parentId); |
71 | 71 | $category->setParent($parent); |
72 | 72 | $category->setRoot($parent->getRoot()); |
73 | - } elseif (empty($parentId) && $request->request->has('after')) { // sibling of top-level child |
|
73 | + } elseif (empty($parentId) && $request->request->has('after')) { |
|
74 | +// sibling of top-level child |
|
74 | 75 | $sibling = $repo->find($request->request->get('after')); |
75 | 76 | $category->setParent($sibling->getParent()); |
76 | 77 | $category->setRoot($sibling->getRoot()); |
@@ -11,9 +11,9 @@ |
||
11 | 11 | |
12 | 12 | namespace Zikula\Bundle\CoreInstallerBundle\Controller; |
13 | 13 | |
14 | -use Symfony\Component\HttpFoundation\Response; |
|
15 | -use Symfony\Component\HttpFoundation\Request; |
|
16 | 14 | use Michelf\MarkdownExtra; |
15 | +use Symfony\Component\HttpFoundation\Request; |
|
16 | +use Symfony\Component\HttpFoundation\Response; |
|
17 | 17 | use Zikula\Bundle\CoreBundle\HttpKernel\ZikulaHttpKernelInterface; |
18 | 18 | use Zikula\Common\Translator\TranslatorInterface; |
19 | 19 | use Zikula\Core\Response\PlainResponse; |
@@ -44,8 +44,8 @@ |
||
44 | 44 | // the following process should be unnecessary because cascade = all but MySQL 5.7 not working with that (#3726) |
45 | 45 | $qb = $this->_em->createQueryBuilder(); |
46 | 46 | $qb->delete('Zikula\UsersModule\Entity\UserAttributeEntity', 'a') |
47 | - ->where('a.user = :userId') |
|
48 | - ->setParameter('userId', $user->getUid()); |
|
47 | + ->where('a.user = :userId') |
|
48 | + ->setParameter('userId', $user->getUid()); |
|
49 | 49 | $query = $qb->getQuery(); |
50 | 50 | $query->execute(); |
51 | 51 | // end of theoretically unrequired process |
@@ -12,17 +12,16 @@ |
||
12 | 12 | |
13 | 13 | namespace Zikula\RoutesModule\Controller; |
14 | 14 | |
15 | -use Zikula\RoutesModule\Controller\Base\AbstractRouteController; |
|
16 | - |
|
17 | 15 | use RuntimeException; |
18 | 16 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache; |
19 | 17 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; |
20 | 18 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
21 | 19 | use Symfony\Component\HttpFoundation\Request; |
22 | -use Symfony\Component\Security\Core\Exception\AccessDeniedException; |
|
23 | 20 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
24 | -use Zikula\ThemeModule\Engine\Annotation\Theme; |
|
21 | +use Symfony\Component\Security\Core\Exception\AccessDeniedException; |
|
22 | +use Zikula\RoutesModule\Controller\Base\AbstractRouteController; |
|
25 | 23 | use Zikula\RoutesModule\Entity\RouteEntity; |
24 | +use Zikula\ThemeModule\Engine\Annotation\Theme; |
|
26 | 25 | |
27 | 26 | /** |
28 | 27 | * Route controller class providing navigation and interaction functionality. |