Skip to content
This repository was archived by the owner on Jan 2, 2019. It is now read-only.

Saving some memory for echo. #566

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

Saving some memory for echo. #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a4d7997
version function
Apr 30, 2015
c9f2ee5
Abstract function PHPExcel_Worksheet_CellIterator::adjustForExistingO…
May 1, 2015
372c7cb
Merge branch 'master' of https://github.com/PHPOffice/PHPExcel
May 1, 2015
0cdda0d
Fix to case-sensitivity in getCell() method when using a worksheet!ce…
May 4, 2015
8d3548a
New calculation example with cyclic formula
May 4, 2015
049e85a
Remove spurious setLineEnding() from csv example
May 5, 2015
c193da7
Remove concatenation
dseguy May 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Classes/PHPExcel/Calculation/Functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ public static function IS_NONTEXT($value = NULL) {
* @return string Version information
*/
public static function VERSION() {
return 'PHPExcel ##VERSION##, ##DATE##';
return 'PHPExcel 1.8.1, 2015-04-30';
} // function VERSION()


Expand Down
2 changes: 1 addition & 1 deletion Classes/PHPExcel/Chart/Renderer/jpgraph.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,7 @@ public function render($outputDestination) {
$this->_renderStockChart($groupCount,$dimensions);
break;
default :
echo $chartType.' is not yet implemented<br />';
echo $chartType,' is not yet implemented<br />';
return false;
}
$this->_renderLegend();
Expand Down
3 changes: 1 addition & 2 deletions Classes/PHPExcel/Worksheet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1152,7 +1152,6 @@ public function setCellValueExplicitByColumnAndRow($pColumn = 0, $pRow = 1, $pVa
*/
public function getCell($pCoordinate = 'A1')
{
$pCoordinate = strtoupper($pCoordinate);
// Check cell collection
if ($this->_cellCollection->isDataSet($pCoordinate)) {
return $this->_cellCollection->getCacheData($pCoordinate);
Expand All @@ -1161,7 +1160,7 @@ public function getCell($pCoordinate = 'A1')
// Worksheet reference?
if (strpos($pCoordinate, '!') !== false) {
$worksheetReference = PHPExcel_Worksheet::extractSheetTitle($pCoordinate, true);
return $this->_parent->getSheetByName($worksheetReference[0])->getCell($worksheetReference[1]);
return $this->_parent->getSheetByName($worksheetReference[0])->getCell(strtoupper($worksheetReference[1]));
}

// Named range?
Expand Down
3 changes: 1 addition & 2 deletions Classes/PHPExcel/Worksheet/CellIterator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ public function getIterateOnlyExistingCells() {
*
* @throws PHPExcel_Exception
*/
abstract protected function adjustForExistingOnlyRange() {
}
abstract protected function adjustForExistingOnlyRange();

/**
* Set the iterator to loop only existing cells
Expand Down
8 changes: 4 additions & 4 deletions Documentation/Examples/Calculations/Database/DAVERAGE.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,16 @@
$criteriaData = $worksheet->rangeToArray('A1:B2',null,true,true,true);
var_dump($criteriaData);

echo $worksheet->getCell("A12")->getValue() .'<br />';
echo 'DAVERAGE() Result is ' . $worksheet->getCell("B12")->getCalculatedValue() .'<br /><br />';
echo $worksheet->getCell("A12")->getValue() ,'<br />';
echo 'DAVERAGE() Result is ' , $worksheet->getCell("B12")->getCalculatedValue() ,'<br /><br />';

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

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

echo $worksheet->getCell("A13")->getValue() .'<br />';
echo 'DAVERAGE() Result is ' . $worksheet->getCell("B13")->getCalculatedValue();
echo $worksheet->getCell("A13")->getValue() ,'<br />';
echo 'DAVERAGE() Result is ' , $worksheet->getCell("B13")->getCalculatedValue();


?>
Expand Down
8 changes: 4 additions & 4 deletions Documentation/Examples/Calculations/Database/DCOUNT.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,16 @@
$criteriaData = $worksheet->rangeToArray('A1:B2',null,true,true,true);
var_dump($criteriaData);

echo $worksheet->getCell("A12")->getValue() .'<br />';
echo 'DCOUNT() Result is ' . $worksheet->getCell("B12")->getCalculatedValue() .'<br /><br />';
echo $worksheet->getCell("A12")->getValue() ,'<br />';
echo 'DCOUNT() Result is ' , $worksheet->getCell("B12")->getCalculatedValue() ,'<br /><br />';

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

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

echo $worksheet->getCell("A13")->getValue() .'<br />';
echo 'DCOUNT() Result is ' . $worksheet->getCell("B13")->getCalculatedValue();
echo $worksheet->getCell("A13")->getValue() ,'<br />';
echo 'DCOUNT() Result is ' , $worksheet->getCell("B13")->getCalculatedValue();


?>
Expand Down
10 changes: 5 additions & 5 deletions Documentation/Examples/Calculations/Database/DGET.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,18 @@
// Test the formulae
echo '<h4>Criteria</h4>';

echo 'ALL' . '<br /><br />';
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);
var_dump($criteriaData);

echo $worksheet->getCell("A13")->getValue() .'<br />';
echo 'DMAX() Result is ' . $worksheet->getCell("B13")->getCalculatedValue();
echo $worksheet->getCell("A13")->getValue() ,'<br />';
echo 'DMAX() Result is ' , $worksheet->getCell("B13")->getCalculatedValue();


?>
Expand Down
10 changes: 5 additions & 5 deletions Documentation/Examples/Calculations/Database/DMAX.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,18 @@
// Test the formulae
echo '<h4>Criteria</h4>';

echo 'ALL' . '<br /><br />';
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);
var_dump($criteriaData);

echo $worksheet->getCell("A13")->getValue() .'<br />';
echo 'DMAX() Result is ' . $worksheet->getCell("B13")->getCalculatedValue();
echo $worksheet->getCell("A13")->getValue() ,'<br />';
echo 'DMAX() Result is ' , $worksheet->getCell("B13")->getCalculatedValue();


?>
Expand Down
10 changes: 5 additions & 5 deletions Documentation/Examples/Calculations/Database/DMIN.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,18 @@
// Test the formulae
echo '<h4>Criteria</h4>';

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

echo $worksheet->getCell("A12")->getValue() .'<br />';
echo 'DMIN() Result is ' . $worksheet->getCell("B12")->getCalculatedValue() .'<br /><br />';
echo $worksheet->getCell("A12")->getValue() ,'<br />';
echo 'DMIN() Result is ' , $worksheet->getCell("B12")->getCalculatedValue() ,'<br /><br />';

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

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

echo $worksheet->getCell("A13")->getValue() .'<br />';
echo 'DMIN() Result is ' . $worksheet->getCell("B13")->getCalculatedValue();
echo $worksheet->getCell("A13")->getValue() ,'<br />';
echo 'DMIN() Result is ' , $worksheet->getCell("B13")->getCalculatedValue();


?>
Expand Down
10 changes: 5 additions & 5 deletions Documentation/Examples/Calculations/Database/DPRODUCT.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,18 @@
// Test the formulae
echo '<h4>Criteria</h4>';

echo 'ALL' . '<br /><br />';
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);
var_dump($criteriaData);

echo $worksheet->getCell("A13")->getValue() .'<br />';
echo 'DMAX() Result is ' . $worksheet->getCell("B13")->getCalculatedValue();
echo $worksheet->getCell("A13")->getValue() ,'<br />';
echo 'DMAX() Result is ' , $worksheet->getCell("B13")->getCalculatedValue();


?>
Expand Down
8 changes: 4 additions & 4 deletions Documentation/Examples/Calculations/Database/DSTDEV.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,16 @@
$criteriaData = $worksheet->rangeToArray('A1:A3',null,true,true,true);
var_dump($criteriaData);

echo $worksheet->getCell("A12")->getValue() .'<br />';
echo 'DSTDEV() Result is ' . $worksheet->getCell("B12")->getCalculatedValue() .'<br /><br />';
echo $worksheet->getCell("A12")->getValue() ,'<br />';
echo 'DSTDEV() Result is ' , $worksheet->getCell("B12")->getCalculatedValue() ,'<br /><br />';

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

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

echo $worksheet->getCell("A13")->getValue() .'<br />';
echo 'DSTDEV() Result is ' . $worksheet->getCell("B13")->getCalculatedValue();
echo $worksheet->getCell("A13")->getValue() ,'<br />';
echo 'DSTDEV() Result is ' , $worksheet->getCell("B13")->getCalculatedValue();


?>
Expand Down
8 changes: 4 additions & 4 deletions Documentation/Examples/Calculations/Database/DSTDEVP.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,16 @@
$criteriaData = $worksheet->rangeToArray('A1:A3',null,true,true,true);
var_dump($criteriaData);

echo $worksheet->getCell("A12")->getValue() .'<br />';
echo 'DSTDEVP() Result is ' . $worksheet->getCell("B12")->getCalculatedValue() .'<br /><br />';
echo $worksheet->getCell("A12")->getValue() ,'<br />';
echo 'DSTDEVP() Result is ' , $worksheet->getCell("B12")->getCalculatedValue() ,'<br /><br />';

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

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

echo $worksheet->getCell("A13")->getValue() .'<br />';
echo 'DSTDEVP() Result is ' . $worksheet->getCell("B13")->getCalculatedValue();
echo $worksheet->getCell("A13")->getValue() ,'<br />';
echo 'DSTDEVP() Result is ' , $worksheet->getCell("B13")->getCalculatedValue();


?>
Expand Down
8 changes: 4 additions & 4 deletions Documentation/Examples/Calculations/Database/DVAR.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,16 @@
$criteriaData = $worksheet->rangeToArray('A1:A3',null,true,true,true);
var_dump($criteriaData);

echo $worksheet->getCell("A12")->getValue() .'<br />';
echo 'DVAR() Result is ' . $worksheet->getCell("B12")->getCalculatedValue() .'<br /><br />';
echo $worksheet->getCell("A12")->getValue() ,'<br />';
echo 'DVAR() Result is ' , $worksheet->getCell("B12")->getCalculatedValue() ,'<br /><br />';

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

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

echo $worksheet->getCell("A13")->getValue() .'<br />';
echo 'DVAR() Result is ' . $worksheet->getCell("B13")->getCalculatedValue();
echo $worksheet->getCell("A13")->getValue() ,'<br />';
echo 'DVAR() Result is ' , $worksheet->getCell("B13")->getCalculatedValue();


?>
Expand Down
8 changes: 4 additions & 4 deletions Documentation/Examples/Calculations/Database/DVARP.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,16 @@
$criteriaData = $worksheet->rangeToArray('A1:A3',null,true,true,true);
var_dump($criteriaData);

echo $worksheet->getCell("A12")->getValue() .'<br />';
echo 'DVARP() Result is ' . $worksheet->getCell("B12")->getCalculatedValue() .'<br /><br />';
echo $worksheet->getCell("A12")->getValue() ,'<br />';
echo 'DVARP() Result is ' , $worksheet->getCell("B12")->getCalculatedValue() ,'<br /><br />';

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

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

echo $worksheet->getCell("A13")->getValue() .'<br />';
echo 'DVARP() Result is ' . $worksheet->getCell("B13")->getCalculatedValue();
echo $worksheet->getCell("A13")->getValue() ,'<br />';
echo 'DVARP() Result is ' , $worksheet->getCell("B13")->getCalculatedValue();


?>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Examples/Calculations/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

foreach($exampleTypeList as $exampleType) {

echo '<h2>' . pathinfo($exampleType,PATHINFO_BASENAME) . ' Function Examples</h2>';
echo '<h2>' , pathinfo($exampleType,PATHINFO_BASENAME) , ' Function Examples</h2>';

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

Expand Down
2 changes: 1 addition & 1 deletion Documentation/Examples/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

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');

Expand Down
16 changes: 8 additions & 8 deletions Examples/10autofilter-selection-1.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@


// Create new PHPExcel object
echo date('H:i:s').' Create new PHPExcel object'.EOL;
echo date('H:i:s'),' Create new PHPExcel object',EOL;
$objPHPExcel = new PHPExcel();

// Set document properties
echo date('H:i:s').' Set document properties'.EOL;
echo date('H:i:s'),' Set document properties',EOL;
$objPHPExcel->getProperties()->setCreator('Maarten Balliauw')
->setLastModifiedBy('Maarten Balliauw')
->setTitle('PHPExcel Test Document')
Expand All @@ -52,7 +52,7 @@
->setCategory('Test result file');

// Create the worksheet
echo date('H:i:s').' Add data'.EOL;
echo date('H:i:s'),' Add data',EOL;
$objPHPExcel->setActiveSheetIndex(0);
$objPHPExcel->getActiveSheet()->setCellValue('A1', 'Financial Year')
->setCellValue('B1', 'Financial Period')
Expand Down Expand Up @@ -111,7 +111,7 @@


// Set styling
echo date('H:i:s').' Set styling'.EOL;
echo date('H:i:s'),' Set styling',EOL;
$objPHPExcel->getActiveSheet()->getStyle('A1:F1')->getFont()->setBold(true);
$objPHPExcel->getActiveSheet()->getStyle('A1:F1')->getAlignment()->setWrapText(TRUE);
$objPHPExcel->getActiveSheet()->getColumnDimension('C')->setWidth(12.5);
Expand All @@ -124,15 +124,15 @@


// Set autofilter range
echo date('H:i:s').' Set autofilter range'.EOL;
echo date('H:i:s'),' Set autofilter range',EOL;
// Always include the complete filter range!
// Excel does support setting only the caption
// row, but that's not a best practise...
$objPHPExcel->getActiveSheet()->setAutoFilter($objPHPExcel->getActiveSheet()->calculateWorksheetDimension());

// Set active filters
$autoFilter = $objPHPExcel->getActiveSheet()->getAutoFilter();
echo date('H:i:s').' Set active filters'.EOL;
echo date('H:i:s'),' Set active filters',EOL;
// Filter the Country column on a filter value of countries beginning with the letter U (or Japan)
// We use * as a wildcard, so specify as U* and using a wildcard requires customFilter
$autoFilter->getColumn('C')
Expand Down Expand Up @@ -214,8 +214,8 @@


// Echo memory peak usage
echo date('H:i:s').' Peak memory usage: '.(memory_get_peak_usage(true) / 1024 / 1024).' MB'.EOL;
echo date('H:i:s'),' Peak memory usage: ',(memory_get_peak_usage(true) / 1024 / 1024),' MB',EOL;

// Echo done
echo date('H:i:s').' Done writing files'.EOL;
echo date('H:i:s'),' Done writing files',EOL;
echo 'Files have been created in ' , getcwd() , EOL;
Loading