luyadev / luya

core/base/Module.php

Spacing +1 added lines, -1 removed lines

@@ -245,7 +245,7 @@
      */
     public function getControllerPath()
     {
-        return Yii::getAlias('@' . str_replace('\\', '/', $this->controllerNamespace), false);
+        return Yii::getAlias('@'.str_replace('\\', '/', $this->controllerNamespace), false);
     }
 
     // STATIC METHODS

core/theme/ThemeConfig.php

Spacing +1 added lines, -1 removed lines

@@ -140,6 +140,6 @@
      */
     public function getViewPath()
     {
-        return $this->getBasePath() . '/views';
+        return $this->getBasePath().'/views';
     }
 }

core/helpers/ObjectHelper.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
         }
         
         if ($throwException) {
-            throw new Exception("The given object must be an instance of: " . implode(",", $haystack));
+            throw new Exception("The given object must be an instance of: ".implode(",", $haystack));
         }
         
         return false;
@@ -227,7 +227,7 @@ 
         } catch (InvalidParamException $e) {
         };
 
-        $staticPath = $module::staticBasePath() . DIRECTORY_SEPARATOR . 'controllers';
+        $staticPath = $module::staticBasePath().DIRECTORY_SEPARATOR.'controllers';
         if (is_dir($staticPath)) {
             foreach (FileHelper::findFiles($staticPath) as $file) {
                 $files[self::fileToName($staticPath, $file)] = $file;

core/helpers/XLSXWriter.php

Spacing +120 added lines, -120 removed lines

@@ -114,24 +114,24 @@ 
     public function writeToFile($filename)
     {
         foreach ($this->sheets as $sheet_name => $sheet) {
-            self::finalizeSheet($sheet_name);//making sure all footers have been written
+            self::finalizeSheet($sheet_name); //making sure all footers have been written
         }
 
         if (file_exists($filename)) {
             if (is_writable($filename)) {
                 @unlink($filename); //if the zip already exists, remove it
             } else {
-                self::log("Error in " . __CLASS__ . "::" . __FUNCTION__ . ", file is not writeable.");
+                self::log("Error in ".__CLASS__."::".__FUNCTION__.", file is not writeable.");
                 return;
             }
         }
         $zip = new ZipArchive();
         if (empty($this->sheets)) {
-            self::log("Error in " . __CLASS__ . "::" . __FUNCTION__ . ", no worksheets defined.");
+            self::log("Error in ".__CLASS__."::".__FUNCTION__.", no worksheets defined.");
             return;
         }
         if (!$zip->open($filename, ZipArchive::CREATE)) {
-            self::log("Error in " . __CLASS__ . "::" . __FUNCTION__ . ", unable to create zip.");
+            self::log("Error in ".__CLASS__."::".__FUNCTION__.", unable to create zip.");
             return;
         }
 
@@ -144,13 +144,13 @@ 
 
         $zip->addEmptyDir("xl/worksheets/");
         foreach ($this->sheets as $sheet) {
-            $zip->addFile($sheet->filename, "xl/worksheets/" . $sheet->xmlname);
+            $zip->addFile($sheet->filename, "xl/worksheets/".$sheet->xmlname);
         }
         $zip->addFromString("xl/workbook.xml", self::buildWorkbookXML());
         $zip->addFile(
             $this->writeStylesXML(),
             "xl/styles.xml"
-        );  //$zip->addFromString("xl/styles.xml"           , self::buildStylesXML() );
+        ); //$zip->addFromString("xl/styles.xml"           , self::buildStylesXML() );
         $zip->addFromString("[Content_Types].xml", self::buildContentTypesXML());
 
         $zip->addEmptyDir("xl/_rels/");
@@ -171,8 +171,8 @@ 
         }
 
         $sheet_filename = $this->tempFilename();
-        $sheet_xmlname = 'sheet' . (count($this->sheets) + 1) . ".xml";
-        $this->sheets[$sheet_name] = (object)array(
+        $sheet_xmlname = 'sheet'.(count($this->sheets) + 1).".xml";
+        $this->sheets[$sheet_name] = (object) array(
             'filename' => $sheet_filename,
             'sheetname' => $sheet_name,
             'xmlname' => $sheet_xmlname,
@@ -188,65 +188,65 @@ 
             'finalized' => false,
         );
         $sheet = &$this->sheets[$sheet_name];
-        $tabselected = count($this->sheets) == 1 ? 'true' : 'false';//only first sheet is selected
-        $max_cell = XLSXWriter::xlsCell(self::EXCEL_2007_MAX_ROW, self::EXCEL_2007_MAX_COL);//XFE1048577
-        $sheet->file_writer->write('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' . "\n");
+        $tabselected = count($this->sheets) == 1 ? 'true' : 'false'; //only first sheet is selected
+        $max_cell = XLSXWriter::xlsCell(self::EXCEL_2007_MAX_ROW, self::EXCEL_2007_MAX_COL); //XFE1048577
+        $sheet->file_writer->write('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n");
         $sheet->file_writer->write('<worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">');
         $sheet->file_writer->write('<sheetPr filterMode="false">');
         $sheet->file_writer->write('<pageSetUpPr fitToPage="false"/>');
         $sheet->file_writer->write('</sheetPr>');
         $sheet->max_cell_tag_start = $sheet->file_writer->ftell();
-        $sheet->file_writer->write('<dimension ref="A1:' . $max_cell . '"/>');
+        $sheet->file_writer->write('<dimension ref="A1:'.$max_cell.'"/>');
         $sheet->max_cell_tag_end = $sheet->file_writer->ftell();
         $sheet->file_writer->write('<sheetViews>');
-        $sheet->file_writer->write('<sheetView colorId="64" defaultGridColor="true" rightToLeft="false" showFormulas="false" showGridLines="true" showOutlineSymbols="true" showRowColHeaders="true" showZeros="true" tabSelected="' . $tabselected . '" topLeftCell="A1" view="normal" windowProtection="false" workbookViewId="0" zoomScale="100" zoomScaleNormal="100" zoomScalePageLayoutView="100">');
+        $sheet->file_writer->write('<sheetView colorId="64" defaultGridColor="true" rightToLeft="false" showFormulas="false" showGridLines="true" showOutlineSymbols="true" showRowColHeaders="true" showZeros="true" tabSelected="'.$tabselected.'" topLeftCell="A1" view="normal" windowProtection="false" workbookViewId="0" zoomScale="100" zoomScaleNormal="100" zoomScalePageLayoutView="100">');
         if ($sheet->freeze_rows && $sheet->freeze_columns) {
-            $sheet->file_writer->write('<pane ySplit="' . $sheet->freeze_rows . '" xSplit="' . $sheet->freeze_columns . '" topLeftCell="' . self::xlsCell(
+            $sheet->file_writer->write('<pane ySplit="'.$sheet->freeze_rows.'" xSplit="'.$sheet->freeze_columns.'" topLeftCell="'.self::xlsCell(
                 $sheet->freeze_rows,
                 $sheet->freeze_columns
-            ) . '" activePane="bottomRight" state="frozen"/>');
-            $sheet->file_writer->write('<selection activeCell="' . self::xlsCell(
+            ).'" activePane="bottomRight" state="frozen"/>');
+            $sheet->file_writer->write('<selection activeCell="'.self::xlsCell(
                 $sheet->freeze_rows,
                 0
-            ) . '" activeCellId="0" pane="topRight" sqref="' . self::xlsCell($sheet->freeze_rows, 0) . '"/>');
-            $sheet->file_writer->write('<selection activeCell="' . self::xlsCell(
+            ).'" activeCellId="0" pane="topRight" sqref="'.self::xlsCell($sheet->freeze_rows, 0).'"/>');
+            $sheet->file_writer->write('<selection activeCell="'.self::xlsCell(
                 0,
                 $sheet->freeze_columns
-            ) . '" activeCellId="0" pane="bottomLeft" sqref="' . self::xlsCell(
+            ).'" activeCellId="0" pane="bottomLeft" sqref="'.self::xlsCell(
                 0,
                 $sheet->freeze_columns
-            ) . '"/>');
-            $sheet->file_writer->write('<selection activeCell="' . self::xlsCell(
+            ).'"/>');
+            $sheet->file_writer->write('<selection activeCell="'.self::xlsCell(
                 $sheet->freeze_rows,
                 $sheet->freeze_columns
-            ) . '" activeCellId="0" pane="bottomRight" sqref="' . self::xlsCell(
+            ).'" activeCellId="0" pane="bottomRight" sqref="'.self::xlsCell(
                 $sheet->freeze_rows,
                 $sheet->freeze_columns
-            ) . '"/>');
+            ).'"/>');
         } elseif ($sheet->freeze_rows) {
-            $sheet->file_writer->write('<pane ySplit="' . $sheet->freeze_rows . '" topLeftCell="' . self::xlsCell(
+            $sheet->file_writer->write('<pane ySplit="'.$sheet->freeze_rows.'" topLeftCell="'.self::xlsCell(
                 $sheet->freeze_rows,
                 0
-            ) . '" activePane="bottomLeft" state="frozen"/>');
-            $sheet->file_writer->write('<selection activeCell="' . self::xlsCell(
+            ).'" activePane="bottomLeft" state="frozen"/>');
+            $sheet->file_writer->write('<selection activeCell="'.self::xlsCell(
                 $sheet->freeze_rows,
                 0
-            ) . '" activeCellId="0" pane="bottomLeft" sqref="' . self::xlsCell(
+            ).'" activeCellId="0" pane="bottomLeft" sqref="'.self::xlsCell(
                 $sheet->freeze_rows,
                 0
-            ) . '"/>');
+            ).'"/>');
         } elseif ($sheet->freeze_columns) {
-            $sheet->file_writer->write('<pane xSplit="' . $sheet->freeze_columns . '" topLeftCell="' . self::xlsCell(
+            $sheet->file_writer->write('<pane xSplit="'.$sheet->freeze_columns.'" topLeftCell="'.self::xlsCell(
                 0,
                 $sheet->freeze_columns
-            ) . '" activePane="topRight" state="frozen"/>');
-            $sheet->file_writer->write('<selection activeCell="' . self::xlsCell(
+            ).'" activePane="topRight" state="frozen"/>');
+            $sheet->file_writer->write('<selection activeCell="'.self::xlsCell(
                 0,
                 $sheet->freeze_columns
-            ) . '" activeCellId="0" pane="topRight" sqref="' . self::xlsCell(
+            ).'" activeCellId="0" pane="topRight" sqref="'.self::xlsCell(
                 0,
                 $sheet->freeze_columns
-            ) . '"/>');
+            ).'"/>');
         } else { // not frozen
             $sheet->file_writer->write('<selection activeCell="A1" activeCellId="0" pane="topLeft" sqref="A1"/>');
         }
@@ -256,11 +256,11 @@ 
         $i = 0;
         if (!empty($col_widths)) {
             foreach ($col_widths as $column_width) {
-                $sheet->file_writer->write('<col collapsed="false" hidden="false" max="' . ($i + 1) . '" min="' . ($i + 1) . '" style="0" customWidth="true" width="' . floatval($column_width) . '"/>');
+                $sheet->file_writer->write('<col collapsed="false" hidden="false" max="'.($i + 1).'" min="'.($i + 1).'" style="0" customWidth="true" width="'.floatval($column_width).'"/>');
                 $i++;
             }
         }
-        $sheet->file_writer->write('<col collapsed="false" hidden="false" max="1024" min="' . ($i + 1) . '" style="0" customWidth="false" width="11.5"/>');
+        $sheet->file_writer->write('<col collapsed="false" hidden="false" max="1024" min="'.($i + 1).'" style="0" customWidth="false" width="11.5"/>');
         $sheet->file_writer->write('</cols>');
         $sheet->file_writer->write('<sheetData>');
     }
@@ -268,7 +268,7 @@ 
     private function addCellStyle($number_format, $cell_style_string)
     {
         $number_format_idx = self::add_to_list_get_index($this->number_formats, $number_format);
-        $lookup_string = $number_format_idx . ";" . $cell_style_string;
+        $lookup_string = $number_format_idx.";".$cell_style_string;
         $cell_style_idx = self::add_to_list_get_index($this->cell_styles, $lookup_string);
         return $cell_style_idx;
     }
@@ -281,7 +281,7 @@ 
             $number_format_type = self::determineNumberFormatType($number_format);
             $cell_style_idx = $this->addCellStyle($number_format, $style_string = null);
             $column_types[] = array(
-                'number_format' => $number_format,//contains excel format like 'YYYY-MM-DD HH:MM:SS'
+                'number_format' => $number_format, //contains excel format like 'YYYY-MM-DD HH:MM:SS'
                 'number_format_type' => $number_format_type, //contains friendly format like 'datetime'
                 'default_cell_style' => $cell_style_idx,
             );
@@ -302,7 +302,7 @@ 
         }
         $style = &$col_options;
 
-        $col_widths = isset($col_options['widths']) ? (array)$col_options['widths'] : array();
+        $col_widths = isset($col_options['widths']) ? (array) $col_options['widths'] : array();
         $auto_filter = isset($col_options['auto_filter']) ? intval($col_options['auto_filter']) : false;
         $freeze_rows = isset($col_options['freeze_rows']) ? intval($col_options['freeze_rows']) : false;
         $freeze_columns = isset($col_options['freeze_columns']) ? intval($col_options['freeze_columns']) : false;
@@ -312,7 +312,7 @@ 
         if (!$suppress_row) {
             $header_row = array_keys($header_types);
 
-            $sheet->file_writer->write('<row collapsed="false" customFormat="false" customHeight="false" hidden="false" ht="12.1" outlineLevel="0" r="' . (1) . '">');
+            $sheet->file_writer->write('<row collapsed="false" customFormat="false" customHeight="false" hidden="false" ht="12.1" outlineLevel="0" r="'.(1).'">');
             foreach ($header_row as $c => $v) {
                 $cell_style_idx = empty($style) ? $sheet->columns[$c]['default_cell_style'] : $this->addCellStyle(
                     'GENERAL',
@@ -339,18 +339,18 @@ 
                 $from = 0,
                 $until = count($row),
                 'GENERAL'
-            ));//will map to n_auto
-            $sheet->columns = array_merge((array)$sheet->columns, $default_column_types);
+            )); //will map to n_auto
+            $sheet->columns = array_merge((array) $sheet->columns, $default_column_types);
         }
 
         if (!empty($row_options)) {
             $ht = isset($row_options['height']) ? floatval($row_options['height']) : 12.1;
             $customHt = isset($row_options['height']) ? true : false;
-            $hidden = isset($row_options['hidden']) ? (bool)($row_options['hidden']) : false;
-            $collapsed = isset($row_options['collapsed']) ? (bool)($row_options['collapsed']) : false;
-            $sheet->file_writer->write('<row collapsed="' . ($collapsed) . '" customFormat="false" customHeight="' . ($customHt) . '" hidden="' . ($hidden) . '" ht="' . ($ht) . '" outlineLevel="0" r="' . ($sheet->row_count + 1) . '">');
+            $hidden = isset($row_options['hidden']) ? (bool) ($row_options['hidden']) : false;
+            $collapsed = isset($row_options['collapsed']) ? (bool) ($row_options['collapsed']) : false;
+            $sheet->file_writer->write('<row collapsed="'.($collapsed).'" customFormat="false" customHeight="'.($customHt).'" hidden="'.($hidden).'" ht="'.($ht).'" outlineLevel="0" r="'.($sheet->row_count + 1).'">');
         } else {
-            $sheet->file_writer->write('<row collapsed="false" customFormat="false" customHeight="false" hidden="false" ht="12.1" outlineLevel="0" r="' . ($sheet->row_count + 1) . '">');
+            $sheet->file_writer->write('<row collapsed="false" customFormat="false" customHeight="false" hidden="false" ht="12.1" outlineLevel="0" r="'.($sheet->row_count + 1).'">');
         }
 
         $style = &$row_options;
