zikula / core

src/themes/PrinterTheme/ZikulaPrinterTheme.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
     {
         $text = preg_replace_callback(
             '/<a [^>]*href\s*=\s*\"?([^>\"]*)\"?[^>]*>(.*?)<\/a.*?>/i',
-            function ($matches) {
+            function($matches) {
                 // @todo - work out why some links need decoding twice (&amp;amp;....)
                 $this->links[] = html_entity_decode(html_entity_decode($matches[1]));
                 // return the replaced link

src/config/config.php

Spacing +8 added lines, -8 removed lines

@@ -29,21 +29,21 @@ 
 // ----------------------------------------------------------------------
 // Logging Settings
 // ----------------------------------------------------------------------
-$ZConfig['Log']['log.apache_uname'] = 0;          // log username to apache logs: please see documentation.  Please check you country's local law covering the logging of personally identifiable user data before enabling.
+$ZConfig['Log']['log.apache_uname'] = 0; // log username to apache logs: please see documentation.  Please check you country's local law covering the logging of personally identifiable user data before enabling.
 
 // ----------------------------------------------------------------------
 // The following define some data layer settings
 // ----------------------------------------------------------------------
-$ZConfig['System']['Z_CONFIG_USE_OBJECT_ATTRIBUTION'] = 0;     // enable universal attribution layer, 0 to turn off
-$ZConfig['System']['Z_CONFIG_USE_OBJECT_CATEGORIZATION'] = 1;  // categorization/filtering services, 0 to turn off
-$ZConfig['System']['Z_CONFIG_USE_OBJECT_LOGGING'] = 0;         // object audit trail logging, 0 to turn off
-$ZConfig['System']['Z_CONFIG_USE_OBJECT_META'] = 0;            // meta-data services, 0 to turn off
+$ZConfig['System']['Z_CONFIG_USE_OBJECT_ATTRIBUTION'] = 0; // enable universal attribution layer, 0 to turn off
+$ZConfig['System']['Z_CONFIG_USE_OBJECT_CATEGORIZATION'] = 1; // categorization/filtering services, 0 to turn off
+$ZConfig['System']['Z_CONFIG_USE_OBJECT_LOGGING'] = 0; // object audit trail logging, 0 to turn off
+$ZConfig['System']['Z_CONFIG_USE_OBJECT_META'] = 0; // meta-data services, 0 to turn off
 
 // ----------------------------------------------------------------------
 // Database cache settings
 // ----------------------------------------------------------------------
-$ZConfig['System']['dbcache.enable'] = 1;             // 0 to disable, 1 to enable
-$ZConfig['System']['dbcache.type'] = 'Array';         // Memcache, Apc, Array, Db, Xcache (todo: Memcached, File)
+$ZConfig['System']['dbcache.enable'] = 1; // 0 to disable, 1 to enable
+$ZConfig['System']['dbcache.type'] = 'Array'; // Memcache, Apc, Array, Db, Xcache (todo: Memcached, File)
 
 // CACHE_SERVERS valid for Memcache/d only.
 // array of arrays: params according to the addServer methods at e.g.
@@ -58,5 +58,5 @@ 
 
 // For pure Doctrine Queries only. Effective only when dbcache.enable = true and dbcache.cache_result = 1
 // http://docs.doctrine-project.org/projects/doctrine1/en/latest/en/manual/caching.html#result-cache
-$ZConfig['System']['dbcache.cache_result'] = 0;      // 1 to enable or 0 to disable.
+$ZConfig['System']['dbcache.cache_result'] = 0; // 1 to enable or 0 to disable.
 $ZConfig['System']['dbcache.cache_result_ttl'] = 30; // seconds, 3600 = 1 hour.

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/DependencyInjection/ZikulaExtensionsExtension.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $loader = new YamlFileLoader($container, new FileLocator(realpath(__DIR__.'/../Resources/config')));
+        $loader = new YamlFileLoader($container, new FileLocator(realpath(__DIR__ . '/../Resources/config')));
 
         $loader->load('services.yml');
     }

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/ExtensionsModule/Helper/BundleSyncHelper.php

Spacing +2 added lines, -2 removed lines

@@ -181,14 +181,14 @@
             // Work out if admin-capable
             // @deprecated - author must declare in Core 2.0
             // e.g. "capabilities": {"admin": {"route": "zikulafoobundle_admin_index"} }
-            if (empty($bundleVersionArray['capabilities']['admin']) && file_exists($bundle->getPath().'/Controller/AdminController.php')) {
+            if (empty($bundleVersionArray['capabilities']['admin']) && file_exists($bundle->getPath() . '/Controller/AdminController.php')) {
                 $bundleVersionArray['capabilities']['admin'] = ['url' => \ModUtil::url($bundle->getName(), 'admin', 'index')];
             }
 
             // Work out if user-capable
             // @deprecated - author must declare in Core 2.0
             // e.g. "capabilities": {"user": {"route": "zikulafoobundle_user_index"} }
-            if (empty($bundleVersionArray['capabilities']['user']) && file_exists($bundle->getPath().'/Controller/UserController.php')) {
+            if (empty($bundleVersionArray['capabilities']['user']) && file_exists($bundle->getPath() . '/Controller/UserController.php')) {
                 $bundleVersionArray['capabilities']['user'] = ['url' => \ModUtil::url($bundle->getName(), 'user', 'index')];
             }
 

src/system/ExtensionsModule/Helper/ExtensionDependencyHelper.php

Spacing +1 added lines, -1 removed lines

@@ -145,7 +145,7 @@
      * @param ExtensionDependencyEntity $dependency
      * @return bool
      */
-    private function bundleDependencySatisfied(ExtensionDependencyEntity &$dependency)
+    private function bundleDependencySatisfied(ExtensionDependencyEntity & $dependency)
     {
         if ($dependency->getModname() == "php") {
             // Do not use PHP_VERSION constant, because it might throw off

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/SearchResultRepository.php

Indentation +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 
         if ($sessionId != '') {
             $qb->where('s.sesid = :sid')
-               ->setParameter('sid', $sessionId);
+                ->setParameter('sid', $sessionId);
         }
 
         $query = $qb->getQuery();
@@ -64,7 +64,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++;
             }
         }
@@ -104,7 +104,7 @@ 
 
         if ($sessionId != '') {
             $qb->orWhere('tbl.sesid = :sid')
-               ->setParameter('sid', $sessionId);
+                ->setParameter('sid', $sessionId);
         }
 
         $query = $qb->getQuery();