evolution-cms / evolution

core/src/Core.php

Doc Comments +24 added lines, -21 removed lines

@@ -132,7 +132,6 @@ 
     public $urlProcessor;
 
     /**
-     * @param array $services
      */
     public function __construct()
     {
@@ -317,7 +316,7 @@ 
      * @param int $count_attempts
      * @param string $type $type
      * @param string $responseCode
-     * @return bool|null
+     * @return false|null
      * @global string $base_url
      * @global string $site_url
      */
@@ -804,7 +803,7 @@ 
     }
 
     /**
-     * @param $contents
+     * @param string $contents
      * @return mixed
      */
     public function RecoveryEscapedTags($contents)
@@ -1652,7 +1651,7 @@ 
 
     /**
      * Remove Comment-Tags from output like <!--@- Comment -@-->
-     * @param $content
+     * @param string $content
      * @param string $left
      * @param string $right
      * @return mixed
@@ -1853,7 +1852,7 @@ 
     /**
      * Run snippets as per the tags in $documentSource and replace the tags with the returned values.
      *
-     * @param $content
+     * @param string $content
      * @return string
      * @internal param string $documentSource
      */
@@ -2298,6 +2297,7 @@ 
 
     /**
      * @deprecated use UrlProcessor::rewriteUrls()
+     * @return string
      */
     public function rewriteUrls($documentSource)
     {
@@ -2761,7 +2761,7 @@ 
 
     /**
      * @param $templateID
-     * @return mixed
+     * @return string
      */
     public function _getTemplateCodeFromDB($templateID)
     {
@@ -2809,7 +2809,7 @@ 
     /**
      * @param $id
      * @param int $top
-     * @return mixed
+     * @return string
      */
     public function getUltimateParentId($id, $top = 0)
     {
@@ -3206,7 +3206,7 @@ 
      *
      * @param int $type Types: 1=template, 2=tv, 3=chunk, 4=snippet, 5=plugin, 6=module, 7=resource, 8=role
      * @param int $id Element- / Resource-id
-     * @return bool
+     * @return false|null
      */
     public function lockElement($type, $id)
     {
@@ -3229,7 +3229,7 @@ 
      * @param int $type Types: 1=template, 2=tv, 3=chunk, 4=snippet, 5=plugin, 6=module, 7=resource, 8=role
      * @param int $id Element- / Resource-id
      * @param bool $includeAllUsers true = Deletes not only own user-locks
-     * @return bool
+     * @return false|null
      */
     public function unlockElement($type, $id, $includeAllUsers = false)
     {
@@ -3784,7 +3784,7 @@ 
      *                     Default: 1
      * @param string $fields List of fields
      *                       Default: id, pagetitle, description, alias
-     * @return boolean|array
+     * @return string
      */
     public function getPageInfo($pageid = -1, $active = 1, $fields = 'id, pagetitle, description, alias')
     {
@@ -3883,7 +3883,7 @@ 
      *
      * @param string $type
      * @param bool $report
-     * @return bool
+     * @return boolean|null
      */
     public function clearCache($type = '', $report = false)
     {
@@ -3926,6 +3926,7 @@ 
 
     /**
      * @deprecated use UrlProcessor::makeUrl()
+     * @return string
      */
     public function makeUrl($id, $alias = '', $args = '', $scheme = '')
     {
@@ -4020,7 +4021,7 @@ 
     }
 
     /**
-     * @param string|object $processor
+     * @param string $processor
      * @return bool
      */
     public function isChunkProcessor($processor)
@@ -4446,9 +4447,9 @@ 
      * Elements representing a TV consist of an array representing a db row including the fields specified in $fields.
      *
      * @param string|array $idnames {array; '*'} - Which TVs to fetch. Can relate to the TV ids in the db (array elements should be numeric only) or the TV names (array elements should be names only). @required
-     * @param string|array $fields {comma separated string; '*'} - Fields names in the TV table of MODx database. Default: '*'
+     * @param string $fields {comma separated string; '*'} - Fields names in the TV table of MODx database. Default: '*'
      * @param int|string $docid {integer; ''} - Id of a document to get. Default: an empty string which indicates the current document.
-     * @param int|string $published {0; 1; 'all'} - Document publication status. Once the parameter equals 'all', the result will be returned regardless of whether the ducuments are published or they are not. Default: 1.
+     * @param integer $published {0; 1; 'all'} - Document publication status. Once the parameter equals 'all', the result will be returned regardless of whether the ducuments are published or they are not. Default: 1.
      * @param string $sort {comma separated string} - Fields of the TV table to sort by. Default: 'rank'.
      * @param string $dir {'ASC'; 'DESC'} - How to sort the result array (direction). Default: 'ASC'.
      *
@@ -5098,7 +5099,7 @@ 
      * Remove event listener - only for use within the current execution cycle
      *
      * @param string $evtName
-     * @return boolean
+     * @return false|null
      */
     public function removeEventListener($evtName)
     {
@@ -5150,7 +5151,7 @@ 
      *
      * @param string $evtName
      * @param array $extParams Parameters available to plugins. Each array key will be the PHP variable name, and the array value will be the variable value.
-     * @return boolean|array
+     * @return false|null
      */
     public function invokeEvent($evtName, $extParams = array())
     {
@@ -5463,6 +5464,7 @@ 
 
     /**
      * {@inheritdoc}
+     * @param string $type
      */
     public function findElements($type, $scanPath, array $ext)
     {
@@ -5604,7 +5606,7 @@ 
 
     /**
      * @param string $str
-     * @return bool|mixed|string
+     * @return string
      */
     public function atBindFileContent($str = '')
     {
@@ -5655,8 +5657,8 @@ 
     }
 
     /**
-     * @param $str
-     * @return bool|string
+     * @param string $str
+     * @return false|string
      */
     public function getExtFromFilename($str)
     {
@@ -5812,7 +5814,7 @@ 
      * @param string $text Error message
      * @param string $file File where the error was detected
      * @param string $line Line number within $file
-     * @return boolean
+     * @return boolean|null
      * @deprecated
      */
     public function phpError($nr, $text, $file, $line)
@@ -5908,6 +5910,7 @@ 
 
     /**
      * @deprecated use UrlProcessor::getIdFromAlias()
+     * @param string $alias
      */
     public function getIdFromAlias($alias)
     {
@@ -5916,7 +5919,7 @@ 
 
     /**
      * @param string $str
-     * @return bool|mixed|string
+     * @return string
      */
     public function atBindInclude($str = '')
     {

Spacing +210 added lines, -211 removed lines

@@ -196,7 +196,7 @@ 
         if ($this->hasEvolutionProperty($name)) {
             if ($this->getConfig('error_reporting', 0) > 1) {
                 trigger_error(
-                    'Property $' . $name . ' is deprecated and should no longer be used. ',
+                    'Property $'.$name.' is deprecated and should no longer be used. ',
                     E_USER_DEPRECATED
                 );
             }
@@ -232,12 +232,12 @@ 
             $info = debug_backtrace();
             $m[] = $msg;
             if (!empty($this->currentSnippet)) {
-                $m[] = 'Snippet - ' . $this->currentSnippet;
+                $m[] = 'Snippet - '.$this->currentSnippet;
             } elseif (!empty($this->event->activePlugin)) {
-                $m[] = 'Plugin - ' . $this->event->activePlugin;
+                $m[] = 'Plugin - '.$this->event->activePlugin;
             }
             $m[] = $this->decoded_request_uri;
-            $m[] = str_replace('\\', '/', $info[0]['file']) . '(line:' . $info[0]['line'] . ')';
+            $m[] = str_replace('\\', '/', $info[0]['file']).'(line:'.$info[0]['line'].')';
             $msg = implode('<br />', $m);
             $this->logEvent(0, $error_type, $msg, $title);
         }
@@ -254,7 +254,7 @@ 
     {
         $flag = false;
         if (is_scalar($connector) && !empty($connector) && isset($this->{$connector}) && $this->{$connector} instanceof Interfaces\DatabaseInterface) {
-            $flag = (bool)$this->{$connector}->conn;
+            $flag = (bool) $this->{$connector}->conn;
         }
 
         return $flag;
@@ -288,7 +288,7 @@ 
         }
         if (!$out && $flag) {
             $extname = trim(str_replace(array('..', '/', '\\'), '', strtolower($extname)));
-            $filename = MODX_MANAGER_PATH . "includes/extenders/ex_{$extname}.inc.php";
+            $filename = MODX_MANAGER_PATH."includes/extenders/ex_{$extname}.inc.php";
             $out = is_file($filename) ? include $filename : false;
         }
         if ($out && !in_array($extname, $this->extensions)) {
@@ -307,7 +307,7 @@ 
     {
         list ($usec, $sec) = explode(' ', microtime());
 
-        return ((float)$usec + (float)$sec);
+        return ((float) $usec + (float) $sec);
     }
 
     /**
@@ -332,8 +332,8 @@ 
             $currentNumberOfRedirects = isset ($_REQUEST['err']) ? $_REQUEST['err'] : 0;
             if ($currentNumberOfRedirects > 3) {
                 $this->getService('ExceptionHandler')->messageQuit(
-                    'Redirection attempt failed - please ensure the document you\'re trying to redirect to exists.' .
-                    '<p>Redirection URL: <i>' . $url . '</i></p>'
+                    'Redirection attempt failed - please ensure the document you\'re trying to redirect to exists.'.
+                    '<p>Redirection URL: <i>'.$url.'</i></p>'
                 );
             } else {
                 $currentNumberOfRedirects += 1;
@@ -345,19 +345,19 @@ 
             }
         }
         if ($type == 'REDIRECT_REFRESH') {
-            $header = 'Refresh: 0;URL=' . $url;
+            $header = 'Refresh: 0;URL='.$url;
         } elseif ($type == 'REDIRECT_META') {
-            $header = '<META HTTP-EQUIV="Refresh" CONTENT="0; URL=' . $url . '" />';
+            $header = '<META HTTP-EQUIV="Refresh" CONTENT="0; URL='.$url.'" />';
             echo $header;
             exit;
         } elseif ($type == 'REDIRECT_HEADER' || empty ($type)) {
             // check if url has /$base_url
             if (substr($url, 0, strlen(MODX_BASE_URL)) == MODX_BASE_URL) {
                 // append $site_url to make it work with Location:
-                $url = MODX_SITE_URL . substr($url, strlen(MODX_BASE_URL));
+                $url = MODX_SITE_URL.substr($url, strlen(MODX_BASE_URL));
             }
             if (strpos($url, "\n") === false) {
-                $header = 'Location: ' . $url;
+                $header = 'Location: '.$url;
             } else {
                 $this->getService('ExceptionHandler')->messageQuit('No newline allowed in redirect url.');
             }
@@ -548,7 +548,7 @@ 
                 // Sort GET parameters so that the order of parameters on the HTTP request don't affect the generated cache ID.
                 $params = $_GET;
                 ksort($params);
-                $hash .= '_' . md5(http_build_query($params));
+                $hash .= '_'.md5(http_build_query($params));
             }
         }
         $evtOut = $this->invokeEvent("OnMakePageCacheKey", array("hash" => $hash, "id" => $id, 'params' => $params));
@@ -703,12 +703,12 @@ 
         if ($js = $this->getRegisteredClientStartupScripts()) {
             // change to just before closing </head>
             // $this->documentContent = preg_replace("/(<head[^>]*>)/i", "\\1\n".$js, $this->documentContent);
-            $this->documentOutput = preg_replace("/(<\/head>)/i", $js . "\n\\1", $this->documentOutput);
+            $this->documentOutput = preg_replace("/(<\/head>)/i", $js."\n\\1", $this->documentOutput);
         }
 
         // Insert jscripts & html block into template - template must have a </body> tag
         if ($js = $this->getRegisteredClientScripts()) {
-            $this->documentOutput = preg_replace("/(<\/body>)/i", $js . "\n\\1", $this->documentOutput);
+            $this->documentOutput = preg_replace("/(<\/body>)/i", $js."\n\\1", $this->documentOutput);
         }
         // End fix by sirlancelot
 
@@ -719,7 +719,7 @@ 
         // send out content-type and content-disposition headers
         if (IN_PARSER_MODE == "true") {
             $type = !empty ($this->contentTypes[$this->documentIdentifier]) ? $this->contentTypes[$this->documentIdentifier] : "text/html";
-            header('Content-Type: ' . $type . '; charset=' . $this->getConfig('modx_charset'));
+            header('Content-Type: '.$type.'; charset='.$this->getConfig('modx_charset'));
             //            if (($this->documentIdentifier == $this->config['error_page']) || $redirect_error)
             //                header('HTTP/1.0 404 Not Found');
             if (!$this->checkPreview() && $this->documentObject['content_dispo'] == 1) {
@@ -737,7 +737,7 @@ 
                     $name = preg_replace('|-+|', '-', $name);
                     $name = trim($name, '-');
                 }
-                $header = 'Content-Disposition: attachment; filename=' . $name;
+                $header = 'Content-Disposition: attachment; filename='.$name;
                 header($header);
             }
         }
@@ -745,7 +745,7 @@ 
 
         $stats = $this->getTimerStats($this->tstart);
 
-        $out =& $this->documentOutput;
+        $out = & $this->documentOutput;
         $out = str_replace("[^q^]", $stats['queries'], $out);
         $out = str_replace("[^qt^]", $stats['queryTime'], $out);
         $out = str_replace("[^p^]", $stats['phpTime'], $out);
@@ -784,19 +784,19 @@ 
                 $sc .= sprintf("%s. %s (%s)<br>", $s, $sname, sprintf("%2.2f ms", $t)); // currentSnippet
                 $tt += $t;
             }
-            echo "<fieldset><legend><b>Snippets</b> (" . count($this->snippetsTime) . " / " . sprintf("%2.2f ms",
-                    $tt) . ")</legend>{$sc}</fieldset><br />";
+            echo "<fieldset><legend><b>Snippets</b> (".count($this->snippetsTime)." / ".sprintf("%2.2f ms",
+                    $tt).")</legend>{$sc}</fieldset><br />";
             echo $this->snippetsCode;
         }
         if ($this->dumpPlugins) {
             $ps = "";
             $tt = 0;
             foreach ($this->pluginsTime as $s => $t) {
-                $ps .= "$s (" . sprintf("%2.2f ms", $t * 1000) . ")<br>";
+                $ps .= "$s (".sprintf("%2.2f ms", $t * 1000).")<br>";
                 $tt += $t;
             }
-            echo "<fieldset><legend><b>Plugins</b> (" . count($this->pluginsTime) . " / " . sprintf("%2.2f ms",
-                    $tt * 1000) . ")</legend>{$ps}</fieldset><br />";
+            echo "<fieldset><legend><b>Plugins</b> (".count($this->pluginsTime)." / ".sprintf("%2.2f ms",
+                    $tt * 1000).")</legend>{$ps}</fieldset><br />";
             echo $this->pluginsCode;
         }
 
@@ -823,7 +823,7 @@ 
         $srcTags = explode(',', $tags);
         $repTags = array();
         foreach ($srcTags as $tag) {
-            $repTags[] = '\\' . $tag[0] . '\\' . $tag[1];
+            $repTags[] = '\\'.$tag[0].'\\'.$tag[1];
         }
 
         return array($srcTags, $repTags);
@@ -846,7 +846,7 @@ 
         $stats['phpTime'] = sprintf("%2.4f s", $stats['phpTime']);
         $stats['source'] = $this->documentGenerated == 1 ? "database" : "cache";
         $stats['queries'] = isset ($this->executedQueries) ? $this->executedQueries : 0;
-        $stats['phpMemory'] = (memory_get_peak_usage(true) / 1024 / 1024) . " mb";
+        $stats['phpMemory'] = (memory_get_peak_usage(true) / 1024 / 1024)." mb";
 
         return $stats;
     }
@@ -879,7 +879,7 @@ 
     {
         $cacheRefreshTime = 0;
         $recent_update = 0;
-        if(file_exists($this->getSitePublishingFilePath())) {
+        if (file_exists($this->getSitePublishingFilePath())) {
             @include($this->getSitePublishingFilePath());
         }
         $this->recentUpdate = $recent_update;
@@ -963,7 +963,7 @@ 
                 }
 
                 $docObjSerial = serialize($this->documentObject);
-                $cacheContent = $docObjSerial . "<!--__MODxCacheSpliter__-->" . $this->documentContent;
+                $cacheContent = $docObjSerial."<!--__MODxCacheSpliter__-->".$this->documentContent;
                 $page_cache_path = $this->getHashFile($this->cacheKey);
                 file_put_contents($page_cache_path, "<?php die('Unauthorized access.'); ?>$cacheContent");
             }
@@ -1024,7 +1024,7 @@ 
         $pos[']]>'] = strpos($content, ']]>');
 
         if ($pos['<![CDATA['] !== false && $pos[']]>'] !== false) {
-            $content = substr($content, 0, $pos['<![CDATA[']) . substr($content, $pos[']]>'] + 3);
+            $content = substr($content, 0, $pos['<![CDATA[']).substr($content, $pos[']]>'] + 3);
         }
 
         $lp = explode($left, $content);
@@ -1165,7 +1165,7 @@ 
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
             } elseif ($this->debug) {
-                $this->addLog('mergeDocumentContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+                $this->addLog('mergeDocumentContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -1345,7 +1345,7 @@ 
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
             } elseif ($this->debug) {
-                $this->addLog('mergeSettingsContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+                $this->addLog('mergeSettingsContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -1399,7 +1399,7 @@ 
             }
 
             $value = $this->parseText($value, $params); // parse local scope placeholers for ConditionalTags
-            $value = $this->mergePlaceholderContent($value, $params);  // parse page global placeholers
+            $value = $this->mergePlaceholderContent($value, $params); // parse page global placeholers
             if ($this->getConfig('enable_at_syntax')) {
                 $value = $this->mergeConditionalTagsContent($value);
             }
@@ -1415,7 +1415,7 @@ 
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
             } elseif ($this->debug) {
-                $this->addLog('mergeChunkContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+                $this->addLog('mergeChunkContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -1475,7 +1475,7 @@ 
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
             } elseif ($this->debug) {
-                $this->addLog('mergePlaceholderContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+                $this->addLog('mergePlaceholderContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -1496,7 +1496,7 @@ 
         $elseiftag = '<@ELSEIF:',
         $elsetag = '<@ELSE>',
         $endiftag = '<@ENDIF>'
-    ) {
+    ){
         if (strpos($content, '@IF') !== false) {
             $content = $this->_prepareCTag($content, $iftag, $elseiftag, $elsetag, $endiftag);
         }
@@ -1505,7 +1505,7 @@ 
             return $content;
         }
 
-        $sp = '#' . md5('ConditionalTags' . $_SERVER['REQUEST_TIME']) . '#';
+        $sp = '#'.md5('ConditionalTags'.$_SERVER['REQUEST_TIME']).'#';
         $content = str_replace(array('<?php', '<?=', '<?', '?>'), array("{$sp}b", "{$sp}p", "{$sp}s", "{$sp}e"),
             $content);
 
@@ -1517,7 +1517,7 @@ 
             }
             list($cmd, $text) = explode('>', $split, 2);
             $cmd = str_replace("'", "\'", $cmd);
-            $content .= "<?php if(\$this->_parseCTagCMD('" . $cmd . "')): ?>";
+            $content .= "<?php if(\$this->_parseCTagCMD('".$cmd."')): ?>";
             $content .= $text;
         }
         $pieces = explode('<@ELSEIF:', $content);
@@ -1528,13 +1528,13 @@ 
             }
             list($cmd, $text) = explode('>', $split, 2);
             $cmd = str_replace("'", "\'", $cmd);
-            $content .= "<?php elseif(\$this->_parseCTagCMD('" . $cmd . "')): ?>";
+            $content .= "<?php elseif(\$this->_parseCTagCMD('".$cmd."')): ?>";
             $content .= $text;
         }
 
         $content = str_replace(array('<@ELSE>', '<@ENDIF>'), array('<?php else:?>', '<?php endif;?>'), $content);
         ob_start();
-        $content = eval('?>' . $content);
+        $content = eval('?>'.$content);
         $content = ob_get_clean();
         $content = str_replace(array("{$sp}b", "{$sp}p", "{$sp}s", "{$sp}e"), array('<?php', '<?=', '<?', '?>'),
             $content);
@@ -1556,7 +1556,7 @@ 
         $elseiftag = '<@ELSEIF:',
         $elsetag = '<@ELSE>',
         $endiftag = '<@ENDIF>'
-    ) {
+    ){
         if (strpos($content, '<!--@IF ') !== false) {
             $content = str_replace('<!--@IF ', $iftag, $content);
         } // for jp
@@ -1666,7 +1666,7 @@ 
         $matches = $this->getTagsFromContent($content, $left, $right);
         if (!empty($matches)) {
             foreach ($matches[0] as $i => $v) {
-                $addBreakMatches[$i] = $v . "\n";
+                $addBreakMatches[$i] = $v."\n";
             }
             $content = str_replace($addBreakMatches, '', $content);
             if (strpos($content, $left) !== false) {
@@ -1701,7 +1701,7 @@ 
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $v, $content);
             } elseif ($this->debug) {
-                $this->addLog('ignoreCommentedTagsContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+                $this->addLog('ignoreCommentedTagsContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -1777,8 +1777,8 @@ 
             );
             if ($this->isBackend()) {
                 $this->event->alert(
-                    'An error occurred while loading. Please see the event log for more information.' .
-                    '<p>' . $msg . '</p>'
+                    'An error occurred while loading. Please see the event log for more information.'.
+                    '<p>'.$msg.'</p>'
                 );
             }
         } else {
@@ -1837,8 +1837,8 @@ 
             );
             if ($this->isBackend()) {
                 $this->event->alert(
-                    'An error occurred while loading. Please see the event log for more information' .
-                    '<p>' . $echo . $return . '</p>'
+                    'An error occurred while loading. Please see the event log for more information'.
+                    '<p>'.$echo.$return.'</p>'
                 );
             }
         }
@@ -1846,7 +1846,7 @@ 
         if (is_array($return) || is_object($return)) {
             return $return;
         } else {
-            return $echo . $return;
+            return $echo.$return;
         }
     }
 
@@ -1886,7 +1886,7 @@ 
                 if (strpos($content, $s) !== false) {
                     $content = str_replace($s, $value, $content);
                 } elseif ($this->debug) {
-                    $this->addLog('evalSnippetsSGVar parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+                    $this->addLog('evalSnippetsSGVar parse error', $_SERVER['REQUEST_URI'].$s, 2);
                 }
                 continue;
             }
@@ -1898,7 +1898,7 @@ 
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
             } elseif ($this->debug) {
-                $this->addLog('evalSnippets parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+                $this->addLog('evalSnippets parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -1991,7 +1991,7 @@ 
             $code = str_replace("\t", '  ', $this->getPhpCompat()->htmlspecialchars($value));
             $piece = str_replace("\t", '  ', $this->getPhpCompat()->htmlspecialchars($piece));
             $print_r_params = str_replace("\t", '  ',
-                $this->getPhpCompat()->htmlspecialchars('$modx->event->params = ' . print_r($params, true)));
+                $this->getPhpCompat()->htmlspecialchars('$modx->event->params = '.print_r($params, true)));
             $this->snippetsCode .= sprintf('<fieldset style="margin:1em;"><legend><b>%s</b>(%s)</legend><pre style="white-space: pre-wrap;background-color:#fff;width:90%%;">[[%s]]</pre><pre style="white-space: pre-wrap;background-color:#fff;width:90%%;">%s</pre><pre style="white-space: pre-wrap;background-color:#fff;width:90%%;">%s</pre></fieldset>',
                 $snippetObject['name'], $eventtime, $piece, $print_r_params, $code);
             $this->snippetsTime[] = array('sname' => $key, 'time' => $eventtime);
@@ -2257,7 +2257,7 @@ 
             ->where('disabled', '=', 0)
             ->get();
         if ($snippetModelCollection->count() > 1) {
-            exit('Error $modx->_getSnippetObject()' . $snip_name);
+            exit('Error $modx->_getSnippetObject()'.$snip_name);
         } elseif ($snippetModelCollection->count() === 1) {
             /** @var Models\SiteSnippet $snippetModel */
             $snippetModel = $snippetModelCollection->first();
@@ -2293,7 +2293,7 @@ 
      */
     public function makeFriendlyURL($pre, $suff, $alias, $isfolder = 0, $id = 0)
     {
-        return UrlProcessor::makeFriendlyURL($pre, $suff, $alias, (bool)$isfolder, (int)$id);
+        return UrlProcessor::makeFriendlyURL($pre, $suff, $alias, (bool) $isfolder, (int) $id);
     }
 
     /**
@@ -2306,7 +2306,7 @@ 
 
     public function sendStrictURI()
     {
-        $url = UrlProcessor::strictURI((string)$this->q, (int)$this->documentIdentifier);
+        $url = UrlProcessor::strictURI((string) $this->q, (int) $this->documentIdentifier);
         if ($url !== null) {
             $this->sendRedirect($url, 0, 'REDIRECT_HEADER', 'HTTP/1.0 301 Moved Permanently');
         }
@@ -2351,7 +2351,7 @@ 
                 $docgrp = implode(",", $docgrp);
             }
             // get document
-            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
             $rs = $this->getDatabase()->select('sc.*', "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg ON dg.document = sc.id", "sc.{$method} = '{$identifier}' AND ({$access})", "", 1);
             if ($this->getDatabase()->getRecordCount($rs) < 1) {
@@ -2389,9 +2389,9 @@ 
             if ($documentObject['template']) {
                 // load TVs and merge with document - Orig by Apodigm - Docvars
                 $rs = $this->getDatabase()->select("tv.*, IF(tvc.value!='',tvc.value,tv.default_text) as value",
-                    $this->getDatabase()->getFullTableName("site_tmplvars") . " tv
-                INNER JOIN " . $this->getDatabase()->getFullTableName("site_tmplvar_templates") . " tvtpl ON tvtpl.tmplvarid = tv.id
-                LEFT JOIN " . $this->getDatabase()->getFullTableName("site_tmplvar_contentvalues") . " tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$documentObject['id']}'",
+                    $this->getDatabase()->getFullTableName("site_tmplvars")." tv
+                INNER JOIN " . $this->getDatabase()->getFullTableName("site_tmplvar_templates")." tvtpl ON tvtpl.tmplvarid = tv.id
+                LEFT JOIN " . $this->getDatabase()->getFullTableName("site_tmplvar_contentvalues")." tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$documentObject['id']}'",
                     "tvtpl.templateid = '{$documentObject['template']}'");
                 $tmplvars = array();
                 while ($row = $this->getDatabase()->getRow($rs)) {
@@ -2438,7 +2438,7 @@ 
                 $st = md5($source);
             }
             if ($this->dumpSnippets == 1) {
-                $this->snippetsCode .= "<fieldset><legend><b style='color: #821517;'>PARSE PASS " . ($i + 1) . "</b></legend><p>The following snippets (if any) were parsed during this pass.</p>";
+                $this->snippetsCode .= "<fieldset><legend><b style='color: #821517;'>PARSE PASS ".($i + 1)."</b></legend><p>The following snippets (if any) were parsed during this pass.</p>";
             }
 
             // invoke OnParseDocument event
@@ -2517,7 +2517,7 @@ 
             // Check use_alias_path and check if $this->virtualDir is set to anything, then parse the path
             if ($this->getConfig('use_alias_path') == 1) {
                 $virtualDir = UrlProcessor::getFacadeRoot()->virtualDir;
-                $alias = (strlen($virtualDir) > 0 ? $virtualDir . '/' : '') . $this->documentIdentifier;
+                $alias = (strlen($virtualDir) > 0 ? $virtualDir.'/' : '').$this->documentIdentifier;
                 if (isset(UrlProcessor::getFacadeRoot()->documentListing[$alias])) {
                     $this->documentIdentifier = UrlProcessor::getFacadeRoot()->documentListing[$alias];
                 } else {
@@ -2539,7 +2539,7 @@ 
 
                         if (!$docId) {
                             $alias = $this->q;
-                            if ((int)$this->getConfig('friendly_url_suffix') !== 0) {
+                            if ((int) $this->getConfig('friendly_url_suffix') !== 0) {
                                 $pos = strrpos($alias, $this->getConfig('friendly_url_suffix'));
 
                                 if ($pos !== false) {
@@ -2580,7 +2580,7 @@ 
                     $docAlias = $this->getDatabase()->escape($this->documentIdentifier);
                     $rs = $this->getDatabase()->select('id', $this->getDatabase()->getFullTableName('site_content'),
                         "deleted=0 and alias='{$docAlias}'");
-                    $this->documentIdentifier = (int)$this->getDatabase()->getValue($rs);
+                    $this->documentIdentifier = (int) $this->getDatabase()->getValue($rs);
                 }
             }
             $this->documentMethod = 'id';
@@ -2638,7 +2638,7 @@ 
                 $_REQUEST[$n] = $_GET[$n] = $v;
             }
         }
-        $_SERVER['PHP_SELF'] = MODX_BASE_URL . $qp['path'];
+        $_SERVER['PHP_SELF'] = MODX_BASE_URL.$qp['path'];
         $this->q = $qp['path'];
 
         return $qp['path'];
@@ -2792,15 +2792,15 @@ 
             $aliasListing = get_by_key(UrlProcessor::getFacadeRoot()->aliasListing, $id, [], 'is_array');
             $tmp = get_by_key($aliasListing, 'parent');
             if ($this->getConfig('aliaslistingfolder')) {
-                $id = $tmp ?? (int)Models\SiteContent::findOrNew($id)->parent;
+                $id = $tmp ?? (int) Models\SiteContent::findOrNew($id)->parent;
             } else {
                 $id = $tmp;
             }
 
-            if ((int)$id === 0) {
+            if ((int) $id === 0) {
                 break;
             }
-            $parents[$thisid] = (int)$id;
+            $parents[$thisid] = (int) $id;
         }
 
         return $parents;
@@ -2844,15 +2844,15 @@ 
         if ($this->getConfig('aliaslistingfolder') == 1) {
 
             $res = $this->getDatabase()->select("id,alias,isfolder,parent",
-                $this->getDatabase()->getFullTableName('site_content'), "parent IN (" . $id . ") AND deleted = '0'");
+                $this->getDatabase()->getFullTableName('site_content'), "parent IN (".$id.") AND deleted = '0'");
             $idx = array();
             while ($row = $this->getDatabase()->getRow($res)) {
                 $pAlias = '';
                 if (isset(UrlProcessor::getFacadeRoot()->aliasListing[$row['parent']])) {
-                    $pAlias .= !empty(UrlProcessor::getFacadeRoot()->aliasListing[$row['parent']]['path']) ? UrlProcessor::getFacadeRoot()->aliasListing[$row['parent']]['path'] . '/' : '';
-                    $pAlias .= !empty(UrlProcessor::getFacadeRoot()->aliasListing[$row['parent']]['alias']) ? UrlProcessor::getFacadeRoot()->aliasListing[$row['parent']]['alias'] . '/' : '';
+                    $pAlias .= !empty(UrlProcessor::getFacadeRoot()->aliasListing[$row['parent']]['path']) ? UrlProcessor::getFacadeRoot()->aliasListing[$row['parent']]['path'].'/' : '';
+                    $pAlias .= !empty(UrlProcessor::getFacadeRoot()->aliasListing[$row['parent']]['alias']) ? UrlProcessor::getFacadeRoot()->aliasListing[$row['parent']]['alias'].'/' : '';
                 };
-                $children[$pAlias . $row['alias']] = $row['id'];
+                $children[$pAlias.$row['alias']] = $row['id'];
                 if ($row['isfolder'] == 1) {
                     $idx[] = $row['id'];
                 }
@@ -2885,7 +2885,7 @@ 
                 $depth--;
 
                 foreach ($documentMap_cache[$id] as $childId) {
-                    $pkey = (strlen(UrlProcessor::getFacadeRoot()->aliasListing[$childId]['path']) ? "{UrlProcessor::getFacadeRoot()->aliasListing[$childId]['path']}/" : '') . UrlProcessor::getFacadeRoot()->aliasListing[$childId]['alias'];
+                    $pkey = (strlen(UrlProcessor::getFacadeRoot()->aliasListing[$childId]['path']) ? "{UrlProcessor::getFacadeRoot()->aliasListing[$childId]['path']}/" : '').UrlProcessor::getFacadeRoot()->aliasListing[$childId]['alias'];
                     if (!strlen($pkey)) {
                         $pkey = "{$childId}";
                     }
@@ -2913,15 +2913,15 @@ 
     {
         global $modx_manager_charset, $modx_lang_attribute, $modx_textdir, $lastInstallTime;
 
-        if(empty($modx_manager_charset)) {
+        if (empty($modx_manager_charset)) {
             $modx_manager_charset = $this->getConfig('modx_charset');
         }
 
-        if(empty($modx_lang_attribute)) {
+        if (empty($modx_lang_attribute)) {
             $modx_lang_attribute = $this->getConfig('lang_code');
         }
 
-        if(empty($modx_textdir)) {
+        if (empty($modx_textdir)) {
             $modx_textdir = $this->getConfig('manager_direction');
         }
         $textdir = $modx_textdir === 'rtl' ? 'rtl' : 'ltr';
@@ -2937,7 +2937,7 @@ 
                 $fnc = 'history.back(-1);';
                 break;
             default:
-                $fnc = "window.location.href='" . addslashes($url) . "';";
+                $fnc = "window.location.href='".addslashes($url)."';";
         }
 
         $style = '';
@@ -2946,9 +2946,9 @@ 
                 $lastInstallTime = time();
             }
 
-            $path =  'media/style/' . $this->getConfig('manager_theme') . '/';
-            $css = file_exists(MODX_MANAGER_PATH .  $path . '/css/styles.min.css') ? '/css/styles.min.css' : 'style.css';
-            $style = '<link rel="stylesheet" type="text/css" href="' . MODX_MANAGER_URL . $path . $css . '?v=' . $lastInstallTime . '"/>';
+            $path = 'media/style/'.$this->getConfig('manager_theme').'/';
+            $css = file_exists(MODX_MANAGER_PATH.$path.'/css/styles.min.css') ? '/css/styles.min.css' : 'style.css';
+            $style = '<link rel="stylesheet" type="text/css" href="'.MODX_MANAGER_URL.$path.$css.'?v='.$lastInstallTime.'"/>';
         }
 
         ob_get_clean();
@@ -2986,17 +2986,17 @@ 
         $state = 0;
         $pms = $_SESSION['mgrPermissions'];
         if ($pms) {
-            $state = (isset($pms[$pm]) && (bool)$pms[$pm] === true);
+            $state = (isset($pms[$pm]) && (bool) $pms[$pm] === true);
         }
 
-        return (int)$state;
+        return (int) $state;
     }
 
     /**
      * @param array $permissions
      * @return bool
      */
-    public function hasAnyPermissions(array $permissions) {
+    public function hasAnyPermissions(array $permissions){
         foreach ($permissions as $p) {
             if ($this->hasPermission($p)) {
                 return true;
@@ -3016,8 +3016,8 @@ 
      */
     public function elementIsLocked($type, $id, $includeThisUser = false)
     {
-        $id = (int)$id;
-        $type = (int)$type;
+        $id = (int) $id;
+        $type = (int) $type;
         if (!$type || !$id) {
             return null;
         }
@@ -3067,7 +3067,7 @@ 
             return $lockedElements;
         }
 
-        $type = (int)$type;
+        $type = (int) $type;
         if (isset($lockedElements[$type])) {
             return $lockedElements[$type];
         } else {
@@ -3085,7 +3085,7 @@ 
             $this->cleanupExpiredLocks();
 
             $rs = $this->getDatabase()->select('sid,internalKey,elementType,elementId,lasthit,username',
-                $this->getDatabase()->getFullTableName('active_user_locks') . " ul
+                $this->getDatabase()->getFullTableName('active_user_locks')." ul
                 LEFT JOIN {$this->getDatabase()->getFullTableName('manager_users')} mu on ul.internalKey = mu.id");
             while ($row = $this->getDatabase()->getRow($rs)) {
                 $this->lockedElements[$row['elementType']][$row['elementId']] = array(
@@ -3108,7 +3108,7 @@ 
     public function cleanupExpiredLocks()
     {
         // Clean-up active_user_sessions first
-        $timeout = (int)$this->getConfig('session_timeout') < 2 ? 120 : $this->getConfig('session_timeout') * 60; // session.js pings every 10min, updateMail() in mainMenu pings every minute, so 2min is minimum
+        $timeout = (int) $this->getConfig('session_timeout') < 2 ? 120 : $this->getConfig('session_timeout') * 60; // session.js pings every 10min, updateMail() in mainMenu pings every minute, so 2min is minimum
         $validSessionTimeLimit = $this->time - $timeout;
         $this->getDatabase()->delete($this->getDatabase()->getFullTableName('active_user_sessions'),
             "lasthit < {$validSessionTimeLimit}");
@@ -3123,7 +3123,7 @@ 
             foreach ($rs as $row) {
                 $userSids[] = $row['sid'];
             }
-            $userSids = "'" . implode("','", $userSids) . "'";
+            $userSids = "'".implode("','", $userSids)."'";
             $this->getDatabase()->delete($this->getDatabase()->getFullTableName('active_user_locks'),
                 "sid NOT IN({$userSids})");
         } else {
@@ -3211,8 +3211,8 @@ 
     public function lockElement($type, $id)
     {
         $userId = $this->isBackend() && $_SESSION['mgrInternalKey'] ? $_SESSION['mgrInternalKey'] : 0;
-        $type = (int)$type;
-        $id = (int)$id;
+        $type = (int) $type;
+        $id = (int) $id;
         if (!$type || !$id || !$userId) {
             return false;
         }
@@ -3234,8 +3234,8 @@ 
     public function unlockElement($type, $id, $includeAllUsers = false)
     {
         $userId = $this->isBackend() && $_SESSION['mgrInternalKey'] ? $_SESSION['mgrInternalKey'] : 0;
-        $type = (int)$type;
-        $id = (int)$id;
+        $type = (int) $type;
+        $id = (int) $id;
         if (!$type || !$id) {
             return false;
         }
@@ -3311,8 +3311,8 @@ 
         }
 
         $usertype = $this->isFrontend() ? 1 : 0;
-        $evtid = (int)$evtid;
-        $type = (int)$type;
+        $evtid = (int) $evtid;
+        $type = (int) $type;
 
         // Types: 1 = information, 2 = warning, 3 = error
         if ($type < 1) {
@@ -3334,8 +3334,8 @@ 
         if ($this->getConfig('send_errormail', '0') != '0') {
             if ($this->getConfig('send_errormail') <= $type) {
                 $this->sendmail(array(
-                    'subject' => 'Evolution CMS System Error on ' . $this->getConfig('site_name'),
-                    'body'    => 'Source: ' . $source . ' - The details of the error could be seen in the Evolution CMS system events log.',
+                    'subject' => 'Evolution CMS System Error on '.$this->getConfig('site_name'),
+                    'body'    => 'Source: '.$source.' - The details of the error could be seen in the Evolution CMS system events log.',
                     'type'    => 'text'
                 ));
             }
@@ -3384,7 +3384,7 @@ 
             $p['fromname'] = $userinfo['username'];
         }
         if ($msg === '' && !isset($p['body'])) {
-            $p['body'] = $_SERVER['REQUEST_URI'] . "\n" . $_SERVER['HTTP_USER_AGENT'] . "\n" . $_SERVER['HTTP_REFERER'];
+            $p['body'] = $_SERVER['REQUEST_URI']."\n".$_SERVER['HTTP_USER_AGENT']."\n".$_SERVER['HTTP_REFERER'];
         } elseif (is_string($msg) && 0 < strlen($msg)) {
             $p['body'] = $msg;
         }
@@ -3425,8 +3425,8 @@ 
             $files = array();
         }
         foreach ($files as $f) {
-            if (file_exists(MODX_BASE_PATH . $f) && is_file(MODX_BASE_PATH . $f) && is_readable(MODX_BASE_PATH . $f)) {
-                $this->getMail()->AddAttachment(MODX_BASE_PATH . $f);
+            if (file_exists(MODX_BASE_PATH.$f) && is_file(MODX_BASE_PATH.$f) && is_readable(MODX_BASE_PATH.$f)) {
+                $this->getMail()->AddAttachment(MODX_BASE_PATH.$f);
             }
         }
 
@@ -3490,7 +3490,7 @@ 
         $sort = 'menuindex',
         $dir = 'ASC',
         $fields = 'id, pagetitle, description, parent, alias, menutitle'
-    ) {
+    ){
 
         $cacheKey = md5(print_r(func_get_args(), true));
         if (isset($this->tmpCache[__FUNCTION__][$cacheKey])) {
@@ -3500,14 +3500,14 @@ 
         $tblsc = $this->getDatabase()->getFullTableName("site_content");
         $tbldg = $this->getDatabase()->getFullTableName("document_groups");
         // modify field names to use sc. table reference
-        $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-        $sort = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+        $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+        $sort = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
         // get document groups for current user
         if ($docgrp = $this->getUserDocGroups()) {
             $docgrp = implode(",", $docgrp);
         }
         // build query
-        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
         $result = $this->getDatabase()->select("DISTINCT {$fields}", "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg on dg.document = sc.id", "sc.parent = '{$id}' AND ({$access}) GROUP BY sc.id",
             "{$sort} {$dir}");
@@ -3533,7 +3533,7 @@ 
         $sort = 'menuindex',
         $dir = 'ASC',
         $fields = 'id, pagetitle, description, parent, alias, menutitle'
-    ) {
+    ){
         $cacheKey = md5(print_r(func_get_args(), true));
         if (isset($this->tmpCache[__FUNCTION__][$cacheKey])) {
             return $this->tmpCache[__FUNCTION__][$cacheKey];
@@ -3543,14 +3543,14 @@ 
         $tbldg = $this->getDatabase()->getFullTableName("document_groups");
 
         // modify field names to use sc. table reference
-        $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-        $sort = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+        $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+        $sort = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
         // get document groups for current user
         if ($docgrp = $this->getUserDocGroups()) {
             $docgrp = implode(",", $docgrp);
         }
         // build query
-        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
         $result = $this->getDatabase()->select("DISTINCT {$fields}", "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg on dg.document = sc.id",
             "sc.parent = '{$id}' AND sc.published=1 AND sc.deleted=0 AND ({$access}) GROUP BY sc.id", "{$sort} {$dir}");
@@ -3587,23 +3587,23 @@ 
         $sort = 'menuindex',
         $dir = 'ASC',
         $limit = ''
-    ) {
+    ){
 
         $cacheKey = md5(print_r(func_get_args(), true));
         if (isset($this->tmpCache[__FUNCTION__][$cacheKey])) {
             return $this->tmpCache[__FUNCTION__][$cacheKey];
         }
 
-        $published = ($published !== 'all') ? 'AND sc.published = ' . $published : '';
-        $deleted = ($deleted !== 'all') ? 'AND sc.deleted = ' . $deleted : '';
+        $published = ($published !== 'all') ? 'AND sc.published = '.$published : '';
+        $deleted = ($deleted !== 'all') ? 'AND sc.deleted = '.$deleted : '';
 
         if ($where != '') {
-            $where = 'AND ' . $where;
+            $where = 'AND '.$where;
         }
 
         // modify field names to use sc. table reference
-        $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-        $sort = ($sort == '') ? '' : 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+        $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+        $sort = ($sort == '') ? '' : 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
 
         // get document groups for current user
         if ($docgrp = $this->getUserDocGroups()) {
@@ -3611,7 +3611,7 @@ 
         }
 
         // build query
-        $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="' . $_SESSION['mgrRole'] . '" OR sc.privatemgr=0') . (!$docgrp ? '' : ' OR dg.document_group IN (' . $docgrp . ')');
+        $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="'.$_SESSION['mgrRole'].'" OR sc.privatemgr=0').(!$docgrp ? '' : ' OR dg.document_group IN ('.$docgrp.')');
 
         $tblsc = $this->getDatabase()->getFullTableName('site_content');
         $tbldg = $this->getDatabase()->getFullTableName('document_groups');
@@ -3654,7 +3654,7 @@ 
         $sort = 'menuindex',
         $dir = 'ASC',
         $limit = ''
-    ) {
+    ){
 
         $cacheKey = md5(print_r(func_get_args(), true));
         if (isset($this->tmpCache[__FUNCTION__][$cacheKey])) {
@@ -3674,10 +3674,10 @@ 
             return false;
         } else {
             // modify field names to use sc. table reference
-            $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-            $sort = ($sort == '') ? '' : 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+            $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+            $sort = ($sort == '') ? '' : 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
             if ($where != '') {
-                $where = 'AND ' . $where;
+                $where = 'AND '.$where;
             }
 
             $published = ($published !== 'all') ? "AND sc.published = '{$published}'" : '';
@@ -3688,14 +3688,14 @@ 
                 $docgrp = implode(',', $docgrp);
             }
 
-            $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="' . $_SESSION['mgrRole'] . '" OR sc.privatemgr=0') . (!$docgrp ? '' : ' OR dg.document_group IN (' . $docgrp . ')');
+            $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="'.$_SESSION['mgrRole'].'" OR sc.privatemgr=0').(!$docgrp ? '' : ' OR dg.document_group IN ('.$docgrp.')');
 
             $tblsc = $this->getDatabase()->getFullTableName('site_content');
             $tbldg = $this->getDatabase()->getFullTableName('document_groups');
 
             $result = $this->getDatabase()->select("DISTINCT {$fields}", "{$tblsc} sc
-                    LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id IN (" . implode(',',
-                    $ids) . ") {$published} {$deleted} {$where}) AND ({$access}) GROUP BY sc.id",
+                    LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id IN (".implode(',',
+                    $ids).") {$published} {$deleted} {$where}) AND ({$access}) GROUP BY sc.id",
                 ($sort ? "{$sort} {$dir}" : ""), $limit);
 
             $resourceArray = $this->getDatabase()->makeArray($result);
@@ -3801,12 +3801,12 @@ 
             $tbldg = $this->getDatabase()->getFullTableName("document_groups");
             $activeSql = $active == 1 ? "AND sc.published=1 AND sc.deleted=0" : "";
             // modify field names to use sc. table reference
-            $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+            $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
             // get document groups for current user
             if ($docgrp = $this->getUserDocGroups()) {
                 $docgrp = implode(",", $docgrp);
             }
-            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
             $result = $this->getDatabase()->select($fields, "{$tblsc} sc LEFT JOIN {$tbldg} dg on dg.document = sc.id",
                 "(sc.id='{$pageid}' {$activeSql}) AND ({$access})", "", 1);
             $pageInfo = $this->getDatabase()->getRow($result);
@@ -3859,7 +3859,7 @@ 
         if ($this->currentSnippet) {
             $tbl = $this->getDatabase()->getFullTableName("site_snippets");
             $rs = $this->getDatabase()->select('id', $tbl,
-                "name='" . $this->getDatabase()->escape($this->currentSnippet) . "'", '', 1);
+                "name='".$this->getDatabase()->escape($this->currentSnippet)."'", '', 1);
             if ($snippetId = $this->getDatabase()->getValue($rs)) {
                 return $snippetId;
             }
@@ -3899,10 +3899,10 @@ 
             $sync->emptyCache();
         } elseif (preg_match('@^[1-9]\d*$@', $type)) {
             $key = ($this->getConfig('cache_type') == 2) ? $this->makePageCacheKey($type) : $type;
-            $file_name = "docid_" . $key . "_*.pageCache.php";
-            $cache_path = $cache_dir . $file_name;
+            $file_name = "docid_".$key."_*.pageCache.php";
+            $cache_path = $cache_dir.$file_name;
             $files = glob($cache_path);
-            $files[] = $cache_dir . "docid_" . $key . ".pageCache.php";
+            $files[] = $cache_dir."docid_".$key.".pageCache.php";
             foreach ($files as $file) {
                 if (!is_file($file)) {
                     continue;
@@ -3910,7 +3910,7 @@ 
                 unlink($file);
             }
         } else {
-            $files = glob($cache_dir . '*');
+            $files = glob($cache_dir.'*');
             foreach ($files as $file) {
                 $name = basename($file);
                 if (strpos($name, '.pageCache.php') === false) {
@@ -3929,7 +3929,7 @@ 
      */
     public function makeUrl($id, $alias = '', $args = '', $scheme = '')
     {
-        return UrlProcessor::makeUrl((int)$id, $alias, $args, $scheme);
+        return UrlProcessor::makeUrl((int) $id, $alias, $args, $scheme);
     }
 
     /**
@@ -3951,7 +3951,7 @@ 
     {
         if (empty($this->version) || !is_array($this->version)) {
             //include for compatibility modx version < 1.0.10
-            $version = include EVO_CORE_PATH . 'factory/version.php';
+            $version = include EVO_CORE_PATH.'factory/version.php';
             $this->version = $version;
             $this->version['new_version'] = $this->getConfig('newversiontext', '');
         }
@@ -3970,12 +3970,12 @@ 
     {
         if (isset ($this->snippetCache[$snippetName])) {
             $snippet = $this->snippetCache[$snippetName];
-            $properties = !empty($this->snippetCache[$snippetName . "Props"]) ? $this->snippetCache[$snippetName . "Props"] : '';
+            $properties = !empty($this->snippetCache[$snippetName."Props"]) ? $this->snippetCache[$snippetName."Props"] : '';
         } else { // not in cache so let's check the db
             $snippetObject = $this->_getSnippetFromDatabase($snippetName);
 
             $snippet = $this->snippetCache[$snippetName] = $snippetObject['content'] === null ?? "return false;";
-            $properties = $this->snippetCache[$snippetName . "Props"] = $snippetObject['properties'];
+            $properties = $this->snippetCache[$snippetName."Props"] = $snippetObject['properties'];
         }
         // load default params/properties
         $parameters = $this->parseProperties($properties, $snippetName, 'snippet');
@@ -4025,8 +4025,8 @@ 
      */
     public function isChunkProcessor($processor)
     {
-        $value = (string)$this->getConfig('chunk_processor');
-        if(is_object($processor)) {
+        $value = (string) $this->getConfig('chunk_processor');
+        if (is_object($processor)) {
             $processor = get_class($processor);
         }
         return is_scalar($processor) && mb_strtolower($value) === mb_strtolower($processor) && class_exists($processor, false);
@@ -4092,8 +4092,8 @@ 
             }
             if (strpos($tpl, $s) !== false) {
                 $tpl = str_replace($s, $value, $tpl);
-            } elseif($this->debug) {
-                $this->addLog('parseText parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('parseText parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -4123,8 +4123,7 @@ 
         }
 
         return $prefix === '[+' && $suffix === '+]' && $this->isChunkProcessor('DLTemplate') ?
-            \DLTemplate::getInstance($this)->parseChunk($chunkName, $chunkArr) :
-            $this->parseText($this->getChunk($chunkName), $chunkArr, $prefix, $suffix);
+            \DLTemplate::getInstance($this)->parseChunk($chunkName, $chunkArr) : $this->parseText($this->getChunk($chunkName), $chunkArr, $prefix, $suffix);
     }
 
     /**
@@ -4145,7 +4144,7 @@ 
             case 'CODE':
                 break;
             case 'FILE':
-                $template = file_get_contents(MODX_BASE_PATH . $template);
+                $template = file_get_contents(MODX_BASE_PATH.$template);
                 break;
             case 'CHUNK':
                 $template = $this->getChunk($template);
@@ -4178,7 +4177,7 @@ 
         if ($mode !== 'formatOnly' && empty($timestamp)) {
             return '-';
         }
-        $timestamp = (int)$timestamp;
+        $timestamp = (int) $timestamp;
 
         switch ($this->getConfig('datetime_format')) {
             case 'YYYY/mm/dd':
@@ -4198,7 +4197,7 @@ 
         }
 
         if (empty($mode)) {
-            $strTime = strftime($dateFormat . " %H:%M:%S", $timestamp);
+            $strTime = strftime($dateFormat." %H:%M:%S", $timestamp);
         } elseif ($mode == 'dateOnly') {
             $strTime = strftime($dateFormat, $timestamp);
         } elseif ($mode == 'formatOnly') {
@@ -4252,7 +4251,7 @@ 
             $S = 0;
         }
         $timeStamp = mktime($H, $M, $S, $m, $d, $Y);
-        $timeStamp = (int)$timeStamp;
+        $timeStamp = (int) $timeStamp;
         return $timeStamp;
     }
 
@@ -4294,7 +4293,7 @@ 
                     if ($v === 'value') {
                         unset($_[$i]);
                     } else {
-                        $_[$i] = 'tv.' . $v;
+                        $_[$i] = 'tv.'.$v;
                     }
                 }
                 $fields = implode(',', $_);
@@ -4303,12 +4302,12 @@ 
             }
 
             if ($tvsort != '') {
-                $tvsort = 'tv.' . implode(',tv.', array_filter(array_map('trim', explode(',', $tvsort))));
+                $tvsort = 'tv.'.implode(',tv.', array_filter(array_map('trim', explode(',', $tvsort))));
             }
             if ($tvidnames == "*") {
                 $query = "tv.id<>0";
             } else {
-                $query = (is_numeric($tvidnames[0]) ? "tv.id" : "tv.name") . " IN ('" . implode("','", $tvidnames) . "')";
+                $query = (is_numeric($tvidnames[0]) ? "tv.id" : "tv.name")." IN ('".implode("','", $tvidnames)."')";
             }
 
             $this->getUserDocGroups();
@@ -4320,10 +4319,10 @@ 
                 $rs = $this->getDatabase()->select(
                     "{$fields}, IF(tvc.value!='',tvc.value,tv.default_text) as value ",
 
-                    $this->getDatabase()->getFullTableName("site_tmplvars") .
-                    " tv INNER JOIN " . $this->getDatabase()->getFullTableName("site_tmplvar_templates") .
-                    " tvtpl ON tvtpl.tmplvarid = tv.id LEFT JOIN " .
-                    $this->getDatabase()->getFullTableName("site_tmplvar_contentvalues") .
+                    $this->getDatabase()->getFullTableName("site_tmplvars").
+                    " tv INNER JOIN ".$this->getDatabase()->getFullTableName("site_tmplvar_templates").
+                    " tvtpl ON tvtpl.tmplvarid = tv.id LEFT JOIN ".
+                    $this->getDatabase()->getFullTableName("site_tmplvar_contentvalues").
                     " tvc ON tvc.tmplvarid=tv.id AND tvc.contentid='{$docid}'",
 
                     "{$query} AND tvtpl.templateid = '{$doc['template']}'",
@@ -4461,7 +4460,7 @@ 
             return $this->tmpCache[__FUNCTION__][$cacheKey];
         }
 
-        if (($idnames !== '*' && !is_array($idnames)) || empty($idnames) ) {
+        if (($idnames !== '*' && !is_array($idnames)) || empty($idnames)) {
             return false;
         } else {
 
@@ -4480,36 +4479,36 @@ 
 
             // get user defined template variables
             if (!empty($fields) && (is_scalar($fields) || \is_array($fields))) {
-                if(\is_scalar($fields)) {
+                if (\is_scalar($fields)) {
                     $fields = explode(',', $fields);
                 }
-                $fields = array_filter(array_map('trim', $fields), function($value) {
+                $fields = array_filter(array_map('trim', $fields), function($value){
                     return $value !== 'value';
                 });
-                $fields = 'tv.' . implode(',tv.', $fields);
+                $fields = 'tv.'.implode(',tv.', $fields);
             } else {
                 $fields = 'tv.*';
             }
-            $sort = ($sort == '') ? '' : 'tv.' . implode(',tv.', array_filter(array_map('trim', explode(',', $sort))));
+            $sort = ($sort == '') ? '' : 'tv.'.implode(',tv.', array_filter(array_map('trim', explode(',', $sort))));
 
             if ($idnames === '*') {
                 $query = 'tv.id<>0';
             } else {
-                $query = (is_numeric($idnames[0]) ? 'tv.id' : 'tv.name') . " IN ('" . implode("','", $idnames) . "')";
+                $query = (is_numeric($idnames[0]) ? 'tv.id' : 'tv.name')." IN ('".implode("','", $idnames)."')";
             }
 
             $rs = $this->getDatabase()->select(
                 "{$fields}, IF(tvc.value != '', tvc.value, tv.default_text) as value",
-                $this->getDatabase()->getFullTableName('site_tmplvars') . ' tv ' .
-                'INNER JOIN ' . $this->getDatabase()->getFullTableName('site_tmplvar_templates') . ' tvtpl ON tvtpl.tmplvarid = tv.id ' .
-                'LEFT JOIN ' . $this->getDatabase()->getFullTableName('site_tmplvar_contentvalues') . " tvc ON tvc.tmplvarid = tv.id AND tvc.contentid = '" . $docid . "'",
-                $query . " AND tvtpl.templateid = '" . $docRow['template'] . "'",
-                ($sort ? ($sort . ' ' . $dir) : '')
+                $this->getDatabase()->getFullTableName('site_tmplvars').' tv '.
+                'INNER JOIN '.$this->getDatabase()->getFullTableName('site_tmplvar_templates').' tvtpl ON tvtpl.tmplvarid = tv.id '.
+                'LEFT JOIN '.$this->getDatabase()->getFullTableName('site_tmplvar_contentvalues')." tvc ON tvc.tmplvarid = tv.id AND tvc.contentid = '".$docid."'",
+                $query." AND tvtpl.templateid = '".$docRow['template']."'",
+                ($sort ? ($sort.' '.$dir) : '')
             );
             $result = $this->getDatabase()->makeArray($rs);
 
             // get default/built-in template variables
-            if(is_array($docRow)){
+            if (is_array($docRow)) {
                 ksort($docRow);
 
                 foreach ($docRow as $name => $value) {
@@ -4544,13 +4543,13 @@ 
      */
     public function getTemplateVarOutput($idnames = array(), $docid = '', $published = 1, $sep = '')
     {
-        if (is_array($idnames) && empty($idnames) ) {
+        if (is_array($idnames) && empty($idnames)) {
             return false;
         } else {
             $output = array();
             $vars = ($idnames == '*' || is_array($idnames)) ? $idnames : array($idnames);
 
-            $docid = (int)$docid > 0 ? (int)$docid : $this->documentIdentifier;
+            $docid = (int) $docid > 0 ? (int) $docid : $this->documentIdentifier;
             // remove sort for speed
             $result = $this->getTemplateVars($vars, '*', $docid, $published, '', '');
 
@@ -4688,8 +4687,8 @@ 
         $out = false;
 
         if (!empty($context)) {
-            if (is_scalar($context) && isset($_SESSION[$context . 'Validated'])) {
-                $out = $_SESSION[$context . 'InternalKey'];
+            if (is_scalar($context) && isset($_SESSION[$context.'Validated'])) {
+                $out = $_SESSION[$context.'InternalKey'];
             }
         } else {
             switch (true) {
@@ -4717,8 +4716,8 @@ 
         $out = false;
 
         if (!empty($context)) {
-            if (is_scalar($context) && isset($_SESSION[$context . 'Validated'])) {
-                $out = $_SESSION[$context . 'Shortname'];
+            if (is_scalar($context) && isset($_SESSION[$context.'Validated'])) {
+                $out = $_SESSION[$context.'Shortname'];
             }
         } else {
             switch (true) {
@@ -4768,8 +4767,8 @@ 
             return $this->tmpCache[__FUNCTION__][$uid];
         }
 
-        $from = $this->getDatabase()->getFullTableName('manager_users') . ' mu INNER JOIN ' .
-            $this->getDatabase()->getFullTableName('user_attributes'). ' mua ON mua.internalkey=mu.id';
+        $from = $this->getDatabase()->getFullTableName('manager_users').' mu INNER JOIN '.
+            $this->getDatabase()->getFullTableName('user_attributes').' mua ON mua.internalkey=mu.id';
         $where = sprintf("mu.id='%s'", $this->getDatabase()->escape($uid));
         $rs = $this->getDatabase()->select('mu.username, mu.password, mua.*', $from, $where, '', 1);
 
@@ -4797,8 +4796,8 @@ 
     {
         $rs = $this->getDatabase()->select(
             'wu.username, wu.password, wua.*',
-            $this->getDatabase()->getFullTableName("web_users") . ' wu ' .
-                'INNER JOIN ' . $this->getDatabase()->getFullTableName("web_user_attributes") . ' wua ' .
+            $this->getDatabase()->getFullTableName("web_users").' wu '.
+                'INNER JOIN '.$this->getDatabase()->getFullTableName("web_user_attributes").' wua '.
                 'ON wua.internalkey=wu.id',
             "wu.id='{$uid}'"
         );
@@ -4840,13 +4839,13 @@ 
             $ds = $this->getDatabase()->select(
                 'name',
                 $this->getDatabase()->getFullTableName("documentgroup_names"),
-                "id IN (" . implode(",", $dg) . ")"
+                "id IN (".implode(",", $dg).")"
             );
             while ($row = $this->getDatabase()->getRow($ds)) {
                 $dgn[] = $row['name'];
             }
             // cache docgroup names to session
-            $_SESSION[$this->getContext() . 'DocgrpNames'] = $dgn;
+            $_SESSION[$this->getContext().'DocgrpNames'] = $dgn;
             return $dgn;
         }
     }
@@ -4865,7 +4864,7 @@ 
         $rt = false;
         if ($_SESSION["webValidated"] == 1) {
             $tbl = $this->getDatabase()->getFullTableName("web_users");
-            $ds = $this->getDatabase()->select('id, username, password', $tbl, "id='" . $this->getLoginUserID() . "'");
+            $ds = $this->getDatabase()->select('id, username, password', $tbl, "id='".$this->getLoginUserID()."'");
             if ($row = $this->getDatabase()->getRow($ds)) {
                 if ($row["password"] == md5($oldPwd)) {
                     if (strlen($newPwd) < 6) {
@@ -4875,7 +4874,7 @@ 
                     } else {
                         $this->getDatabase()->update(array(
                             'password' => $this->getDatabase()->escape($newPwd),
-                        ), $tbl, "id='" . $this->getLoginUserID() . "'");
+                        ), $tbl, "id='".$this->getLoginUserID()."'");
                         // invoke OnWebChangePassword event
                         $this->invokeEvent("OnWebChangePassword", array(
                             "userid" => $row["id"],
@@ -4908,8 +4907,8 @@ 
         if (!is_array($grpNames)) {
             $rs = $this->getDatabase()->select(
                 'wgn.name',
-                $this->getDatabase()->getFullTableName("webgroup_names") . ' wgn ' .
-                    'INNER JOIN ' . $this->getDatabase()->getFullTableName("web_groups") . " wg ON wg.webgroup=wgn.id AND wg.webuser='" . $this->getLoginUserID() . "'"
+                $this->getDatabase()->getFullTableName("webgroup_names").' wgn '.
+                    'INNER JOIN '.$this->getDatabase()->getFullTableName("web_groups")." wg ON wg.webgroup=wgn.id AND wg.webuser='".$this->getLoginUserID()."'"
             );
             $grpNames = $this->getDatabase()->getColumn("name", $rs);
             // save to cache
@@ -4943,7 +4942,7 @@ 
         if (strpos(strtolower($src), "<style") !== false || strpos(strtolower($src), "<link") !== false) {
             $this->sjscripts[$nextpos] = $src;
         } else {
-            $this->sjscripts[$nextpos] = "\t" . '<link rel="stylesheet" type="text/css" href="' . $src . '" ' . ($media ? 'media="' . $media . '" ' : '') . '/>';
+            $this->sjscripts[$nextpos] = "\t".'<link rel="stylesheet" type="text/css" href="'.$src.'" '.($media ? 'media="'.$media.'" ' : '').'/>';
         }
     }
 
@@ -5022,7 +5021,7 @@ 
         }
 
         if ($useThisVer && $plaintext != true && (strpos(strtolower($src), "<script") === false)) {
-            $src = "\t" . '<script type="text/javascript" src="' . $src . '"></script>';
+            $src = "\t".'<script type="text/javascript" src="'.$src.'"></script>';
         }
         if ($startup) {
             $pos = isset($overwritepos) ? $overwritepos : max(array_merge(array(0), array_keys($this->sjscripts))) + 1;
@@ -5162,7 +5161,7 @@ 
 
         $this->storeEvent();
 
-        $out = $this['events']->dispatch('evolution.' . $evtName, [$extParams]);
+        $out = $this['events']->dispatch('evolution.'.$evtName, [$extParams]);
         if ($out === false) {
             $this->restoreEvent();
             return false;
@@ -5216,7 +5215,7 @@ 
                 $eventtime = $this->getMicroTime() - $eventtime;
                 $this->pluginsCode .= sprintf('<fieldset><legend><b>%s / %s</b> (%2.2f ms)</legend>', $evtName, $pluginName, $eventtime * 1000);
                 foreach ($parameter as $k => $v) {
-                    $this->pluginsCode .= "{$k} => " . print_r($v, true) . '<br>';
+                    $this->pluginsCode .= "{$k} => ".print_r($v, true).'<br>';
                 }
                 $this->pluginsCode .= '</fieldset><br />';
                 $this->pluginsTime["{$evtName} / {$pluginName}"] += $eventtime;
@@ -5244,13 +5243,13 @@ 
         $plugin = array();
         if (isset ($this->pluginCache[$pluginName])) {
             $pluginCode = $this->pluginCache[$pluginName];
-            $pluginProperties = isset($this->pluginCache[$pluginName . "Props"]) ? $this->pluginCache[$pluginName . "Props"] : '';
+            $pluginProperties = isset($this->pluginCache[$pluginName."Props"]) ? $this->pluginCache[$pluginName."Props"] : '';
         } else {
             $pluginName = $this->getDatabase()->escape($pluginName);
             $result = $this->getDatabase()->select('name, plugincode, properties', $this->getDatabase()->getFullTableName("site_plugins"), "name='{$pluginName}' AND disabled=0");
             if ($row = $this->getDatabase()->getRow($result)) {
                 $pluginCode = $this->pluginCache[$row['name']] = $row['plugincode'];
-                $pluginProperties = $this->pluginCache[$row['name'] . "Props"] = $row['properties'];
+                $pluginProperties = $this->pluginCache[$row['name']."Props"] = $row['properties'];
             } else {
                 $pluginCode = $this->pluginCache[$pluginName] = "return false;";
                 $pluginProperties = '';
@@ -5274,7 +5273,7 @@ 
     {
         $property = array();
 
-        if(\is_scalar($propertyString)) {
+        if (\is_scalar($propertyString)) {
             $propertyString = trim($propertyString);
             $propertyString = str_replace('{}', '', $propertyString);
             $propertyString = str_replace('} {', ',', $propertyString);
@@ -5328,7 +5327,7 @@ 
                 }
             }
         }
-        elseif(\is_array($propertyString)) {
+        elseif (\is_array($propertyString)) {
             $property = $propertyString;
         }
         if (!empty($elementName) && !empty($elementType)) {
@@ -5351,7 +5350,7 @@ 
     /**
      * @deprecated
      */
-    public function parseDocBlockFromFile($element_dir, $filename, $escapeValues = false) {
+    public function parseDocBlockFromFile($element_dir, $filename, $escapeValues = false){
         $data = $this->get('DocBlock')->parseFromFile($element_dir, $filename);
         if ($escapeValues) {
             $data = $this->getDatabase()->escape($data);
@@ -5362,7 +5361,7 @@ 
     /**
      * @deprecated
      */
-    public function parseDocBlockFromString($string, $escapeValues = false) {
+    public function parseDocBlockFromString($string, $escapeValues = false){
         $data = $this->get('DocBlock')->parseFromString($string);
         if ($escapeValues) {
             $data = $this->getDatabase()->escape($data);
@@ -5373,14 +5372,14 @@ 
     /**
      * @deprecated
      */
-    public function parseDocBlockLine($line, $docblock_start_found, $name_found, $description_found, $docblock_end_found) {
+    public function parseDocBlockLine($line, $docblock_start_found, $name_found, $description_found, $docblock_end_found){
         return $this->get('DocBlock')->parseLine($line, $docblock_start_found, $name_found, $description_found, $docblock_end_found);
     }
 
     /**
      * @deprecated
      */
-    public function convertDocBlockIntoList($parsed) {
+    public function convertDocBlockIntoList($parsed){
         return $this->get('DocBlock')->convertIntoList($parsed);
     }
 
@@ -5449,8 +5448,8 @@ 
      */
     public function addSnippet($name, $phpCode, $namespace = '#', array $defaultParams = array())
     {
-        $this->snippetCache[$namespace . $name] = $phpCode;
-        $this->snippetCache[$namespace . $name . 'Props'] = $defaultParams;
+        $this->snippetCache[$namespace.$name] = $phpCode;
+        $this->snippetCache[$namespace.$name.'Props'] = $defaultParams;
     }
 
     /**
@@ -5458,7 +5457,7 @@ 
      */
     public function addChunk($name, $text, $namespace = '#')
     {
-        $this->chunkCache[$namespace . $name] = $text;
+        $this->chunkCache[$namespace.$name] = $text;
     }
 
     /**
@@ -5468,7 +5467,7 @@ 
     {
         $out = array();
 
-        if (! is_dir($scanPath) || empty($ext)) {
+        if (!is_dir($scanPath) || empty($ext)) {
             return $out;
         }
         $iterator = new \RecursiveIteratorIterator(
@@ -5480,22 +5479,22 @@ 
              * @var \SplFileInfo $item
              */
             if ($item->isFile() && $item->isReadable() && \in_array($item->getExtension(), $ext)) {
-                $name = $item->getBasename('.' . $item->getExtension());
+                $name = $item->getBasename('.'.$item->getExtension());
                 $path = ltrim(str_replace(
                     array(rtrim($scanPath, '//'), '/'),
                     array('', '\\'),
-                    $item->getPath() . '/'
+                    $item->getPath().'/'
                 ), '\\');
 
                 if (!empty($path)) {
-                    $name = $path . $name;
+                    $name = $path.$name;
                 }
                 switch ($type) {
                     case 'chunk':
                         $out[$name] = file_get_contents($item->getRealPath());
                         break;
                     case 'snippet':
-                        $out[$name] = "return require '" . $item->getRealPath() . "';";
+                        $out[$name] = "return require '".$item->getRealPath()."';";
                         break;
                     default:
                         throw new \Exception;
@@ -5539,7 +5538,7 @@ 
         }
 
         if (!$isSafe) {
-            $msg = $phpcode . "\n" . $this->currentSnippet . "\n" . print_r($_SERVER, true);
+            $msg = $phpcode."\n".$this->currentSnippet."\n".print_r($_SERVER, true);
             $title = sprintf('Unknown eval was executed (%s)', $this->getPhpCompat()->htmlspecialchars(substr(trim($phpcode), 0, 50)));
             $this->getService('ExceptionHandler')
                 ->messageQuit($title, '', true, '', '', 'Parser', $msg);
@@ -5554,7 +5553,7 @@ 
             return 'array()';
         }
 
-        $output = $echo . $return;
+        $output = $echo.$return;
         modx_sanitize_gpc($output);
         return $this->getPhpCompat()->htmlspecialchars($output); // Maybe, all html tags are dangerous
     }
@@ -5572,8 +5571,8 @@ 
 
         $safe = explode(',', $safe_functions);
 
-        $phpcode = rtrim($phpcode, ';') . ';';
-        $tokens = token_get_all('<?php ' . $phpcode);
+        $phpcode = rtrim($phpcode, ';').';';
+        $tokens = token_get_all('<?php '.$phpcode);
         foreach ($tokens as $i => $token) {
             if (!is_array($token)) {
                 continue;
@@ -5609,7 +5608,7 @@ 
     public function atBindFileContent($str = '')
     {
 
-        $search_path = array('assets/tvs/', 'assets/chunks/', 'assets/templates/', $this->getConfig('rb_base_url') . 'files/', '');
+        $search_path = array('assets/tvs/', 'assets/chunks/', 'assets/templates/', $this->getConfig('rb_base_url').'files/', '');
 
         if (stripos($str, '@FILE') !== 0) {
             return $str;
@@ -5632,7 +5631,7 @@ 
         $errorMsg = sprintf("Could not retrieve string '%s'.", $str);
 
         foreach ($search_path as $path) {
-            $file_path = MODX_BASE_PATH . $path . $str;
+            $file_path = MODX_BASE_PATH.$path.$str;
             if (strpos($file_path, MODX_MANAGER_PATH) === 0) {
                 return $errorMsg;
             } elseif (is_file($file_path)) {
@@ -5646,7 +5645,7 @@ 
             return $errorMsg;
         }
 
-        $content = (string)file_get_contents($file_path);
+        $content = (string) file_get_contents($file_path);
         if ($content === false) {
             return $errorMsg;
         }
@@ -5723,7 +5722,7 @@ 
             }
 
             if (isset ($usrType)) {
-                $_SESSION[$usrType . 'UsrConfigSet'] = $usrSettings;
+                $_SESSION[$usrType.'UsrConfigSet'] = $usrSettings;
             } // store user settings in session
         }
         if ($this->isFrontend() && $mgrid = $this->getLoginUserID('mgr')) {
@@ -5765,7 +5764,7 @@ 
             include $siteCachePath;
         }
 
-        if (! empty($this->config)) {
+        if (!empty($this->config)) {
             return;
         }
 
@@ -5778,7 +5777,7 @@ 
         if (is_file($siteCachePath)) {
             include $siteCachePath;
         }
-        if (! empty($this->config)) {
+        if (!empty($this->config)) {
             return;
         }
 
@@ -5882,7 +5881,7 @@ 
             $alias = strip_tags($alias); // strip HTML
             $alias = preg_replace('/[^\.A-Za-z0-9 _-]/', '', $alias); // strip non-alphanumeric characters
             $alias = preg_replace('/\s+/', '-', $alias); // convert white-space to dash
-            $alias = preg_replace('/-+/', '-', $alias);  // convert multiple dashes to one
+            $alias = preg_replace('/-+/', '-', $alias); // convert multiple dashes to one
             $alias = trim($alias, '-'); // trim excess
             return $alias;
         }
@@ -5936,10 +5935,10 @@ 
 
         if (strpos($str, MODX_MANAGER_PATH) === 0) {
             return false;
-        } elseif (is_file(MODX_BASE_PATH . $str)) {
-            $file_path = MODX_BASE_PATH . $str;
-        } elseif (is_file(MODX_BASE_PATH . "{$tpl_dir}{$str}")) {
-            $file_path = MODX_BASE_PATH . $tpl_dir . $str;
+        } elseif (is_file(MODX_BASE_PATH.$str)) {
+            $file_path = MODX_BASE_PATH.$str;
+        } elseif (is_file(MODX_BASE_PATH."{$tpl_dir}{$str}")) {
+            $file_path = MODX_BASE_PATH.$tpl_dir.$str;
         } else {
             return false;
         }
@@ -6036,7 +6035,7 @@ 
             $title = 'no title';
         }
         if (is_array($msg)) {
-            $msg = '<pre>' . print_r($msg, true) . '</pre>';
+            $msg = '<pre>'.print_r($msg, true).'</pre>';
         } elseif ($msg === '') {
             $msg = $_SERVER['REQUEST_URI'];
         }

Braces +31 added lines, -18 removed lines

@@ -898,7 +898,8 @@ 
             $where
         );
         $this->getDatabase()->update($field, $this->getDatabase()->getFullTableName('site_content'), $where);
-        if ($this->getDatabase()->getRecordCount($result_pub) >= 1) { //Event unPublished doc
+        if ($this->getDatabase()->getRecordCount($result_pub) >= 1) {
+//Event unPublished doc
             while ($row_pub = $this->getDatabase()->getRow($result_pub)) {
                 $this->invokeEvent("OnDocUnPublished", array(
                     "docid" => $row_pub['id']
@@ -915,7 +916,8 @@ 
             $where
         );
         $this->getDatabase()->update($field, $this->getDatabase()->getFullTableName('site_content'), $where);
-        if ($this->getDatabase()->getRecordCount($result_unpub) >= 1) { //Event unPublished doc
+        if ($this->getDatabase()->getRecordCount($result_unpub) >= 1) {
+//Event unPublished doc
             while ($row_unpub = $this->getDatabase()->getRow($result_unpub)) {
                 $this->invokeEvent("OnDocUnPublished", array(
                     "docid" => $row_unpub['id']
@@ -1071,7 +1073,8 @@ 
                         }
                     }
 
-                    if (!in_array($fetch, $tags)) {  // Avoid double Matches
+                    if (!in_array($fetch, $tags)) {
+// Avoid double Matches
                         $tags[] = $fetch; // Fetch
                     };
                     $fetch = ''; // and reset
@@ -1914,7 +1917,8 @@ 
      * @return mixed|string
      */
     public function _getSGVar($value)
-    { // Get super globals
+    {
+// Get super globals
         $key = $value;
         $_ = $this->getConfig('enable_filter');
         $this->setConfig('enable_filter', 1);
@@ -2996,7 +3000,8 @@ 
      * @param array $permissions
      * @return bool
      */
-    public function hasAnyPermissions(array $permissions) {
+    public function hasAnyPermissions(array $permissions)
+    {
         foreach ($permissions as $p) {
             if ($this->hasPermission($p)) {
                 return true;
@@ -3971,7 +3976,8 @@ 
         if (isset ($this->snippetCache[$snippetName])) {
             $snippet = $this->snippetCache[$snippetName];
             $properties = !empty($this->snippetCache[$snippetName . "Props"]) ? $this->snippetCache[$snippetName . "Props"] : '';
-        } else { // not in cache so let's check the db
+        } else {
+// not in cache so let's check the db
             $snippetObject = $this->_getSnippetFromDatabase($snippetName);
 
             $snippet = $this->snippetCache[$snippetName] = $snippetObject['content'] === null ?? "return false;";
@@ -4483,7 +4489,7 @@ 
                 if(\is_scalar($fields)) {
                     $fields = explode(',', $fields);
                 }
-                $fields = array_filter(array_map('trim', $fields), function($value) {
+                $fields = array_filter(array_map('trim', $fields), function($value){
                     return $value !== 'value';
                 });
                 $fields = 'tv.' . implode(',tv.', $fields);
@@ -4509,7 +4515,7 @@ 
             $result = $this->getDatabase()->makeArray($rs);
 
             // get default/built-in template variables
-            if(is_array($docRow)){
+            if(is_array($docRow)) {
                 ksort($docRow);
 
                 foreach ($docRow as $name => $value) {
@@ -4989,7 +4995,8 @@ 
         unset($overwritepos); // probably unnecessary--just making sure
 
         $useThisVer = true;
-        if (isset($this->loadedjscripts[$key])) { // a matching script was found
+        if (isset($this->loadedjscripts[$key])) {
+// a matching script was found
             // if existing script is a startup script, make sure the candidate is also a startup script
             if ($this->loadedjscripts[$key]['startup']) {
                 $startup = true;
@@ -5009,7 +5016,8 @@ 
                     // overwrite the old script (the position may be important for dependent scripts)
                     $overwritepos = $this->loadedjscripts[$key]['pos'];
                 }
-            } else { // Use the original version
+            } else {
+// Use the original version
                 if ($startup == true && $this->loadedjscripts[$key]['startup'] == false) {
                     // need to move the exisiting script to the head
                     $version = $this->loadedjscripts[$key][$version];
@@ -5181,7 +5189,8 @@ 
             return $results ?? false;
         }
 
-        foreach ($this->pluginEvent[$evtName] as $pluginName) { // start for loop
+        foreach ($this->pluginEvent[$evtName] as $pluginName) {
+// start for loop
             if ($this->dumpPlugins) {
                 $eventtime = $this->getMicroTime();
             }
@@ -5327,8 +5336,7 @@ 
                     }
                 }
             }
-        }
-        elseif(\is_array($propertyString)) {
+        } elseif(\is_array($propertyString)) {
             $property = $propertyString;
         }
         if (!empty($elementName) && !empty($elementType)) {
@@ -5351,7 +5359,8 @@ 
     /**
      * @deprecated
      */
-    public function parseDocBlockFromFile($element_dir, $filename, $escapeValues = false) {
+    public function parseDocBlockFromFile($element_dir, $filename, $escapeValues = false)
+    {
         $data = $this->get('DocBlock')->parseFromFile($element_dir, $filename);
         if ($escapeValues) {
             $data = $this->getDatabase()->escape($data);
@@ -5362,7 +5371,8 @@ 
     /**
      * @deprecated
      */
-    public function parseDocBlockFromString($string, $escapeValues = false) {
+    public function parseDocBlockFromString($string, $escapeValues = false)
+    {
         $data = $this->get('DocBlock')->parseFromString($string);
         if ($escapeValues) {
             $data = $this->getDatabase()->escape($data);
@@ -5373,14 +5383,16 @@ 
     /**
      * @deprecated
      */
-    public function parseDocBlockLine($line, $docblock_start_found, $name_found, $description_found, $docblock_end_found) {
+    public function parseDocBlockLine($line, $docblock_start_found, $name_found, $description_found, $docblock_end_found)
+    {
         return $this->get('DocBlock')->parseLine($line, $docblock_start_found, $name_found, $description_found, $docblock_end_found);
     }
 
     /**
      * @deprecated
      */
-    public function convertDocBlockIntoList($parsed) {
+    public function convertDocBlockIntoList($parsed)
+    {
         return $this->get('DocBlock')->convertIntoList($parsed);
     }
 
@@ -5565,7 +5577,8 @@ 
      * @return bool
      */
     public function isSafeCode($phpcode = '', $safe_functions = '')
-    { // return true or false
+    {
+// return true or false
         if ($safe_functions == '') {
             return false;
         }

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

@@ -2225,11 +2225,11 @@ 
         if (array_key_exists($snip_name, $this->snippetCache)) {
             $snippetObject['name'] = $snip_name;
             $snippetObject['content'] = $this->snippetCache[$snip_name];
-            if (isset($this->snippetCache["{$snip_name}Props"])) {
-                if (!isset($this->snippetCache["{$snip_name}Props"])) {
-                    $this->snippetCache["{$snip_name}Props"] = '';
+            if (isset($this->snippetCache["{$snip_name}props"])) {
+                if (!isset($this->snippetCache["{$snip_name}props"])) {
+                    $this->snippetCache["{$snip_name}props"] = '';
                 }
-                $snippetObject['properties'] = $this->snippetCache["{$snip_name}Props"];
+                $snippetObject['properties'] = $this->snippetCache["{$snip_name}props"];
             }
         } elseif (substr($snip_name, 0, 1) === '@' && isset($this->pluginEvent[substr($snip_name, 1)])) {
             $snippetObject['name'] = substr($snip_name, 1);
@@ -2242,7 +2242,7 @@ 
             $snippetObject = $this->_getSnippetFromDatabase($snip_name);
 
             $this->snippetCache[$snip_name] = $snippetObject['content'];
-            $this->snippetCache["{$snip_name}Props"] = $snippetObject['properties'];
+            $this->snippetCache["{$snip_name}props"] = $snippetObject['properties'];
         }
 
         return $snippetObject;
@@ -3508,7 +3508,7 @@ 
         }
         // build query
         $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
-        $result = $this->getDatabase()->select("DISTINCT {$fields}", "{$tblsc} sc
+        $result = $this->getDatabase()->select("distinct {$fields}", "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg on dg.document = sc.id", "sc.parent = '{$id}' AND ({$access}) GROUP BY sc.id",
             "{$sort} {$dir}");
         $resourceArray = $this->getDatabase()->makeArray($result);
@@ -3551,7 +3551,7 @@ 
         }
         // build query
         $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
-        $result = $this->getDatabase()->select("DISTINCT {$fields}", "{$tblsc} sc
+        $result = $this->getDatabase()->select("distinct {$fields}", "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg on dg.document = sc.id",
             "sc.parent = '{$id}' AND sc.published=1 AND sc.deleted=0 AND ({$access}) GROUP BY sc.id", "{$sort} {$dir}");
         $resourceArray = $this->getDatabase()->makeArray($result);
@@ -3616,7 +3616,7 @@ 
         $tblsc = $this->getDatabase()->getFullTableName('site_content');
         $tbldg = $this->getDatabase()->getFullTableName('document_groups');
 
-        $result = $this->getDatabase()->select("DISTINCT {$fields}", "{$tblsc} sc
+        $result = $this->getDatabase()->select("distinct {$fields}", "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg on dg.document = sc.id",
             "sc.parent = '{$parentid}' {$published} {$deleted} {$where} AND ({$access}) GROUP BY sc.id",
             ($sort ? "{$sort} {$dir}" : ""), $limit);
@@ -3693,7 +3693,7 @@ 
             $tblsc = $this->getDatabase()->getFullTableName('site_content');
             $tbldg = $this->getDatabase()->getFullTableName('document_groups');
 
-            $result = $this->getDatabase()->select("DISTINCT {$fields}", "{$tblsc} sc
+            $result = $this->getDatabase()->select("distinct {$fields}", "{$tblsc} sc
                     LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id IN (" . implode(',',
                     $ids) . ") {$published} {$deleted} {$where}) AND ({$access}) GROUP BY sc.id",
                 ($sort ? "{$sort} {$dir}" : ""), $limit);
@@ -4155,7 +4155,7 @@ 
                 $template = $doc['content'];
                 break;
             case 'SELECT':
-                $this->getDatabase()->getValue($this->getDatabase()->query("SELECT {$template}"));
+                $this->getDatabase()->getValue($this->getDatabase()->query("select {$template}"));
                 break;
             default:
                 if (!($template = $this->getChunk($tpl))) {

core/src/Database.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,8 +2,8 @@
 
 use AgelxNash\Modx\Evo\Database\Database as BaseDatabase;
 use AgelxNash\Modx\Evo\Database\Drivers\IlluminateDriver;
-use Exception;
 use AgelxNash\Modx\Evo\Database\Exceptions;
+use Exception;
 
 class Database extends BaseDatabase implements Interfaces\DatabaseInterface
 {

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
     public function replaceFullTableName($tableName, $force = false)
     {
         $tableName = trim($tableName);
-        if ((bool)$force === true) {
+        if ((bool) $force === true) {
             $result = $this->getFullTableName($tableName);
         } elseif (strpos($tableName, '[+prefix+]') !== false) {
             $dbase = trim($this->getConfig('database'), '`');
@@ -26,7 +26,7 @@ 
 
             $result = preg_replace(
                 '@\[\+prefix\+\](\w+)@',
-                '`' . $dbase . '`.`' . $prefix . '$1`',
+                '`'.$dbase.'`.`'.$prefix.'$1`',
                 $tableName
             );
         } else {
@@ -64,7 +64,7 @@ 
         $fromTable = '',
         $where = '',
         $limit = ''
-    ) {
+    ){
         if (is_array($fields)) {
             $onlyKeys = true;
             foreach ($fields as $key => $value) {

core/src/Event.php

Doc Comments +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
     }
 
     /**
-     * @param mixed $data
+     * @param string $data
      */
     public function addOutput($data)
     {
@@ -90,7 +90,7 @@ 
     }
 
     /**
-     * @return mixed
+     * @return string
      */
     public function getOutput()
     {

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
         if (is_array($SystemAlertMsgQueque)) {
             $title = '';
             if ($this->name && $this->activePlugin) {
-                $title = "<div><b>" . $this->activePlugin . "</b> - <span style='color:maroon;'>" . $this->name . "</span></div>";
+                $title = "<div><b>".$this->activePlugin."</b> - <span style='color:maroon;'>".$this->name."</span></div>";
             }
             $SystemAlertMsgQueque[] = "$title<div style='margin-left:10px;margin-top:3px;'>$msg</div>";
         }

core/src/ExceptionHandler.php

Doc Comments +2 added lines, -2 removed lines

@@ -96,7 +96,7 @@ 
      * @param string $text Error message
      * @param string $file File where the error was detected
      * @param string $line Line number within $file
-     * @return boolean
+     * @return boolean|null
      */
     public function phpError($nr, $text, $file, $line)
     {
@@ -148,7 +148,7 @@ 
      * @param string $text
      * @param string $line
      * @param string $output
-     * @return bool
+     * @return null|boolean
      */
     public function messageQuit(
         $msg = 'unspecified error',

Unused Use Statements +3 added lines, -3 removed lines

@@ -1,12 +1,12 @@
 <?php namespace EvolutionCMS;
 
-use Illuminate\Contracts\Container\Container;
 use AgelxNash\Modx\Evo\Database\Exceptions\ConnectException;
+use EvolutionCMS\Interfaces\TracyPanel;
+use EvolutionCMS\Tracy\Debugger;
 use Exception;
+use Illuminate\Contracts\Container\Container;
 use Symfony\Component\Debug\Exception\FatalErrorException;
 use Symfony\Component\Debug\Exception\FatalThrowableError;
-use EvolutionCMS\Tracy\Debugger;
-use EvolutionCMS\Interfaces\TracyPanel;
 
 /**
  * @see: https://github.com/laravel/framework/blob/5.6/src/Illuminate/Foundation/Bootstrap/HandleExceptions.php

Spacing +34 added lines, -34 removed lines

@@ -24,8 +24,8 @@ 
         $this->container = $container;
 
         Debugger::enable(
-            ! $this->container['config']->get('tracy.active'),
-            evolutionCMS()->storagePath() . '/logs'
+            !$this->container['config']->get('tracy.active'),
+            evolutionCMS()->storagePath().'/logs'
         );
         Debugger::$strictMode = false;
         Debugger::$showLocation = true;
@@ -161,7 +161,7 @@ 
         $line = '',
         $output = '',
         $backtrace = array()
-    ) {
+    ){
         if (0 < $this->container->messageQuitCount) {
             return;
         }
@@ -176,7 +176,7 @@ 
 
         $version = isset ($GLOBALS['modx_version']) ? $GLOBALS['modx_version'] : '';
         $release_date = isset ($GLOBALS['release_date']) ? $GLOBALS['release_date'] : '';
-        $request_uri = "http://" . $_SERVER['HTTP_HOST'] . ($_SERVER["SERVER_PORT"] == 80 ? "" : (":" . $_SERVER["SERVER_PORT"])) . $_SERVER['REQUEST_URI'];
+        $request_uri = "http://".$_SERVER['HTTP_HOST'].($_SERVER["SERVER_PORT"] == 80 ? "" : (":".$_SERVER["SERVER_PORT"])).$_SERVER['REQUEST_URI'];
         $request_uri = $this->container->getPhpCompat()->htmlspecialchars($request_uri, ENT_QUOTES,
             $this->container->getConfig('modx_charset'));
         $ua = $this->container->getPhpCompat()->htmlspecialchars($_SERVER['HTTP_USER_AGENT'], ENT_QUOTES,
@@ -186,15 +186,15 @@ 
         if ($is_error) {
             $str = '<h2 style="color:red">&laquo; Evo Parse Error &raquo;</h2>';
             if ($msg != 'PHP Parse Error') {
-                $str .= '<h3 style="color:red">' . $msg . '</h3>';
+                $str .= '<h3 style="color:red">'.$msg.'</h3>';
             }
         } else {
             $str = '<h2 style="color:#003399">&laquo; Evo Debug/ stop message &raquo;</h2>';
-            $str .= '<h3 style="color:#003399">' . $msg . '</h3>';
+            $str .= '<h3 style="color:#003399">'.$msg.'</h3>';
         }
 
         if (!empty ($query)) {
-            $str .= '<pre style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">SQL &gt; <span id="sqlHolder">' . $query . '</span></pre>';
+            $str .= '<pre style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">SQL &gt; <span id="sqlHolder">'.$query.'</span></pre>';
         }
 
         $errortype = array(
@@ -217,13 +217,13 @@ 
 
         if (!empty($nr) || !empty($file)) {
             if ($text != '') {
-                $str .= '<pre style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">Error : ' . $text . '</pre>';
+                $str .= '<pre style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">Error : '.$text.'</pre>';
             }
             if ($output != '') {
-                $str .= '<pre style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">' . $output . '</pre>';
+                $str .= '<pre style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">'.$output.'</pre>';
             }
             if ($nr !== '') {
-                $table[] = array('ErrorType[num]', $errortype [$nr] . "[" . $nr . "]");
+                $table[] = array('ErrorType[num]', $errortype [$nr]."[".$nr."]");
             }
             if ($file) {
                 $table[] = array('File', $file);
@@ -243,7 +243,7 @@ 
         }
 
         if (!empty($this->event->activePlugin)) {
-            $table[] = array('Current Plugin', $this->event->activePlugin . '(' . $this->event->name . ')');
+            $table[] = array('Current Plugin', $this->event->activePlugin.'('.$this->event->name.')');
         }
 
         $str .= $MakeTable->create($table, array('Error information', ''));
@@ -254,11 +254,11 @@ 
 
         if ($this->container->getManagerApi()->action) {
             $actionName = Legacy\LogHandler::getAction($this->container->getManagerApi()->action);
-            if (! empty($actionName)) {
-                $actionName = ' - ' . $actionName;
+            if (!empty($actionName)) {
+                $actionName = ' - '.$actionName;
             }
 
-            $table[] = array('Manager action', $this->container->getManagerApi()->action . $actionName);
+            $table[] = array('Manager action', $this->container->getManagerApi()->action.$actionName);
         }
 
         if (preg_match('@^[0-9]+@', $this->container->documentIdentifier)) {
@@ -266,7 +266,7 @@ 
             $url = $this->container->makeUrl($this->container->documentIdentifier, '', '', 'full');
             $table[] = array(
                 'Resource',
-                '[' . $this->container->documentIdentifier . '] <a href="' . $url . '" target="_blank">' . $resource['pagetitle'] . '</a>'
+                '['.$this->container->documentIdentifier.'] <a href="'.$url.'" target="_blank">'.$resource['pagetitle'].'</a>'
             );
         }
         $table[] = array('Referer', $referer);
@@ -291,7 +291,7 @@ 
 
         $mem = memory_get_peak_usage(true);
         $total_mem = $mem - $this->container->mstart;
-        $total_mem = ($total_mem / 1024 / 1024) . ' mb';
+        $total_mem = ($total_mem / 1024 / 1024).' mb';
 
         $queryTime = $this->container->queryTime;
         $phpTime = $totalTime - $queryTime;
@@ -308,23 +308,23 @@ 
 
         $php_errormsg = error_get_last();
         if (!empty($php_errormsg) && isset($php_errormsg['message'])) {
-            $str = '<b>' . $php_errormsg['message'] . '</b><br />' . PHP_EOL . $str;
+            $str = '<b>'.$php_errormsg['message'].'</b><br />'.PHP_EOL.$str;
         }
         $str .= $this->getBacktrace(empty($backtrace) ? debug_backtrace() : $backtrace);
         // Log error
         if (!empty($this->container->currentSnippet)) {
-            $source = 'Snippet - ' . $this->container->currentSnippet;
+            $source = 'Snippet - '.$this->container->currentSnippet;
         } elseif (!empty($this->container->event->activePlugin)) {
-            $source = 'Plugin - ' . $this->container->event->activePlugin;
+            $source = 'Plugin - '.$this->container->event->activePlugin;
         } elseif ($source !== '') {
-            $source = 'Parser - ' . $source;
+            $source = 'Parser - '.$source;
         } elseif ($query !== '') {
             $source = 'SQL Query';
         } else {
             $source = 'Parser';
         }
         if ($msg) {
-            $source .= ' / ' . $msg;
+            $source .= ' / '.$msg;
         }
         if (isset($actionName) && !empty($actionName)) {
             $source .= $actionName;
@@ -361,13 +361,13 @@ 
 
         // Display error
         if ($this->shouldDisplay()) {
-            echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"><html><head><title>EVO Content Manager ' . $version . ' &raquo; ' . $release_date . '</title>
+            echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"><html><head><title>EVO Content Manager '.$version.' &raquo; '.$release_date.'</title>
                  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-                 <link rel="stylesheet" type="text/css" href="' . MODX_MANAGER_URL . 'media/style/' . $this->container->getConfig('manager_theme',
-                    'default') . '/style.css" />
+                 <link rel="stylesheet" type="text/css" href="' . MODX_MANAGER_URL.'media/style/'.$this->container->getConfig('manager_theme',
+                    'default').'/style.css" />
                  <style type="text/css">body { padding:10px; } td {font:inherit;}</style>
                  </head><body>
-                 ' . $str . '</body></html>';
+                 ' . $str.'</body></html>';
 
         } else {
             echo 'Error';
@@ -407,7 +407,7 @@ 
             switch (get_by_key($val, 'type')) {
                 case '->':
                 case '::':
-                    $functionName = $val['function'] = $val['class'] . $val['type'] . $val['function'];
+                    $functionName = $val['function'] = $val['class'].$val['type'].$val['function'];
                     break;
                 default:
                     $functionName = $val['function'];
@@ -417,7 +417,7 @@ 
             $args = array_pad(array(), $_, '$var');
             $args = implode(", ", $args);
             $modx = &$this;
-            $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val) {
+            $args = preg_replace_callback('/\$var/', function() use ($modx, &$tmp, $val) {
                 $arg = $val['args'][$tmp - 1];
                 switch (true) {
                     case is_null($arg):
@@ -432,8 +432,8 @@ 
                         }
                     case is_scalar($arg):
                         {
-                            $out = strlen($arg) > 20 ? 'string $var' . $tmp : ("'" . $this->container->getPhpCompat()->htmlspecialchars(str_replace("'",
-                                    "\\'", $arg)) . "'");
+                            $out = strlen($arg) > 20 ? 'string $var'.$tmp : ("'".$this->container->getPhpCompat()->htmlspecialchars(str_replace("'",
+                                    "\\'", $arg))."'");
                             break;
                         }
                     case is_bool($arg):
@@ -443,17 +443,17 @@ 
                         }
                     case is_array($arg):
                         {
-                            $out = 'array $var' . $tmp;
+                            $out = 'array $var'.$tmp;
                             break;
                         }
                     case is_object($arg):
                         {
-                            $out = get_class($arg) . ' $var' . $tmp;
+                            $out = get_class($arg).' $var'.$tmp;
                             break;
                         }
                     default:
                         {
-                            $out = '$var' . $tmp;
+                            $out = '$var'.$tmp;
                         }
                 }
                 $tmp++;
@@ -461,8 +461,8 @@ 
                 return $out;
             }, $args);
             $line = array(
-                "<strong>" . $functionName . "</strong>(" . $args . ")",
-                $path . " on line " . $val['line']
+                "<strong>".$functionName."</strong>(".$args.")",
+                $path." on line ".$val['line']
             );
             $table[] = array(implode("<br />", $line));
         }

Braces +1 added lines, -1 removed lines

@@ -417,7 +417,7 @@
             $args = array_pad(array(), $_, '$var');
             $args = implode(", ", $args);
             $modx = &$this;
-            $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val) {
+            $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val){
                 $arg = $val['args'][$tmp - 1];
                 switch (true) {
                     case is_null($arg):

core/src/Interfaces/CoreInterface.php

Doc Comments +2 added lines

@@ -19,6 +19,7 @@ 
      * @param string $phpCode
      * @param string $namespace
      * @param array defaultParams
+     * @return void
      */
     public function addSnippet($name, $phpCode, $namespace = '#', array $defaultParams = array());
 
@@ -26,6 +27,7 @@ 
      * @param string $name
      * @param string $text
      * @param string $namespace
+     * @return void
      */
     public function addChunk($name, $text, $namespace = '#');
 

core/src/Interfaces/ManagerTheme/ControllerInterface.php

Doc Comments +9 added lines

@@ -4,8 +4,14 @@ 
 
 interface ControllerInterface
 {
+    /**
+     * @return void
+     */
     public function __construct(ManagerThemeInterface $managerTheme, array $data = []);
 
+    /**
+     * @return string
+     */
     public function getView() : ?string;
 
     public function setView($view) : bool;
@@ -24,6 +30,9 @@ 
 
     public function render(array $params = []) : string;
 
+    /**
+     * @return void
+     */
     public function setIndex($index) : void;
 
     public function getElementId() : int;

core/src/Interfaces/ManagerThemeInterface.php

Doc Comments +4 added lines

@@ -6,11 +6,15 @@
 
     public function getLang() : string;
 
+    /**
+     * @param string $key
+     */
     public function getStyle($key = null);
 
     /**
      * @param string $message
      * @param bool $lexicon
+     * @return void
      */
     public function alertAndQuit(string $message, $lexicon = true) : void;
 }

core/src/Legacy/Cache.php

Doc Comments +1 added lines, -1 removed lines

@@ -252,7 +252,7 @@
     /**
      * build siteCache file
      * @param Interfaces\CoreInterface $modx
-     * @return boolean success
+     * @return null|boolean success
      */
     public function buildCache($modx)
     {

Spacing +36 added lines, -36 removed lines

@@ -101,7 +101,7 @@ 
         if (isset($this->aliases[$id])) {
             if ($this->aliasVisible[$id] == 1) {
                 if ($path != '') {
-                    $path = $this->aliases[$id] . '/' . $path;
+                    $path = $this->aliases[$id].'/'.$path;
                 } else {
                     $path = $this->aliases[$id];
                 }
@@ -125,7 +125,7 @@ 
             $modx->getService('ExceptionHandler')->messageQuit("Cache path not set.");
         }
 
-        $files = glob(realpath($this->cachePath) . '/*.pageCache.php');
+        $files = glob(realpath($this->cachePath).'/*.pageCache.php');
         $filesincache = count($files);
         $deletedfiles = array();
         while ($file = array_shift($files)) {
@@ -160,9 +160,9 @@ 
                 if (isset($opcache)) {
                     echo '<p>Opcache empty.</p>';
                 }
-                echo '<p>' . $_lang['cache_files_deleted'] . '</p><ul>';
+                echo '<p>'.$_lang['cache_files_deleted'].'</p><ul>';
                 foreach ($deletedfiles as $deletedfile) {
-                    echo '<li>' . $deletedfile . '</li>';
+                    echo '<li>'.$deletedfile.'</li>';
                 }
                 echo '</ul>';
             }
@@ -181,9 +181,9 @@ 
 
 
         // write the file
-        $content = '<?php' . "\n";
-        $content .= '$recent_update=\'' . $this->request_time . '\';' . "\n";
-        $content .= '$cacheRefreshTime=\'' . $cacheRefreshTime . '\';' . "\n";
+        $content = '<?php'."\n";
+        $content .= '$recent_update=\''.$this->request_time.'\';'."\n";
+        $content .= '$cacheRefreshTime=\''.$cacheRefreshTime.'\';'."\n";
 
         $filename = evolutionCMS()->getSitePublishingFilePath();
         if (!$handle = fopen($filename, 'w')) {
@@ -211,7 +211,7 @@ 
         $result = $modx->getDatabase()->select(
             'MIN(pub_date) AS minpub',
             $modx->getDatabase()->getFullTableName('site_content'),
-            'pub_date>' . $this->request_time
+            'pub_date>'.$this->request_time
         );
         if (!$result) {
             echo "Couldn't determine next publish event!";
@@ -225,7 +225,7 @@ 
         $result = $modx->getDatabase()->select(
             'MIN(unpub_date) AS minunpub',
             $modx->getDatabase()->getFullTableName('site_content'),
-            'unpub_date>' . $this->request_time
+            'unpub_date>'.$this->request_time
         );
         if (!$result) {
             echo "Couldn't determine next unpublish event!";
@@ -265,7 +265,7 @@ 
         $config = array();
         $content .= '$c=&$this->config;';
         while (list($key, $value) = $modx->getDatabase()->getRow($rs, 'num')) {
-            $content .= '$c[\'' . $modx->getDatabase()->escape($key) . '\']="' . $this->escapeDoubleQuotes($value) . '";';
+            $content .= '$c[\''.$modx->getDatabase()->escape($key).'\']="'.$this->escapeDoubleQuotes($value).'";';
             $config[$key] = $value;
         }
 
@@ -282,8 +282,8 @@ 
             $f['isfolder'] = 'c.isfolder';
             $f['alias_visible'] = 'c.alias_visible';
             $from = array();
-            $from[] = $modx->getDatabase()->getFullTableName('site_content') . ' c';
-            $from[] = 'LEFT JOIN ' . $modx->getDatabase()->getFullTableName('site_content') . ' p ON p.id=c.parent';
+            $from[] = $modx->getDatabase()->getFullTableName('site_content').' c';
+            $from[] = 'LEFT JOIN '.$modx->getDatabase()->getFullTableName('site_content').' p ON p.id=c.parent';
             $where = 'c.deleted=0 AND (c.isfolder=1 OR p.alias_visible=0)';
             $rs = $modx->getDatabase()->select($f, $from, $where, 'c.parent, c.menuindex');
         } else {
@@ -305,16 +305,16 @@ 
             $docid = $doc['id'];
             if ($use_alias_path) {
                 $tmpPath = $this->getParents($doc['parent']);
-                $alias = (strlen($tmpPath) > 0 ? "$tmpPath/" : '') . $doc['alias'];
+                $alias = (strlen($tmpPath) > 0 ? "$tmpPath/" : '').$doc['alias'];
                 $key = $alias;
             } else {
                 $key = $doc['alias'];
             }
 
             $doc['path'] = $tmpPath;
-            $content .= '$a[' . $docid . ']=array(\'id\'=>' . $docid . ',\'alias\'=>\'' . $doc['alias'] . '\',\'path\'=>\'' . $doc['path'] . '\',\'parent\'=>' . $doc['parent'] . ',\'isfolder\'=>' . $doc['isfolder'] . ',\'alias_visible\'=>' . $doc['alias_visible'] . ');';
-            $content .= '$d[\'' . $key . '\']=' . $docid . ';';
-            $content .= '$m[]=array(' . $doc['parent'] . '=>' . $docid . ');';
+            $content .= '$a['.$docid.']=array(\'id\'=>'.$docid.',\'alias\'=>\''.$doc['alias'].'\',\'path\'=>\''.$doc['path'].'\',\'parent\'=>'.$doc['parent'].',\'isfolder\'=>'.$doc['isfolder'].',\'alias_visible\'=>'.$doc['alias_visible'].');';
+            $content .= '$d[\''.$key.'\']='.$docid.';';
+            $content .= '$m[]=array('.$doc['parent'].'=>'.$docid.');';
         }
 
         // get content types
@@ -325,37 +325,37 @@ 
         );
         $content .= '$c=&$this->contentTypes;';
         while ($doc = $modx->getDatabase()->getRow($rs)) {
-            $content .= '$c[\'' . $doc['id'] . '\']=\'' . $doc['contentType'] . '\';';
+            $content .= '$c[\''.$doc['id'].'\']=\''.$doc['contentType'].'\';';
         }
 
         // WRITE Chunks to cache file
         $rs = $modx->getDatabase()->select('*', $modx->getDatabase()->getFullTableName('site_htmlsnippets'));
         $content .= '$c=&$this->chunkCache;';
         while ($doc = $modx->getDatabase()->getRow($rs)) {
-            $content .= '$c[\'' . $modx->getDatabase()->escape($doc['name']) . '\']=\'' . ($doc['disabled'] ? '' : $this->escapeSingleQuotes($doc['snippet'])) . '\';';
+            $content .= '$c[\''.$modx->getDatabase()->escape($doc['name']).'\']=\''.($doc['disabled'] ? '' : $this->escapeSingleQuotes($doc['snippet'])).'\';';
         }
 
         // WRITE snippets to cache file
         $f = 'ss.*, sm.properties as sharedproperties';
-        $from = $modx->getDatabase()->getFullTableName('site_snippets') . ' ss LEFT JOIN ' .
-            $modx->getDatabase()->getFullTableName('site_modules') . ' sm on sm.guid=ss.moduleguid';
+        $from = $modx->getDatabase()->getFullTableName('site_snippets').' ss LEFT JOIN '.
+            $modx->getDatabase()->getFullTableName('site_modules').' sm on sm.guid=ss.moduleguid';
         $rs = $modx->getDatabase()->select($f, $from);
         $content .= '$s=&$this->snippetCache;';
         while ($row = $modx->getDatabase()->getRow($rs)) {
             $key = $modx->getDatabase()->escape($row['name']);
             if ($row['disabled']) {
-                $content .= '$s[\'' . $key . '\']=\'return false;\';';
+                $content .= '$s[\''.$key.'\']=\'return false;\';';
             } else {
                 $value = trim($row['snippet']);
                 if ($modx->getConfig('minifyphp_incache')) {
                     $value = $this->php_strip_whitespace($value);
                 }
-                $content .= '$s[\'' . $key . '\']=\'' . $this->escapeSingleQuotes($value) . '\';';
+                $content .= '$s[\''.$key.'\']=\''.$this->escapeSingleQuotes($value).'\';';
                 $properties = $modx->parseProperties($row['properties']);
                 $sharedproperties = $modx->parseProperties($row['sharedproperties']);
                 $properties = array_merge($sharedproperties, $properties);
                 if (0 < count($properties)) {
-                    $content .= '$s[\'' . $key . 'Props\']=\'' . $this->escapeSingleQuotes(json_encode($properties)) . '\';';
+                    $content .= '$s[\''.$key.'Props\']=\''.$this->escapeSingleQuotes(json_encode($properties)).'\';';
                 }
             }
         }
@@ -363,8 +363,8 @@ 
         // WRITE plugins to cache file
         $f = 'sp.*, sm.properties as sharedproperties';
         $from = [];
-        $from[] = $modx->getDatabase()->getFullTableName('site_plugins') . ' sp';
-        $from[] = 'LEFT JOIN ' . $modx->getDatabase()->getFullTableName('site_modules') . ' sm on sm.guid=sp.moduleguid';
+        $from[] = $modx->getDatabase()->getFullTableName('site_plugins').' sp';
+        $from[] = 'LEFT JOIN '.$modx->getDatabase()->getFullTableName('site_modules').' sm on sm.guid=sp.moduleguid';
         $rs = $modx->getDatabase()->select($f, $from, 'sp.disabled=0');
         $content .= '$p=&$this->pluginCache;';
         while ($row = $modx->getDatabase()->getRow($rs)) {
@@ -373,13 +373,13 @@ 
             if ($modx->getConfig('minifyphp_incache')) {
                 $value = $this->php_strip_whitespace($value);
             }
-            $content .= '$p[\'' . $key . '\']=\'' . $this->escapeSingleQuotes($value) . '\';';
+            $content .= '$p[\''.$key.'\']=\''.$this->escapeSingleQuotes($value).'\';';
             if ($row['properties'] != '' || $row['sharedproperties'] != '') {
                 $properties = $modx->parseProperties($row['properties']);
                 $sharedproperties = $modx->parseProperties($row['sharedproperties']);
                 $properties = array_merge($sharedproperties, $properties);
                 if (0 < count($properties)) {
-                    $content .= '$p[\'' . $key . 'Props\']=\'' . $this->escapeSingleQuotes(json_encode($properties)) . '\';';
+                    $content .= '$p[\''.$key.'Props\']=\''.$this->escapeSingleQuotes(json_encode($properties)).'\';';
                 }
             }
         }
@@ -387,9 +387,9 @@ 
         // WRITE system event triggers
         $f = 'sysevt.name as evtname, event.pluginid, plugin.name as pname';
         $from = array();
-        $from[] = $modx->getDatabase()->getFullTableName('system_eventnames') . ' sysevt';
-        $from[] = 'INNER JOIN ' . $modx->getDatabase()->getFullTableName('site_plugin_events') . ' event ON event.evtid=sysevt.id';
-        $from[] = 'INNER JOIN ' . $modx->getDatabase()->getFullTableName('site_plugins') . ' plugin ON plugin.id=event.pluginid';
+        $from[] = $modx->getDatabase()->getFullTableName('system_eventnames').' sysevt';
+        $from[] = 'INNER JOIN '.$modx->getDatabase()->getFullTableName('site_plugin_events').' event ON event.evtid=sysevt.id';
+        $from[] = 'INNER JOIN '.$modx->getDatabase()->getFullTableName('site_plugins').' plugin ON plugin.id=event.pluginid';
         $rs = $modx->getDatabase()->select($f, $from, 'plugin.disabled=0', 'sysevt.name, event.priority');
         $content .= '$e=&$this->pluginEvent;';
         $events = array();
@@ -402,8 +402,8 @@ 
         }
         foreach ($events as $evtname => $pluginnames) {
             $events[$evtname] = $pluginnames;
-            $content .= '$e[\'' . $evtname . '\']=array(\'' . implode('\',\'',
-                    $this->escapeSingleQuotes($pluginnames)) . '\');';
+            $content .= '$e[\''.$evtname.'\']=array(\''.implode('\',\'',
+                    $this->escapeSingleQuotes($pluginnames)).'\');';
         }
 
         $content .= "\n";
@@ -418,8 +418,8 @@ 
             exit("Cannot write main Evolution CMS cache file! Make sure the assets/cache directory is writable!");
         }
 
-        if (!is_file($this->cachePath . '/.htaccess')) {
-            file_put_contents($this->cachePath . '/.htaccess', "order deny,allow\ndeny from all\n");
+        if (!is_file($this->cachePath.'/.htaccess')) {
+            file_put_contents($this->cachePath.'/.htaccess', "order deny,allow\ndeny from all\n");
         }
 
         // invoke OnCacheUpdate event
@@ -439,7 +439,7 @@ 
 
         $source = trim($source);
         if (substr($source, 0, 5) !== '<?php') {
-            $source = '<?php ' . $source;
+            $source = '<?php '.$source;
         }
 
         $tokens = token_get_all($source);
@@ -497,7 +497,7 @@ 
             }
         }
         $source = preg_replace(array('@^<\?php@i', '|\s+|', '|<!--|', '|-->|', '|-->\s+<!--|'),
-            array('', ' ', "\n" . '<!--', '-->' . "\n", '-->' . "\n" . '<!--'), $_);
+            array('', ' ', "\n".'<!--', '-->'."\n", '-->'."\n".'<!--'), $_);
         $source = trim($source);
 
         return $source;

Braces +4 added lines, -2 removed lines

@@ -82,7 +82,8 @@ 
      * @return string
      */
     public function getParents($id, $path = '')
-    { // modx:returns child's parent
+    {
+// modx:returns child's parent
         $modx = evolutionCMS();
         if (empty($this->aliases)) {
             $rs = $modx->getDatabase()->select(
@@ -481,7 +482,8 @@ 
                         $_ = trim($_);
                     }
                     $lastChar = substr($_, -1);
-                    if (!in_array($lastChar, $chars)) {// ,320,327,288,284,289
+                    if (!in_array($lastChar, $chars)) {
+// ,320,327,288,284,289
                         if (!in_array($prev_token,
                             array(T_FOREACH, T_WHILE, T_FOR, T_BOOLEAN_AND, T_BOOLEAN_OR, T_DOUBLE_ARROW))) {
                             $_ .= ' ';

core/src/Legacy/Modifiers.php

Doc Comments +26 added lines, -1 removed lines

@@ -101,7 +101,7 @@ 
     /**
      * @param string $mode
      * @param string $modifiers
-     * @return bool|string
+     * @return false|string
      */
     public function _getDelim($mode, $modifiers)
     {
@@ -151,6 +151,13 @@ 
         }
     }
 
+    /**
+     * @param string $mode
+     * @param false|string $delim
+     * @param string $modifiers
+     *
+     * @return string
+     */
     public function _getRemainModifiers($mode, $delim, $modifiers)
     {
         if ($delim) {
@@ -187,6 +194,9 @@ 
         return substr($string, strpos($string, $delim) + $len);
     }
 
+    /**
+     * @param string $modifiers
+     */
     public function splitEachModifiers($modifiers)
     {
         $modx = evolutionCMS();
@@ -259,6 +269,10 @@ 
         return $result;
     }
 
+    /**
+     * @param string $key
+     * @param string $value
+     */
     public function parsePhx($key, $value, $modifiers)
     {
         $modx = evolutionCMS();
@@ -340,6 +354,10 @@ 
         }
     }
 
+    /**
+     * @param string $cmd
+     * @param string $opt
+     */
     public function getValueFromPreset($key, $value, $cmd, $opt)
     {
         $modx = evolutionCMS();
@@ -1285,6 +1303,9 @@ 
         return $value;
     }
 
+    /**
+     * @param string $cmd
+     */
     public function includeMdfFile($cmd)
     {
         $modx = evolutionCMS();
@@ -1477,6 +1498,10 @@ 
     }
 
     // Sets a placeholder variable which can only be access by Modifiers
+
+    /**
+     * @param string $value
+     */
     public function setModifiersVariable($key, $value)
     {
         if ($key != 'phx' && $key != 'dummy') {

Spacing +45 added lines, -45 removed lines

@@ -82,7 +82,7 @@ 
         }
         $this->srcValue = $value;
         $modifiers = trim($modifiers);
-        $modifiers = ':' . trim($modifiers, ':');
+        $modifiers = ':'.trim($modifiers, ':');
         $modifiers = str_replace(array("\r\n", "\r"), "\n", $modifiers);
         $modifiers = $this->splitEachModifiers($modifiers);
 
@@ -129,7 +129,7 @@ 
     {
         if ($delim) {
             if ($mode == '(') {
-                return substr($modifiers, 1, strpos($modifiers, $delim . ')') - 1);
+                return substr($modifiers, 1, strpos($modifiers, $delim.')') - 1);
             }
 
             return substr($modifiers, 1, strpos($modifiers, $delim, 1) - 1);
@@ -155,7 +155,7 @@ 
     {
         if ($delim) {
             if ($mode == '(') {
-                return $this->_fetchContent($modifiers, $delim . ')');
+                return $this->_fetchContent($modifiers, $delim.')');
             } else {
                 $modifiers = trim($modifiers);
                 $modifiers = substr($modifiers, 1);
@@ -217,7 +217,7 @@ 
             } elseif (in_array($c, array('+', '-', '*', '/')) && preg_match('@^[0-9]+@', $modifiers,
                     $match)) { // :+3, :-3, :*3 ...
                 $modifiers = substr($modifiers, strlen($match[0]));
-                $result[] = array('cmd' => 'math', 'opt' => '%s' . $c . $match[0]);
+                $result[] = array('cmd' => 'math', 'opt' => '%s'.$c.$match[0]);
                 $cmd = '';
             } elseif ($c === '(' || $c === '=') {
                 $modifiers = $m1 = trim($modifiers);
@@ -332,7 +332,7 @@ 
         }
 
         $_ = explode(',',
-            $this->condModifiers . ',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary');
+            $this->condModifiers.',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary');
         if (in_array($cmd, $_)) {
             return false;
         } else {
@@ -365,7 +365,7 @@ 
             case 'eq':
             case 'is':
             case 'equals':
-                $this->condition[] = (int)($value == $opt);
+                $this->condition[] = (int) ($value == $opt);
                 break;
             case 'neq':
             case 'ne':
@@ -373,59 +373,59 @@ 
             case 'isnot':
             case 'isnt':
             case 'not':
-                $this->condition[] = (int)($value != $opt);
+                $this->condition[] = (int) ($value != $opt);
                 break;
             case '%':
-                $this->condition[] = (int)($value % $opt == 0);
+                $this->condition[] = (int) ($value % $opt == 0);
                 break;
             case 'isempty':
-                $this->condition[] = (int)(empty($value));
+                $this->condition[] = (int) (empty($value));
                 break;
             case 'isntempty':
             case 'isnotempty':
-                $this->condition[] = (int)(!empty($value));
+                $this->condition[] = (int) (!empty($value));
                 break;
             case '>=':
             case 'gte':
             case 'eg':
             case 'isgte':
-                $this->condition[] = (int)($value >= $opt);
+                $this->condition[] = (int) ($value >= $opt);
                 break;
             case '<=':
             case 'lte':
             case 'el':
             case 'islte':
-                $this->condition[] = (int)($value <= $opt);
+                $this->condition[] = (int) ($value <= $opt);
                 break;
             case '>':
             case 'gt':
             case 'greaterthan':
             case 'isgreaterthan':
             case 'isgt':
-                $this->condition[] = (int)($value > $opt);
+                $this->condition[] = (int) ($value > $opt);
                 break;
             case '<':
             case 'lt':
             case 'lowerthan':
             case 'islowerthan':
             case 'islt':
-                $this->condition[] = (int)($value < $opt);
+                $this->condition[] = (int) ($value < $opt);
                 break;
             case 'find':
-                $this->condition[] = (int)(strpos($value, $opt) !== false);
+                $this->condition[] = (int) (strpos($value, $opt) !== false);
                 break;
             case 'inarray':
             case 'in_array':
             case 'in':
                 $opt = explode(',', $opt);
-                $this->condition[] = (int)(in_array($value, $opt) !== false);
+                $this->condition[] = (int) (in_array($value, $opt) !== false);
                 break;
             case 'wildcard_match':
             case 'wcard_match':
             case 'wildcard':
             case 'wcard':
             case 'fnmatch':
-                $this->condition[] = (int)(fnmatch($opt, $value) !== false);
+                $this->condition[] = (int) (fnmatch($opt, $value) !== false);
                 break;
             case 'is_file':
             case 'is_dir':
@@ -443,7 +443,7 @@ 
                 if (strpos($path, MODX_BASE_PATH) === false) {
                     $path = ltrim($path, '/');
                 }
-                $this->condition[] = (int)($cmd($path) !== false);
+                $this->condition[] = (int) ($cmd($path) !== false);
                 break;
             case 'is_image':
                 if (!$opt) {
@@ -456,13 +456,13 @@ 
                     break;
                 }
                 $_ = getimagesize($path);
-                $this->condition[] = (int)($_[0]);
+                $this->condition[] = (int) ($_[0]);
                 break;
             case 'regex':
             case 'preg':
             case 'preg_match':
             case 'isinrole':
-                $this->condition[] = (int)(preg_match($opt, $value));
+                $this->condition[] = (int) (preg_match($opt, $value));
                 break;
             case 'ir':
             case 'memberof':
@@ -479,7 +479,7 @@ 
             case 'show':
             case 'this':
                 $conditional = implode(' ', $this->condition);
-                $isvalid = (int)(eval("return ({$conditional});"));
+                $isvalid = (int) (eval("return ({$conditional});"));
                 if ($isvalid) {
                     return $this->srcValue;
                 }
@@ -487,7 +487,7 @@ 
                 return null;
             case 'then':
                 $conditional = implode(' ', $this->condition);
-                $isvalid = (int)eval("return ({$conditional});");
+                $isvalid = (int) eval("return ({$conditional});");
                 if ($isvalid) {
                     return $opt;
                 }
@@ -495,7 +495,7 @@ 
                 return null;
             case 'else':
                 $conditional = implode(' ', $this->condition);
-                $isvalid = (int)eval("return ({$conditional});");
+                $isvalid = (int) eval("return ({$conditional});");
                 if (!$isvalid) {
                     return $opt;
                 }
@@ -654,7 +654,7 @@ 
                 return $this->strpos($value, $opt);
             case 'wordwrap':
                 // default: 70
-                $wrapat = (int)$opt > 0 ? (int)$opt : 70;
+                $wrapat = (int) $opt > 0 ? (int) $opt : 70;
                 if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
                     return $this->includeMdfFile('wordwrap');
                 } else {
@@ -686,7 +686,7 @@ 
                 if (strpos($opt, ',') !== false) {
                     list($b, $e) = explode(',', $opt, 2);
 
-                    return $this->substr($value, $b, (int)$e);
+                    return $this->substr($value, $b, (int) $e);
                 } else {
                     return $this->substr($value, $opt);
                 }
@@ -705,9 +705,9 @@ 
                     $str = '';
                 }
                 if (preg_match('/^[1-9][0-9]*$/', $len)) {
-                    return $this->substr($value, 0, $len) . $str;
+                    return $this->substr($value, 0, $len).$str;
                 } elseif (preg_match('/^\-[1-9][0-9]*$/', $len)) {
-                    return $str . $this->substr($value, $len);
+                    return $str.$this->substr($value, $len);
                 }
                 break;
             case 'summary':
@@ -772,7 +772,7 @@ 
             case 'concatenate':
             case '.':
                 if ($value !== '') {
-                    return $value . $opt;
+                    return $value.$opt;
                 }
                 break;
             case 'sprintf':
@@ -790,7 +790,7 @@ 
             case 'money_format':
                 setlocale(LC_MONETARY, setlocale(LC_TIME, 0));
                 if ($value !== '') {
-                    return money_format($opt, (double)$value);
+                    return money_format($opt, (double) $value);
                 }
                 break;
             case 'tobool':
@@ -865,7 +865,7 @@ 
                 return strtotime($value);
             #####  mathematical function
             case 'toint':
-                return (int)$value;
+                return (int) $value;
             case 'tofloat':
                 return floatval($value);
             case 'round':
@@ -883,7 +883,7 @@ 
                 return $cmd($value);
             case 'math':
             case 'calc':
-                $value = (int)$value;
+                $value = (int) $value;
                 if (empty($value)) {
                     $value = '0';
                 }
@@ -1026,7 +1026,7 @@ 
                 $where = implode(' AND ', $where);
                 $children = $modx->getDocumentChildren($value, $published, '0', 'id', $where);
                 $result = array();
-                foreach ((array)$children as $child) {
+                foreach ((array) $children as $child) {
                     $result[] = $child['id'];
                 }
 
@@ -1130,7 +1130,7 @@ 
                     $opt .= '/';
                 }
 
-                $filename = MODX_BASE_PATH . $opt . $filename;
+                $filename = MODX_BASE_PATH.$opt.$filename;
 
                 if (is_file($filename)) {
                     clearstatcache();
@@ -1291,7 +1291,7 @@ 
         $value = $this->value;
         $opt = $this->opt;
 
-        return include(MODX_MANAGER_PATH . "includes/extenders/modifiers/mdf_{$cmd}.inc.php");
+        return include(MODX_MANAGER_PATH."includes/extenders/modifiers/mdf_{$cmd}.inc.php");
     }
 
     public function getValueFromElement($key, $value, $cmd, $opt)
@@ -1311,13 +1311,13 @@ 
                 $row = $modx->getDatabase()->getRow($result);
                 $php = $row['snippet'];
             } elseif ($total == 0) {
-                $assets_path = MODX_BASE_PATH . 'assets/';
-                if (is_file($assets_path . "modifiers/mdf_{$cmd}.inc.php")) {
-                    $modifiers_path = $assets_path . "modifiers/mdf_{$cmd}.inc.php";
-                } elseif (is_file($assets_path . "plugins/phx/modifiers/{$cmd}.phx.php")) {
-                    $modifiers_path = $assets_path . "plugins/phx/modifiers/{$cmd}.phx.php";
-                } elseif (is_file(MODX_MANAGER_PATH . "includes/extenders/modifiers/mdf_{$cmd}.inc.php")) {
-                    $modifiers_path = MODX_MANAGER_PATH . "includes/extenders/modifiers/mdf_{$cmd}.inc.php";
+                $assets_path = MODX_BASE_PATH.'assets/';
+                if (is_file($assets_path."modifiers/mdf_{$cmd}.inc.php")) {
+                    $modifiers_path = $assets_path."modifiers/mdf_{$cmd}.inc.php";
+                } elseif (is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php")) {
+                    $modifiers_path = $assets_path."plugins/phx/modifiers/{$cmd}.phx.php";
+                } elseif (is_file(MODX_MANAGER_PATH."includes/extenders/modifiers/mdf_{$cmd}.inc.php")) {
+                    $modifiers_path = MODX_MANAGER_PATH."includes/extenders/modifiers/mdf_{$cmd}.inc.php";
                 } else {
                     $modifiers_path = false;
                 }
@@ -1335,7 +1335,7 @@ 
                         $php = substr($php, 0, -2);
                     }
                     if ($this->elmName !== '') {
-                        $modx->snippetCache[$this->elmName . 'Props'] = '';
+                        $modx->snippetCache[$this->elmName.'Props'] = '';
                     }
                 } else {
                     $php = false;
@@ -1372,7 +1372,7 @@ 
             $custom = eval($php);
             $msg = ob_get_contents();
             if ($value === $this->bt) {
-                $value = $msg . $custom;
+                $value = $msg.$custom;
             }
             ob_end_clean();
         } elseif ($html !== false && isset($value) && $value !== '') {
@@ -1546,7 +1546,7 @@ 
     public function ucfirst($str)
     {
         if (function_exists('mb_strtoupper')) {
-            return mb_strtoupper($this->substr($str, 0, 1)) . $this->substr($str, 1, $this->strlen($str));
+            return mb_strtoupper($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
         }
 
         return ucfirst($str);
@@ -1555,7 +1555,7 @@ 
     public function lcfirst($str)
     {
         if (function_exists('mb_strtolower')) {
-            return mb_strtolower($this->substr($str, 0, 1)) . $this->substr($str, 1, $this->strlen($str));
+            return mb_strtolower($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
         }
 
         return lcfirst($str);

Braces +4 added lines, -2 removed lines

@@ -199,7 +199,8 @@ 
             $c = substr($modifiers, 0, 1);
             $modifiers = substr($modifiers, 1);
 
-            if ($c === ':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { // :=, :!=, :<=, :>=, :!<=, :!>=
+            if ($c === ':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) {
+// :=, :!=, :<=, :>=, :!<=, :!>=
                 $c = substr($modifiers, strlen($match[1]), 1);
                 $debuginfo = "#i=0 #c=[{$c}] #m=[{$modifiers}]";
                 if ($c === '(') {
@@ -215,7 +216,8 @@ 
                 $result[] = array('cmd' => trim($match[1]), 'opt' => $opt, 'debuginfo' => $debuginfo);
                 $cmd = '';
             } elseif (in_array($c, array('+', '-', '*', '/')) && preg_match('@^[0-9]+@', $modifiers,
-                    $match)) { // :+3, :-3, :*3 ...
+                    $match)) {
+// :+3, :-3, :*3 ...
                 $modifiers = substr($modifiers, strlen($match[0]));
                 $result[] = array('cmd' => 'math', 'opt' => '%s' . $c . $match[0]);
                 $cmd = '';