@@ -389,7 +389,7 @@ 
         if (!empty($sheet->merge_cells)) {
             $sheet->file_writer->write('<mergeCells>');
             foreach ($sheet->merge_cells as $range) {
-                $sheet->file_writer->write('<mergeCell ref="' . $range . '"/>');
+                $sheet->file_writer->write('<mergeCell ref="'.$range.'"/>');
             }
             $sheet->file_writer->write('</mergeCells>');
         }
@@ -397,7 +397,7 @@ 
         $max_cell = self::xlsCell($sheet->row_count - 1, count($sheet->columns) - 1);
 
         if ($sheet->auto_filter) {
-            $sheet->file_writer->write('<autoFilter ref="A1:' . $max_cell . '"/>');
+            $sheet->file_writer->write('<autoFilter ref="A1:'.$max_cell.'"/>');
         }
 
         $sheet->file_writer->write('<printOptions headings="false" gridLines="false" gridLinesSet="true" horizontalCentered="false" verticalCentered="false"/>');
@@ -409,10 +409,10 @@ 
         $sheet->file_writer->write('</headerFooter>');
         $sheet->file_writer->write('</worksheet>');
 
-        $max_cell_tag = '<dimension ref="A1:' . $max_cell . '"/>';
+        $max_cell_tag = '<dimension ref="A1:'.$max_cell.'"/>';
         $padding_length = $sheet->max_cell_tag_end - $sheet->max_cell_tag_start - strlen($max_cell_tag);
         $sheet->file_writer->fseek($sheet->max_cell_tag_start);
