@@ -70,7 +70,8 @@ |
||
70 | 70 | $parent = $repo->find($parentId); |
71 | 71 | $category->setParent($parent); |
72 | 72 | $category->setRoot($parent->getRoot()); |
73 | - } elseif (empty($parent) && $request->request->has('after')) { // sibling of top-level child |
|
73 | + } elseif (empty($parent) && $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()); |
@@ -246,7 +246,7 @@ |
||
246 | 246 | * @param AbstractBundle $bundle The bundle |
247 | 247 | * @param string $bundleName The bundle's name |
248 | 248 | * |
249 | - * @return array The legacy $type and $func parameters |
|
249 | + * @return string[] The legacy $type and $func parameters |
|
250 | 250 | */ |
251 | 251 | private function setZikulaDefaults(Route $route, AbstractBundle $bundle, $bundleName) |
252 | 252 | { |
@@ -158,7 +158,7 @@ |
||
158 | 158 | * @param ExtensionDependencyEntity $dependency |
159 | 159 | * @return bool |
160 | 160 | */ |
161 | - private function bundleDependencySatisfied(ExtensionDependencyEntity &$dependency) |
|
161 | + private function bundleDependencySatisfied(ExtensionDependencyEntity & $dependency) |
|
162 | 162 | { |
163 | 163 | if ($dependency->getModname() == "php") { |
164 | 164 | // Do not use PHP_VERSION constant, because it might throw off the semver parser. |
@@ -98,7 +98,7 @@ |
||
98 | 98 | } |
99 | 99 | } |
100 | 100 | } |
101 | - $cacheName = in_array($type, ['js', 'css']) ? "{$type}Cache" : null; |
|
101 | + $cacheName = in_array($type, ['js', 'css']) ? "{$type}cache" : null; |
|
102 | 102 | /** @var CacheProvider $cacheService */ |
103 | 103 | $cacheService = $this->$cacheName; |
104 | 104 | $key = md5(serialize($assets)) . (int)$this->minify . (int)$this->compress . $this->lifetime . '.' . $type; |
@@ -63,7 +63,7 @@ |
||
63 | 63 | |
64 | 64 | if ($constraint->propertyName == 'workflowState' && in_array($value, ['initial', 'deleted'])) { |
65 | 65 | return; |
66 | - } |
|
66 | + } |
|
67 | 67 | |
68 | 68 | $listEntries = $this->listEntriesHelper->getEntries($constraint->entityName, $constraint->propertyName); |
69 | 69 | $allowedValues = []; |
@@ -262,7 +262,7 @@ |
||
262 | 262 | * |
263 | 263 | * @param EntityAccess $entity The given entity |
264 | 264 | * |
265 | - * @return Event The created event instance |
|
265 | + * @return string The created event instance |
|
266 | 266 | */ |
267 | 267 | protected function createFilterEvent($entity) |
268 | 268 | { |
@@ -24,7 +24,6 @@ |
||
24 | 24 | use Symfony\Component\EventDispatcher\EventDispatcherInterface; |
25 | 25 | use Zikula\Core\Doctrine\EntityAccess; |
26 | 26 | use Zikula\RoutesModule\RoutesEvents; |
27 | -use Zikula\RoutesModule\Event\FilterRouteEvent; |
|
28 | 27 | |
29 | 28 | /** |
30 | 29 | * Event subscriber base class for entity lifecycle events. |
@@ -91,7 +91,8 @@ |
||
91 | 91 | $form = $this->createForm(DefaultLoginType::class, ['uid' => $uid]); |
92 | 92 | $loginFormEvent = new UserFormAwareEvent($form); |
93 | 93 | $dispatcher->dispatch(AccessEvents::AUTHENTICATION_FORM, $loginFormEvent); |
94 | - if ($form->count() > 3) { // count > 3 means that the AUTHENTICATION_FORM event added some form children |
|
94 | + if ($form->count() > 3) { |
|
95 | +// count > 3 means that the AUTHENTICATION_FORM event added some form children |
|
95 | 96 | $form->handleRequest($request); |
96 | 97 | if ($form->isValid() && $form->isSubmitted()) { |
97 | 98 | $uid = $form->get('uid')->getData(); |
@@ -243,10 +243,10 @@ |
||
243 | 243 | $siteName = $this->variableApi->getSystemVar('sitename'); |
244 | 244 | $pageTitle = iconv('UTF-8', 'ASCII//TRANSLIT', $this->pageVars->get('title', '')); |
245 | 245 | $fileTitle = iconv('UTF-8', 'ASCII//TRANSLIT', $siteName) |
246 | - . '-' |
|
247 | - . ($pageTitle != '' ? $pageTitle . '-' : '') |
|
248 | - . date('Ymd') . '.pdf'; |
|
249 | - $fileTitle = str_replace(' ', '_', $fileTitle); |
|
246 | + . '-' |
|
247 | + . ($pageTitle != '' ? $pageTitle . '-' : '') |
|
248 | + . date('Ymd') . '.pdf'; |
|
249 | + $fileTitle = str_replace(' ', '_', $fileTitle); |
|
250 | 250 | |
251 | 251 | /* |
252 | 252 | if (true === $this->request->query->getBoolean('dbg', false)) { |
@@ -20,8 +20,8 @@ |
||
20 | 20 | use Zikula\Core\Response\PlainResponse; |
21 | 21 | use Zikula\ExtensionsModule\Api\ApiInterface\VariableApiInterface; |
22 | 22 | use Zikula\PermissionsModule\Api\ApiInterface\PermissionApiInterface; |
23 | -use Zikula\ThemeModule\Engine\ParameterBag; |
|
24 | 23 | use Zikula\RoutesModule\Helper\ControllerHelper; |
24 | +use Zikula\ThemeModule\Engine\ParameterBag; |
|
25 | 25 | |
26 | 26 | /** |
27 | 27 | * Helper base class for view layer methods. |
@@ -66,7 +66,7 @@ |
||
66 | 66 | /** |
67 | 67 | * Displays the avatar of a given user. |
68 | 68 | * |
69 | - * @param int|string $uid The user's id or name |
|
69 | + * @param integer $uid The user's id or name |
|
70 | 70 | * @param array $parameters Any additional arguments (e.g. width, height, size, rating) |
71 | 71 | * |
72 | 72 | * @return string |