zikula / core

src/lib/legacy/util/DataUtil.php

Spacing +3 added lines, -3 removed lines

@@ -185,14 +185,14 @@
                 $var[$k] = self::formatForDisplay($v);
             }
         } else {
-            $var = htmlspecialchars((string) $var);
+            $var = htmlspecialchars((string)$var);
             // This search and replace finds the text 'x@y' and replaces
             // it with HTML entities, this provides protection against
             // email harvesters
             $var = preg_replace_callback(
                 '/(.)@(.)/s',
-                function ($m) {
-                    return "&#".sprintf("%03d", ord($m[1])).";@&#" .sprintf("%03d", ord($m[2])) . ";";
+                function($m) {
+                    return "&#" . sprintf("%03d", ord($m[1])) . ";@&#" . sprintf("%03d", ord($m[2])) . ";";
                 },
                 $var);
         }

src/lib/legacy/util/FileUtil.php

Spacing +2 added lines, -2 removed lines

@@ -527,7 +527,7 @@ 
 
         // create random filename if none is given or else format it appropriately
         if (!isset($filename)) {
-            $filename = 'csv_'.time().'.csv';
+            $filename = 'csv_' . time() . '.csv';
         } else {
             $filename = DataUtil::formatForOS($filename);
         }
@@ -537,7 +537,7 @@ 
         ini_set('zlib.output_compression', 0);
         header('Cache-Control: no-store, no-cache');
         header('Content-type: text/csv');
-        header('Content-Disposition: attachment; filename="'.$filename.'"');
+        header('Content-Disposition: attachment; filename="' . $filename . '"');
         header('Content-Transfer-Encoding: binary');
 
         // open a file for csv writing

Indentation +1 added lines, -1 removed lines

@@ -223,7 +223,7 @@
                         $files[$filenameToStore] = (array)self::getFiles($path, $recurse, $relativepath, $extensions, $type, $nestedData);
                     } else {
                         $files = array_merge((array)$files,
-                                              (array)self::getFiles($path, $recurse, $relativepath, $extensions, $type, $nestedData));
+                                                (array)self::getFiles($path, $recurse, $relativepath, $extensions, $type, $nestedData));
                     }
                 } elseif (!$extensions && !$regexpMatch) {
                     $files[] = $filenameToStore;

src/lib/legacy/util/BlockUtil.php

Spacing +26 added lines, -26 removed lines

@@ -72,14 +72,14 @@ 
                     foreach ($arguments as $argument) {
                         $args = explode('=', $argument);
                         if (!in_array($args[0], $filtervars)) {
-                            $customargs[] = DataUtil::formatForOS(strip_tags($args[0])).'='.DataUtil::formatForOS(
+                            $customargs[] = DataUtil::formatForOS(strip_tags($args[0])) . '=' . DataUtil::formatForOS(
                                     strip_tags($args[1])
                                 );
                         }
                     }
                 } else {
                     if (!in_array($var, $filtervars)) {
-                        $customargs[] = DataUtil::formatForOS(strip_tags($var)).'='.DataUtil::formatForOS(
+                        $customargs[] = DataUtil::formatForOS(strip_tags($var)) . '=' . DataUtil::formatForOS(
                                 strip_tags($value)
                             );
                     }
@@ -144,9 +144,9 @@ 
             $modinfo = ModUtil::getInfo($blockinfo['mid']);
             $blockOutput = self::show($modinfo['name'], $blockinfo['bkey'], $blockinfo, $blockplacement->getBlock());
             // wrap block if theme requires it.
-            $blockWrapper = (bool) Zikula_View_Theme::getInstance()->themeconfig['blockwrapper'];
+            $blockWrapper = (bool)Zikula_View_Theme::getInstance()->themeconfig['blockwrapper'];
             if ($blockWrapper) {
-                $blockOutput = '<div class="z-block '. 'z-blockposition-'.DataUtil::formatForDisplay($blockinfo['position']).' z-bkey-' . DataUtil::formatForDisplay(strtolower($blockinfo['bkey'])) . ' z-bid-' . DataUtil::formatForDisplay($blockinfo['bid']) . '">' . "\n" . $blockOutput . "</div>\n";
+                $blockOutput = '<div class="z-block ' . 'z-blockposition-' . DataUtil::formatForDisplay($blockinfo['position']) . ' z-bkey-' . DataUtil::formatForDisplay(strtolower($blockinfo['bkey'])) . ' z-bid-' . DataUtil::formatForDisplay($blockinfo['bid']) . '">' . "\n" . $blockOutput . "</div>\n";
             }
             if ($echo) {
                 echo $blockOutput;
@@ -190,7 +190,7 @@ 
             $instanceArgs = $blockinfo;
         }
         if (is_callable($displayfunc)) {
-            $content =  call_user_func($displayfunc, $instanceArgs);
+            $content = call_user_func($displayfunc, $instanceArgs);
         }
         if ($blockInstance instanceof BlockHandlerInterface) {
             // FC blocks require wrapping the content in the theme
@@ -228,19 +228,19 @@ 
             }
             // check for collapsable menus being enabled, and setup the collapsable menu image.
             if (!isset($upb)) {
-                if (file_exists('themes/'.$themedir.'/images/upb.png')) {
-                    $upb = '<img src="themes/'.$themedir.'/images/upb.png" alt="-" />';
-                } elseif (file_exists('themes/'.$themedir.'/images/14_layer_raiselayer.png')) {
-                    $upb = '<img src="themes/'.$themedir.'/images/14_layer_raiselayer.png" alt="-" />';
+                if (file_exists('themes/' . $themedir . '/images/upb.png')) {
+                    $upb = '<img src="themes/' . $themedir . '/images/upb.png" alt="-" />';
+                } elseif (file_exists('themes/' . $themedir . '/images/14_layer_raiselayer.png')) {
+                    $upb = '<img src="themes/' . $themedir . '/images/14_layer_raiselayer.png" alt="-" />';
                 } else {
                     $upb = '<img src="images/icons/extrasmall/14_layer_raiselayer.png" alt="-" />';
                 }
             }
             if (!isset($downb)) {
-                if (file_exists('themes/'.$themedir.'/images/downb.png')) {
-                    $downb = '<img src="themes/'.$themedir.'/images/downb.png" alt="+" />';
-                } elseif (file_exists('themes/'.$themedir.'/images/14_layer_lowerlayer.png')) {
-                    $downb = '<img src="themes/'.$themedir.'/images/14_layer_lowerlayer.png" alt="+" />';
+                if (file_exists('themes/' . $themedir . '/images/downb.png')) {
+                    $downb = '<img src="themes/' . $themedir . '/images/downb.png" alt="+" />';
+                } elseif (file_exists('themes/' . $themedir . '/images/14_layer_lowerlayer.png')) {
+                    $downb = '<img src="themes/' . $themedir . '/images/14_layer_lowerlayer.png" alt="+" />';
                 } else {
                     $downb = '<img src="images/icons/extrasmall/14_layer_lowerlayer.png" alt="+" />';
                 }
@@ -248,16 +248,16 @@ 
             $checkUserBlock = self::checkUserBlock($blockinfo);
             if ($checkUserBlock) {
                 if (!empty($blockinfo['title'])) {
-                    $blockinfo['minbox'] = '<a href="'.DataUtil::formatForDisplay(
+                    $blockinfo['minbox'] = '<a href="' . DataUtil::formatForDisplay(
                             ModUtil::url('ZikulaBlocksModule', 'user', 'changestatus', ['bid' => $blockinfo['bid']])
-                        ).'">'.$upb.'</a>';
+                        ) . '">' . $upb . '</a>';
                 }
             } else {
                 $blockinfo['content'] = '';
                 if (!empty($blockinfo['title'])) {
-                    $blockinfo['minbox'] = '<a href="'.DataUtil::formatForDisplay(
+                    $blockinfo['minbox'] = '<a href="' . DataUtil::formatForDisplay(
                             ModUtil::url('ZikulaBlocksModule', 'user', 'changestatus', ['bid' => $blockinfo['bid']])
-                        ).'">'.$downb.'</a>';
+                        ) . '">' . $downb . '</a>';
                 }
             }
             // end collapseable menu config
@@ -291,7 +291,7 @@ 
         if ($modinfo['state'] != \ModUtil::STATE_ACTIVE) {
             return false;
         }
-        $serviceId = strtolower('block.'.$modinfo['name'].'_'.'Block_'.$block);
+        $serviceId = strtolower('block.' . $modinfo['name'] . '_' . 'Block_' . $block);
         if ($sm->has($serviceId)) {
             return $sm->get($serviceId);
         }
@@ -301,7 +301,7 @@ 
         $basedir = ($modinfo['type'] == ModUtil::TYPE_SYSTEM) ? 'system' : 'modules';
         $moddir = DataUtil::formatForOS($modinfo['directory']);
         $blockdir = "$basedir/$moddir/lib/$moddir/Block";
-        $ooblock = "$blockdir/".ucwords($block).'.php';
+        $ooblock = "$blockdir/" . ucwords($block) . '.php';
         ModUtil::load($modname);
         // get the block info
         $kernel = $sm->get('kernel');
@@ -309,14 +309,14 @@ 
         try {
             /** @var $module \Zikula\Core\AbstractModule */
             $module = $kernel->getModule($modinfo['name']);
-            $className = $module->getNamespace().'\\Block\\'.ucwords($block);
-            $className = preg_match('/.*Block$/', $className) ? $className : $className.'Block';
+            $className = $module->getNamespace() . '\\Block\\' . ucwords($block);
+            $className = preg_match('/.*Block$/', $className) ? $className : $className . 'Block';
         } catch (\InvalidArgumentException $e) {
         }
         if (!isset($className)) {
-            $className = ucwords($modinfo['name']).'\\'.'Block\\'.ucwords($block);
-            $className = preg_match('/.*Block$/', $className) ? $className : $className.'Block';
-            $classNameOld = ucwords($modinfo['name']).'_'.'Block_'.ucwords($block);
+            $className = ucwords($modinfo['name']) . '\\' . 'Block\\' . ucwords($block);
+            $className = preg_match('/.*Block$/', $className) ? $className : $className . 'Block';
+            $classNameOld = ucwords($modinfo['name']) . '_' . 'Block_' . ucwords($block);
             $className = class_exists($className) ? $className : $classNameOld;
         }
         $blockInstance = \ServiceUtil::get('zikula_blocks_module.api.block_factory')->getInstance($className, $module);
@@ -405,14 +405,14 @@ 
             $item = $entityManager->getRepository('ZikulaBlocksModule:UserBlockEntity')->findOneBy(['uid' => $uid, 'bid' => $blockinfo['bid']]);
             if (!$item) {
                 $item = new \Zikula\BlocksModule\Entity\UserBlockEntity();
-                $item['uid'] = (int) $uid;
+                $item['uid'] = (int)$uid;
                 $item['bid'] = $blockinfo['bid'];
                 $item['active'] = $blockinfo['defaultstate'];
                 $entityManager->persist($item);
                 $entityManager->flush();
             }
 
-            return (bool) $item['active'];
+            return (bool)$item['active'];
         }
 
         return false;

src/lib/legacy/util/EventUtil.php

Spacing +1 added lines, -1 removed lines

@@ -336,7 +336,7 @@
                             if (is_callable($handler['callable'])) {
                                 self::attach($handler['eventname'], $handler['callable'], $handler['weight']);
                             } else {
-                                LogUtil::log(sprintf("Event handler was not attached for event '%s' because method '%s' is not callable", $handler['eventname'], $handler['callable'][0].'::'.$handler['callable'][1]), \Monolog\Logger::ERROR);
+                                LogUtil::log(sprintf("Event handler was not attached for event '%s' because method '%s' is not callable", $handler['eventname'], $handler['callable'][0] . '::' . $handler['callable'][1]), \Monolog\Logger::ERROR);
                             }
                         }
                     } catch (InvalidArgumentException $e) {

src/lib/legacy/util/StringUtil.php

Spacing +2 added lines, -2 removed lines

@@ -182,14 +182,14 @@
             }
 
             // Get context on the left
-            $startPos = (int) max(0, $startPos - floor($contextSize / 2));
+            $startPos = (int)max(0, $startPos - floor($contextSize / 2));
             // Get the first word of section in full length
             while ($startPos > 0 && $text[$startPos] != ' ') {
                 --$startPos;
             }
 
             // Get context on the right
-            $endPos = (int) min($textLen, $startPos + $contextSize);
+            $endPos = (int)min($textLen, $startPos + $contextSize);
             // Get the last word of section in full length
             while ($endPos < (mb_strlen($text)) && $text[$endPos] != ' ') {
                 ++$endPos;

src/lib/legacy/util/ThemeUtil.php

Indentation +4 added lines, -4 removed lines

@@ -104,16 +104,16 @@
             /** @var $entityManager Doctrine\ORM\EntityManager */
             $entityManager = ServiceUtil::get('doctrine.orm.default_entity_manager');
             $qb = $entityManager->createQueryBuilder()
-                     ->select('t')
-                     ->from('ZikulaThemeModule:ThemeEntity', 't');
+                        ->select('t')
+                        ->from('ZikulaThemeModule:ThemeEntity', 't');
 
             if ($state != self::STATE_ALL) {
                 $qb->andWhere('t.state = :state')
-                   ->setParameter('state', $state);
+                    ->setParameter('state', $state);
             }
             if ($type != self::TYPE_ALL) {
                 $qb->andWhere('t.type = :type')
-                   ->setParameter('type', $type);
+                    ->setParameter('type', $type);
             }
             switch ($filter) {
                 case self::FILTER_USER:

Spacing +2 added lines, -2 removed lines

@@ -298,7 +298,7 @@ 
             $bundleRelativePath = str_replace('\\', '/', $bundleRelativePath);
         }
         $paths[] = null === $theme ?
-            "themes/$themeName/style/$osmodname" : $bundleRelativePath.'/Resources/css/'.$theme->getName();
+            "themes/$themeName/style/$osmodname" : $bundleRelativePath . '/Resources/css/' . $theme->getName();
 
         // module directory
         $modinfo = ModUtil::getInfoFromName($modname);
@@ -308,7 +308,7 @@ 
             $dir = ModUtil::getModuleBaseDir($modname);
             $bundleRelativePath = substr($module->getPath(), strpos($module->getPath(), $dir), strlen($module->getPath()));
             $bundleRelativePath = str_replace('\\', '/', $bundleRelativePath);
-            $paths[] = $bundleRelativePath."/Resources/public/css";
+            $paths[] = $bundleRelativePath . "/Resources/public/css";
         }
         $paths[] = "modules/$osmoddir/style";
         $paths[] = "system/$osmoddir/style";

src/lib/legacy/util/HtmlUtil.php

Spacing +2 added lines, -2 removed lines

@@ -108,8 +108,8 @@
         $multiple = $multipleSize > 1 ? 'multiple="multiple"' : '';
         $multipleSize = $multipleSize > 1 ? "size=\"$multipleSize\"" : '';
         $submit = $submit ? 'onchange="this.form.submit();"' : '';
-        $required = ($required) ? 'required="required" oninvalid="this.setCustomValidity(\''.__('Please select an item in the list.').'\');" onchange="this.setCustomValidity(\'\');" onblur="this.checkValidity();"' : '';
-        $title = (is_null($title)) ? '' : 'title="'.$title.'" x-moz-errormessage="'.$title.'"';
+        $required = ($required) ? 'required="required" oninvalid="this.setCustomValidity(\'' . __('Please select an item in the list.') . '\');" onchange="this.setCustomValidity(\'\');" onblur="this.checkValidity();"' : '';
+        $title = (is_null($title)) ? '' : 'title="' . $title . '" x-moz-errormessage="' . $title . '"';
 
         $html = "<select name=\"$name\" id=\"$id\" class=\"$class\" $multipleSize $multiple $submit $disabled $required $title>";
 

src/lib/legacy/util/Loader.php

Spacing +1 added lines, -1 removed lines

@@ -184,7 +184,7 @@
             throw new \Exception(__f("Error! Invalid 'base_obj_type' specification '%s'.", $base_obj_type));
         }
 
-        $prefix = (string) $prefix;
+        $prefix = (string)$prefix;
 
         if (strpos($base_obj_type, '_') !== false) {
             $c = $base_obj_type;

src/lib/legacy/dbobject/DBObjectArray.php

Spacing +1 added lines, -1 removed lines

@@ -894,7 +894,7 @@
             throw new \Exception(__f("Non-existing field [%s] received", $column));
         }
 
-        $where  = '';
+        $where = '';
         if ($filter) {
             $filter = $this->cleanFilter($filter);
             $where  = DBUtil::_checkWhereClause($this->genFilter($filter));

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -905,7 +905,7 @@
             }
         }
         $val = DBUtil::_typesafeQuotedID($this->_objType, $column, $value);
-        $sql = "UPDATE $tab SET $col = $val $where";
+        $sql = "update $tab SET $col = $val $where";
         $res = DBUtil::executeSQL($sql);
 
         return $res;