PHPOffice / PhpSpreadsheet

Documentation/Examples/Reader/exampleReader14.php

Indentation +27 added lines, -27 removed lines

@@ -27,23 +27,23 @@ 
 /**  Define a Read Filter class implementing PHPExcel_Reader_IReadFilter  */

 class chunkReadFilter implements PHPExcel_Reader_IReadFilter

 {

-	private $_startRow = 0;

-

-	private $_endRow = 0;

-

-	/**  Set the list of rows that we want to read  */

-	public function setRows($startRow, $chunkSize) {

-		$this->_startRow	= $startRow;

-		$this->_endRow		= $startRow + $chunkSize;

-	}

-

-	public function readCell($column, $row, $worksheetName = '') {

-		//  Only read the heading row, and the rows that are configured in $this->_startRow and $this->_endRow

-		if (($row == 1) || ($row >= $this->_startRow && $row < $this->_endRow)) {

-			return true;

-		}

-		return false;

-	}

+    private $_startRow = 0;

+

+    private $_endRow = 0;

+

+    /**  Set the list of rows that we want to read  */

+    public function setRows($startRow, $chunkSize) {

+        $this->_startRow	= $startRow;

+        $this->_endRow		= $startRow + $chunkSize;

+    }

+

+    public function readCell($column, $row, $worksheetName = '') {

+        //  Only read the heading row, and the rows that are configured in $this->_startRow and $this->_endRow

+        if (($row == 1) || ($row >= $this->_startRow && $row < $this->_endRow)) {

+            return true;

+        }

+        return false;

+    }

 }

 

 

@@ -63,7 +63,7 @@ 
 /**  Tell the Reader that we want to use the Read Filter that we've Instantiated  **/

 /**    and that we want to store it in contiguous rows/columns  **/

 $objReader->setReadFilter($chunkFilter)

-		  ->setContiguous(true);

+            ->setContiguous(true);

 

 

 /**  Instantiate a new PHPExcel object manually  **/

