PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/Writer/Xlsx/Comments.php

Spacing +4 added lines, -4 removed lines

@@ -204,15 +204,15 @@
 
         // v:shape
         $objWriter->startElement('v:shape');
-        $objWriter->writeAttribute('id', '_x0000_s'.$id);
+        $objWriter->writeAttribute('id', '_x0000_s' . $id);
         $objWriter->writeAttribute('type', '#_x0000_t202');
-        $objWriter->writeAttribute('style', 'position:absolute;margin-left:'.$pComment->getMarginLeft().';margin-top:'.$pComment->getMarginTop().';width:'.$pComment->getWidth().';height:'.$pComment->getHeight().';z-index:1;visibility:'.($pComment->getVisible() ? 'visible' : 'hidden'));
-        $objWriter->writeAttribute('fillcolor', '#'.$pComment->getFillColor()->getRGB());
+        $objWriter->writeAttribute('style', 'position:absolute;margin-left:' . $pComment->getMarginLeft() . ';margin-top:' . $pComment->getMarginTop() . ';width:' . $pComment->getWidth() . ';height:' . $pComment->getHeight() . ';z-index:1;visibility:' . ($pComment->getVisible() ? 'visible' : 'hidden'));
+        $objWriter->writeAttribute('fillcolor', '#' . $pComment->getFillColor()->getRGB());
         $objWriter->writeAttribute('o:insetmode', 'auto');
 
             // v:fill
             $objWriter->startElement('v:fill');
-        $objWriter->writeAttribute('color2', '#'.$pComment->getFillColor()->getRGB());
+        $objWriter->writeAttribute('color2', '#' . $pComment->getFillColor()->getRGB());
         $objWriter->endElement();
 
             // v:shadow

src/PhpSpreadsheet/Writer/Xlsx/ContentTypes.php

Spacing +5 added lines, -5 removed lines

