zikula / core

src/system/ExtensionsModule/Api/AdminApi.php

Indentation +30 added lines, -30 removed lines

@@ -160,7 +160,7 @@ 
 
         // add select and from params
         $qb->select('e')
-           ->from(self::EXTENSION_ENTITY, 'e');
+            ->from(self::EXTENSION_ENTITY, 'e');
 
         // filter by first letter of module
         if (isset($args['letter']) && !empty($args['letter'])) {
@@ -208,7 +208,7 @@ 
         $numitems = (!isset($args['numitems']) || empty($args['numitems']) || $args['numitems'] < 0) ? 0 : (int)$args['numitems'];
         if ($numitems > 0) {
             $qb->setFirstResult($startnum)
-               ->setMaxResults($numitems);
+                ->setMaxResults($numitems);
         }
 
         // convert querybuilder instance into a Query object
@@ -396,11 +396,11 @@ 
 
         // Delete any module variables that the module cleanup function might have missed
         $query = $this->entityManager->createQueryBuilder()
-                                     ->delete()
-                                     ->from('Zikula\ExtensionsModule\Entity\ExtensionVarEntity', 'v')
-                                     ->where('v.modname = :modname')
-                                     ->setParameter('modname', $modinfo['name'])
-                                     ->getQuery();
+                                        ->delete()
+                                        ->from('Zikula\ExtensionsModule\Entity\ExtensionVarEntity', 'v')
+                                        ->where('v.modname = :modname')
+                                        ->setParameter('modname', $modinfo['name'])
+                                        ->getQuery();
         $query->getResult();
 
         if (is_object($version)) {
@@ -421,11 +421,11 @@ 
             if ($canDelete == 1 || $modinfo['state'] == ModUtil::STATE_NOTALLOWED || $modinfo['state'] == ModUtil::STATE_MISSING || $modinfo['state'] == ModUtil::STATE_INVALID) {
                 // remove the entry from the modules table
                 $query = $this->entityManager->createQueryBuilder()
-                                             ->delete()
-                                             ->from(self::EXTENSION_ENTITY, 'e')
-                                             ->where('e.id = :id')
-                                             ->setParameter('id', $args['id'])
-                                             ->getQuery();
+                                                ->delete()
+                                                ->from(self::EXTENSION_ENTITY, 'e')
+                                                ->where('e.id = :id')
+                                                ->setParameter('id', $args['id'])
+                                                ->getQuery();
                 $query->getResult();
             } else {
                 //set state as uninitialised
@@ -434,11 +434,11 @@ 
         } else {
             // remove the entry from the modules table
             $query = $this->entityManager->createQueryBuilder()
-                                         ->delete()
-                                         ->from(self::EXTENSION_ENTITY, 'e')
-                                         ->where('e.id = :id')
-                                         ->setParameter('id', $args['id'])
-                                         ->getQuery();
+                                            ->delete()
+                                            ->from(self::EXTENSION_ENTITY, 'e')
+                                            ->where('e.id = :id')
+                                            ->setParameter('id', $args['id'])
+                                            ->getQuery();
             $query->getResult();
         }
 
@@ -748,22 +748,22 @@ 
                     if (isset($dbmodinfo['name']) && in_array($dbmodinfo['name'], (array)$modinfo['oldnames'])) {
                         // migrate its modvars
                         $query = $this->entityManager->createQueryBuilder()
-                             ->update('Zikula\ExtensionsModule\Entity\ExtensionVarEntity', 'v')
-                             ->set('v.modname', ':modname')
-                             ->setParameter('modname', $modinfo['name'])
-                             ->where('v.modname = :dbname')
-                             ->setParameter('dbname', $dbname)
-                             ->getQuery();
+                                ->update('Zikula\ExtensionsModule\Entity\ExtensionVarEntity', 'v')
+                                ->set('v.modname', ':modname')
+                                ->setParameter('modname', $modinfo['name'])
+                                ->where('v.modname = :dbname')
+                                ->setParameter('dbname', $dbname)
+                                ->getQuery();
                         $query->execute();
 
                         // rename the module register
                         $query = $this->entityManager->createQueryBuilder()
-                             ->update(self::EXTENSION_ENTITY, 'e')
-                             ->set('e.name', ':modname')
-                             ->setParameter('modname', $modinfo['name'])
-                             ->where('e.id = :dbname')
-                             ->setParameter('dbname', $dbmodules[$dbname]['id'])
-                             ->getQuery();
+                                ->update(self::EXTENSION_ENTITY, 'e')
+                                ->set('e.name', ':modname')
+                                ->setParameter('modname', $modinfo['name'])
+                                ->where('e.id = :dbname')
+                                ->setParameter('dbname', $dbmodules[$dbname]['id'])
+                                ->getQuery();
                         $query->execute();
 
                         // replace the old module with the new one in the dbmodules array
@@ -1194,7 +1194,7 @@ 
 
         // add select and from params
         $qb->select('COUNT(e.id)')
-           ->from(self::EXTENSION_ENTITY, 'e');
+            ->from(self::EXTENSION_ENTITY, 'e');
 
         // filter by first letter of module
         if (isset($args['letter']) && !empty($args['letter'])) {

Spacing +3 added lines, -3 removed lines

@@ -106,7 +106,7 @@ 
             throw new \InvalidArgumentException($this->__('Error! Module URL is a required field, please enter a unique name.'));
         }
 
-        $path = realpath($this->getContainer()->get('kernel')->getRootDir(). '/../' . DataUtil::formatForOS($args['url']));
+        $path = realpath($this->getContainer()->get('kernel')->getRootDir() . '/../' . DataUtil::formatForOS($args['url']));
         if (is_dir($path)) {
             throw new \InvalidArgumentException($this->__('You have attempted to select an invalid name (it is a subdirectory).'));
         }
@@ -524,7 +524,7 @@ 
             // Work out if admin-capable
             // @deprecated - author must declare in Core 2.0
             // e.g. "capabilities": {"admin": {"route": "zikulafoomodule_admin_index"} }
-            if (empty($moduleVersionArray['capabilities']['admin']) && file_exists($bundle->getPath().'/Controller/AdminController.php')) {
+            if (empty($moduleVersionArray['capabilities']['admin']) && file_exists($bundle->getPath() . '/Controller/AdminController.php')) {
                 $caps = $moduleVersionArray['capabilities'];
                 $caps['admin'] = ['url' => ModUtil::url($bundle->getName(), 'admin', 'index')];
                 $moduleVersionArray['capabilities'] = $caps;
@@ -533,7 +533,7 @@ 
             // Work out if user-capable
             // @deprecated - author must declare in Core 2.0
             // e.g. "capabilities": {"user": {"route": "zikulafoomodule_user_index"} }
-            if (empty($moduleVersionArray['capabilities']['user']) && file_exists($bundle->getPath().'/Controller/UserController.php')) {
+            if (empty($moduleVersionArray['capabilities']['user']) && file_exists($bundle->getPath() . '/Controller/UserController.php')) {
                 $caps = $moduleVersionArray['capabilities'];
                 $caps['user'] = ['url' => ModUtil::url($bundle->getName(), 'user', 'index')];
                 $moduleVersionArray['capabilities'] = $caps;

src/system/ExtensionsModule/Controller/AdminController.php

Indentation +5 added lines, -5 removed lines

@@ -286,11 +286,11 @@
         }
 
         $this->view->assign('plugins', $plugins)
-                   ->assign('module', $module)
-                   ->assign('sort', $sort)
-                   ->assign('state', $state)
-                   ->assign('systemplugins', $systemplugins)
-                   ->assign('_type', ($systemplugins) ? 'system' : 'module');
+                    ->assign('module', $module)
+                    ->assign('sort', $sort)
+                    ->assign('state', $state)
+                    ->assign('systemplugins', $systemplugins)
+                    ->assign('_type', ($systemplugins) ? 'system' : 'module');
 
         // Return the output that has been generated by this function
         return new Response($this->view->fetch('Admin/viewPlugins.tpl'));

Spacing +1 added lines, -1 removed lines

@@ -260,7 +260,7 @@
                 ];
             }
 
-            $info =  [
+            $info = [
                 'instance'    => $instance,
                 'status'      => $status,
                 'statusclass' => $statusclass,

src/system/SearchModule/Api/UserApi.php

Spacing +2 added lines, -2 removed lines

@@ -277,7 +277,7 @@ 
     public function getallplugins($args)
     {
         // defaults
-        $loadAll = isset($args['loadall']) ? (bool) $args['loadall'] : false;
+        $loadAll = isset($args['loadall']) ? (bool)$args['loadall'] : false;
 
         // initialize the search plugins array
         $search_modules = [];
@@ -382,7 +382,7 @@ 
 
         if (!empty($args['q'])) {
             $q = DataUtil::formatForStore($args['q']);
-            $q = str_replace('%', '\\%', $q);  // Don't allow user input % as wildcard
+            $q = str_replace('%', '\\%', $q); // Don't allow user input % as wildcard
             $where .= ' (';
             if ($args['searchtype'] !== 'EXACT') {
                 $searchwords = self::split_query($q);

src/system/SearchModule/Entity/Repository/SearchStatRepository.php

Indentation +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
             $i = 1;
             foreach ($filters as $w_key => $w_value) {
                 $qb->andWhere($qb->expr()->eq('tbl.' . $w_key, '?' . $i))
-                   ->setParameter($i, $w_value);
+                    ->setParameter($i, $w_value);
                 $i++;
             }
         }

src/system/ThemeModule/Api/AdminApi.php

Spacing +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
         }
 
         $themeinfo = ThemeUtil::getInfo(ThemeUtil::getIDFromName($args['themename']));
-        if (!file_exists('themes/' . DataUtil::formatForOS($themeinfo['directory']). '/' . $themeinfo['name'] . '.php')) {
+        if (!file_exists('themes/' . DataUtil::formatForOS($themeinfo['directory']) . '/' . $themeinfo['name'] . '.php')) {
             throw new \InvalidArgumentException(__('Invalid arguments array received'));
         }
 
@@ -228,7 +228,7 @@ 
 
         $ostemp  = CacheUtil::getLocalDir();
         $ostheme = DataUtil::formatForOS($themename);
-        $osfile  = $ostemp.'/Theme_Config/'.$ostheme.'/'.DataUtil::formatForOS($args['file']);
+        $osfile  = $ostemp . '/Theme_Config/' . $ostheme . '/' . DataUtil::formatForOS($args['file']);
 
         if (file_exists($osfile) && is_writable($osfile)) {
             unlink($osfile);

src/system/ThemeModule/Api/UserApi.php

Spacing +16 added lines, -16 removed lines

@@ -285,7 +285,7 @@ 
 
         $themename = $args['theme'];
         $theme = ThemeUtil::getTheme($themename);
-        $themeinfo   = ThemeUtil::getInfo(ThemeUtil::getIDFromName($themename));
+        $themeinfo = ThemeUtil::getInfo(ThemeUtil::getIDFromName($themename));
         if (isset($theme)) {
             $templatedir = $theme->getConfigPath();
         } else {
@@ -322,9 +322,9 @@ 
 
         $themeinfo = ThemeUtil::getInfo(ThemeUtil::getIDFromName($args['theme']));
         if ($theme = ThemeUtil::getTheme($themeinfo['name'])) {
-            $templatedir = $theme->getPath().'/Resources/views';
+            $templatedir = $theme->getPath() . '/Resources/views';
         } else {
-            $templatedir = 'themes/'.DataUtil::formatForOS($themeinfo['directory']).'/templates';
+            $templatedir = 'themes/' . DataUtil::formatForOS($themeinfo['directory']) . '/templates';
         }
 
         if ($args['type'] == 'modules') {
@@ -334,7 +334,7 @@ 
             $templatelist = [];
         }
 
-        $templatelist = array_merge($templatelist, FileUtil::getFiles($templatedir.'/'.$args['type'], false, $args['type'], ['.tpl', '.htm'], 'f'));
+        $templatelist = array_merge($templatelist, FileUtil::getFiles($templatedir . '/' . $args['type'], false, $args['type'], ['.tpl', '.htm'], 'f'));
 
         return $templatelist;
     }
@@ -374,12 +374,12 @@ 
         $ostheme  = DataUtil::formatForOS($themeinfo['directory']);
         $osfile   = DataUtil::formatForOS($args['file']);
 
-        if (file_exists($ostemp.'/Theme_Config/'.$ostheme.'/'.$osfile)) {
-            return parse_ini_file($ostemp.'/Theme_Config/'.$ostheme.'/'.$osfile, $args['sections']);
-        } elseif (file_exists('themes/'.$ostheme.'/templates/config/'.$osfile)) {
-            return parse_ini_file('themes/'.$ostheme.'/templates/config/'.$osfile, $args['sections']);
+        if (file_exists($ostemp . '/Theme_Config/' . $ostheme . '/' . $osfile)) {
+            return parse_ini_file($ostemp . '/Theme_Config/' . $ostheme . '/' . $osfile, $args['sections']);
+        } elseif (file_exists('themes/' . $ostheme . '/templates/config/' . $osfile)) {
+            return parse_ini_file('themes/' . $ostheme . '/templates/config/' . $osfile, $args['sections']);
         } elseif ($theme = ThemeUtil::getTheme($themeinfo['name'])) {
-            $file = $theme->getPath().'/Resources/config/'.$osfile;
+            $file = $theme->getPath() . '/Resources/config/' . $osfile;
             if (file_exists($file)) {
                 return parse_ini_file($file, $args['sections']);
             } else {
@@ -423,20 +423,20 @@ 
 
         // verify the writable paths
         if ($theme = ThemeUtil::getTheme($themeinfo['name'])) {
-            $tpath = $theme->getPath().'/Resources/config';
+            $tpath = $theme->getPath() . '/Resources/config';
         } else {
-            $tpath = 'themes/'.$ostheme.'/templates/config';
+            $tpath = 'themes/' . $ostheme . '/templates/config';
         }
 
-        if (is_writable($tpath.'/'.$osfile)) {
-            $handle = fopen($tpath.'/'.$osfile, 'w+');
+        if (is_writable($tpath . '/' . $osfile)) {
+            $handle = fopen($tpath . '/' . $osfile, 'w+');
         } else {
-            if (!file_exists($zpath = $ostemp.'/Theme_Config/'.$ostheme)) {
+            if (!file_exists($zpath = $ostemp . '/Theme_Config/' . $ostheme)) {
                 mkdir($zpath, $this->serviceManager['system.chmod_dir'], true);
             }
 
-            if (!file_exists($zpath.'/'.$osfile) || is_writable($zpath.'/'.$osfile)) {
-                $handle = fopen($zpath.'/'.$osfile, 'w+');
+            if (!file_exists($zpath . '/' . $osfile) || is_writable($zpath . '/' . $osfile)) {
+                $handle = fopen($zpath . '/' . $osfile, 'w+');
             } else {
                 throw new \RuntimeException($this->__f('Error! Cannot write in "%1$s" or "%2$s" to store the contents of "%3$s"', [$tpath, $zpath, $osfile]));
             }

src/system/ThemeModule/Block/ThemeswitcherBlock.php

Indentation +3 added lines, -3 removed lines

@@ -129,9 +129,9 @@
         }
 
         $this->view->assign($vars)
-                   ->assign('currentthemepic', $currentthemepic)
-                   ->assign('currenttheme', $currenttheme)
-                   ->assign('themes', $previewthemes);
+                    ->assign('currentthemepic', $currentthemepic)
+                    ->assign('currenttheme', $currenttheme)
+                    ->assign('themes', $previewthemes);
 
         $blockinfo['content'] = $this->view->fetch('Block/themeswitcher.tpl');
 

Spacing +2 added lines, -2 removed lines

@@ -115,9 +115,9 @@
         $currentthemepic = null;
         foreach ($themes as $themeinfo) {
             $themename = $themeinfo['name'];
-            if (file_exists($themepic = 'themes/'.DataUtil::formatForOS($themeinfo['directory']).'/images/preview_small.png')) {
+            if (file_exists($themepic = 'themes/' . DataUtil::formatForOS($themeinfo['directory']) . '/images/preview_small.png')) {
                 $themeinfo['previewImage'] = $themepic;
-            } elseif (file_exists($themepic = 'themes/'.DataUtil::formatForOS($themeinfo['directory']).'/Resources/public/images/preview_small.png')) {
+            } elseif (file_exists($themepic = 'themes/' . DataUtil::formatForOS($themeinfo['directory']) . '/Resources/public/images/preview_small.png')) {
                 $themeinfo['previewImage'] = $themepic;
             } else {
                 $themeinfo['previewImage'] = 'system/ThemeModule/Resources/public/images/preview_small.png';

src/system/ThemeModule/Block/RenderBlock.php

Indentation +2 added lines, -2 removed lines

@@ -195,8 +195,8 @@
 
         // generate the output
         return $this->view->assign($vars)
-                          ->assign('warnings', $warnings)
-                          ->fetch('Block/render_modify.tpl');
+                            ->assign('warnings', $warnings)
+                            ->fetch('Block/render_modify.tpl');
     }
 
     /**

src/system/ThemeModule/Engine/AssetFilter.php

Spacing +2 added lines, -2 removed lines

@@ -87,7 +87,7 @@ 
         $header .= ($this->scriptPosition == 'head') ? $this->jsResolver->compile() : '';
         $header .= trim(implode("\n", \PageUtil::getVar('header', [])) . "\n"); // @todo legacy - remove at Core-2.0
         if (strripos($source, '</head>')) {
-            $source = str_replace('</head>', $header."\n</head>", $source);
+            $source = str_replace('</head>', $header . "\n</head>", $source);
         }
 
         // compile and replace foot
@@ -95,7 +95,7 @@ 
         $footer .= trim(implode("\n", $this->footers->all()) . "\n");
         $footer .= trim(implode("\n", \PageUtil::getVar('footer', [])) . "\n"); // @todo legacy - remove at Core-2.0
         if (false === empty($footer)) {
-            $source = str_replace('</body>', $footer."\n</body>", $source);
+            $source = str_replace('</body>', $footer . "\n</body>", $source);
         }
 
         return $source;