Completed
Pull Request — master (#3788)
by Craig
01:31
created
src/system/CategoriesModule/Form/Type/CategoryRegistryType.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
             ])
75 75
         ;
76 76
 
77
-        $formModifier = function (FormInterface $form, $modName = null) use ($options) {
77
+        $formModifier = function(FormInterface $form, $modName = null) use ($options) {
78 78
             $entities = null === $modName ? [] : $this->entitySelectionBuilder->buildFor($modName);
79 79
             $form->add('entityname', ChoiceType::class, [
80 80
                 'label' => $options['translator']->__('Entity'),
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 
86 86
         $builder->addEventListener(
87 87
             FormEvents::PRE_SET_DATA,
88
-            function (FormEvent $event) use ($formModifier) {
88
+            function(FormEvent $event) use ($formModifier) {
89 89
                 /** @var CategoryRegistryEntity $data */
90 90
                 $data = $event->getData();
91 91
                 $formModifier($event->getForm(), $data->getModname());
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 
95 95
         $builder->get('modname')->addEventListener(
96 96
             FormEvents::POST_SUBMIT,
97
-            function (FormEvent $event) use ($formModifier) {
97
+            function(FormEvent $event) use ($formModifier) {
98 98
                 $modName = $event->getForm()->getData();
99 99
                 $formModifier($event->getForm()->getParent(), $modName);
100 100
             }
Please login to merge, or discard this patch.
src/system/RoutesModule/Helper/Base/AbstractViewHelper.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -243,10 +243,10 @@
 block discarded – undo
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)) {
Please login to merge, or discard this patch.
src/system/ThemeModule/Entity/Repository/ThemeEntityRepository.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@
 block discarded – undo
91 91
         $result = $query->getResult();
92 92
         $themesArray = [];
93 93
         foreach ($result as $theme) {
94
-            $themesArray[$theme->getName()]= $theme->toArray();
94
+            $themesArray[$theme->getName()] = $theme->toArray();
95 95
             $kernel = $this->getKernel(); // allow to throw exception outside the try/catch block
96 96
             try {
97 97
                 $themeBundle = $kernel->getTheme($theme['name']);
Please login to merge, or discard this patch.
src/system/ExtensionsModule/Controller/ModuleController.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -278,7 +278,8 @@
 block discarded – undo
278 278
             throw new AccessDeniedException();
279 279
         }
280 280
         $extensionHelper = $this->get('zikula_extensions_module.extension_helper');
281
-        if (!$this->get('kernel')->isBundle($extension->getName()) && !$extensionHelper->isLegacyModuleType($extension)) { // @deprecated method call
281
+        if (!$this->get('kernel')->isBundle($extension->getName()) && !$extensionHelper->isLegacyModuleType($extension)) {
282
+// @deprecated method call
282 283
             $this->get('zikula_extensions_module.extension_state_helper')->updateState($extension->getId(), Constant::STATE_TRANSITIONAL);
283 284
             $this->get('zikula.cache_clearer')->clear('symfony');
284 285
 
Please login to merge, or discard this patch.
src/system/RoutesModule/Entity/Repository/RouteRepository.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,8 +41,8 @@
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
src/system/UsersModule/Entity/Repository/UserRepository.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,8 +44,8 @@
 block discarded – undo
44 44
         // the following process should be unnecessary because cascade = all but MySQL 5.7 not working with that (#3726)
45 45
         $qb = $this->_em->createQueryBuilder();
46 46
         $qb->delete('Zikula\UsersModule\Entity\UserAttributeEntity', 'a')
47
-           ->where('a.user = :userId')
48
-           ->setParameter('userId', $user->getUid());
47
+            ->where('a.user = :userId')
48
+            ->setParameter('userId', $user->getUid());
49 49
         $query = $qb->getQuery();
50 50
         $query->execute();
51 51
         // end of theoretically unrequired process
Please login to merge, or discard this patch.
src/system/BlocksModule/Controller/BlockController.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -114,7 +114,8 @@
 block discarded – undo
114 114
         }
115 115
 
116 116
         if ($form->isSubmitted() && $form->get('save')->isClicked() && $form->isValid()) {
117
-            if ($blockInstance instanceof \Zikula_Controller_AbstractBlock) { // @todo remove this BC at Core-2.0
117
+            if ($blockInstance instanceof \Zikula_Controller_AbstractBlock) {
118
+// @todo remove this BC at Core-2.0
118 119
                 if ($blockInstance->info()['form_content']) {
119 120
                     $content = $this->formContentModify($request);
120 121
                     $blockEntity->setContent($content);
Please login to merge, or discard this patch.
src/system/BlocksModule/Api/MenutreeApi.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -58,8 +58,8 @@  discard block
 block discarded – undo
58 58
         // Convert extrainfo into flags
59 59
         $extrainfo = ($extrainfo) ? preg_split("/[\s]*,[\s]*/", trim($extrainfo)) : [];
60 60
         $flag = [];
61
-        $flag['flat']     = in_array('flat', $extrainfo);  //now true or false
62
-        $flag['category'] = in_array('category', $extrainfo);  //now true or false
61
+        $flag['flat']     = in_array('flat', $extrainfo); //now true or false
62
+        $flag['category'] = in_array('category', $extrainfo); //now true or false
63 63
 
64 64
         // Make sure admin API is loaded
65 65
         if (!ModUtil::loadApi('ZikulaAdminModule', 'admin', true)) {
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
             if (SecurityUtil::checkPermission("$adminmodule[name]::", '::', ACCESS_EDIT)) {
140 140
                 $cid = ModUtil::apiFunc('ZikulaAdminModule', 'admin', 'getmodcategory',
141 141
                         ['mid' => ModUtil::getIdFromName($adminmodule['name'])]);
142
-                $cid = (isset($catinfo[$cid])) ? $cid : $default_cid;  // make sure each module is assigned a category
142
+                $cid = (isset($catinfo[$cid])) ? $cid : $default_cid; // make sure each module is assigned a category
143 143
 
144 144
                 if ($adminmodule['type'] == 2 || $adminmodule['type'] == 3) {
145 145
                     $menutexturl = isset($adminmodule['capabilities']['admin']['url'])
Please login to merge, or discard this patch.
src/system/BlocksModule/Api/UserApi.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
         // add select and from params
66 66
         $qb->select('b')
67
-           ->from('ZikulaBlocksModule:BlockEntity', 'b');
67
+            ->from('ZikulaBlocksModule:BlockEntity', 'b');
68 68
 
69 69
         // add clause for filtering blockposition
70 70
         if (isset($args['blockposition_id']) && is_numeric($args['blockposition_id']) && $args['blockposition_id']) {
@@ -149,9 +149,9 @@  discard block
 block discarded – undo
149 149
     public function countitems()
150 150
     {
151 151
         $query = $this->entityManager->createQueryBuilder()
152
-                                     ->select('count(b.bid)')
153
-                                     ->from('ZikulaBlocksModule:BlockEntity', 'b')
154
-                                     ->getQuery();
152
+                                        ->select('count(b.bid)')
153
+                                        ->from('ZikulaBlocksModule:BlockEntity', 'b')
154
+                                        ->getQuery();
155 155
 
156 156
         return (int)$query->getSingleScalarResult();
157 157
     }
Please login to merge, or discard this patch.