From b2a26349d45d8147df554364ffb8c2ad63bea146 Mon Sep 17 00:00:00 2001 From: Mark Baker Date: Tue, 16 Oct 2012 13:39:59 +0100 Subject: [PATCH] Bugfix: Work item 18794 - CSV files without a file extension being identified as HTML --- Classes/PHPExcel/Reader/HTML.php | 7 +++- Examples/33chartcreate-area.php | 20 +++++------ Examples/33chartcreate-bar-stacked.php | 20 +++++------ Examples/33chartcreate-bar.php | 20 +++++------ Examples/33chartcreate-column-2.php | 18 +++++----- Examples/33chartcreate-column.php | 20 +++++------ Examples/33chartcreate-line.php | 20 +++++------ Examples/33chartcreate-multiple-charts.php | 40 +++++++++++----------- Examples/33chartcreate-pie.php | 22 ++++++------ Examples/33chartcreate-radar.php | 18 +++++----- changelog.txt | 8 +++-- 11 files changed, 110 insertions(+), 103 deletions(-) diff --git a/Classes/PHPExcel/Reader/HTML.php b/Classes/PHPExcel/Reader/HTML.php index 73a0fe5..0bb7ec1 100644 --- a/Classes/PHPExcel/Reader/HTML.php +++ b/Classes/PHPExcel/Reader/HTML.php @@ -134,7 +134,12 @@ class PHPExcel_Reader_HTML implements PHPExcel_Reader_IReader $data = fread($fh, 2048); fclose($fh); - return true; + if ((strpos('<',$data) !== FALSE) && + (strlen($data) !== strlen(strip_tags($data)))) { + return TRUE; + } + + return FALSE; } /** diff --git a/Examples/33chartcreate-area.php b/Examples/33chartcreate-area.php index 34679c5..1e53b60 100644 --- a/Examples/33chartcreate-area.php +++ b/Examples/33chartcreate-area.php @@ -62,9 +62,9 @@ $objWorksheet->fromArray( // Data values // Data Marker $dataseriesLabels = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', null, 1), // 2010 - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', null, 1), // 2011 - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', null, 1), // 2012 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', NULL, 1), // 2010 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 2012 ); // Set the X-Axis Labels // Datatype @@ -74,7 +74,7 @@ $dataseriesLabels = array( // Data values // Data Marker $xAxisTickValues = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$5', null, 4), // Q1 to Q4 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$5', NULL, 4), // Q1 to Q4 ); // Set the Data values for each data series we want to plot // Datatype @@ -84,9 +84,9 @@ $xAxisTickValues = array( // Data values // Data Marker $dataSeriesValues = array( - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$B$2:$B$5', null, 4), - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', null, 4), - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$D$2:$D$5', null, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$B$2:$B$5', NULL, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', NULL, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$D$2:$D$5', NULL, 4), ); // Build the dataseries @@ -100,9 +100,9 @@ $series = new PHPExcel_Chart_DataSeries( ); // Set the series in the plot area -$plotarea = new PHPExcel_Chart_PlotArea(null, array($series)); +$plotarea = new PHPExcel_Chart_PlotArea(NULL, array($series)); // Set the chart legend -$legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_TOPRIGHT, null, false); +$legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_TOPRIGHT, NULL, false); $title = new PHPExcel_Chart_Title('Test %age-Stacked Area Chart'); $yAxisLabel = new PHPExcel_Chart_Title('Value ($k)'); @@ -116,7 +116,7 @@ $chart = new PHPExcel_Chart( $plotarea, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs - null, // xAxisLabel + NULL, // xAxisLabel $yAxisLabel // yAxisLabel ); diff --git a/Examples/33chartcreate-bar-stacked.php b/Examples/33chartcreate-bar-stacked.php index 180985f..f6465ee 100644 --- a/Examples/33chartcreate-bar-stacked.php +++ b/Examples/33chartcreate-bar-stacked.php @@ -62,9 +62,9 @@ $objWorksheet->fromArray( // Data values // Data Marker $dataseriesLabels = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', null, 1), // 2010 - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', null, 1), // 2011 - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', null, 1), // 2012 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', NULL, 1), // 2010 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 2012 ); // Set the X-Axis Labels // Datatype @@ -74,7 +74,7 @@ $dataseriesLabels = array( // Data values // Data Marker $xAxisTickValues = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$5', null, 4), // Q1 to Q4 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$5', NULL, 4), // Q1 to Q4 ); // Set the Data values for each data series we want to plot // Datatype @@ -84,9 +84,9 @@ $xAxisTickValues = array( // Data values // Data Marker $dataSeriesValues = array( - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$B$2:$B$5', null, 4), - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', null, 4), - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$D$2:$D$5', null, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$B$2:$B$5', NULL, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', NULL, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$D$2:$D$5', NULL, 4), ); // Build the dataseries @@ -103,9 +103,9 @@ $series = new PHPExcel_Chart_DataSeries( $series->setPlotDirection(PHPExcel_Chart_DataSeries::DIRECTION_BAR); // Set the series in the plot area -$plotarea = new PHPExcel_Chart_PlotArea(null, array($series)); +$plotarea = new PHPExcel_Chart_PlotArea(NULL, array($series)); // Set the chart legend -$legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT, null, false); +$legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT, NULL, false); $title = new PHPExcel_Chart_Title('Test Chart'); $yAxisLabel = new PHPExcel_Chart_Title('Value ($k)'); @@ -119,7 +119,7 @@ $chart = new PHPExcel_Chart( $plotarea, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs - null, // xAxisLabel + NULL, // xAxisLabel $yAxisLabel // yAxisLabel ); diff --git a/Examples/33chartcreate-bar.php b/Examples/33chartcreate-bar.php index 866fa69..764942f 100644 --- a/Examples/33chartcreate-bar.php +++ b/Examples/33chartcreate-bar.php @@ -62,9 +62,9 @@ $objWorksheet->fromArray( // Data values // Data Marker $dataseriesLabels = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', null, 1), // 2010 - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', null, 1), // 2011 - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', null, 1), // 2012 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', NULL, 1), // 2010 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 2012 ); // Set the X-Axis Labels // Datatype @@ -74,7 +74,7 @@ $dataseriesLabels = array( // Data values // Data Marker $xAxisTickValues = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$5', null, 4), // Q1 to Q4 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$5', NULL, 4), // Q1 to Q4 ); // Set the Data values for each data series we want to plot // Datatype @@ -84,9 +84,9 @@ $xAxisTickValues = array( // Data values // Data Marker $dataSeriesValues = array( - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$B$2:$B$5', null, 4), - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', null, 4), - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$D$2:$D$5', null, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$B$2:$B$5', NULL, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', NULL, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$D$2:$D$5', NULL, 4), ); // Build the dataseries @@ -103,9 +103,9 @@ $series = new PHPExcel_Chart_DataSeries( $series->setPlotDirection(PHPExcel_Chart_DataSeries::DIRECTION_BAR); // Set the series in the plot area -$plotarea = new PHPExcel_Chart_PlotArea(null, array($series)); +$plotarea = new PHPExcel_Chart_PlotArea(NULL, array($series)); // Set the chart legend -$legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT, null, false); +$legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT, NULL, false); $title = new PHPExcel_Chart_Title('Test Bar Chart'); $yAxisLabel = new PHPExcel_Chart_Title('Value ($k)'); @@ -119,7 +119,7 @@ $chart = new PHPExcel_Chart( $plotarea, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs - null, // xAxisLabel + NULL, // xAxisLabel $yAxisLabel // yAxisLabel ); diff --git a/Examples/33chartcreate-column-2.php b/Examples/33chartcreate-column-2.php index 7f1e1a2..9210499 100644 --- a/Examples/33chartcreate-column-2.php +++ b/Examples/33chartcreate-column-2.php @@ -70,9 +70,9 @@ $objWorksheet->fromArray( // Data values // Data Marker $dataseriesLabels = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', null, 1), // 'Budget' - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', null, 1), // 'Forecast' - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$E$1', null, 1), // 'Actual' + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 'Budget' + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 'Forecast' + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$E$1', NULL, 1), // 'Actual' ); // Set the X-Axis Labels // Datatype @@ -82,7 +82,7 @@ $dataseriesLabels = array( // Data values // Data Marker $xAxisTickValues = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$B$13', null, 12), // Q1 to Q4 for 2010 to 2012 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$B$13', NULL, 12), // Q1 to Q4 for 2010 to 2012 ); // Set the Data values for each data series we want to plot // Datatype @@ -92,9 +92,9 @@ $xAxisTickValues = array( // Data values // Data Marker $dataSeriesValues = array( - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$13', null, 12), - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$D$2:$D$13', null, 12), - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$E$2:$E$13', null, 12), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$13', NULL, 12), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$D$2:$D$13', NULL, 12), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$E$2:$E$13', NULL, 12), ); // Build the dataseries @@ -111,9 +111,9 @@ $series = new PHPExcel_Chart_DataSeries( $series->setPlotDirection(PHPExcel_Chart_DataSeries::DIRECTION_COL); // Set the series in the plot area -$plotarea = new PHPExcel_Chart_PlotArea(null, array($series)); +$plotarea = new PHPExcel_Chart_PlotArea(NULL, array($series)); // Set the chart legend -$legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_BOTTOM, null, false); +$legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_BOTTOM, NULL, false); $title = new PHPExcel_Chart_Title('Test Grouped Column Chart'); $xAxisLabel = new PHPExcel_Chart_Title('Financial Period'); diff --git a/Examples/33chartcreate-column.php b/Examples/33chartcreate-column.php index 768c06d..6feacf9 100644 --- a/Examples/33chartcreate-column.php +++ b/Examples/33chartcreate-column.php @@ -62,9 +62,9 @@ $objWorksheet->fromArray( // Data values // Data Marker $dataseriesLabels = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', null, 1), // 2010 - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', null, 1), // 2011 - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', null, 1), // 2012 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', NULL, 1), // 2010 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 2012 ); // Set the X-Axis Labels // Datatype @@ -74,7 +74,7 @@ $dataseriesLabels = array( // Data values // Data Marker $xAxisTickValues = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$5', null, 4), // Q1 to Q4 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$5', NULL, 4), // Q1 to Q4 ); // Set the Data values for each data series we want to plot // Datatype @@ -84,9 +84,9 @@ $xAxisTickValues = array( // Data values // Data Marker $dataSeriesValues = array( - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$B$2:$B$5', null, 4), - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', null, 4), - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$D$2:$D$5', null, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$B$2:$B$5', NULL, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', NULL, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$D$2:$D$5', NULL, 4), ); // Build the dataseries @@ -103,9 +103,9 @@ $series = new PHPExcel_Chart_DataSeries( $series->setPlotDirection(PHPExcel_Chart_DataSeries::DIRECTION_COL); // Set the series in the plot area -$plotarea = new PHPExcel_Chart_PlotArea(null, array($series)); +$plotarea = new PHPExcel_Chart_PlotArea(NULL, array($series)); // Set the chart legend -$legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT, null, false); +$legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT, NULL, false); $title = new PHPExcel_Chart_Title('Test Column Chart'); $yAxisLabel = new PHPExcel_Chart_Title('Value ($k)'); @@ -119,7 +119,7 @@ $chart = new PHPExcel_Chart( $plotarea, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs - null, // xAxisLabel + NULL, // xAxisLabel $yAxisLabel // yAxisLabel ); diff --git a/Examples/33chartcreate-line.php b/Examples/33chartcreate-line.php index 1372270..8fc9714 100644 --- a/Examples/33chartcreate-line.php +++ b/Examples/33chartcreate-line.php @@ -62,9 +62,9 @@ $objWorksheet->fromArray( // Data values // Data Marker $dataseriesLabels = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', null, 1), // 2010 - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', null, 1), // 2011 - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', null, 1), // 2012 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', NULL, 1), // 2010 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 2012 ); // Set the X-Axis Labels // Datatype @@ -74,7 +74,7 @@ $dataseriesLabels = array( // Data values // Data Marker $xAxisTickValues = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$5', null, 4), // Q1 to Q4 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$5', NULL, 4), // Q1 to Q4 ); // Set the Data values for each data series we want to plot // Datatype @@ -84,9 +84,9 @@ $xAxisTickValues = array( // Data values // Data Marker $dataSeriesValues = array( - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$B$2:$B$5', null, 4), - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', null, 4), - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$D$2:$D$5', null, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$B$2:$B$5', NULL, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', NULL, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$D$2:$D$5', NULL, 4), ); // Build the dataseries @@ -100,9 +100,9 @@ $series = new PHPExcel_Chart_DataSeries( ); // Set the series in the plot area -$plotarea = new PHPExcel_Chart_PlotArea(null, array($series)); +$plotarea = new PHPExcel_Chart_PlotArea(NULL, array($series)); // Set the chart legend -$legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_TOPRIGHT, null, false); +$legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_TOPRIGHT, NULL, false); $title = new PHPExcel_Chart_Title('Test Stacked Line Chart'); $yAxisLabel = new PHPExcel_Chart_Title('Value ($k)'); @@ -116,7 +116,7 @@ $chart = new PHPExcel_Chart( $plotarea, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs - null, // xAxisLabel + NULL, // xAxisLabel $yAxisLabel // yAxisLabel ); diff --git a/Examples/33chartcreate-multiple-charts.php b/Examples/33chartcreate-multiple-charts.php index 6c8bcbe..a8943ee 100644 --- a/Examples/33chartcreate-multiple-charts.php +++ b/Examples/33chartcreate-multiple-charts.php @@ -63,9 +63,9 @@ $objWorksheet->fromArray( // Data values // Data Marker $dataseriesLabels1 = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', null, 1), // 2010 - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', null, 1), // 2011 - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', null, 1), // 2012 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', NULL, 1), // 2010 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 2012 ); // Set the X-Axis Labels // Datatype @@ -75,7 +75,7 @@ $dataseriesLabels1 = array( // Data values // Data Marker $xAxisTickValues1 = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$5', null, 4), // Q1 to Q4 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$5', NULL, 4), // Q1 to Q4 ); // Set the Data values for each data series we want to plot // Datatype @@ -85,9 +85,9 @@ $xAxisTickValues1 = array( // Data values // Data Marker $dataSeriesValues1 = array( - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$B$2:$B$5', null, 4), - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', null, 4), - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$D$2:$D$5', null, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$B$2:$B$5', NULL, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', NULL, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$D$2:$D$5', NULL, 4), ); // Build the dataseries @@ -101,9 +101,9 @@ $series1 = new PHPExcel_Chart_DataSeries( ); // Set the series in the plot area -$plotarea1 = new PHPExcel_Chart_PlotArea(null, array($series1)); +$plotarea1 = new PHPExcel_Chart_PlotArea(NULL, array($series1)); // Set the chart legend -$legend1 = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_TOPRIGHT, null, false); +$legend1 = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_TOPRIGHT, NULL, false); $title1 = new PHPExcel_Chart_Title('Test %age-Stacked Area Chart'); $yAxisLabel1 = new PHPExcel_Chart_Title('Value ($k)'); @@ -117,7 +117,7 @@ $chart1 = new PHPExcel_Chart( $plotarea1, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs - null, // xAxisLabel + NULL, // xAxisLabel $yAxisLabel1 // yAxisLabel ); @@ -137,9 +137,9 @@ $objWorksheet->addChart($chart1); // Data values // Data Marker $dataseriesLabels2 = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', null, 1), // 2010 - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', null, 1), // 2011 - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', null, 1), // 2012 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', NULL, 1), // 2010 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 2012 ); // Set the X-Axis Labels // Datatype @@ -149,7 +149,7 @@ $dataseriesLabels2 = array( // Data values // Data Marker $xAxisTickValues2 = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$5', null, 4), // Q1 to Q4 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$5', NULL, 4), // Q1 to Q4 ); // Set the Data values for each data series we want to plot // Datatype @@ -159,9 +159,9 @@ $xAxisTickValues2 = array( // Data values // Data Marker $dataSeriesValues2 = array( - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$B$2:$B$5', null, 4), - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', null, 4), - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$D$2:$D$5', null, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$B$2:$B$5', NULL, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', NULL, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$D$2:$D$5', NULL, 4), ); // Build the dataseries @@ -178,9 +178,9 @@ $series2 = new PHPExcel_Chart_DataSeries( $series2->setPlotDirection(PHPExcel_Chart_DataSeries::DIRECTION_COL); // Set the series in the plot area -$plotarea2 = new PHPExcel_Chart_PlotArea(null, array($series2)); +$plotarea2 = new PHPExcel_Chart_PlotArea(NULL, array($series2)); // Set the chart legend -$legend2 = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT, null, false); +$legend2 = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT, NULL, false); $title2 = new PHPExcel_Chart_Title('Test Column Chart'); $yAxisLabel2 = new PHPExcel_Chart_Title('Value ($k)'); @@ -194,7 +194,7 @@ $chart2 = new PHPExcel_Chart( $plotarea2, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs - null, // xAxisLabel + NULL, // xAxisLabel $yAxisLabel2 // yAxisLabel ); diff --git a/Examples/33chartcreate-pie.php b/Examples/33chartcreate-pie.php index 86b2ce4..fe68ba2 100644 --- a/Examples/33chartcreate-pie.php +++ b/Examples/33chartcreate-pie.php @@ -63,7 +63,7 @@ $objWorksheet->fromArray( // Data values // Data Marker $dataseriesLabels1 = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', null, 1), // 2011 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011 ); // Set the X-Axis Labels // Datatype @@ -73,7 +73,7 @@ $dataseriesLabels1 = array( // Data values // Data Marker $xAxisTickValues1 = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$5', null, 4), // Q1 to Q4 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$5', NULL, 4), // Q1 to Q4 ); // Set the Data values for each data series we want to plot // Datatype @@ -83,7 +83,7 @@ $xAxisTickValues1 = array( // Data values // Data Marker $dataSeriesValues1 = array( - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', null, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', NULL, 4), ); // Build the dataseries @@ -104,7 +104,7 @@ $layout1->setShowPercent(TRUE); // Set the series in the plot area $plotarea1 = new PHPExcel_Chart_PlotArea($layout1, array($series1)); // Set the chart legend -$legend1 = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT, null, false); +$legend1 = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT, NULL, false); $title1 = new PHPExcel_Chart_Title('Test Pie Chart'); @@ -117,8 +117,8 @@ $chart1 = new PHPExcel_Chart( $plotarea1, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs - null, // xAxisLabel - null // yAxisLabel - Pie charts don't have a Y-Axis + NULL, // xAxisLabel + NULL // yAxisLabel - Pie charts don't have a Y-Axis ); // Set the position where the chart should appear in the worksheet @@ -137,7 +137,7 @@ $objWorksheet->addChart($chart1); // Data values // Data Marker $dataseriesLabels2 = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', null, 1), // 2011 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011 ); // Set the X-Axis Labels // Datatype @@ -147,7 +147,7 @@ $dataseriesLabels2 = array( // Data values // Data Marker $xAxisTickValues2 = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$5', null, 4), // Q1 to Q4 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$5', NULL, 4), // Q1 to Q4 ); // Set the Data values for each data series we want to plot // Datatype @@ -157,7 +157,7 @@ $xAxisTickValues2 = array( // Data values // Data Marker $dataSeriesValues2 = array( - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', null, 4), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', NULL, 4), ); // Build the dataseries @@ -189,8 +189,8 @@ $chart2 = new PHPExcel_Chart( $plotarea2, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs - null, // xAxisLabel - null // yAxisLabel - Like Pie charts, Donut charts don't have a Y-Axis + NULL, // xAxisLabel + NULL // yAxisLabel - Like Pie charts, Donut charts don't have a Y-Axis ); // Set the position where the chart should appear in the worksheet diff --git a/Examples/33chartcreate-radar.php b/Examples/33chartcreate-radar.php index 4751f8a..a1bb413 100644 --- a/Examples/33chartcreate-radar.php +++ b/Examples/33chartcreate-radar.php @@ -71,8 +71,8 @@ $objWorksheet->fromArray( // Data values // Data Marker $dataseriesLabels = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', null, 1), // 2011 - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', null, 1), // 2012 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011 + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 2012 ); // Set the X-Axis Labels // Datatype @@ -82,8 +82,8 @@ $dataseriesLabels = array( // Data values // Data Marker $xAxisTickValues = array( - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$13', null, 12), // Jan to Dec - new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$13', null, 12), // Jan to Dec + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$13', NULL, 12), // Jan to Dec + new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$13', NULL, 12), // Jan to Dec ); // Set the Data values for each data series we want to plot // Datatype @@ -93,8 +93,8 @@ $xAxisTickValues = array( // Data values // Data Marker $dataSeriesValues = array( - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$13', null, 12), - new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$D$2:$D$13', null, 12), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$13', NULL, 12), + new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$D$2:$D$13', NULL, 12), ); // Build the dataseries @@ -115,7 +115,7 @@ $layout = new PHPExcel_Chart_Layout(); // Set the series in the plot area $plotarea = new PHPExcel_Chart_PlotArea($layout, array($series)); // Set the chart legend -$legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT, null, false); +$legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT, NULL, false); $title = new PHPExcel_Chart_Title('Test Radar Chart'); @@ -128,8 +128,8 @@ $chart = new PHPExcel_Chart( $plotarea, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs - null, // xAxisLabel - null // yAxisLabel - Radar charts don't have a Y-Axis + NULL, // xAxisLabel + NULL // yAxisLabel - Radar charts don't have a Y-Axis ); // Set the position where the chart should appear in the worksheet diff --git a/changelog.txt b/changelog.txt index de9b0cf..ffca13a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -23,6 +23,11 @@ ************************************************************************************** +Fixed in develop branch: +- Bugfix: (Asker) Work item 18777 - Error in PHPEXCEL/Calculation.php script on line 2976 (stack pop check) +- Bugfix: (MBaker) Work item 18794 - CSV files without a file extension being identified as HTML + + -------------------------------------------------------------------------------- BREAKING CHANGE! As part of the planned changes for handling array formulae in workbooks, there are some changes that will affect the PHPExcel_Cell object @@ -71,9 +76,6 @@ The following methods will be changed in version 1.7.9 -------------------------------------------------------------------------------- -Fixed in develop branch: - - 2012-10-12 (v1.7.8): - Special: (kkamkou) Phar builder script to add phar file as a distribution option - Feature: (MBaker) Refactor PDF Writer to allow use with a choice of PDF Rendering library