zikula / core

src/system/BlocksModule/Helper/InstallerHelper.php

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
             $blockClassName = preg_match('/.*Block$/', $blockClassName) ? $blockClassName : $blockClassName . 'Block';
         } catch (\Exception $e) {
             $moduleBundle = null;
-            $blockClassName = '\\' . ucwords($moduleName).'\\'.'Block\\'.ucwords($blockEntity->getBkey());
+            $blockClassName = '\\' . ucwords($moduleName) . '\\' . 'Block\\' . ucwords($blockEntity->getBkey());
             $blockClassName = preg_match('/.*Block$/', $blockClassName) ? $blockClassName : $blockClassName . 'Block';
             $blockClassNameOld = '\\' . ucwords($moduleName) . '_' . 'Block_' . ucwords($blockEntity->getBkey());
             $blockClassName = class_exists($blockClassName) ? $blockClassName : $blockClassNameOld;

src/system/RoutesModule/Translation/ZikulaPatternGenerationStrategy.php

Spacing +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
                 || (self::STRATEGY_PREFIX_EXCEPT_DEFAULT === $this->strategy && $this->defaultLocale !== $locale)) {
                 $i18nPattern = '/' . $locale . $i18nPattern;
                 if (null !== $route->getOption('i18n_prefix')) {
-                    $i18nPattern = $route->getOption('i18n_prefix').$i18nPattern;
+                    $i18nPattern = $route->getOption('i18n_prefix') . $i18nPattern;
                 }
             }
 

src/system/RoutesModule/Entity/Repository/Base/AbstractRouteRepository.php

Spacing +2 added lines, -2 removed lines

@@ -533,7 +533,7 @@ 
         $qb = $this->addCommonViewFilters($qb);
     
         $query = $this->getQueryFromBuilder($qb);
-        $offset = ($currentPage-1) * $resultsPerPage;
+        $offset = ($currentPage - 1) * $resultsPerPage;
     
         $query->setFirstResult($offset)
               ->setMaxResults($resultsPerPage);