@@ -74,13 +74,13 @@ 
 /**  Loop to read our worksheet in "chunk size" blocks  **/

 /**  $startRow is set to 2 initially because we always read the headings in row #1  **/

 for ($startRow = 2; $startRow <= 240; $startRow += $chunkSize) {

-	echo 'Loading WorkSheet #',($sheet+1),' using configurable filter for headings row 1 and for rows ',$startRow,' to ',($startRow+$chunkSize-1),'<br />';

-	/**  Tell the Read Filter, the limits on which rows we want to read this iteration  **/

-	$chunkFilter->setRows($startRow,$chunkSize);

+    echo 'Loading WorkSheet #',($sheet+1),' using configurable filter for headings row 1 and for rows ',$startRow,' to ',($startRow+$chunkSize-1),'<br />';

+    /**  Tell the Read Filter, the limits on which rows we want to read this iteration  **/

+    $chunkFilter->setRows($startRow,$chunkSize);

 

     /**  Increment the worksheet index pointer for the Reader  **/

     $objReader->setSheetIndex($sheet);

-	/**  Load only the rows that match our filter into a new worksheet in the PHPExcel Object  **/

+    /**  Load only the rows that match our filter into a new worksheet in the PHPExcel Object  **/

     $objReader->loadIntoExisting($inputFileName,$objPHPExcel);

     /**  Set the worksheet title (to reference the "sheet" of data that we've loaded)  **/

     /**    and increment the sheet index as well  **/

@@ -93,11 +93,11 @@ 
 echo $objPHPExcel->getSheetCount(),' worksheet',(($objPHPExcel->getSheetCount() == 1) ? '' : 's'),' loaded<br /><br />';

 $loadedSheetNames = $objPHPExcel->getSheetNames();

 foreach($loadedSheetNames as $sheetIndex => $loadedSheetName) {

-	echo '<b>Worksheet #',$sheetIndex,' -> ',$loadedSheetName,'</b><br />';

-	$objPHPExcel->setActiveSheetIndexByName($loadedSheetName);

-	$sheetData = $objPHPExcel->getActiveSheet()->toArray(null,false,false,true);

-	var_dump($sheetData);

-	echo '<br />';

+    echo '<b>Worksheet #',$sheetIndex,' -> ',$loadedSheetName,'</b><br />';

+    $objPHPExcel->setActiveSheetIndexByName($loadedSheetName);

+    $sheetData = $objPHPExcel->getActiveSheet()->toArray(null,false,false,true);

+    var_dump($sheetData);

+    echo '<br />';

 }

 

 ?>

Spacing +11 added lines, -11 removed lines

@@ -33,8 +33,8 @@ 
 

 	/**  Set the list of rows that we want to read  */

 	public function setRows($startRow, $chunkSize) {

-		$this->_startRow	= $startRow;

-		$this->_endRow		= $startRow + $chunkSize;

+		$this->_startRow = $startRow;

+		$this->_endRow = $startRow + $chunkSize;

 	}

 

 	public function readCell($column, $row, $worksheetName = '') {

@@ -47,7 +47,7 @@ 
 }

 

 

-echo 'Loading file ',pathinfo($inputFileName,PATHINFO_BASENAME),' using IOFactory with a defined reader type of ',$inputFileType,'<br />';

+echo 'Loading file ', pathinfo($inputFileName, PATHINFO_BASENAME), ' using IOFactory with a defined reader type of ', $inputFileType, '<br />';

 /**  Create a new Reader of the type defined in $inputFileType  **/

 $objReader = PHPExcel_IOFactory::createReader($inputFileType);

 

@@ -74,28 +74,28 @@ 
 /**  Loop to read our worksheet in "chunk size" blocks  **/

 /**  $startRow is set to 2 initially because we always read the headings in row #1  **/

 for ($startRow = 2; $startRow <= 240; $startRow += $chunkSize) {

-	echo 'Loading WorkSheet #',($sheet+1),' using configurable filter for headings row 1 and for rows ',$startRow,' to ',($startRow+$chunkSize-1),'<br />';

+	echo 'Loading WorkSheet #', ($sheet + 1), ' using configurable filter for headings row 1 and for rows ', $startRow, ' to ', ($startRow + $chunkSize - 1), '<br />';

 	/**  Tell the Read Filter, the limits on which rows we want to read this iteration  **/

-	$chunkFilter->setRows($startRow,$chunkSize);

+	$chunkFilter->setRows($startRow, $chunkSize);

 

     /**  Increment the worksheet index pointer for the Reader  **/

     $objReader->setSheetIndex($sheet);

 	/**  Load only the rows that match our filter into a new worksheet in the PHPExcel Object  **/

-    $objReader->loadIntoExisting($inputFileName,$objPHPExcel);

+    $objReader->loadIntoExisting($inputFileName, $objPHPExcel);

     /**  Set the worksheet title (to reference the "sheet" of data that we've loaded)  **/

     /**    and increment the sheet index as well  **/

-    $objPHPExcel->getActiveSheet()->setTitle('Country Data #'.(++$sheet));

+    $objPHPExcel->getActiveSheet()->setTitle('Country Data #' . (++$sheet));

 }

 

 

 echo '<hr />';

 

-echo $objPHPExcel->getSheetCount(),' worksheet',(($objPHPExcel->getSheetCount() == 1) ? '' : 's'),' loaded<br /><br />';

+echo $objPHPExcel->getSheetCount(), ' worksheet', (($objPHPExcel->getSheetCount() == 1) ? '' : 's'), ' loaded<br /><br />';

 $loadedSheetNames = $objPHPExcel->getSheetNames();

-foreach($loadedSheetNames as $sheetIndex => $loadedSheetName) {

-	echo '<b>Worksheet #',$sheetIndex,' -> ',$loadedSheetName,'</b><br />';

+foreach ($loadedSheetNames as $sheetIndex => $loadedSheetName) {

+	echo '<b>Worksheet #', $sheetIndex, ' -> ', $loadedSheetName, '</b><br />';

 	$objPHPExcel->setActiveSheetIndexByName($loadedSheetName);

-	$sheetData = $objPHPExcel->getActiveSheet()->toArray(null,false,false,true);

+	$sheetData = $objPHPExcel->getActiveSheet()->toArray(null, false, false, true);

 	var_dump($sheetData);

 	echo '<br />';

 }

Documentation/Examples/Reader/exampleReader18.php

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 echo '<h3>Worksheet Names</h3>';
 echo '<ol>';
 foreach ($worksheetNames as $worksheetName) {
-	echo '<li>', $worksheetName, '</li>';
+    echo '<li>', $worksheetName, '</li>';
 }
 echo '</ol>';
 

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 //	$inputFileType = 'Gnumeric';
 $inputFileName = './sampleData/example1.xls';
 
-echo 'Loading file ',pathinfo($inputFileName,PATHINFO_BASENAME),' information using IOFactory with a defined reader type of ',$inputFileType,'<br />';
+echo 'Loading file ', pathinfo($inputFileName, PATHINFO_BASENAME), ' information using IOFactory with a defined reader type of ', $inputFileType, '<br />';
 
 $objReader = PHPExcel_IOFactory::createReader($inputFileType);
 $worksheetData = $objReader->listWorksheetInfo($inputFileName);

Documentation/Examples/Reader/exampleReader05.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 //	$inputFileType = 'Gnumeric';

 $inputFileName = './sampleData/example1.xls';

 

-echo 'Loading file ',pathinfo($inputFileName,PATHINFO_BASENAME),' using IOFactory with a defined reader type of ',$inputFileType,'<br />';

+echo 'Loading file ', pathinfo($inputFileName, PATHINFO_BASENAME), ' using IOFactory with a defined reader type of ', $inputFileType, '<br />';

 $objReader = PHPExcel_IOFactory::createReader($inputFileType);

 echo 'Turning Formatting off for Load<br />';

 $objReader->setReadDataOnly(true);

@@ -42,7 +42,7 @@ 
 

 echo '<hr />';

 

-$sheetData = $objPHPExcel->getActiveSheet()->toArray(null,true,true,true);

+$sheetData = $objPHPExcel->getActiveSheet()->toArray(null, true, true, true);

 var_dump($sheetData);

 

 

Documentation/Examples/Reader/exampleReader19.php

Indentation +4 added lines, -4 removed lines

@@ -41,10 +41,10 @@
 echo '<h3>Worksheet Information</h3>';
 echo '<ol>';
 foreach ($worksheetData as $worksheet) {
-	echo '<li>', $worksheet['worksheetName'], '<br />';
-	echo 'Rows: ', $worksheet['totalRows'], ' Columns: ', $worksheet['totalColumns'], '<br />';
-	echo 'Cell Range: A1:', $worksheet['lastColumnLetter'], $worksheet['totalRows'];
-	echo '</li>';
+    echo '<li>', $worksheet['worksheetName'], '<br />';
+    echo 'Rows: ', $worksheet['totalRows'], ' Columns: ', $worksheet['totalColumns'], '<br />';
+    echo 'Cell Range: A1:', $worksheet['lastColumnLetter'], $worksheet['totalRows'];
+    echo '</li>';
 }
 echo '</ol>';
 

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 //	$inputFileType = 'Gnumeric';
 $inputFileName = './sampleData/example1.xls';
 
-echo 'Loading file ',pathinfo($inputFileName,PATHINFO_BASENAME),' information using IOFactory with a defined reader type of ',$inputFileType,'<br />';
+echo 'Loading file ', pathinfo($inputFileName, PATHINFO_BASENAME), ' information using IOFactory with a defined reader type of ', $inputFileType, '<br />';
 
 $objReader = PHPExcel_IOFactory::createReader($inputFileType);
 $worksheetData = $objReader->listWorksheetInfo($inputFileName);

Documentation/Examples/index.php

Indentation +16 added lines, -16 removed lines

@@ -21,28 +21,28 @@
 

 foreach($exampleTypeList as $exampleType) {

 

-	echo '<h1>PHPExcel ' . pathinfo($exampleType,PATHINFO_BASENAME) . ' Examples</h1>';

+    echo '<h1>PHPExcel ' . pathinfo($exampleType,PATHINFO_BASENAME) . ' Examples</h1>';

 

-	$exampleList = glob('./'.$exampleType.'/*.php');

+    $exampleList = glob('./'.$exampleType.'/*.php');

 

-	foreach($exampleList as $exampleFile) {

-		$fileData = file_get_contents($exampleFile);

+    foreach($exampleList as $exampleFile) {

+        $fileData = file_get_contents($exampleFile);

 

-		$h1Pattern = '#<h1>(.*?)</h1>#';

-		$h2Pattern = '#<h2>(.*?)</h2>#';

+        $h1Pattern = '#<h1>(.*?)</h1>#';

+        $h2Pattern = '#<h2>(.*?)</h2>#';

 

-		if (preg_match($h1Pattern, $fileData, $out)) {

-			$h1Text = $out[1];

-			$h2Text = (preg_match($h2Pattern, $fileData, $out)) ? $out[1] : '';

+        if (preg_match($h1Pattern, $fileData, $out)) {

+            $h1Text = $out[1];

+            $h2Text = (preg_match($h2Pattern, $fileData, $out)) ? $out[1] : '';

 

-			echo '<a href="',$exampleFile,'">',$h1Text,'</a><br />';

-			if (($h2Text > '') &&

-				(pathinfo($exampleType,PATHINFO_BASENAME) != 'Calculations')) {

-				echo $h2Text,'<br />';

-			}

-		}

+            echo '<a href="',$exampleFile,'">',$h1Text,'</a><br />';

+            if (($h2Text > '') &&

+                (pathinfo($exampleType,PATHINFO_BASENAME) != 'Calculations')) {

+                echo $h2Text,'<br />';

+            }

+        }

 

-	}

+    }

 }

 

 ?>

Spacing +8 added lines, -8 removed lines

@@ -17,15 +17,15 @@ 
 

 <?php

 

-$exampleTypeList = glob('./*',GLOB_ONLYDIR);

+$exampleTypeList = glob('./*', GLOB_ONLYDIR);

 

-foreach($exampleTypeList as $exampleType) {

+foreach ($exampleTypeList as $exampleType) {

 

-	echo '<h1>PHPExcel ' . pathinfo($exampleType,PATHINFO_BASENAME) . ' Examples</h1>';

+	echo '<h1>PHPExcel ' . pathinfo($exampleType, PATHINFO_BASENAME) . ' Examples</h1>';

 

-	$exampleList = glob('./'.$exampleType.'/*.php');

+	$exampleList = glob('./' . $exampleType . '/*.php');

 

-	foreach($exampleList as $exampleFile) {

+	foreach ($exampleList as $exampleFile) {

 		$fileData = file_get_contents($exampleFile);

 

 		$h1Pattern = '#<h1>(.*?)</h1>#';

@@ -35,10 +35,10 @@ 
 			$h1Text = $out[1];

 			$h2Text = (preg_match($h2Pattern, $fileData, $out)) ? $out[1] : '';

 

-			echo '<a href="',$exampleFile,'">',$h1Text,'</a><br />';

+			echo '<a href="', $exampleFile, '">', $h1Text, '</a><br />';

 			if (($h2Text > '') &&

-				(pathinfo($exampleType,PATHINFO_BASENAME) != 'Calculations')) {

-				echo $h2Text,'<br />';

+				(pathinfo($exampleType, PATHINFO_BASENAME) != 'Calculations')) {

+				echo $h2Text, '<br />';

 			}

 		}

 

src/PhpSpreadsheet/Writer/Excel5/Font.php

Spacing +5 added lines, -5 removed lines

@@ -85,9 +85,9 @@ 
         $bFamily = 0; // Font family
         $bCharSet = \PHPExcel\Shared\Font::getCharsetFromFontName($this->font->getName()); // Character set
 
-        $record = 0x31;        // Record identifier
-        $reserved = 0x00;    // Reserved
-        $grbit = 0x00;        // Font attributes
+        $record = 0x31; // Record identifier
+        $reserved = 0x00; // Reserved
+        $grbit = 0x00; // Font attributes
         if ($this->font->getItalic()) {
             $grbit |= 0x02;
         }
@@ -134,9 +134,9 @@ 
     private static function mapBold($bold)
     {
         if ($bold) {
-            return 0x2BC;  //  700 = Bold font weight
+            return 0x2BC; //  700 = Bold font weight
         }
-        return 0x190;      //  400 = Normal font weight
+        return 0x190; //  400 = Normal font weight
     }
 
     /**

Documentation/Examples/Reader/exampleReader03.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 //	$inputFileType = 'Gnumeric';

 $inputFileName = './sampleData/example1.xls';

 

-echo 'Loading file ',pathinfo($inputFileName,PATHINFO_BASENAME),' using IOFactory with a defined reader type of ',$inputFileType,'<br />';

+echo 'Loading file ', pathinfo($inputFileName, PATHINFO_BASENAME), ' using IOFactory with a defined reader type of ', $inputFileType, '<br />';

 $objReader = PHPExcel_IOFactory::createReader($inputFileType);

 echo 'Turning Formatting off for Load<br />';

 $objReader->setReadDataOnly(true);

@@ -42,7 +42,7 @@ 
 

 echo '<hr />';

 

-$sheetData = $objPHPExcel->getActiveSheet()->toArray(null,true,true,true);

+$sheetData = $objPHPExcel->getActiveSheet()->toArray(null, true, true, true);

 var_dump($sheetData);

 

 

Documentation/Examples/Calculations/Database/DPRODUCT.php

Indentation +10 added lines, -10 removed lines

@@ -33,17 +33,17 @@
 

 // Add some data

 $database = array( array( 'Tree',  'Height', 'Age', 'Yield', 'Profit' ),

-                   array( 'Apple',  18,       20,    14,      105.00  ),

-                   array( 'Pear',   12,       12,    10,       96.00  ),

-                   array( 'Cherry', 13,       14,     9,      105.00  ),

-                   array( 'Apple',  14,       15,    10,       75.00  ),

-                   array( 'Pear',    9,        8,     8,       76.80  ),

-                   array( 'Apple',   8,        9,     6,       45.00  ),

-                 );

+                    array( 'Apple',  18,       20,    14,      105.00  ),

+                    array( 'Pear',   12,       12,    10,       96.00  ),

+                    array( 'Cherry', 13,       14,     9,      105.00  ),

+                    array( 'Apple',  14,       15,    10,       75.00  ),

+                    array( 'Pear',    9,        8,     8,       76.80  ),

+                    array( 'Apple',   8,        9,     6,       45.00  ),

+                    );

 $criteria = array( array( 'Tree',      'Height', 'Age', 'Yield', 'Profit', 'Height' ),

-                   array( '="=Apple"', '>10',    NULL,  NULL,    NULL,     '<16'    ),

-                   array( '="=Pear"',  NULL,     NULL,  NULL,    NULL,     NULL     )

-                 );

+                    array( '="=Apple"', '>10',    NULL,  NULL,    NULL,     '<16'    ),

+                    array( '="=Pear"',  NULL,     NULL,  NULL,    NULL,     NULL     )

+                    );

 

 $worksheet->fromArray( $criteria, NULL, 'A1' );

 $worksheet->fromArray( $database, NULL, 'A4' );

Spacing +17 added lines, -17 removed lines

@@ -32,21 +32,21 @@ 
 $worksheet = $objPHPExcel->getActiveSheet();

 

 // Add some data

-$database = array( array( 'Tree',  'Height', 'Age', 'Yield', 'Profit' ),

-                   array( 'Apple',  18,       20,    14,      105.00  ),

-                   array( 'Pear',   12,       12,    10,       96.00  ),

-                   array( 'Cherry', 13,       14,     9,      105.00  ),

-                   array( 'Apple',  14,       15,    10,       75.00  ),

-                   array( 'Pear',    9,        8,     8,       76.80  ),

-                   array( 'Apple',   8,        9,     6,       45.00  ),

+$database = array(array('Tree', 'Height', 'Age', 'Yield', 'Profit'),

+                   array('Apple', 18, 20, 14, 105.00),

+                   array('Pear', 12, 12, 10, 96.00),

+                   array('Cherry', 13, 14, 9, 105.00),

+                   array('Apple', 14, 15, 10, 75.00),

+                   array('Pear', 9, 8, 8, 76.80),

+                   array('Apple', 8, 9, 6, 45.00),

                  );

-$criteria = array( array( 'Tree',      'Height', 'Age', 'Yield', 'Profit', 'Height' ),

-                   array( '="=Apple"', '>10',    NULL,  NULL,    NULL,     '<16'    ),

-                   array( '="=Pear"',  NULL,     NULL,  NULL,    NULL,     NULL     )

+$criteria = array(array('Tree', 'Height', 'Age', 'Yield', 'Profit', 'Height'),

+                   array('="=Apple"', '>10', NULL, NULL, NULL, '<16'),

+                   array('="=Pear"', NULL, NULL, NULL, NULL, NULL)

                  );

 

-$worksheet->fromArray( $criteria, NULL, 'A1' );

-$worksheet->fromArray( $database, NULL, 'A4' );

+$worksheet->fromArray($criteria, NULL, 'A1');

+$worksheet->fromArray($database, NULL, 'A4');

 

 $worksheet->setCellValue('A12', 'The height of the Apple tree between 10\' and 16\' tall');

 $worksheet->setCellValue('B12', '=DGET(A4:E10,"Height",A1:F2)');

@@ -57,7 +57,7 @@ 
 

 echo '<h4>Database</h4>';

 

-$databaseData = $worksheet->rangeToArray('A4:E10',null,true,true,true);

+$databaseData = $worksheet->rangeToArray('A4:E10', null, true, true, true);

 var_dump($databaseData);

 

 

@@ -69,15 +69,15 @@ 
 

 echo 'ALL' . '<br /><br />';

 

-echo $worksheet->getCell("A12")->getValue() .'<br />';

-echo 'DMAX() Result is ' . $worksheet->getCell("B12")->getCalculatedValue() .'<br /><br />';

+echo $worksheet->getCell("A12")->getValue() . '<br />';

+echo 'DMAX() Result is ' . $worksheet->getCell("B12")->getCalculatedValue() . '<br /><br />';

 

 echo '<h4>Criteria</h4>';

 

-$criteriaData = $worksheet->rangeToArray('A1:A2',null,true,true,true);

+$criteriaData = $worksheet->rangeToArray('A1:A2', null, true, true, true);

 var_dump($criteriaData);

 

-echo $worksheet->getCell("A13")->getValue() .'<br />';

+echo $worksheet->getCell("A13")->getValue() . '<br />';

 echo 'DMAX() Result is ' . $worksheet->getCell("B13")->getCalculatedValue();

 

 

Documentation/Examples/Calculations/Database/DMAX.php

Indentation +10 added lines, -10 removed lines

@@ -33,17 +33,17 @@
 

 // Add some data

 $database = array( array( 'Tree',  'Height', 'Age', 'Yield', 'Profit' ),

-                   array( 'Apple',  18,       20,    14,      105.00  ),

-                   array( 'Pear',   12,       12,    10,       96.00  ),

-                   array( 'Cherry', 13,       14,     9,      105.00  ),

-                   array( 'Apple',  14,       15,    10,       75.00  ),

-                   array( 'Pear',    9,        8,     8,       76.80  ),

-                   array( 'Apple',   8,        9,     6,       45.00  ),

-                 );

+                    array( 'Apple',  18,       20,    14,      105.00  ),

+                    array( 'Pear',   12,       12,    10,       96.00  ),

+                    array( 'Cherry', 13,       14,     9,      105.00  ),

+                    array( 'Apple',  14,       15,    10,       75.00  ),

+                    array( 'Pear',    9,        8,     8,       76.80  ),

+                    array( 'Apple',   8,        9,     6,       45.00  ),

+                    );

 $criteria = array( array( 'Tree',      'Height', 'Age', 'Yield', 'Profit', 'Height' ),

-                   array( '="=Apple"', '>10',    NULL,  NULL,    NULL,     '<16'    ),

-                   array( '="=Pear"',  NULL,     NULL,  NULL,    NULL,     NULL     )

-                 );

+                    array( '="=Apple"', '>10',    NULL,  NULL,    NULL,     '<16'    ),

+                    array( '="=Pear"',  NULL,     NULL,  NULL,    NULL,     NULL     )

+                    );

 

 $worksheet->fromArray( $criteria, NULL, 'A1' );

 $worksheet->fromArray( $database, NULL, 'A4' );

Spacing +17 added lines, -17 removed lines

@@ -32,21 +32,21 @@ 
 $worksheet = $objPHPExcel->getActiveSheet();

 

 // Add some data

-$database = array( array( 'Tree',  'Height', 'Age', 'Yield', 'Profit' ),

-                   array( 'Apple',  18,       20,    14,      105.00  ),

-                   array( 'Pear',   12,       12,    10,       96.00  ),

-                   array( 'Cherry', 13,       14,     9,      105.00  ),

-                   array( 'Apple',  14,       15,    10,       75.00  ),

-                   array( 'Pear',    9,        8,     8,       76.80  ),

-                   array( 'Apple',   8,        9,     6,       45.00  ),

+$database = array(array('Tree', 'Height', 'Age', 'Yield', 'Profit'),

+                   array('Apple', 18, 20, 14, 105.00),

+                   array('Pear', 12, 12, 10, 96.00),

+                   array('Cherry', 13, 14, 9, 105.00),

+                   array('Apple', 14, 15, 10, 75.00),

+                   array('Pear', 9, 8, 8, 76.80),

+                   array('Apple', 8, 9, 6, 45.00),

                  );

-$criteria = array( array( 'Tree',      'Height', 'Age', 'Yield', 'Profit', 'Height' ),

-                   array( '="=Apple"', '>10',    NULL,  NULL,    NULL,     '<16'    ),

-                   array( '="=Pear"',  NULL,     NULL,  NULL,    NULL,     NULL     )

+$criteria = array(array('Tree', 'Height', 'Age', 'Yield', 'Profit', 'Height'),

+                   array('="=Apple"', '>10', NULL, NULL, NULL, '<16'),

+                   array('="=Pear"', NULL, NULL, NULL, NULL, NULL)

                  );

 

-$worksheet->fromArray( $criteria, NULL, 'A1' );

-$worksheet->fromArray( $database, NULL, 'A4' );

+$worksheet->fromArray($criteria, NULL, 'A1');

+$worksheet->fromArray($database, NULL, 'A4');

 

 $worksheet->setCellValue('A12', 'The height of the Apple tree between 10\' and 16\' tall');

 $worksheet->setCellValue('B12', '=DGET(A4:E10,"Height",A1:F2)');

@@ -57,7 +57,7 @@ 
 

 echo '<h4>Database</h4>';

 

-$databaseData = $worksheet->rangeToArray('A4:E10',null,true,true,true);

+$databaseData = $worksheet->rangeToArray('A4:E10', null, true, true, true);

 var_dump($databaseData);

 

 

@@ -69,15 +69,15 @@ 
 

 echo 'ALL' . '<br /><br />';

 

-echo $worksheet->getCell("A12")->getValue() .'<br />';

-echo 'DMAX() Result is ' . $worksheet->getCell("B12")->getCalculatedValue() .'<br /><br />';

+echo $worksheet->getCell("A12")->getValue() . '<br />';

+echo 'DMAX() Result is ' . $worksheet->getCell("B12")->getCalculatedValue() . '<br /><br />';

 

 echo '<h4>Criteria</h4>';

 

-$criteriaData = $worksheet->rangeToArray('A1:A2',null,true,true,true);

+$criteriaData = $worksheet->rangeToArray('A1:A2', null, true, true, true);

 var_dump($criteriaData);

 

-echo $worksheet->getCell("A13")->getValue() .'<br />';

+echo $worksheet->getCell("A13")->getValue() . '<br />';

 echo 'DMAX() Result is ' . $worksheet->getCell("B13")->getCalculatedValue();