-        $sheet->file_writer->write($max_cell_tag . str_repeat(" ", $padding_length));
+        $sheet->file_writer->write($max_cell_tag.str_repeat(" ", $padding_length));
         $sheet->file_writer->close();
         $sheet->finalized = true;
     }
@@ -428,7 +428,7 @@ 
 
         $startCell = self::xlsCell($start_cell_row, $start_cell_column);
         $endCell = self::xlsCell($end_cell_row, $end_cell_column);
-        $sheet->merge_cells[] = $startCell . ":" . $endCell;
+        $sheet->merge_cells[] = $startCell.":".$endCell;
     }
 
     public function writeSheet(array $data, $sheet_name = '', array $header_types = array())
@@ -455,26 +455,26 @@ 
         $cell_name = self::xlsCell($row_number, $column_number);
 
         if (!is_scalar($value) || $value === '') { //objects, array, empty
-            $file->write('<c r="' . $cell_name . '" s="' . $cell_style_idx . '"/>');
+            $file->write('<c r="'.$cell_name.'" s="'.$cell_style_idx.'"/>');
         } elseif (is_string($value) && $value{0} == '=') {
-            $file->write('<c r="' . $cell_name . '" s="' . $cell_style_idx . '" t="s"><f>' . self::xmlspecialchars($value) . '</f></c>');
+            $file->write('<c r="'.$cell_name.'" s="'.$cell_style_idx.'" t="s"><f>'.self::xmlspecialchars($value).'</f></c>');
         } elseif ($num_format_type == 'n_date') {
-            $file->write('<c r="' . $cell_name . '" s="' . $cell_style_idx . '" t="n"><v>' . intval(self::convert_date_time($value)) . '</v></c>');
+            $file->write('<c r="'.$cell_name.'" s="'.$cell_style_idx.'" t="n"><v>'.intval(self::convert_date_time($value)).'</v></c>');
         } elseif ($num_format_type == 'n_datetime') {
-            $file->write('<c r="' . $cell_name . '" s="' . $cell_style_idx . '" t="n"><v>' . self::convert_date_time($value) . '</v></c>');
+            $file->write('<c r="'.$cell_name.'" s="'.$cell_style_idx.'" t="n"><v>'.self::convert_date_time($value).'</v></c>');
         } elseif ($num_format_type == 'n_numeric') {
-            $file->write('<c r="' . $cell_name . '" s="' . $cell_style_idx . '" t="n"><v>' . self::xmlspecialchars($value) . '</v></c>');//int,float,currency
+            $file->write('<c r="'.$cell_name.'" s="'.$cell_style_idx.'" t="n"><v>'.self::xmlspecialchars($value).'</v></c>'); //int,float,currency
         } elseif ($num_format_type == 'n_string') {
-            $file->write('<c r="' . $cell_name . '" s="' . $cell_style_idx . '" t="inlineStr"><is><t>' . self::xmlspecialchars($value) . '</t></is></c>');
+            $file->write('<c r="'.$cell_name.'" s="'.$cell_style_idx.'" t="inlineStr"><is><t>'.self::xmlspecialchars($value).'</t></is></c>');
         } elseif ($num_format_type == 'n_auto' || 1) { //auto-detect unknown column types
             if (!is_string($value) || $value == '0' || ($value[0] != '0' && ctype_digit($value)) || preg_match(
                 "/^\-?(0|[1-9][0-9]*)(\.[0-9]+)?$/",
                 $value
             )
             ) {
-                $file->write('<c r="' . $cell_name . '" s="' . $cell_style_idx . '" t="n"><v>' . self::xmlspecialchars($value) . '</v></c>');//int,float,currency
+                $file->write('<c r="'.$cell_name.'" s="'.$cell_style_idx.'" t="n"><v>'.self::xmlspecialchars($value).'</v></c>'); //int,float,currency
             } else { //implied: ($cell_format=='string')
-                $file->write('<c r="' . $cell_name . '" s="' . $cell_style_idx . '" t="inlineStr"><is><t>' . self::xmlspecialchars($value) . '</t></is></c>');
+                $file->write('<c r="'.$cell_name.'" s="'.$cell_style_idx.'" t="inlineStr"><is><t>'.self::xmlspecialchars($value).'</t></is></c>');
             }
         }
     }
