@@ -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 |
@@ -12,15 +12,14 @@ |
||
| 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\Route; |
| 19 | 17 | use Symfony\Component\HttpFoundation\Request; |
| 20 | -use Symfony\Component\Security\Core\Exception\AccessDeniedException; |
|
| 21 | 18 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
| 22 | -use Zikula\ThemeModule\Engine\Annotation\Theme; |
|
| 19 | +use Symfony\Component\Security\Core\Exception\AccessDeniedException; |
|
| 20 | +use Zikula\RoutesModule\Controller\Base\AbstractRouteController; |
|
| 23 | 21 | use Zikula\RoutesModule\Entity\RouteEntity; |
| 22 | +use Zikula\ThemeModule\Engine\Annotation\Theme; |
|
| 24 | 23 | |
| 25 | 24 | /** |
| 26 | 25 | * Route controller class providing navigation and interaction functionality. |
@@ -13,17 +13,16 @@ |
||
| 13 | 13 | namespace Zikula\RoutesModule\Entity\Repository\Base; |
| 14 | 14 | |
| 15 | 15 | use Doctrine\Common\Collections\ArrayCollection; |
| 16 | -use Gedmo\Sortable\Entity\Repository\SortableRepository; |
|
| 17 | - |
|
| 18 | 16 | use Doctrine\ORM\Query; |
| 19 | 17 | use Doctrine\ORM\QueryBuilder; |
| 20 | 18 | use Doctrine\ORM\Tools\Pagination\Paginator; |
| 19 | +use Gedmo\Sortable\Entity\Repository\SortableRepository; |
|
| 21 | 20 | use InvalidArgumentException; |
| 22 | 21 | use Psr\Log\LoggerInterface; |
| 23 | 22 | use Zikula\Common\Translator\TranslatorInterface; |
| 24 | -use Zikula\UsersModule\Api\ApiInterface\CurrentUserApiInterface; |
|
| 25 | 23 | use Zikula\RoutesModule\Entity\RouteEntity; |
| 26 | 24 | use Zikula\RoutesModule\Helper\CollectionFilterHelper; |
| 25 | +use Zikula\UsersModule\Api\ApiInterface\CurrentUserApiInterface; |
|
| 27 | 26 | |
| 28 | 27 | /** |
| 29 | 28 | * Repository class used to implement own convenience methods for performing certain DQL queries. |
@@ -150,9 +150,9 @@ discard block |
||
| 150 | 150 | |
| 151 | 151 | $qb = $this->getEntityManager()->createQueryBuilder(); |
| 152 | 152 | $qb->update($this->mainEntityClass, 'tbl') |
| 153 | - ->set('tbl.createdBy', $newUserId) |
|
| 154 | - ->where('tbl.createdBy = :creator') |
|
| 155 | - ->setParameter('creator', $userId); |
|
| 153 | + ->set('tbl.createdBy', $newUserId) |
|
| 154 | + ->where('tbl.createdBy = :creator') |
|
| 155 | + ->setParameter('creator', $userId); |
|
| 156 | 156 | $query = $qb->getQuery(); |
| 157 | 157 | $query->execute(); |
| 158 | 158 | |
@@ -183,9 +183,9 @@ discard block |
||
| 183 | 183 | |
| 184 | 184 | $qb = $this->getEntityManager()->createQueryBuilder(); |
| 185 | 185 | $qb->update($this->mainEntityClass, 'tbl') |
| 186 | - ->set('tbl.updatedBy', $newUserId) |
|
| 187 | - ->where('tbl.updatedBy = :editor') |
|
| 188 | - ->setParameter('editor', $userId); |
|
| 186 | + ->set('tbl.updatedBy', $newUserId) |
|
| 187 | + ->where('tbl.updatedBy = :editor') |
|
| 188 | + ->setParameter('editor', $userId); |
|
| 189 | 189 | $query = $qb->getQuery(); |
| 190 | 190 | $query->execute(); |
| 191 | 191 | |
@@ -214,8 +214,8 @@ discard block |
||
| 214 | 214 | |
| 215 | 215 | $qb = $this->getEntityManager()->createQueryBuilder(); |
| 216 | 216 | $qb->delete($this->mainEntityClass, 'tbl') |
| 217 | - ->where('tbl.createdBy = :creator') |
|
| 218 | - ->setParameter('creator', $userId); |
|
| 217 | + ->where('tbl.createdBy = :creator') |
|
| 218 | + ->setParameter('creator', $userId); |
|
| 219 | 219 | $query = $qb->getQuery(); |
| 220 | 220 | $query->execute(); |
| 221 | 221 | |
@@ -244,8 +244,8 @@ discard block |
||
| 244 | 244 | |
| 245 | 245 | $qb = $this->getEntityManager()->createQueryBuilder(); |
| 246 | 246 | $qb->delete($this->mainEntityClass, 'tbl') |
| 247 | - ->where('tbl.updatedBy = :editor') |
|
| 248 | - ->setParameter('editor', $userId); |
|
| 247 | + ->where('tbl.updatedBy = :editor') |
|
| 248 | + ->setParameter('editor', $userId); |
|
| 249 | 249 | $query = $qb->getQuery(); |
| 250 | 250 | $query->execute(); |
| 251 | 251 | |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | { |
| 331 | 331 | if (count($exclusions) > 0) { |
| 332 | 332 | $qb->andWhere('tbl.id NOT IN (:excludedIdentifiers)') |
| 333 | - ->setParameter('excludedIdentifiers', $exclusions); |
|
| 333 | + ->setParameter('excludedIdentifiers', $exclusions); |
|
| 334 | 334 | } |
| 335 | 335 | |
| 336 | 336 | return $qb; |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | $offset = ($currentPage - 1) * $resultsPerPage; |
| 391 | 391 | |
| 392 | 392 | $query->setFirstResult($offset) |
| 393 | - ->setMaxResults($resultsPerPage); |
|
| 393 | + ->setMaxResults($resultsPerPage); |
|
| 394 | 394 | |
| 395 | 395 | return $query; |
| 396 | 396 | } |
@@ -487,7 +487,7 @@ discard block |
||
| 487 | 487 | |
| 488 | 488 | $qb = $this->getEntityManager()->createQueryBuilder(); |
| 489 | 489 | $qb->select($selection) |
| 490 | - ->from($this->mainEntityClass, 'tbl'); |
|
| 490 | + ->from($this->mainEntityClass, 'tbl'); |
|
| 491 | 491 | |
| 492 | 492 | if (!empty($where)) { |
| 493 | 493 | $qb->andWhere($where); |
@@ -536,7 +536,7 @@ discard block |
||
| 536 | 536 | { |
| 537 | 537 | $qb = $this->getCountQuery('', false); |
| 538 | 538 | $qb->andWhere('tbl.' . $fieldName . ' = :' . $fieldName) |
| 539 | - ->setParameter($fieldName, $fieldValue); |
|
| 539 | + ->setParameter($fieldName, $fieldValue); |
|
| 540 | 540 | |
| 541 | 541 | if ($excludeId > 0) { |
| 542 | 542 | $qb = $this->addExclusion($qb, [$excludeId]); |
@@ -579,7 +579,7 @@ discard block |
||
| 579 | 579 | |
| 580 | 580 | $qb = $this->getEntityManager()->createQueryBuilder(); |
| 581 | 581 | $qb->select($selection) |
| 582 | - ->from($this->mainEntityClass, 'tbl'); |
|
| 582 | + ->from($this->mainEntityClass, 'tbl'); |
|
| 583 | 583 | |
| 584 | 584 | if (true === $useJoins) { |
| 585 | 585 | $this->addJoinsToFrom($qb); |
@@ -607,7 +607,7 @@ discard block |
||
| 607 | 607 | if ($orderBy == 'RAND()') { |
| 608 | 608 | // random selection |
| 609 | 609 | $qb->addSelect('MOD(tbl.id, ' . mt_rand(2, 15) . ') AS HIDDEN randomIdentifiers') |
| 610 | - ->add('orderBy', 'randomIdentifiers'); |
|
| 610 | + ->add('orderBy', 'randomIdentifiers'); |
|
| 611 | 611 | |
| 612 | 612 | return $qb; |
| 613 | 613 | } |
@@ -626,12 +626,12 @@ discard block |
||
| 626 | 626 | } |
| 627 | 627 | if (false !== strpos($orderBy, 'tbl.createdBy')) { |
| 628 | 628 | $qb->addSelect('tblCreator') |
| 629 | - ->leftJoin('tbl.createdBy', 'tblCreator'); |
|
| 629 | + ->leftJoin('tbl.createdBy', 'tblCreator'); |
|
| 630 | 630 | $orderBy = str_replace('tbl.createdBy', 'tblCreator.uname', $orderBy); |
| 631 | 631 | } |
| 632 | 632 | if (false !== strpos($orderBy, 'tbl.updatedBy')) { |
| 633 | 633 | $qb->addSelect('tblUpdater') |
| 634 | - ->leftJoin('tbl.updatedBy', 'tblUpdater'); |
|
| 634 | + ->leftJoin('tbl.updatedBy', 'tblUpdater'); |
|
| 635 | 635 | $orderBy = str_replace('tbl.updatedBy', 'tblUpdater.uname', $orderBy); |
| 636 | 636 | } |
| 637 | 637 | $qb->add('orderBy', $orderBy); |
@@ -281,7 +281,7 @@ |
||
| 281 | 281 | /** |
| 282 | 282 | * Selects an object from the database. |
| 283 | 283 | * |
| 284 | - * @param mixed $id The id (or array of ids) to use to retrieve the object (optional) (default=0) |
|
| 284 | + * @param integer $id The id (or array of ids) to use to retrieve the object (optional) (default=0) |
|
| 285 | 285 | * @param boolean $useJoins Whether to include joining related objects (optional) (default=true) |
| 286 | 286 | * @param boolean $slimMode If activated only some basic fields are selected without using any joins (optional) (default=false) |
| 287 | 287 | * |