@@ -16,10 +16,10 @@ |
||
| 16 | 16 | use Symfony\Component\EventDispatcher\EventSubscriberInterface; |
| 17 | 17 | use Zikula\Common\Translator\TranslatorInterface; |
| 18 | 18 | use Zikula\Core\Event\GenericEvent; |
| 19 | +use Zikula\RoutesModule\Entity\Factory\EntityFactory; |
|
| 19 | 20 | use Zikula\UsersModule\Api\ApiInterface\CurrentUserApiInterface; |
| 20 | 21 | use Zikula\UsersModule\Constant as UsersConstant; |
| 21 | 22 | use Zikula\UsersModule\UserEvents; |
| 22 | -use Zikula\RoutesModule\Entity\Factory\EntityFactory; |
|
| 23 | 23 | |
| 24 | 24 | /** |
| 25 | 25 | * Event handler base class for user-related events. |
@@ -17,8 +17,8 @@ |
||
| 17 | 17 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; |
| 18 | 18 | use Symfony\Component\DependencyInjection\ContainerAwareTrait; |
| 19 | 19 | use Zikula\Common\Translator\TranslatorTrait; |
| 20 | -use Zikula\UsersModule\Constant as UsersConstant; |
|
| 21 | 20 | use Zikula\RoutesModule\Entity\RouteEntity; |
| 21 | +use Zikula\UsersModule\Constant as UsersConstant; |
|
| 22 | 22 | |
| 23 | 23 | /** |
| 24 | 24 | * This is the item actions menu implementation class. |
@@ -211,7 +211,7 @@ |
||
| 211 | 211 | return false; |
| 212 | 212 | } |
| 213 | 213 | |
| 214 | - $out = "GET $path_query? HTTP/1.1\r\n"; |
|
| 214 | + $out = "get $path_query? HTTP/1.1\r\n"; |
|
| 215 | 215 | $out .= "User-Agent: $userAgent\r\n"; |
| 216 | 216 | $out .= "Referer: $ref\r\n"; |
| 217 | 217 | $out .= "Host: $urlArray[host]\r\n"; |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | return false; |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - list($id, , $timestamp) = $this->tokenGenerator->decode($token); |
|
| 73 | + list($id,, $timestamp) = $this->tokenGenerator->decode($token); |
|
| 74 | 74 | $decoded = [ |
| 75 | 75 | 'id' => $id, |
| 76 | 76 | 'time' => $timestamp |
@@ -56,7 +56,8 @@ |
||
| 56 | 56 | $parent = $repo->find($request->request->get('parent')); |
| 57 | 57 | $menuItemEntity->setParent($parent); |
| 58 | 58 | $menuItemEntity->setRoot($parent->getRoot()); |
| 59 | - } elseif (empty($parentId) && $request->request->has('after')) { // sibling of top-level child |
|
| 59 | + } elseif (empty($parentId) && $request->request->has('after')) { |
|
| 60 | +// sibling of top-level child |
|
| 60 | 61 | $sibling = $repo->find($request->request->get('after')); |
| 61 | 62 | $menuItemEntity->setParent($sibling->getParent()); |
| 62 | 63 | $menuItemEntity->setRoot($sibling->getRoot()); |
@@ -173,14 +173,14 @@ discard block |
||
| 173 | 173 | if ((!is_numeric($v) && $v != '') || (is_numeric($v) && $v > 0)) { |
| 174 | 174 | if ($k == 'workflowState' && substr($v, 0, 1) == '!') { |
| 175 | 175 | $qb->andWhere('tbl.' . $k . ' != :' . $k) |
| 176 | - ->setParameter($k, substr($v, 1, strlen($v) - 1)); |
|
| 176 | + ->setParameter($k, substr($v, 1, strlen($v) - 1)); |
|
| 177 | 177 | } elseif (substr($v, 0, 1) == '%') { |
| 178 | 178 | $qb->andWhere('tbl.' . $k . ' LIKE :' . $k) |
| 179 | - ->setParameter($k, '%' . $v . '%'); |
|
| 179 | + ->setParameter($k, '%' . $v . '%'); |
|
| 180 | 180 | } else { |
| 181 | 181 | $qb->andWhere('tbl.' . $k . ' = :' . $k) |
| 182 | - ->setParameter($k, $v); |
|
| 183 | - } |
|
| 182 | + ->setParameter($k, $v); |
|
| 183 | + } |
|
| 184 | 184 | } |
| 185 | 185 | } |
| 186 | 186 | } |
@@ -289,10 +289,10 @@ discard block |
||
| 289 | 289 | |
| 290 | 290 | if (is_array($userId)) { |
| 291 | 291 | $qb->andWhere('tbl.createdBy IN (:userIds)') |
| 292 | - ->setParameter('userIds', $userId); |
|
| 292 | + ->setParameter('userIds', $userId); |
|
| 293 | 293 | } else { |
| 294 | 294 | $qb->andWhere('tbl.createdBy = :userId') |
| 295 | - ->setParameter('userId', $userId); |
|
| 295 | + ->setParameter('userId', $userId); |
|
| 296 | 296 | } |
| 297 | 297 | |
| 298 | 298 | return $qb; |
@@ -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. |
@@ -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; |