@@ -500,9 +500,9 @@ 
         static $horizontal_allowed = array('general', 'left', 'right', 'justify', 'center');
         static $vertical_allowed = array('bottom', 'center', 'distributed', 'top');
         $default_font = array('size' => '10', 'name' => 'Arial', 'family' => '2');
-        $fills = array('', '');//2 placeholders for static xml later
-        $fonts = array('', '', '', '');//4 placeholders for static xml later
-        $borders = array('');//1 placeholder for static xml later
+        $fills = array('', ''); //2 placeholders for static xml later
+        $fonts = array('', '', '', ''); //4 placeholders for static xml later
+        $borders = array(''); //1 placeholder for static xml later
         $style_indexes = array();
         foreach ($this->cell_styles as $i => $cell_style_string) {
             $semi_colon_pos = strpos($cell_style_string, ";");
@@ -510,7 +510,7 @@ 
             $style_json_string = substr($cell_style_string, $semi_colon_pos + 1);
             $style = @json_decode($style_json_string, $as_assoc = true);
 
-            $style_indexes[$i] = array('num_fmt_idx' => $number_format_idx);//initialize entry
+            $style_indexes[$i] = array('num_fmt_idx' => $number_format_idx); //initialize entry
             if (isset($style['border']) && is_string($style['border'])) {//border is a comma delimited str
                 $border_value['side'] = array_intersect(explode(",", $style['border']), $border_allowed);
                 if (isset($style['border-style']) && in_array($style['border-style'], $border_style_allowed)) {
@@ -518,15 +518,15 @@ 
                 }
                 if (isset($style['border-color']) && is_string($style['border-color']) && $style['border-color'][0] == '#') {
                     $v = substr($style['border-color'], 1, 6);
-                    $v = strlen($v) == 3 ? $v[0] . $v[0] . $v[1] . $v[1] . $v[2] . $v[2] : $v;// expand cf0 => ccff00
-                    $border_value['color'] = "FF" . strtoupper($v);
+                    $v = strlen($v) == 3 ? $v[0].$v[0].$v[1].$v[1].$v[2].$v[2] : $v; // expand cf0 => ccff00
+                    $border_value['color'] = "FF".strtoupper($v);
                 }
                 $style_indexes[$i]['border_idx'] = self::add_to_list_get_index($borders, json_encode($border_value));
             }
             if (isset($style['fill']) && is_string($style['fill']) && $style['fill'][0] == '#') {
                 $v = substr($style['fill'], 1, 6);
-                $v = strlen($v) == 3 ? $v[0] . $v[0] . $v[1] . $v[1] . $v[2] . $v[2] : $v;// expand cf0 => ccff00
-                $style_indexes[$i]['fill_idx'] = self::add_to_list_get_index($fills, "FF" . strtoupper($v));
+                $v = strlen($v) == 3 ? $v[0].$v[0].$v[1].$v[1].$v[2].$v[2] : $v; // expand cf0 => ccff00
+                $style_indexes[$i]['fill_idx'] = self::add_to_list_get_index($fills, "FF".strtoupper($v));
             }
             if (isset($style['halign']) && in_array($style['halign'], $horizontal_allowed)) {
                 $style_indexes[$i]['alignment'] = true;
@@ -538,12 +538,12 @@ 
             }
             if (isset($style['wrap_text'])) {
                 $style_indexes[$i]['alignment'] = true;
-                $style_indexes[$i]['wrap_text'] = (bool)$style['wrap_text'];
+                $style_indexes[$i]['wrap_text'] = (bool) $style['wrap_text'];
             }
 
             $font = $default_font;
             if (isset($style['font-size'])) {
-                $font['size'] = floatval($style['font-size']);//floatval to allow "10.5" etc
+                $font['size'] = floatval($style['font-size']); //floatval to allow "10.5" etc
             }
             if (isset($style['font']) && is_string($style['font'])) {
                 if ($style['font'] == 'Comic Sans MS') {
@@ -573,8 +573,8 @@ 
             }
             if (isset($style['color']) && is_string($style['color']) && $style['color'][0] == '#') {
                 $v = substr($style['color'], 1, 6);
-                $v = strlen($v) == 3 ? $v[0] . $v[0] . $v[1] . $v[1] . $v[2] . $v[2] : $v;// expand cf0 => ccff00
-                $font['color'] = "FF" . strtoupper($v);
+                $v = strlen($v) == 3 ? $v[0].$v[0].$v[1].$v[1].$v[2].$v[2] : $v; // expand cf0 => ccff00
+                $font['color'] = "FF".strtoupper($v);
             }
             if ($font != $default_font) {
                 $style_indexes[$i]['font_idx'] = self::add_to_list_get_index($fonts, json_encode($font));
@@ -593,11 +593,11 @@ 
 
         $temporary_filename = $this->tempFilename();
         $file = new XLSXWriter_BuffererWriter($temporary_filename);
-        $file->write('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' . "\n");
+        $file->write('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n");
         $file->write('<styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">');
-        $file->write('<numFmts count="' . count($this->number_formats) . '">');
+        $file->write('<numFmts count="'.count($this->number_formats).'">');
         foreach ($this->number_formats as $i => $v) {
-            $file->write('<numFmt numFmtId="' . (164 + $i) . '" formatCode="' . self::xmlspecialchars($v) . '" />');
+            $file->write('<numFmt numFmtId="'.(164 + $i).'" formatCode="'.self::xmlspecialchars($v).'" />');
         }
         //$file->write(		'<numFmt formatCode="GENERAL" numFmtId="164"/>');
         //$file->write(		'<numFmt formatCode="[$$-1009]#,##0.00;[RED]\-[$$-1009]#,##0.00" numFmtId="165"/>');
@@ -605,7 +605,7 @@ 
         //$file->write(		'<numFmt formatCode="YYYY-MM-DD" numFmtId="167"/>');
         $file->write('</numFmts>');
 
-        $file->write('<fonts count="' . (count($fonts)) . '">');
+        $file->write('<fonts count="'.(count($fonts)).'">');
         $file->write('<font><name val="Arial"/><charset val="1"/><family val="2"/><sz val="10"/></font>');
         $file->write('<font><name val="Arial"/><family val="0"/><sz val="10"/></font>');
         $file->write('<font><name val="Arial"/><family val="0"/><sz val="10"/></font>');
@@ -615,10 +615,10 @@ 
             if (!empty($font)) { //fonts have 4 empty placeholders in array to offset the 4 static xml entries above
                 $f = json_decode($font, true);
                 $file->write('<font>');
-                $file->write('<name val="' . htmlspecialchars($f['name']) . '"/><charset val="1"/><family val="' . intval($f['family']) . '"/>');
-                $file->write('<sz val="' . intval($f['size']) . '"/>');
+                $file->write('<name val="'.htmlspecialchars($f['name']).'"/><charset val="1"/><family val="'.intval($f['family']).'"/>');
+                $file->write('<sz val="'.intval($f['size']).'"/>');
                 if (!empty($f['color'])) {
-                    $file->write('<color rgb="' . strval($f['color']) . '"/>');
+                    $file->write('<color rgb="'.strval($f['color']).'"/>');
                 }
                 if (!empty($f['bold'])) {
                     $file->write('<b val="true"/>');
@@ -637,23 +637,23 @@ 
         }
         $file->write('</fonts>');
 
-        $file->write('<fills count="' . (count($fills)) . '">');
+        $file->write('<fills count="'.(count($fills)).'">');
         $file->write('<fill><patternFill patternType="none"/></fill>');
         $file->write('<fill><patternFill patternType="gray125"/></fill>');
         foreach ($fills as $fill) {
             if (!empty($fill)) { //fills have 2 empty placeholders in array to offset the 2 static xml entries above
-                $file->write('<fill><patternFill patternType="solid"><fgColor rgb="' . strval($fill) . '"/><bgColor indexed="64"/></patternFill></fill>');
+                $file->write('<fill><patternFill patternType="solid"><fgColor rgb="'.strval($fill).'"/><bgColor indexed="64"/></patternFill></fill>');
             }
         }
         $file->write('</fills>');
 
-        $file->write('<borders count="' . (count($borders)) . '">');
+        $file->write('<borders count="'.(count($borders)).'">');
         $file->write('<border diagonalDown="false" diagonalUp="false"><left/><right/><top/><bottom/><diagonal/></border>');
         foreach ($borders as $border) {
             if (!empty($border)) { //fonts have an empty placeholder in the array to offset the static xml entry above
                 $pieces = json_decode($border, true);
                 $border_style = !empty($pieces['style']) ? $pieces['style'] : 'hair';
-                $border_color = !empty($pieces['color']) ? '<color rgb="' . strval($pieces['color']) . '"/>' : '';
+                $border_color = !empty($pieces['color']) ? '<color rgb="'.strval($pieces['color']).'"/>' : '';
                 $file->write('<border diagonalDown="false" diagonalUp="false">');
                 foreach (array('left', 'right', 'top', 'bottom') as $side) {
                     $show_side = in_array($side, $pieces['side']) ? true : false;
@@ -691,7 +691,7 @@ 
         $file->write('<xf applyAlignment="false" applyBorder="false" applyFont="true" applyProtection="false" borderId="0" fillId="0" fontId="1" numFmtId="9"/>');
         $file->write('</cellStyleXfs>');
 
-        $file->write('<cellXfs count="' . (count($style_indexes)) . '">');
+        $file->write('<cellXfs count="'.(count($style_indexes)).'">');
         //$file->write(		'<xf applyAlignment="false" applyBorder="false" applyFont="false" applyProtection="false" borderId="0" fillId="0" fontId="0" numFmtId="164" xfId="0"/>');
         //$file->write(		'<xf applyAlignment="false" applyBorder="false" applyFont="false" applyProtection="false" borderId="0" fillId="0" fontId="0" numFmtId="165" xfId="0"/>');
         //$file->write(		'<xf applyAlignment="false" applyBorder="false" applyFont="false" applyProtection="false" borderId="0" fillId="0" fontId="0" numFmtId="166" xfId="0"/>');
@@ -707,8 +707,8 @@ 
             $fillIdx = isset($v['fill_idx']) ? intval($v['fill_idx']) : 0;
             $fontIdx = isset($v['font_idx']) ? intval($v['font_idx']) : 0;
             //$file->write('<xf applyAlignment="'.$applyAlignment.'" applyBorder="'.$applyBorder.'" applyFont="'.$applyFont.'" applyProtection="false" borderId="'.($borderIdx).'" fillId="'.($fillIdx).'" fontId="'.($fontIdx).'" numFmtId="'.(164+$v['num_fmt_idx']).'" xfId="0"/>');
-            $file->write('<xf applyAlignment="' . $applyAlignment . '" applyBorder="' . $applyBorder . '" applyFont="' . $applyFont . '" applyProtection="false" borderId="' . ($borderIdx) . '" fillId="' . ($fillIdx) . '" fontId="' . ($fontIdx) . '" numFmtId="' . (164 + $v['num_fmt_idx']) . '" xfId="0">');
-            $file->write('	<alignment horizontal="' . $horizAlignment . '" vertical="' . $vertAlignment . '" textRotation="0" wrapText="' . $wrapText . '" indent="0" shrinkToFit="false"/>');
+            $file->write('<xf applyAlignment="'.$applyAlignment.'" applyBorder="'.$applyBorder.'" applyFont="'.$applyFont.'" applyProtection="false" borderId="'.($borderIdx).'" fillId="'.($fillIdx).'" fontId="'.($fontIdx).'" numFmtId="'.(164 + $v['num_fmt_idx']).'" xfId="0">');
+            $file->write('	<alignment horizontal="'.$horizAlignment.'" vertical="'.$vertAlignment.'" textRotation="0" wrapText="'.$wrapText.'" indent="0" shrinkToFit="false"/>');
             $file->write('	<protection locked="true" hidden="false"/>');
             $file->write('</xf>');
         }
@@ -729,10 +729,10 @@ 
     protected function buildAppXML()
     {
         $app_xml = "";
-        $app_xml .= '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' . "\n";
+        $app_xml .= '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n";
         $app_xml .= '<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes">';
         $app_xml .= '<TotalTime>0</TotalTime>';
-        $app_xml .= '<Company>' . self::xmlspecialchars($this->company) . '</Company>';
+        $app_xml .= '<Company>'.self::xmlspecialchars($this->company).'</Company>';
         $app_xml .= '</Properties>';
         return $app_xml;
     }
@@ -740,19 +740,19 @@ 
     protected function buildCoreXML()
     {
         $core_xml = "";
-        $core_xml .= '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' . "\n";
+        $core_xml .= '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n";
         $core_xml .= '<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">';
-        $core_xml .= '<dcterms:created xsi:type="dcterms:W3CDTF">' . date("Y-m-d\TH:i:s.00\Z") . '</dcterms:created>';//$date_time = '2014-10-25T15:54:37.00Z';
-        $core_xml .= '<dc:title>' . self::xmlspecialchars($this->title) . '</dc:title>';
-        $core_xml .= '<dc:subject>' . self::xmlspecialchars($this->subject) . '</dc:subject>';
-        $core_xml .= '<dc:creator>' . self::xmlspecialchars($this->author) . '</dc:creator>';
+        $core_xml .= '<dcterms:created xsi:type="dcterms:W3CDTF">'.date("Y-m-d\TH:i:s.00\Z").'</dcterms:created>'; //$date_time = '2014-10-25T15:54:37.00Z';
+        $core_xml .= '<dc:title>'.self::xmlspecialchars($this->title).'</dc:title>';
+        $core_xml .= '<dc:subject>'.self::xmlspecialchars($this->subject).'</dc:subject>';
+        $core_xml .= '<dc:creator>'.self::xmlspecialchars($this->author).'</dc:creator>';
         if (!empty($this->keywords)) {
-            $core_xml .= '<cp:keywords>' . self::xmlspecialchars(implode(
+            $core_xml .= '<cp:keywords>'.self::xmlspecialchars(implode(
                 ", ",
-                (array)$this->keywords
-            )) . '</cp:keywords>';
+                (array) $this->keywords
+            )).'</cp:keywords>';
         }
-        $core_xml .= '<dc:description>' . self::xmlspecialchars($this->description) . '</dc:description>';
+        $core_xml .= '<dc:description>'.self::xmlspecialchars($this->description).'</dc:description>';
         $core_xml .= '<cp:revision>0</cp:revision>';
         $core_xml .= '</cp:coreProperties>';
         return $core_xml;
@@ -761,7 +761,7 @@ 
     protected function buildRelationshipsXML()
     {
         $rels_xml = "";
-        $rels_xml .= '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
+        $rels_xml .= '<?xml version="1.0" encoding="UTF-8"?>'."\n";
         $rels_xml .= '<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">';
         $rels_xml .= '<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="xl/workbook.xml"/>';
         $rels_xml .= '<Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/>';
@@ -775,14 +775,14 @@ 
     {
         $i = 0;
         $workbook_xml = "";
-        $workbook_xml .= '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' . "\n";
+        $workbook_xml .= '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n";
         $workbook_xml .= '<workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">';
         $workbook_xml .= '<fileVersion appName="Calc"/><workbookPr backupFile="false" showObjects="all" date1904="false"/><workbookProtection/>';
         $workbook_xml .= '<bookViews><workbookView activeTab="0" firstSheet="0" showHorizontalScroll="true" showSheetTabs="true" showVerticalScroll="true" tabRatio="212" windowHeight="8192" windowWidth="16384" xWindow="0" yWindow="0"/></bookViews>';
         $workbook_xml .= '<sheets>';
         foreach ($this->sheets as $sheet_name => $sheet) {
             $sheetname = self::sanitize_sheetname($sheet->sheetname);
-            $workbook_xml .= '<sheet name="' . self::xmlspecialchars($sheetname) . '" sheetId="' . ($i + 1) . '" state="visible" r:id="rId' . ($i + 2) . '"/>';
+            $workbook_xml .= '<sheet name="'.self::xmlspecialchars($sheetname).'" sheetId="'.($i + 1).'" state="visible" r:id="rId'.($i + 2).'"/>';
             $i++;
         }
         $workbook_xml .= '</sheets>';
@@ -790,11 +790,11 @@ 
         foreach ($this->sheets as $sheet_name => $sheet) {
             if ($sheet->auto_filter) {
                 $sheetname = self::sanitize_sheetname($sheet->sheetname);
-                $workbook_xml .= '<definedName name="_xlnm._FilterDatabase" localSheetId="0" hidden="1">\'' . self::xmlspecialchars($sheetname) . '\'!$A$1:' . self::xlsCell(
+                $workbook_xml .= '<definedName name="_xlnm._FilterDatabase" localSheetId="0" hidden="1">\''.self::xmlspecialchars($sheetname).'\'!$A$1:'.self::xlsCell(
                     $sheet->row_count - 1,
                     count($sheet->columns) - 1,
                     true
-                ) . '</definedName>';
+                ).'</definedName>';
                 $i++;
             }
         }
@@ -807,11 +807,11 @@ 
     {
         $i = 0;
         $wkbkrels_xml = "";
-        $wkbkrels_xml .= '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
+        $wkbkrels_xml .= '<?xml version="1.0" encoding="UTF-8"?>'."\n";
         $wkbkrels_xml .= '<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">';
         $wkbkrels_xml .= '<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/>';
         foreach ($this->sheets as $sheet_name => $sheet) {
-            $wkbkrels_xml .= '<Relationship Id="rId' . ($i + 2) . '" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/' . ($sheet->xmlname) . '"/>';
+            $wkbkrels_xml .= '<Relationship Id="rId'.($i + 2).'" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/'.($sheet->xmlname).'"/>';
             $i++;
         }
         $wkbkrels_xml .= "\n";
@@ -822,12 +822,12 @@ 
     protected function buildContentTypesXML()
     {
         $content_types_xml = "";
-        $content_types_xml .= '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
+        $content_types_xml .= '<?xml version="1.0" encoding="UTF-8"?>'."\n";
         $content_types_xml .= '<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">';
         $content_types_xml .= '<Override PartName="/_rels/.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>';
         $content_types_xml .= '<Override PartName="/xl/_rels/workbook.xml.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>';
         foreach ($this->sheets as $sheet_name => $sheet) {
-            $content_types_xml .= '<Override PartName="/xl/worksheets/' . ($sheet->xmlname) . '" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>';
+            $content_types_xml .= '<Override PartName="/xl/worksheets/'.($sheet->xmlname).'" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>';
         }
         $content_types_xml .= '<Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>';
         $content_types_xml .= '<Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/>';
@@ -849,12 +849,12 @@ 
     {
         $n = $column_number;
         for ($r = ""; $n >= 0; $n = intval($n / 26) - 1) {
-            $r = chr($n % 26 + 0x41) . $r;
+            $r = chr($n % 26 + 0x41).$r;
         }
         if ($absolute) {
-            return '$' . $r . '$' . ($row_number + 1);
+            return '$'.$r.'$'.($row_number + 1);
         }
-        return $r . ($row_number + 1);
+        return $r.($row_number + 1);
     }
 
     //------------------------------------------------------------------
@@ -862,7 +862,7 @@ 
     {
         file_put_contents(
             "php://stderr",
-            date("Y-m-d H:i:s:") . rtrim(is_array($string) ? json_encode($string) : $string) . "\n"
+            date("Y-m-d H:i:s:").rtrim(is_array($string) ? json_encode($string) : $string)."\n"
         );
     }
 
@@ -884,8 +884,8 @@ 
         static $goodchars = '        ';
         $sheetname = strtr($sheetname, $badchars, $goodchars);
         $sheetname = substr($sheetname, 0, 31);
-        $sheetname = trim(trim(trim($sheetname), "'"));//trim before and after trimming single quotes
-        return !empty($sheetname) ? $sheetname : 'Sheet' . ((rand() % 900) + 100);
+        $sheetname = trim(trim(trim($sheetname), "'")); //trim before and after trimming single quotes
+        return !empty($sheetname) ? $sheetname : 'Sheet'.((rand() % 900) + 100);
     }
 
     //------------------------------------------------------------------
@@ -898,7 +898,7 @@ 
             htmlspecialchars($val, ENT_QUOTES | ENT_XML1),
             $badchars,
             $goodchars
-        );//strtr appears to be faster than str_replace
+        ); //strtr appears to be faster than str_replace
     }
 
     //------------------------------------------------------------------
@@ -1002,7 +1002,7 @@ 
                 }
             }
             if ($ignore_until == '' && ($c == ' ' || $c == '-' || $c == '(' || $c == ')') && ($i == 0 || $num_format[$i - 1] != '_')) {
-                $escaped .= "\\" . $c;
+                $escaped .= "\\".$c;
             } else {
                 $escaped .= $c;
             }
@@ -1024,8 +1024,8 @@ 
     //------------------------------------------------------------------
     public static function convert_date_time($date_input) //thanks to Excel::Writer::XLSX::Worksheet.pm (perl)
     {
-        $days = 0;    # Number of days since epoch
-        $seconds = 0;    # Time expressed as fraction of 24h hours in seconds
+        $days = 0; # Number of days since epoch
+        $seconds = 0; # Time expressed as fraction of 24h hours in seconds
         $year = $month = $day = 0;
         $hour = $min = $sec = 0;
 
@@ -1076,13 +1076,13 @@ 
         }
 
         # Accumulate the number of days since the epoch.
-        $days = $day;    # Add days for current month
-        $days += array_sum(array_slice($mdays, 0, $month - 1));    # Add days for past months
-        $days += $range * 365;                      # Add days for past years
-        $days += intval(($range) / 4);             # Add leapdays
+        $days = $day; # Add days for current month
+        $days += array_sum(array_slice($mdays, 0, $month - 1)); # Add days for past months
+        $days += $range * 365; # Add days for past years
+        $days += intval(($range) / 4); # Add leapdays
         $days -= intval(($range + $offset) / 100); # Subtract 100 year leapdays
-        $days += intval(($range + $offset + $norm) / 400);  # Add 400 year leapdays
-        $days -= $leap;                                      # Already counted above
+        $days += intval(($range + $offset + $norm) / 400); # Add 400 year leapdays
+        $days -= $leap; # Already counted above
 
         # Adjust for Excel erroneously treating 1900 as a leap year.
         if ($days > 59) {

core/tag/tags/LinkTag.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
     {
         if (StringHelper::startsWith($value, '//')) {
             // its an absolute url
-            $value = StringHelper::replaceFirst('//', Url::base(true) . '/', $value);
+            $value = StringHelper::replaceFirst('//', Url::base(true).'/', $value);
             $external = false;
         } elseif (StringHelper::startsWith($value, '/')) {
             // its a relative url, keep it like this

core/traits/ErrorHandlerTrait.php

Spacing +4 added lines, -4 removed lines

@@ -176,9 +176,9 @@ 
             $_file = $exception->getFile();
             $_line = $exception->getLine();
         } elseif (is_string($exception)) {
-            $_message = 'exception string: ' . $exception;
+            $_message = 'exception string: '.$exception;
         } elseif (is_array($exception)) {
-            $_message = isset($exception['message']) ? $exception['message'] : 'exception array dump: ' . print_r($exception, true);
+            $_message = isset($exception['message']) ? $exception['message'] : 'exception array dump: '.print_r($exception, true);
             $_file = isset($exception['file']) ? $exception['file'] : __FILE__;
             $_line = isset($exception['line']) ? $exception['line'] : __LINE__;
         }
@@ -249,7 +249,7 @@ 
 
         if (!empty($file)) {
             try {
-                $lineInArray = $line -1;
+                $lineInArray = $line - 1;
                 // load file from path
                 $fileInfo = file($file, FILE_IGNORE_NEW_LINES);
                 // load file if false from real path
@@ -289,7 +289,7 @@ 
             'class' => isset($item['class']) ? $item['class'] : null,
             // currently arguments wont be transmited due to large amount of informations based on base object
             //'args' => isset($item['args']) ? ArrayHelper::coverSensitiveValues($item['args'], $this->sensitiveKeys) : [],
-        ], function ($value) {
+        ], function($value) {
             return !empty($value);
         });
     }