evolution-cms / evolution

core/src/Support/MakeTable.php

Doc Comments +2 added lines, -6 removed lines

@@ -280,8 +280,6 @@ 
     /**
      * Sets the width attribute of each column in the array.
      *
-     * @param array $value An Array of column widths in the order of the keys in the
-     *            source table array.
      */
     public function setColumnWidths($widthArray)
     {
@@ -291,7 +289,6 @@ 
     /**
      * An optional array of values that can be preselected when using
      *
-     * @param array $value Indicates the INPUT form element type attribute.
      */
     public function setSelectedValues($valueArray)
     {
@@ -328,7 +325,7 @@ 
     /**
      * Determines what class the current row should have applied.
      *
-     * @param int $value The position of the current row being rendered.
+     * @param integer $position
      * @return string
      */
     public function determineRowClass($position)
@@ -355,7 +352,6 @@ 
      * Generates an onclick action applied to the current cell, to execute
      * any specified cell actions.
      *
-     * @param string $value Indicates the INPUT form element type attribute.
      * @return string
      */
     public function getCellAction($currentActionFieldValue)
@@ -397,7 +393,7 @@ 
     /**
      * Function to prepare a link generated in the table cell/link actions.
      *
-     * @param string $value Indicates the INPUT form element type attribute.
+     * @param string $link
      * @return string
      */
     public function prepareLink($link)

Spacing +28 added lines, -28 removed lines

@@ -132,7 +132,7 @@ 
      */
     public function setTableWidth($value)
     {
-        $this->tableWidth = (int)$value;
+        $this->tableWidth = (int) $value;
     }
 
     /**
@@ -318,8 +318,8 @@ 
     public function getColumnWidth($columnPosition)
     {
         $currentWidth = '';
-        if (is_array($this->columnWidths) && ! empty($this->columnWidths[$columnPosition])) {
-            $currentWidth = ' width="' . $this->columnWidths[$columnPosition] . '" ';
+        if (is_array($this->columnWidths) && !empty($this->columnWidths[$columnPosition])) {
+            $currentWidth = ' width="'.$this->columnWidths[$columnPosition].'" ';
         }
 
         return $currentWidth;
@@ -348,7 +348,7 @@ 
             $currentClass = $this->rowAlternateClass;
         }
 
-        return ' class="' . $currentClass . '"';
+        return ' class="'.$currentClass.'"';
     }
 
     /**
@@ -362,7 +362,7 @@ 
     {
         $cellAction = '';
         if ($this->cellAction) {
-            $cellAction = ' onClick="javascript:window.location=\'' . $this->cellAction . $this->actionField . '=' . urlencode($currentActionFieldValue) . '\'" ';
+            $cellAction = ' onClick="javascript:window.location=\''.$this->cellAction.$this->actionField.'='.urlencode($currentActionFieldValue).'\'" ';
         }
 
         return $cellAction;
@@ -379,7 +379,7 @@ 
     {
         $cell = $value;
         if ($this->linkAction) {
-            $cell = '<a href="' . $this->linkAction . $this->actionField . '=' . urlencode($currentActionFieldValue) . '">' . $cell . '</a>';
+            $cell = '<a href="'.$this->linkAction.$this->actionField.'='.urlencode($currentActionFieldValue).'">'.$cell.'</a>';
         }
 
         return $cell;
@@ -408,7 +408,7 @@ 
             $end = '?';
         }
 
-        return $link . $end;
+        return $link.$end;
     }
 
     /**
@@ -430,7 +430,7 @@ 
         if (is_array($fieldsArray)) {
             $i = 0;
             foreach ($fieldsArray as $fieldName => $fieldValue) {
-                $table .= "\t<tr" . $this->determineRowClass($i) . ">\n";
+                $table .= "\t<tr".$this->determineRowClass($i).">\n";
                 $currentActionFieldValue = get_by_key($fieldValue, $this->actionField, '');
                 if (is_array($this->selectedValues)) {
                     $isChecked = array_search($currentActionFieldValue, $this->selectedValues) === false ? 0 : 1;
@@ -441,15 +441,15 @@ 
                 $colPosition = 0;
                 foreach ($fieldValue as $key => $value) {
                     if (!in_array($key, $this->excludeFields)) {
-                        $table .= "\t\t<td" . $this->getCellAction($currentActionFieldValue) . ">";
+                        $table .= "\t\t<td".$this->getCellAction($currentActionFieldValue).">";
                         $table .= $this->createCellText($currentActionFieldValue, $value);
                         $table .= "</td>\n";
                         if ($i == 0) {
                             if (empty ($header) && $this->formElementType) {
-                                $header .= "\t\t<th style=\"width:32px\" " . ($this->thClass ? 'class="' . $this->thClass . '"' : '') . ">" . ($this->allOption ? '<a href="javascript:clickAll()">all</a>' : '') . "</th>\n";
+                                $header .= "\t\t<th style=\"width:32px\" ".($this->thClass ? 'class="'.$this->thClass.'"' : '').">".($this->allOption ? '<a href="javascript:clickAll()">all</a>' : '')."</th>\n";
                             }
                             $headerText = array_key_exists($key, $fieldHeadersArray) ? $fieldHeadersArray[$key] : $key;
-                            $header .= "\t\t<th" . $this->getColumnWidth($colPosition) . ($this->thClass ? ' class="' . $this->thClass . '" ' : '') . ">" . $headerText . "</th>\n";
+                            $header .= "\t\t<th".$this->getColumnWidth($colPosition).($this->thClass ? ' class="'.$this->thClass.'" ' : '').">".$headerText."</th>\n";
                         }
                         $colPosition++;
                     }
@@ -457,9 +457,9 @@ 
                 $i++;
                 $table .= "\t</tr>\n";
             }
-            $table = "\n" . '<table' . ($this->tableWidth > 0 ? ' width="' . $this->tableWidth . '"' : '') . ($this->tableClass ? ' class="' . $this->tableClass . '"' : '') . ($this->tableID ? ' id="' . $this->tableID . '"' : '') . ">\n" . ($header ? "\t<thead>\n\t<tr class=\"" . $this->rowHeaderClass . "\">\n" . $header . "\t</tr>\n\t</thead>\n" : '') . $table . "</table>\n";
+            $table = "\n".'<table'.($this->tableWidth > 0 ? ' width="'.$this->tableWidth.'"' : '').($this->tableClass ? ' class="'.$this->tableClass.'"' : '').($this->tableID ? ' id="'.$this->tableID.'"' : '').">\n".($header ? "\t<thead>\n\t<tr class=\"".$this->rowHeaderClass."\">\n".$header."\t</tr>\n\t</thead>\n" : '').$table."</table>\n";
             if ($this->formElementType) {
-                $table = "\n" . '<form id="' . $this->formName . '" name="' . $this->formName . '" action="' . $this->formAction . '" method="POST">' . $table;
+                $table = "\n".'<form id="'.$this->formName.'" name="'.$this->formName.'" action="'.$this->formAction.'" method="POST">'.$table;
             }
             if (strlen($this->pageNav) > 1) {//changed to display the pagination if exists.
                 /* commented this part because of cookie
@@ -473,7 +473,7 @@ 
 
                 $table .= '</select>'.$_lang["pagination_table_perpage"].'</div>';
                 */
-                $table .= '<div id="pagination" class="paginate">' . $_lang["pagination_table_gotopage"] . '<ul>' . $this->pageNav . '</ul></div>';
+                $table .= '<div id="pagination" class="paginate">'.$_lang["pagination_table_gotopage"].'<ul>'.$this->pageNav.'</ul></div>';
                 //$table .= '<script language="javascript">function updatePageSize(size){window.location = \''.$this->prepareLink($linkpage).'pageSize=\'+size;}</script>';
 
             }
@@ -482,7 +482,7 @@ 
 <script language="javascript">
 	toggled = 0;
 	function clickAll() {
-		myform = document.getElementById("' . $this->formName . '");
+		myform = document.getElementById("' . $this->formName.'");
 		for(i=0;i<myform.length;i++) {
 			if(myform.elements[i].type==\'checkbox\') {
 				myform.elements[i].checked=(toggled?false:true);
@@ -494,9 +494,9 @@ 
             }
             if ($this->formElementType) {
                 if ($this->extra) {
-                    $table .= "\n" . $this->extra . "\n";
+                    $table .= "\n".$this->extra."\n";
                 }
-                $table .= "\n" . '</form>' . "\n";
+                $table .= "\n".'</form>'."\n";
             }
 
             return $table;
@@ -519,7 +519,7 @@ 
         $numPages = ceil($numRecords / MAX_DISPLAY_RECORDS_NUM);
         $nav = '';
         if ($numPages > 1) {
-            $currentURL = empty($qs) ? '' : '?' . $qs;
+            $currentURL = empty($qs) ? '' : '?'.$qs;
             if ($currentPage > 6) {
                 $nav .= $this->createPageLink($currentURL, 1, $_lang["pagination_table_first"]);
             }
@@ -544,7 +544,7 @@ 
                 $nav .= $this->createPageLink($currentURL, $numPages, $_lang["pagination_table_last"]);
             }
         }
-        $this->pageNav = ' ' . $nav;
+        $this->pageNav = ' '.$nav;
     }
 
     /**
@@ -560,14 +560,14 @@ 
     public function createPageLink($link = '', $pageNum, $displayText, $currentPage = false, $qs = '')
     {
         $modx = evolutionCMS();
-        $orderBy = !empty($_GET['orderby']) ? '&orderby=' . $_GET['orderby'] : '';
-        $orderDir = !empty($_GET['orderdir']) ? '&orderdir=' . $_GET['orderdir'] : '';
+        $orderBy = !empty($_GET['orderby']) ? '&orderby='.$_GET['orderby'] : '';
+        $orderDir = !empty($_GET['orderdir']) ? '&orderdir='.$_GET['orderdir'] : '';
         if (!empty($qs)) {
             $qs = "?$qs";
         }
         $link = empty($link) ? $modx->makeUrl($modx->documentIdentifier, $modx->documentObject['alias'],
-            $qs . "page=$pageNum$orderBy$orderDir") : $this->prepareLink($link) . "page=$pageNum";
-        $nav = '<li' . ($currentPage ? ' class="currentPage"' : '') . '><a' . ($currentPage ? ' class="currentPage"' : '') . ' href="' . $link . '">' . $displayText . '</a></li>' . "\n";
+            $qs."page=$pageNum$orderBy$orderDir") : $this->prepareLink($link)."page=$pageNum";
+        $nav = '<li'.($currentPage ? ' class="currentPage"' : '').'><a'.($currentPage ? ' class="currentPage"' : '').' href="'.$link.'">'.$displayText.'</a></li>'."\n";
 
         return $nav;
     }
@@ -585,7 +585,7 @@ 
         $field = '';
         if ($this->formElementType) {
             $checked = $isChecked ? "checked " : "";
-            $field = "\t\t" . '<td><input type="' . $this->formElementType . '" name="' . ($this->formElementName ? $this->formElementName : $value) . '"  value="' . $value . '" ' . $checked . '/></td>' . "\n";
+            $field = "\t\t".'<td><input type="'.$this->formElementType.'" name="'.($this->formElementName ? $this->formElementName : $value).'"  value="'.$value.'" '.$checked.'/></td>'."\n";
         }
 
         return $field;
@@ -599,7 +599,7 @@ 
     public function handlePaging()
     {
         $offset = (is_numeric($_GET['page']) && $_GET['page'] > 0) ? $_GET['page'] - 1 : 0;
-        $limitClause = ' LIMIT ' . ($offset * MAX_DISPLAY_RECORDS_NUM) . ', ' . MAX_DISPLAY_RECORDS_NUM;
+        $limitClause = ' LIMIT '.($offset * MAX_DISPLAY_RECORDS_NUM).', '.MAX_DISPLAY_RECORDS_NUM;
 
         return $limitClause;
     }
@@ -614,10 +614,10 @@ 
     public function handleSorting($natural_order = false)
     {
         $orderByClause = '';
-        if ((bool)$natural_order === false) {
+        if ((bool) $natural_order === false) {
             $orderby = !empty($_GET['orderby']) ? $_GET['orderby'] : "id";
             $orderdir = !empty($_GET['orderdir']) ? $_GET['orderdir'] : "DESC";
-            $orderByClause = !empty($orderby) ? ' ORDER BY ' . $orderby . ' ' . $orderdir . ' ' : "";
+            $orderByClause = !empty($orderby) ? ' ORDER BY '.$orderby.' '.$orderdir.' ' : "";
         }
 
         return $orderByClause;
@@ -646,7 +646,7 @@ 
             }
         }
 
-        return '<a href="[~' . $modx->documentIdentifier . '~]?' . $qs . 'orderby=' . $key . $orderDir . '">' . $text . '</a>';
+        return '<a href="[~'.$modx->documentIdentifier.'~]?'.$qs.'orderby='.$key.$orderDir.'">'.$text.'</a>';
     }
 
 }

Braces +2 added lines, -1 removed lines

@@ -457,7 +457,8 @@
             if ($this->formElementType) {
                 $table = "\n" . '<form id="' . $this->formName . '" name="' . $this->formName . '" action="' . $this->formAction . '" method="POST">' . $table;
             }
-            if (strlen($this->pageNav) > 1) {//changed to display the pagination if exists.
+            if (strlen($this->pageNav) > 1) {
+//changed to display the pagination if exists.
                 /* commented this part because of cookie
                 $table .= '<div id="max-display-records" ><select style="display:inline" onchange="javascript:updatePageSize(this[this.selectedIndex].value);">';
                 $pageSizes= array (10, 25, 50, 100, 250);

core/src/Support/Paginate.php

Doc Comments +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
     /**
      * This function returns the current page number.
      *
-     * @return int
+     * @return string
      */
     public function getCurrentPage()
     {

Spacing +6 added lines, -6 removed lines

@@ -101,14 +101,14 @@ 
         $array_paging['total'] = $this->int_nbr_row;
 
         if ($this->int_cur_position != 0) {
-            $array_paging['first_link'] = "<a href=\"$PHP_SELF?int_cur_position=0" . $this->str_ext_argv . "\">";
-            $array_paging['previous_link'] = "<a href=\"$PHP_SELF?int_cur_position=" . ($this->int_cur_position - $this->int_num_result) . $this->str_ext_argv . "\">";
+            $array_paging['first_link'] = "<a href=\"$PHP_SELF?int_cur_position=0".$this->str_ext_argv."\">";
+            $array_paging['previous_link'] = "<a href=\"$PHP_SELF?int_cur_position=".($this->int_cur_position - $this->int_num_result).$this->str_ext_argv."\">";
         }
 
         if (($this->int_nbr_row - $this->int_cur_position) > $this->int_num_result) {
             $int_new_position = $this->int_cur_position + $this->int_num_result;
-            $array_paging['last_link'] = "<a href=\"$PHP_SELF?int_cur_position=" . $this->int_nbr_row . $this->str_ext_argv . "\">";
-            $array_paging['next_link'] = "<a href=\"$PHP_SELF?int_cur_position=$int_new_position" . $this->str_ext_argv . "\">";
+            $array_paging['last_link'] = "<a href=\"$PHP_SELF?int_cur_position=".$this->int_nbr_row.$this->str_ext_argv."\">";
+            $array_paging['next_link'] = "<a href=\"$PHP_SELF?int_cur_position=$int_new_position".$this->str_ext_argv."\">";
         }
 
         return $array_paging;
@@ -126,10 +126,10 @@ 
         for ($i = 0; $i < $this->getNumberOfPage(); $i++) {
             // if current page, do not make a link
             if ($i == $this->getCurrentPage()) {
-                $array_all_page[$i] = "<b>" . ($i + 1) . "</b>&nbsp;";
+                $array_all_page[$i] = "<b>".($i + 1)."</b>&nbsp;";
             } else {
                 $int_new_position = ($i * $this->int_num_result);
-                $array_all_page[$i] = "<a href=\"" . $PHP_SELF . "?int_cur_position=$int_new_position$this->str_ext_argv\">" . ($i + 1) . "</a>&nbsp;";
+                $array_all_page[$i] = "<a href=\"".$PHP_SELF."?int_cur_position=$int_new_position$this->str_ext_argv\">".($i + 1)."</a>&nbsp;";
             }
         }
 

core/src/Tracy/Panels/AbstractPanel.php

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

@@ -1,10 +1,10 @@
 <?php namespace EvolutionCMS\Tracy\Panels;
 
+use EvolutionCMS\Interfaces\CoreInterface;
 use EvolutionCMS\Interfaces\TracyPanel;
+use EvolutionCMS\Tracy\Template;
 use Tracy\Helpers;
 use Tracy\IBarPanel;
-use EvolutionCMS\Tracy\Template;
-use EvolutionCMS\Interfaces\CoreInterface;
 
 /**
  * @see: https://github.com/recca0120/laravel-tracy

Spacing +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
         }
 
         $class_info = new \ReflectionClass($this);
-        return $this->viewPath = dirname($class_info->getFileName()) . '/assets/';
+        return $this->viewPath = dirname($class_info->getFileName()).'/assets/';
     }
     /**
      * getAttributes.

core/src/Tracy/Panels/Database/Panel.php

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

@@ -1,10 +1,10 @@
 <?php namespace EvolutionCMS\Tracy\Panels\Database;
 
-use PDO;
+use EvolutionCMS\Support\Formatter\SqlFormatter;
+use EvolutionCMS\Tracy\Panels\AbstractPanel;
 use Exception;
 use Illuminate\Database\Events\QueryExecuted;
-use EvolutionCMS\Tracy\Panels\AbstractPanel;
-use EvolutionCMS\Support\Formatter\SqlFormatter;
+use PDO;
 
 /**
  * @see: https://github.com/recca0120/laravel-tracy

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
     protected function subscribe()
     {
         $events = $this->evolution['events'];
-        $events->listen(QueryExecuted::class, function ($event) {
+        $events->listen(QueryExecuted::class, function($event){
             $this->logQuery(
                 $event->sql,
                 $event->bindings,

Braces +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
     protected function subscribe()
     {
         $events = $this->evolution['events'];
-        $events->listen(QueryExecuted::class, function ($event) {
+        $events->listen(QueryExecuted::class, function ($event){
             $this->logQuery(
                 $event->sql,
                 $event->bindings,

core/src/Tracy/Panels/Event/Panel.php

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

@@ -1,7 +1,7 @@
 <?php namespace EvolutionCMS\Tracy\Panels\Event;
 
-use Tracy\Debugger;
 use EvolutionCMS\Tracy\Panels\AbstractPanel;
+use Tracy\Debugger;
 
 class Panel extends AbstractPanel
 {

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         Debugger::timer($id);
         $events = $this->evolution['events'];
 
-        $events->listen('evolution.*', function ($key, $payload) use ($id) {
+        $events->listen('evolution.*', function($key, $payload) use ($id) {
             $execTime = Debugger::timer($id);
             $editorLink = static::editorLink(static::findSource());
             $this->totalTime += $execTime;

Braces +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         Debugger::timer($id);
         $events = $this->evolution['events'];
 
-        $events->listen('evolution.*', function ($key, $payload) use ($id) {
+        $events->listen('evolution.*', function ($key, $payload) use ($id){
             $execTime = Debugger::timer($id);
             $editorLink = static::editorLink(static::findSource());
             $this->totalTime += $execTime;

core/src/Tracy/Panels/Routing/Panel.php

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

@@ -1,7 +1,7 @@
 <?php namespace EvolutionCMS\Tracy\Panels\Routing;
 
-use Illuminate\Support\Arr;
 use EvolutionCMS\Tracy\Panels\AbstractPanel;
+use Illuminate\Support\Arr;
 use ManagerTheme;
 
 class Panel extends AbstractPanel

Spacing +4 added lines, -4 removed lines

@@ -20,21 +20,21 @@
             if ($this->evolution->isBackend()) {
                 $action = Arr::get($_REQUEST, 'a');
                 if ($action !== null) {
-                    $rows['route'] = 'action: ' . $action;
+                    $rows['route'] = 'action: '.$action;
                 } else {
                     $rows['route'] = 'n/a';
                 }
 
                 $controller = ManagerTheme::findController($action);
-                if($controller !== null && ! \is_int($controller)) {
+                if ($controller !== null && !\is_int($controller)) {
                     $rows['controller'] = $controller;
                 }
             } else {
                 if (!empty($this->evolution->documentMethod) && !empty($this->evolution->documentIdentifier)) {
-                    $rows['route'] = $this->evolution->documentMethod . ' : ' . $this->evolution->documentIdentifier;
+                    $rows['route'] = $this->evolution->documentMethod.' : '.$this->evolution->documentIdentifier;
                 }
 
-                if (! empty($this->evolution->documentObject)) {
+                if (!empty($this->evolution->documentObject)) {
                     $rows['document'] = $this->evolution->documentObject;
                 }
             }

core/src/Tracy/Panels/View/Panel.php

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

@@ -1,8 +1,8 @@
 <?php namespace EvolutionCMS\Tracy\Panels\View;
 
+use EvolutionCMS\Tracy\Panels\AbstractPanel;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
-use EvolutionCMS\Tracy\Panels\AbstractPanel;
 
 class Panel extends AbstractPanel
 {

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
      */
     protected function subscribe()
     {
-        $this->evolution['events']->listen('composing:*', function ($key, $payload) {
+        $this->evolution['events']->listen('composing:*', function($key, $payload){
             $this->logView($payload[0]);
         });
     }

Braces +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
      */
     protected function subscribe()
     {
-        $this->evolution['events']->listen('composing:*', function ($key, $payload) {
+        $this->evolution['events']->listen('composing:*', function ($key, $payload){
             $this->logView($payload[0]);
         });
     }

core/src/Traits/Models/SoftDeletes.php

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

@@ -1,7 +1,7 @@
 <?php namespace EvolutionCMS\Traits\Models;
 
-use Illuminate\Database\Eloquent\SoftDeletes as BaseSoftDeletes;
 use EvolutionCMS\Shit\SoftDeletingScope;
+use Illuminate\Database\Eloquent\SoftDeletes as BaseSoftDeletes;
 
 trait SoftDeletes{
     use BaseSoftDeletes {

Braces +2 added lines, -1 removed lines

@@ -3,7 +3,8 @@
 use Illuminate\Database\Eloquent\SoftDeletes as BaseSoftDeletes;
 use EvolutionCMS\Shit\SoftDeletingScope;
 
-trait SoftDeletes{
+trait SoftDeletes
+{
     use BaseSoftDeletes {
         bootSoftDeletes as baseBootSoftDeletes;
         restore as baseRestore;

core/src/Traits/Settings.php

Doc Comments +4 added lines, -1 removed lines

@@ -46,7 +46,7 @@ 
     ];
 
     /**
-     * @param $name
+     * @param string $name
      * @param $value
      */
     public function setConfig($name, $value)
@@ -161,6 +161,9 @@ 
         }
     }
 
+    /**
+     * @param string $key
+     */
     protected function getCastType($key)
     {
         return isset($this->casts[$key]) ? trim(strtolower($this->casts[$key])) : null;

Spacing +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
     public function setConfig($name, $value)
     {
         $this['config']
-            ->set('cms.settings.' . $name, $value);
+            ->set('cms.settings.'.$name, $value);
     }
 
     /**
@@ -81,7 +81,7 @@ 
         }
 
         $value = $this['config']->get(
-            'cms.settings.' . $name,
+            'cms.settings.'.$name,
             $config
         );
 
@@ -125,7 +125,7 @@ 
 
     public function getFactorySettings() : array
     {
-        $out = include EVO_CORE_PATH . 'factory/settings.php';
+        $out = include EVO_CORE_PATH.'factory/settings.php';
         return \is_array($out) ? $out : [];
     }