@@ -632,7 +632,7 @@ 
                 if ((!is_numeric($v) && $v != '') || (is_numeric($v) && $v > 0)) {
                     if ($k == 'workflowState' && substr($v, 0, 1) == '!') {
                         $qb->andWhere('tbl.' . $k . ' != :' . $k)
-                           ->setParameter($k, substr($v, 1, strlen($v)-1));
+                           ->setParameter($k, substr($v, 1, strlen($v) - 1));
                     } elseif (substr($v, 0, 1) == '%') {
                         $qb->andWhere('tbl.' . $k . ' LIKE :' . $k)
                            ->setParameter($k, '%' . $v . '%');

Doc Comments +3 added lines, -4 removed lines

@@ -50,7 +50,7 @@ 
     /**
      * Retrieves an array with all fields which can be used for sorting instances.
      *
-     * @return array Sorting fields array
+     * @return string[] Sorting fields array
      */
     public function getAllowedSortingFields()
     {
@@ -103,7 +103,7 @@ 
     /**
      * Returns the request.
      *
-     * @return Request
+     * @return null|Request
      */
     public function getRequest()
     {
@@ -175,7 +175,6 @@ 
     /**
      * Returns an array of additional template variables which are specific to the object type treated by this repository.
      *
-     * @param ImageHelper $imageHelper ImageHelper service instance
      * @param string      $context     Usage context (allowed values: controllerAction, api, actionHandler, block, contentType)
      * @param array       $args        Additional arguments
      *
@@ -421,7 +420,7 @@ 
     /**
      * Selects an object from the database.
      *
-     * @param mixed   $id       The id (or array of ids) to use to retrieve the object (optional) (default=0)
+     * @param integer   $id       The id (or array of ids) to use to retrieve the object (optional) (default=0)
      * @param boolean $useJoins Whether to include joining related objects (optional) (default=true)
      * @param boolean $slimMode If activated only some basic fields are selected without using any joins (optional) (default=false)
      *

Indentation +24 added lines, -24 removed lines

@@ -279,9 +279,9 @@ 
     
         $qb = $this->getEntityManager()->createQueryBuilder();
         $qb->update('Zikula\RoutesModule\Entity\RouteEntity', 'tbl')
-           ->set('tbl.createdBy', $newUserId)
-           ->where('tbl.createdBy = :creator')
-           ->setParameter('creator', $userId);
+            ->set('tbl.createdBy', $newUserId)
+            ->where('tbl.createdBy = :creator')
+            ->setParameter('creator', $userId);
         $query = $qb->getQuery();
         $query->execute();
     
@@ -312,9 +312,9 @@ 
     
         $qb = $this->getEntityManager()->createQueryBuilder();
         $qb->update('Zikula\RoutesModule\Entity\RouteEntity', 'tbl')
-           ->set('tbl.updatedBy', $newUserId)
-           ->where('tbl.updatedBy = :editor')
-           ->setParameter('editor', $userId);
+            ->set('tbl.updatedBy', $newUserId)
+            ->where('tbl.updatedBy = :editor')
+            ->setParameter('editor', $userId);
         $query = $qb->getQuery();
         $query->execute();
     
@@ -343,8 +343,8 @@ 
     
         $qb = $this->getEntityManager()->createQueryBuilder();
         $qb->delete('Zikula\RoutesModule\Entity\RouteEntity', 'tbl')
-           ->where('tbl.createdBy = :creator')
-           ->setParameter('creator', $userId);
+            ->where('tbl.createdBy = :creator')
+            ->setParameter('creator', $userId);
         $query = $qb->getQuery();
     
         $query->execute();
@@ -374,8 +374,8 @@ 
     
         $qb = $this->getEntityManager()->createQueryBuilder();
         $qb->delete('Zikula\RoutesModule\Entity\RouteEntity', 'tbl')
-           ->where('tbl.updatedBy = :editor')
-           ->setParameter('editor', $userId);
+            ->where('tbl.updatedBy = :editor')
+            ->setParameter('editor', $userId);
         $query = $qb->getQuery();
     
         $query->execute();
@@ -471,7 +471,7 @@ 
     {
         if ($excludeId > 0) {
             $qb->andWhere('tbl.id != :excludeId')
-               ->setParameter('excludeId', $excludeId);
+                ->setParameter('excludeId', $excludeId);
         }
     
         return $qb;
@@ -533,7 +533,7 @@ 
         $offset = ($currentPage-1) * $resultsPerPage;
     
         $query->setFirstResult($offset)
-              ->setMaxResults($resultsPerPage);
+                ->setMaxResults($resultsPerPage);
     
         return $query;
     }
@@ -599,14 +599,14 @@ 
                 if ((!is_numeric($v) && $v != '') || (is_numeric($v) && $v > 0)) {
                     if ($k == 'workflowState' && substr($v, 0, 1) == '!') {
                         $qb->andWhere('tbl.' . $k . ' != :' . $k)
-                           ->setParameter($k, substr($v, 1, strlen($v)-1));
+                            ->setParameter($k, substr($v, 1, strlen($v)-1));
                     } elseif (substr($v, 0, 1) == '%') {
                         $qb->andWhere('tbl.' . $k . ' LIKE :' . $k)
-                           ->setParameter($k, '%' . $v . '%');
+                            ->setParameter($k, '%' . $v . '%');
                     } else {
                         $qb->andWhere('tbl.' . $k . ' = :' . $k)
-                           ->setParameter($k, $v);
-                   }
+                            ->setParameter($k, $v);
+                    }
                 }
             }
         }
@@ -703,7 +703,7 @@ 
         $parameters['searchGroup'] = '%' . $fragment . '%';
     
         $qb->andWhere('(' . implode(' OR ', $filters) . ')')
-           ->setParameters($parameters);
+            ->setParameters($parameters);
     
         return $qb;
     }
@@ -756,7 +756,7 @@ 
     
         $qb = $this->getEntityManager()->createQueryBuilder();
         $qb->select($selection)
-           ->from('Zikula\RoutesModule\Entity\RouteEntity', 'tbl');
+            ->from('Zikula\RoutesModule\Entity\RouteEntity', 'tbl');
     
         if (true === $useJoins) {
             $this->addJoinsToFrom($qb);
@@ -801,7 +801,7 @@ 
     {
         $qb = $this->getCountQuery('', false);
         $qb->andWhere('tbl.' . $fieldName . ' = :' . $fieldName)
-           ->setParameter($fieldName, $fieldValue);
+            ->setParameter($fieldName, $fieldValue);
     
         $qb = $this->addExclusion($qb, $excludeId);
     
@@ -847,7 +847,7 @@ 
     
         $qb = $this->getEntityManager()->createQueryBuilder();
         $qb->select($selection)
-           ->from('Zikula\RoutesModule\Entity\RouteEntity', 'tbl');
+            ->from('Zikula\RoutesModule\Entity\RouteEntity', 'tbl');
     
         if (true === $useJoins) {
             $this->addJoinsToFrom($qb);
@@ -921,7 +921,7 @@ 
             
             $userId = $this->getRequest()->getSession()->get('uid');
             $qb->andWhere('tbl.createdBy = :creator')
-               ->setParameter('creator', $userId);
+                ->setParameter('creator', $userId);
         }
     
         return $qb;
@@ -940,7 +940,7 @@ 
         if ($orderBy == 'RAND()') {
             // random selection
             $qb->addSelect('MOD(tbl.id, ' . mt_rand(2, 15) . ') AS HIDDEN randomIdentifiers')
-               ->add('orderBy', 'randomIdentifiers');
+                ->add('orderBy', 'randomIdentifiers');
             $orderBy = '';
         } elseif (empty($orderBy)) {
             $orderBy = $this->defaultSortingField;
@@ -953,12 +953,12 @@ 
             }
             if (false !== strpos($orderBy, 'tbl.createdBy')) {
                 $qb->addSelect('tblCreator')
-                   ->leftJoin('tbl.createdBy', 'tblCreator');
+                    ->leftJoin('tbl.createdBy', 'tblCreator');
                 $orderBy = str_replace('tbl.createdBy', 'tblCreator.uname', $orderBy);
             }
             if (false !== strpos($orderBy, 'tbl.updatedBy')) {
                 $qb->addSelect('tblUpdater')
-                   ->leftJoin('tbl.updatedBy', 'tblUpdater');
+                    ->leftJoin('tbl.updatedBy', 'tblUpdater');
                 $orderBy = str_replace('tbl.updatedBy', 'tblUpdater.uname', $orderBy);
             }
             $qb->add('orderBy', $orderBy);

src/system/RoutesModule/Helper/Base/AbstractControllerHelper.php

Spacing +3 added lines, -3 removed lines

@@ -145,7 +145,7 @@ 
             } else {
                 // single identifier
                 if (array_key_exists($idField, $routeParams)) {
-                    $id = (int) !empty($routeParams[$idField]) ? $routeParams[$idField] : $defaultValue;
+                    $id = (int)!empty($routeParams[$idField]) ? $routeParams[$idField] : $defaultValue;
                 } elseif ($request->query->has($idField)) {
                     $id = $request->query->getInt($idField, $defaultValue);
                 } else {
@@ -157,9 +157,9 @@ 
             if (!$id && $idField != 'id' && count($idFields) == 1) {
                 $defaultValue = isset($args['id']) && is_numeric($args['id']) ? $args['id'] : 0;
                 if (array_key_exists('id', $routeParams)) {
-                    $id = (int) !empty($routeParams['id']) ? $routeParams['id'] : $defaultValue;
+                    $id = (int)!empty($routeParams['id']) ? $routeParams['id'] : $defaultValue;
                 } elseif ($request->query->has('id')) {
-                    $id = (int) $request->query->getInt('id', $defaultValue);
+                    $id = (int)$request->query->getInt('id', $defaultValue);
                 } else {
                     $id = $defaultValue;
                 }

Doc Comments +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
      * @param string $context Usage context (allowed values: controllerAction, api, helper, actionHandler, block, contentType, util)
      * @param array  $args    Additional arguments
      *
-     * @return array List of allowed object types
+     * @return string[] List of allowed object types
      */
     public function getObjectTypes($context = '', $args = [])
     {

src/system/RoutesModule/Helper/Base/AbstractSelectionHelper.php

Indentation +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
         $slimMode = (bool) $slimMode; 
     
         if (!empty($idList)) {
-           return $repository->selectByIdList($idList, $useJoins, $slimMode);
+            return $repository->selectByIdList($idList, $useJoins, $slimMode);
         }
     
         return $repository->selectWhere($where, $orderBy, $useJoins, $slimMode);

Spacing +6 added lines, -6 removed lines

@@ -106,8 +106,8 @@ 
     
         $repository = $this->getRepository($objectType);
     
-        $useJoins = (bool) $useJoins;
-        $slimMode = (bool) $slimMode; 
+        $useJoins = (bool)$useJoins;
+        $slimMode = (bool)$slimMode; 
     
         $entity = $repository->selectById($id, $useJoins, $slimMode);
     
@@ -133,8 +133,8 @@ 
         }
         $repository = $this->getRepository($objectType);
     
-        $useJoins = (bool) $useJoins;
-        $slimMode = (bool) $slimMode; 
+        $useJoins = (bool)$useJoins;
+        $slimMode = (bool)$slimMode; 
     
         if (!empty($idList)) {
            return $repository->selectByIdList($idList, $useJoins, $slimMode);
@@ -163,8 +163,8 @@ 
         }
         $repository = $this->getRepository($objectType);
     
-        $useJoins = (bool) $useJoins;
-        $slimMode = (bool) $slimMode; 
+        $useJoins = (bool)$useJoins;
+        $slimMode = (bool)$slimMode; 
     
         return $repository->selectWherePaginated($where, $orderBy, $currentPage, $resultsPerPage, $useJoins, $slimMode);
     }

src/system/MenuModule/Block/Form/Type/MenuType.php

Spacing +2 added lines, -2 removed lines

@@ -39,10 +39,10 @@
         ;
         $builder->get('options')
             ->addModelTransformer(new CallbackTransformer(
-                function ($text) {
+                function($text) {
                     return $text;
                 },
-                function ($text) {
+                function($text) {
                     if (empty($text)) {
                         return '{}';
                     }

src/system/MenuModule/Controller/NodeController.php

Spacing +2 added lines, -2 removed lines

@@ -122,9 +122,9 @@
         $entityId = str_replace($this->domTreeNodePrefix, '', $node['id']);
         $menuItemEntity = $repo->find($entityId);
         $oldParent = $request->request->get('old_parent');
-        $oldPosition = (int) $request->request->get('old_position');
+        $oldPosition = (int)$request->request->get('old_position');
         $parent = $request->request->get('parent');
-        $position = (int) $request->request->get('position');
+        $position = (int)$request->request->get('position');
         if ($oldParent == $parent) {
             $diff = $oldPosition - $position; // if $diff is positive, then node moved up
             $methodName = $diff > 0 ? 'moveUp' : 'moveDown';

Braces +2 added lines, -1 removed lines

@@ -56,7 +56,8 @@
                         $parent = $repo->find($request->request->get('parent'));
                         $menuItemEntity->setParent($parent);
                         $menuItemEntity->setRoot($parent->getRoot());
-                    } elseif (empty($parent) && $request->request->has('after')) { // sibling of top-level child
+                    } elseif (empty($parent) && $request->request->has('after')) {
+// sibling of top-level child
                         $sibling = $repo->find($request->request->get('after'));
                         $menuItemEntity->setParent($sibling->getParent());
                         $menuItemEntity->setRoot($sibling->getRoot());

src/system/CategoriesModule/Entity/Repository/CategoryRepository.php

Indentation +2 added lines, -2 removed lines

@@ -36,12 +36,12 @@
 
         if ($parentId > 0) {
             $qb->andWhere('c.parent = :parentid')
-               ->setParameter('parentid', $parentId);
+                ->setParameter('parentid', $parentId);
         }
 
         if ($excludedId > 0) {
             $qb->andWhere('c.id != :id')
-               ->setParameter('id', $excludedId);
+                ->setParameter('id', $excludedId);
         }
 
         $query = $qb->getQuery();

src/system/CategoriesModule/Form/DataTransformer/CategoriesCollectionTransformer.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
         $class = $this->entityCategoryClass;
 
         foreach ($value as $regId => $categories) {
-            $regId = (int) substr($regId, strpos($regId, '_') + 1);
+            $regId = (int)substr($regId, strpos($regId, '_') + 1);
             $subCollection = new ArrayCollection();
             if (!is_array($categories) && $categories instanceof CategoryEntity) {
                 $categories = [$categories];