@@ -99,7 +99,7 @@ 
         // Worksheets
         $sheetCount = $spreadsheet->getSheetCount();
         for ($i = 0; $i < $sheetCount; ++$i) {
-            $this->writeOverrideContentType($objWriter, '/xl/worksheets/sheet'.($i + 1).'.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml');
+            $this->writeOverrideContentType($objWriter, '/xl/worksheets/sheet' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml');
         }
 
         // Shared strings
@@ -114,13 +114,13 @@ 
 
             //    We need a drawing relationship for the worksheet if we have either drawings or charts
             if (($drawingCount > 0) || ($chartCount > 0)) {
-                $this->writeOverrideContentType($objWriter, '/xl/drawings/drawing'.($i + 1).'.xml', 'application/vnd.openxmlformats-officedocument.drawing+xml');
+                $this->writeOverrideContentType($objWriter, '/xl/drawings/drawing' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.drawing+xml');
             }
 
             //    If we have charts, then we need a chart relationship for every individual chart
             if ($chartCount > 0) {
                 for ($c = 0; $c < $chartCount; ++$c) {
-                    $this->writeOverrideContentType($objWriter, '/xl/charts/chart'.$chart++.'.xml', 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml');
+                    $this->writeOverrideContentType($objWriter, '/xl/charts/chart' . $chart++ . '.xml', 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml');
                 }
             }
         }
@@ -128,7 +128,7 @@ 
         // Comments
         for ($i = 0; $i < $sheetCount; ++$i) {
             if (count($spreadsheet->getSheet($i)->getComments()) > 0) {
-                $this->writeOverrideContentType($objWriter, '/xl/comments'.($i + 1).'.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml');
+                $this->writeOverrideContentType($objWriter, '/xl/comments' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml');
             }
         }
 
@@ -161,7 +161,7 @@ 
             // we need to write "Extension" but not already write for media content
             $tabRibbonTypes = array_diff($spreadsheet->getRibbonBinObjects('types'), array_keys($aMediaContentTypes));
             foreach ($tabRibbonTypes as $aRibbonType) {
-                $mimeType = 'image/.'.$aRibbonType; //we wrote $mimeType like customUI Editor
+                $mimeType = 'image/.' . $aRibbonType; //we wrote $mimeType like customUI Editor
                 $this->writeDefaultContentType($objWriter, $aRibbonType, $mimeType);
             }
         }

src/PhpSpreadsheet/Writer/Xlsx/StringTable.php

Spacing +15 added lines, -15 removed lines

@@ -153,31 +153,31 @@ 
         $elements = $pRichText->getRichTextElements();
         foreach ($elements as $element) {
             // r
-            $objWriter->startElement($prefix.'r');
+            $objWriter->startElement($prefix . 'r');
 
             // rPr
             if ($element instanceof \PhpOffice\PhpSpreadsheet\RichText\Run) {
                 // rPr
-                $objWriter->startElement($prefix.'rPr');
+                $objWriter->startElement($prefix . 'rPr');
 
                 // rFont
-                $objWriter->startElement($prefix.'rFont');
+                $objWriter->startElement($prefix . 'rFont');
                 $objWriter->writeAttribute('val', $element->getFont()->getName());
                 $objWriter->endElement();
 
                 // Bold
-                $objWriter->startElement($prefix.'b');
+                $objWriter->startElement($prefix . 'b');
                 $objWriter->writeAttribute('val', ($element->getFont()->getBold() ? 'true' : 'false'));
                 $objWriter->endElement();
 
                 // Italic
-                $objWriter->startElement($prefix.'i');
+                $objWriter->startElement($prefix . 'i');
                 $objWriter->writeAttribute('val', ($element->getFont()->getItalic() ? 'true' : 'false'));
                 $objWriter->endElement();
 
                 // Superscript / subscript
                 if ($element->getFont()->getSuperScript() || $element->getFont()->getSubScript()) {
-                    $objWriter->startElement($prefix.'vertAlign');
+                    $objWriter->startElement($prefix . 'vertAlign');
                     if ($element->getFont()->getSuperScript()) {
                         $objWriter->writeAttribute('val', 'superscript');
                     } elseif ($element->getFont()->getSubScript()) {
@@ -187,22 +187,22 @@ 
                 }
 
                 // Strikethrough
-                $objWriter->startElement($prefix.'strike');
+                $objWriter->startElement($prefix . 'strike');
                 $objWriter->writeAttribute('val', ($element->getFont()->getStrikethrough() ? 'true' : 'false'));
                 $objWriter->endElement();
 
                 // Color
-                $objWriter->startElement($prefix.'color');
+                $objWriter->startElement($prefix . 'color');
                 $objWriter->writeAttribute('rgb', $element->getFont()->getColor()->getARGB());
                 $objWriter->endElement();
 
                 // Size
-                $objWriter->startElement($prefix.'sz');
+                $objWriter->startElement($prefix . 'sz');
                 $objWriter->writeAttribute('val', $element->getFont()->getSize());
                 $objWriter->endElement();
 
                 // Underline
-                $objWriter->startElement($prefix.'u');
+                $objWriter->startElement($prefix . 'u');
                 $objWriter->writeAttribute('val', $element->getFont()->getUnderline());
                 $objWriter->endElement();
 
@@ -210,7 +210,7 @@ 
             }
 
             // t
-            $objWriter->startElement($prefix.'t');
+            $objWriter->startElement($prefix . 't');
             $objWriter->writeAttribute('xml:space', 'preserve');
             $objWriter->writeRawData(\PhpOffice\PhpSpreadsheet\Shared\StringHelper::controlCharacterPHP2OOXML($element->getText()));
             $objWriter->endElement();
@@ -244,10 +244,10 @@ 
         $elements = $pRichText->getRichTextElements();
         foreach ($elements as $element) {
             // r
-            $objWriter->startElement($prefix.'r');
+            $objWriter->startElement($prefix . 'r');
 
             // rPr
-            $objWriter->startElement($prefix.'rPr');
+            $objWriter->startElement($prefix . 'rPr');
 
             // Bold
             $objWriter->writeAttribute('b', ($element->getFont()->getBold() ? 1 : 0));
@@ -268,14 +268,14 @@ 
             $objWriter->writeAttribute('strike', ($element->getFont()->getStrikethrough() ? 'sngStrike' : 'noStrike'));
 
             // rFont
-            $objWriter->startElement($prefix.'latin');
+            $objWriter->startElement($prefix . 'latin');
             $objWriter->writeAttribute('typeface', $element->getFont()->getName());
             $objWriter->endElement();
 
             $objWriter->endElement();
 
             // t
-            $objWriter->startElement($prefix.'t');
+            $objWriter->startElement($prefix . 't');
             $objWriter->writeRawData(\PhpOffice\PhpSpreadsheet\Shared\StringHelper::controlCharacterPHP2OOXML($element->getText()));
             $objWriter->endElement();
 

src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php

Spacing +7 added lines, -7 removed lines

@@ -515,19 +515,19 @@ 
                     if ($conditional->getConditionType() == \PhpOffice\PhpSpreadsheet\Style\Conditional::CONDITION_CONTAINSTEXT
                         && $conditional->getOperatorType() == \PhpOffice\PhpSpreadsheet\Style\Conditional::OPERATOR_CONTAINSTEXT
                         && !is_null($conditional->getText())) {
-                        $objWriter->writeElement('formula', 'NOT(ISERROR(SEARCH("'.$conditional->getText().'",'.$cellCoordinate.')))');
+                        $objWriter->writeElement('formula', 'NOT(ISERROR(SEARCH("' . $conditional->getText() . '",' . $cellCoordinate . ')))');
                     } elseif ($conditional->getConditionType() == \PhpOffice\PhpSpreadsheet\Style\Conditional::CONDITION_CONTAINSTEXT
                         && $conditional->getOperatorType() == \PhpOffice\PhpSpreadsheet\Style\Conditional::OPERATOR_BEGINSWITH
                         && !is_null($conditional->getText())) {
-                        $objWriter->writeElement('formula', 'LEFT('.$cellCoordinate.','.strlen($conditional->getText()).')="'.$conditional->getText().'"');
+                        $objWriter->writeElement('formula', 'LEFT(' . $cellCoordinate . ',' . strlen($conditional->getText()) . ')="' . $conditional->getText() . '"');
                     } elseif ($conditional->getConditionType() == \PhpOffice\PhpSpreadsheet\Style\Conditional::CONDITION_CONTAINSTEXT
                         && $conditional->getOperatorType() == \PhpOffice\PhpSpreadsheet\Style\Conditional::OPERATOR_ENDSWITH
                         && !is_null($conditional->getText())) {
-                        $objWriter->writeElement('formula', 'RIGHT('.$cellCoordinate.','.strlen($conditional->getText()).')="'.$conditional->getText().'"');
+                        $objWriter->writeElement('formula', 'RIGHT(' . $cellCoordinate . ',' . strlen($conditional->getText()) . ')="' . $conditional->getText() . '"');
                     } elseif ($conditional->getConditionType() == \PhpOffice\PhpSpreadsheet\Style\Conditional::CONDITION_CONTAINSTEXT
                         && $conditional->getOperatorType() == \PhpOffice\PhpSpreadsheet\Style\Conditional::OPERATOR_NOTCONTAINS
                         && !is_null($conditional->getText())) {
-                        $objWriter->writeElement('formula', 'ISERROR(SEARCH("'.$conditional->getText().'",'.$cellCoordinate.'))');
+                        $objWriter->writeElement('formula', 'ISERROR(SEARCH("' . $conditional->getText() . '",' . $cellCoordinate . '))');
                     } elseif ($conditional->getConditionType() == \PhpOffice\PhpSpreadsheet\Style\Conditional::CONDITION_CELLIS
                         || $conditional->getConditionType() == \PhpOffice\PhpSpreadsheet\Style\Conditional::CONDITION_CONTAINSTEXT
                         || $conditional->getConditionType() == \PhpOffice\PhpSpreadsheet\Style\Conditional::CONDITION_EXPRESSION) {
@@ -637,7 +637,7 @@ 
 
                 $objWriter->writeAttribute('ref', $coordinate);
                 if (!$hyperlink->isInternal()) {
-                    $objWriter->writeAttribute('r:id', 'rId_hyperlink_'.$relationId);
+                    $objWriter->writeAttribute('r:id', 'rId_hyperlink_' . $relationId);
                     ++$relationId;
                 } else {
                     $objWriter->writeAttribute('location', str_replace('sheet://', '', $hyperlink->getUrl()));
@@ -672,7 +672,7 @@ 
             foreach ($pSheet->getProtectedCells() as $protectedCell => $passwordHash) {
                 // protectedRange
                 $objWriter->startElement('protectedRange');
-                $objWriter->writeAttribute('name', 'p'.md5($protectedCell));
+                $objWriter->writeAttribute('name', 'p' . md5($protectedCell));
                 $objWriter->writeAttribute('sqref', $protectedCell);
                 if (!empty($passwordHash)) {
                     $objWriter->writeAttribute('password', $passwordHash);
@@ -1015,7 +1015,7 @@ 
                     // Start a new row
                     $objWriter->startElement('row');
                     $objWriter->writeAttribute('r', $currentRow);
-                    $objWriter->writeAttribute('spans', '1:'.$colCount);
+                    $objWriter->writeAttribute('spans', '1:' . $colCount);
 
                     // Row dimensions
                     if ($rowDimension->getRowHeight() >= 0) {

src/PhpSpreadsheet/Spreadsheet.php

Spacing +6 added lines, -6 removed lines

@@ -733,7 +733,7 @@ 
             return $worksheet;
         }
 
-        throw new Exception('Workbook does not contain sheet:'.$pValue);
+        throw new Exception('Workbook does not contain sheet:' . $pValue);
     }
 
     /**
@@ -812,7 +812,7 @@ 
             $this->namedRanges[$namedRange->getName()] = $namedRange;
         } else {
             // local scope
-            $this->namedRanges[$namedRange->getScope()->getTitle().'!'.$namedRange->getName()] = $namedRange;
+            $this->namedRanges[$namedRange->getScope()->getTitle() . '!' . $namedRange->getName()] = $namedRange;
         }
 
         return true;
@@ -837,8 +837,8 @@ 
             }
 
             // then look for local defined name (has priority over global defined name if both names exist)
-            if (($pSheet !== null) && isset($this->namedRanges[$pSheet->getTitle().'!'.$namedRange])) {
-                $returnValue = $this->namedRanges[$pSheet->getTitle().'!'.$namedRange];
+            if (($pSheet !== null) && isset($this->namedRanges[$pSheet->getTitle() . '!' . $namedRange])) {
+                $returnValue = $this->namedRanges[$pSheet->getTitle() . '!' . $namedRange];
             }
         }
 
@@ -860,8 +860,8 @@ 
                 unset($this->namedRanges[$namedRange]);
             }
         } else {
-            if (isset($this->namedRanges[$pSheet->getTitle().'!'.$namedRange])) {
-                unset($this->namedRanges[$pSheet->getTitle().'!'.$namedRange]);
+            if (isset($this->namedRanges[$pSheet->getTitle() . '!' . $namedRange])) {
+                unset($this->namedRanges[$pSheet->getTitle() . '!' . $namedRange]);
             }
         }
 

src/PhpSpreadsheet/Chart/Properties.php

Spacing +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
 
     protected function getTrueAlpha($alpha)
     {
-        return (string) 100 - $alpha.'000';
+        return (string) 100 - $alpha . '000';
     }
 
     protected function setColorProperties($color, $alpha, $type)

src/PhpSpreadsheet/Chart/Renderer/JpGraph.php

Spacing +19 added lines, -19 removed lines

@@ -544,7 +544,7 @@ 
 
     private function renderAreaChart($groupCount, $dimensions = '2d')
     {
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_line.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php';
 
         $this->renderCartesianPlotArea();
 
@@ -555,7 +555,7 @@ 
 
     private function renderLineChart($groupCount, $dimensions = '2d')
     {
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_line.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php';
 
         $this->renderCartesianPlotArea();
 
@@ -566,7 +566,7 @@ 
 
     private function renderBarChart($groupCount, $dimensions = '2d')
     {
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_bar.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_bar.php';
 
         $this->renderCartesianPlotArea();
 
@@ -577,9 +577,9 @@ 
 
     private function renderScatterChart($groupCount)
     {
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_scatter.php';
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_regstat.php';
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_line.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_scatter.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_regstat.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php';
 
         $this->renderCartesianPlotArea('linlin');
 
@@ -590,7 +590,7 @@ 
 
     private function renderBubbleChart($groupCount)
     {
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_scatter.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_scatter.php';
 
         $this->renderCartesianPlotArea('linlin');
 
@@ -601,9 +601,9 @@ 
 
     private function renderPieChart($groupCount, $dimensions = '2d', $doughnut = false, $multiplePlots = false)
     {
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_pie.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_pie.php';
         if ($dimensions == '3d') {
-            require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_pie3d.php';
+            require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_pie3d.php';
         }
 
         $this->renderPiePlotArea($doughnut);
@@ -677,7 +677,7 @@ 
 
     private function renderRadarChart($groupCount)
     {
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_radar.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_radar.php';
 
         $this->renderRadarPlotArea();
 
@@ -688,7 +688,7 @@ 
 
     private function renderStockChart($groupCount)
     {
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_stock.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_stock.php';
 
         $this->renderCartesianPlotArea('intint');
 
@@ -699,7 +699,7 @@ 
 
     private function renderContourChart($groupCount, $dimensions)
     {
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_contour.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_contour.php';
 
         $this->renderCartesianPlotArea('intint');
 
@@ -710,11 +710,11 @@ 
 
     private function renderCombinationChart($groupCount, $dimensions, $outputDestination)
     {
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_line.php';
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_bar.php';
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_scatter.php';
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_regstat.php';
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_line.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_bar.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_scatter.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_regstat.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php';
 
         $this->renderCartesianPlotArea();
 
@@ -836,7 +836,7 @@ 
                 $this->renderStockChart($groupCount, $dimensions);
                 break;
             default:
-                echo $chartType.' is not yet implemented<br />';
+                echo $chartType . ' is not yet implemented<br />';
 
                 return false;
         }
@@ -855,6 +855,6 @@ 
         $this->graph = null;
         $this->chart = $chart;
 
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'/jpgraph.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . '/jpgraph.php';
     }
 }

src/PhpSpreadsheet/Cell/AdvancedValueBinder.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
             }
 
             // Check for number in scientific format
-            if (preg_match('/^'.\PhpOffice\PhpSpreadsheet\Calculation::CALCULATION_REGEXP_NUMBER.'$/', $value)) {
+            if (preg_match('/^' . \PhpOffice\PhpSpreadsheet\Calculation::CALCULATION_REGEXP_NUMBER . '$/', $value)) {
                 $cell->setValueExplicit((float) $value, DataType::TYPE_NUMERIC);
 
                 return true;
@@ -109,7 +109,7 @@ 
             $currencyCode = \PhpOffice\PhpSpreadsheet\Shared\StringHelper::getCurrencyCode();
             $decimalSeparator = \PhpOffice\PhpSpreadsheet\Shared\StringHelper::getDecimalSeparator();
             $thousandsSeparator = \PhpOffice\PhpSpreadsheet\Shared\StringHelper::getThousandsSeparator();
-            if (preg_match('/^'.preg_quote($currencyCode).' *(\d{1,3}('.preg_quote($thousandsSeparator).'\d{3})*|(\d+))('.preg_quote($decimalSeparator).'\d{2})?$/', $value)) {
+            if (preg_match('/^' . preg_quote($currencyCode) . ' *(\d{1,3}(' . preg_quote($thousandsSeparator) . '\d{3})*|(\d+))(' . preg_quote($decimalSeparator) . '\d{2})?$/', $value)) {
                 // Convert value to number
                 $value = (float) trim(str_replace([$currencyCode, $thousandsSeparator, $decimalSeparator], ['', '', '.'], $value));
                 $cell->setValueExplicit($value, DataType::TYPE_NUMERIC);

src/PhpSpreadsheet/Cell/DataValidation.php

Spacing +13 added lines, -13 removed lines

@@ -471,19 +471,19 @@
     public function getHashCode()
     {
         return md5(
-            $this->formula1.
-            $this->formula2.
-            $this->type = self::TYPE_NONE.
-            $this->errorStyle = self::STYLE_STOP.
-            $this->operator.
-            ($this->allowBlank ? 't' : 'f').
-            ($this->showDropDown ? 't' : 'f').
-            ($this->showInputMessage ? 't' : 'f').
-            ($this->showErrorMessage ? 't' : 'f').
-            $this->errorTitle.
-            $this->error.
-            $this->promptTitle.
-            $this->prompt.
+            $this->formula1 .
+            $this->formula2 .
+            $this->type = self::TYPE_NONE .
+            $this->errorStyle = self::STYLE_STOP .
+            $this->operator .
+            ($this->allowBlank ? 't' : 'f') .
+            ($this->showDropDown ? 't' : 'f') .
+            ($this->showInputMessage ? 't' : 'f') .
+            ($this->showErrorMessage ? 't' : 'f') .
+            $this->errorTitle .
+            $this->error .
+            $this->promptTitle .
+            $this->prompt .
             __CLASS__
         );
     }