@@ -67,6 +67,9 @@ |
||
67 | 67 | return $links; |
68 | 68 | } |
69 | 69 | |
70 | + /** |
|
71 | + * @param string $containerName |
|
72 | + */ |
|
70 | 73 | public function hasContainer($containerName) |
71 | 74 | { |
72 | 75 | return isset($this->linkContainers[$containerName]); |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | |
384 | 384 | /** |
385 | 385 | * get the category display name |
386 | - * @param $lang |
|
386 | + * @param string $lang |
|
387 | 387 | * |
388 | 388 | * @return array|string the category display name(s) |
389 | 389 | */ |
@@ -463,7 +463,7 @@ discard block |
||
463 | 463 | /** |
464 | 464 | * set the creation date of the category |
465 | 465 | * |
466 | - * @param mixed $cr_date the creation date |
|
466 | + * @param \DateTime $cr_date the creation date |
|
467 | 467 | */ |
468 | 468 | public function setCr_date($cr_date) |
469 | 469 | { |
@@ -503,7 +503,7 @@ discard block |
||
503 | 503 | /** |
504 | 504 | * set the last updated timestamp of the category |
505 | 505 | * |
506 | - * @param mixed $lu_date the last updated timestamp |
|
506 | + * @param \DateTime $lu_date the last updated timestamp |
|
507 | 507 | */ |
508 | 508 | public function setLu_date($lu_date) |
509 | 509 | { |
@@ -14,7 +14,6 @@ |
||
14 | 14 | |
15 | 15 | use Symfony\Component\Routing\RouteCollection; |
16 | 16 | use Zikula\Bundle\CoreBundle\CacheClearer; |
17 | -use Zikula\RoutesModule\Entity\RouteEntity; |
|
18 | 17 | use Zikula\RoutesModule\Form\Handler\Route\Base\AbstractEditHandler; |
19 | 18 | use Zikula\RoutesModule\Helper\PathBuilderHelper; |
20 | 19 | use Zikula\RoutesModule\Helper\RouteDumperHelper; |
@@ -14,7 +14,6 @@ discard block |
||
14 | 14 | |
15 | 15 | use Symfony\Component\Form\AbstractType; |
16 | 16 | use Symfony\Component\Form\Extension\Core\Type\CheckboxType; |
17 | -use Symfony\Component\Form\Extension\Core\Type\ChoiceType; |
|
18 | 17 | use Symfony\Component\Form\Extension\Core\Type\DateTimeType; |
19 | 18 | use Symfony\Component\Form\Extension\Core\Type\IntegerType; |
20 | 19 | use Symfony\Component\Form\Extension\Core\Type\ResetType; |
@@ -28,8 +27,8 @@ discard block |
||
28 | 27 | use Zikula\RoutesModule\Entity\Factory\EntityFactory; |
29 | 28 | use Zikula\RoutesModule\Form\Type\Field\ArrayType; |
30 | 29 | use Zikula\RoutesModule\Form\Type\Field\MultiListType; |
31 | -use Zikula\UsersModule\Form\Type\UserLiveSearchType; |
|
32 | 30 | use Zikula\RoutesModule\Helper\ListEntriesHelper; |
31 | +use Zikula\UsersModule\Form\Type\UserLiveSearchType; |
|
33 | 32 | |
34 | 33 | /** |
35 | 34 | * Route editing form type base class. |
@@ -17,7 +17,6 @@ |
||
17 | 17 | use Symfony\Component\HttpFoundation\RequestStack; |
18 | 18 | use Zikula\UsersModule\Api\ApiInterface\CurrentUserApiInterface; |
19 | 19 | use Zikula\UsersModule\Constant as UsersConstant; |
20 | -use Zikula\RoutesModule\Entity\RouteEntity; |
|
21 | 20 | |
22 | 21 | /** |
23 | 22 | * Entity collection filter helper base class. |
@@ -177,7 +177,7 @@ |
||
177 | 177 | if ((!is_numeric($v) && $v != '') || (is_numeric($v) && $v > 0)) { |
178 | 178 | if ($k == 'workflowState' && substr($v, 0, 1) == '!') { |
179 | 179 | $qb->andWhere('tbl.' . $k . ' != :' . $k) |
180 | - ->setParameter($k, substr($v, 1, strlen($v)-1)); |
|
180 | + ->setParameter($k, substr($v, 1, strlen($v) - 1)); |
|
181 | 181 | } elseif (substr($v, 0, 1) == '%') { |
182 | 182 | $qb->andWhere('tbl.' . $k . ' LIKE :' . $k) |
183 | 183 | ->setParameter($k, '%' . substr($v, 1) . '%'); |
@@ -177,17 +177,17 @@ discard block |
||
177 | 177 | if ((!is_numeric($v) && $v != '') || (is_numeric($v) && $v > 0)) { |
178 | 178 | if ($k == 'workflowState' && substr($v, 0, 1) == '!') { |
179 | 179 | $qb->andWhere('tbl.' . $k . ' != :' . $k) |
180 | - ->setParameter($k, substr($v, 1, strlen($v)-1)); |
|
180 | + ->setParameter($k, substr($v, 1, strlen($v)-1)); |
|
181 | 181 | } elseif (substr($v, 0, 1) == '%') { |
182 | 182 | $qb->andWhere('tbl.' . $k . ' LIKE :' . $k) |
183 | - ->setParameter($k, '%' . substr($v, 1) . '%'); |
|
183 | + ->setParameter($k, '%' . substr($v, 1) . '%'); |
|
184 | 184 | } elseif (in_array($k, ['schemes', 'methods'])) { |
185 | 185 | // multi list filter |
186 | 186 | $qb->andWhere('tbl.' . $k . ' LIKE :' . $k) |
187 | - ->setParameter($k, '%' . $v . '%'); |
|
187 | + ->setParameter($k, '%' . $v . '%'); |
|
188 | 188 | } else { |
189 | 189 | $qb->andWhere('tbl.' . $k . ' = :' . $k) |
190 | - ->setParameter($k, $v); |
|
190 | + ->setParameter($k, $v); |
|
191 | 191 | } |
192 | 192 | } |
193 | 193 | } |
@@ -293,10 +293,10 @@ discard block |
||
293 | 293 | |
294 | 294 | if (is_array($userId)) { |
295 | 295 | $qb->andWhere('tbl.createdBy IN (:userIds)') |
296 | - ->setParameter('userIds', $userId); |
|
296 | + ->setParameter('userIds', $userId); |
|
297 | 297 | } else { |
298 | 298 | $qb->andWhere('tbl.createdBy = :userId') |
299 | - ->setParameter('userId', $userId); |
|
299 | + ->setParameter('userId', $userId); |
|
300 | 300 | } |
301 | 301 | |
302 | 302 | return $qb; |
@@ -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 | } |
@@ -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()); |