Modify Test examples to echo nicely from both CLI and in a web browser

k1LoW · Aug 5, 2012 · 8ba160e · 8ba160e
1 parent 4edc686
commit 8ba160e
Show file tree

Hide file tree

Showing 21 changed files with 339 additions and 376 deletions.
diff --git a/Classes/PHPExcel/Reader/HTML.php b/Classes/PHPExcel/Reader/HTML.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
  * @version    ##VERSION##, ##DATE##
  */
@@ -40,7 +40,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Reader_HTML implements PHPExcel_Reader_IReader
 {

diff --git a/Tests/01simple-download-pdf.php b/Tests/01simple-download-pdf.php
@@ -27,9 +27,13 @@
 
 /** Error reporting */
 error_reporting(E_ALL);
-
+ini_set('display_errors', TRUE);
+ini_set('display_startup_errors', TRUE);
 date_default_timezone_set('Europe/London');
 
+if (PHP_SAPI == 'cli')
+	die('This example should only be run from a Web Browser');
+
 /** Include PHPExcel */
 require_once '../Classes/PHPExcel.php';
 
@@ -84,7 +88,7 @@
 	)) {
 	die(
 		'NOTICE: Please set the $rendererName and $rendererLibraryPath values' .
-		PHP_EOL .
+		'<br />' .
 		'at the top of this script as appropriate for your directory structure'
 	);
 }

diff --git a/Tests/01simple-download-xls.php b/Tests/01simple-download-xls.php
@@ -27,9 +27,13 @@
 
 /** Error reporting */
 error_reporting(E_ALL);
-
+ini_set('display_errors', TRUE);
+ini_set('display_startup_errors', TRUE);
 date_default_timezone_set('Europe/London');
 
+if (PHP_SAPI == 'cli')
+	die('This example should only be run from a Web Browser');
+
 /** Include PHPExcel */
 require_once '../Classes/PHPExcel.php';
 

diff --git a/Tests/01simple-download-xlsx.php b/Tests/01simple-download-xlsx.php
@@ -27,9 +27,13 @@
 
 /** Error reporting */
 error_reporting(E_ALL);
-
+ini_set('display_errors', TRUE);
+ini_set('display_startup_errors', TRUE);
 date_default_timezone_set('Europe/London');
 
+if (PHP_SAPI == 'cli')
+	die('This example should only be run from a Web Browser');
+
 /** Include PHPExcel */
 require_once '../Classes/PHPExcel.php';
 

diff --git a/Tests/01simple.php b/Tests/01simple.php
@@ -27,19 +27,22 @@
 
 /** Error reporting */
 error_reporting(E_ALL);
-
+ini_set('display_errors', TRUE);
+ini_set('display_startup_errors', TRUE);
 date_default_timezone_set('Europe/London');
 
+define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
+
 /** Include PHPExcel */
 require_once '../Classes/PHPExcel.php';
 
 
 // Create new PHPExcel object
-echo date('H:i:s') , " Create new PHPExcel object" , PHP_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" , PHP_EOL;
+echo date('H:i:s') , " Set document properties" , EOL;
 $objPHPExcel->getProperties()->setCreator("Maarten Balliauw")
 							 ->setLastModifiedBy("Maarten Balliauw")
 							 ->setTitle("PHPExcel Test Document")
@@ -50,7 +53,7 @@
 
 
 // Add some data
-echo date('H:i:s') , " Add some data" , PHP_EOL;
+echo date('H:i:s') , " Add some data" , EOL;
 $objPHPExcel->setActiveSheetIndex(0)
             ->setCellValue('A1', 'Hello')
             ->setCellValue('B2', 'world!')
@@ -63,7 +66,7 @@
             ->setCellValue('A5', 'éàèùâêîôûëïüÿäöüç');
 
 // Rename worksheet
-echo date('H:i:s') , " Rename worksheet" , PHP_EOL;
+echo date('H:i:s') , " Rename worksheet" , EOL;
 $objPHPExcel->getActiveSheet()->setTitle('Simple');
 
 
@@ -72,19 +75,20 @@
 
 
 // Save Excel 2007 file
-echo date('H:i:s') , " Write to Excel2007 format" , PHP_EOL;
+echo date('H:i:s') , " Write to Excel2007 format" , EOL;
 $objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007');
 $objWriter->save(str_replace('.php', '.xlsx', __FILE__));
-echo date('H:i:s') , " File written to " , str_replace('.php', '.xlsx', __FILE__) , PHP_EOL;
+echo date('H:i:s') , " File written to " , str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
 // Save Excel5 file
-echo date('H:i:s') , " Write to Excel5 format" , PHP_EOL;
+echo date('H:i:s') , " Write to Excel5 format" , EOL;
 $objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5');
 $objWriter->save(str_replace('.php', '.xls', __FILE__));
-echo date('H:i:s') , " File written to " , str_replace('.php', '.xls', __FILE__) , PHP_EOL;
+echo date('H:i:s') , " File written to " , str_replace('.php', '.xls', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
 
 
 // Echo memory peak usage
-echo date('H:i:s') , " Peak memory usage: " , (memory_get_peak_usage(true) / 1024 / 1024) , " MB" , PHP_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 file" , PHP_EOL;
+echo date('H:i:s') , " Done writing files" , EOL;
+echo 'Files have been created in ' , getcwd() , EOL;
diff --git a/Tests/02types-xls.php b/Tests/02types-xls.php
@@ -27,19 +27,22 @@
 
 /** Error reporting */
 error_reporting(E_ALL);
-
+ini_set('display_errors', TRUE); 
+ini_set('display_startup_errors', TRUE); 
 date_default_timezone_set('Europe/London');
 
+define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
+
 /** Include PHPExcel */
 require_once '../Classes/PHPExcel.php';
 
 
 // Create new PHPExcel object
-echo date('H:i:s') , " Create new PHPExcel object" , PHP_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" , PHP_EOL;
+echo date('H:i:s') , " Set document properties" , EOL;
 $objPHPExcel->getProperties()->setCreator("Maarten Balliauw")
 							 ->setLastModifiedBy("Maarten Balliauw")
 							 ->setTitle("Office 2007 XLSX Test Document")
@@ -49,65 +52,65 @@
 							 ->setCategory("Test result file");
 
 // Set default font
-echo date('H:i:s') , " Set default font" , PHP_EOL;
-$objPHPExcel->getDefaultStyle()->getFont()->setName('Arial');
-$objPHPExcel->getDefaultStyle()->getFont()->setSize(10);
+echo date('H:i:s') , " Set default font" , EOL;
+$objPHPExcel->getDefaultStyle()->getFont()->setName('Arial')
+                                          ->setSize(10);
 
 // Add some data, resembling some different data types
-echo date('H:i:s') , " Add some data" , PHP_EOL;
-$objPHPExcel->getActiveSheet()->setCellValue('A1', 'String');
-$objPHPExcel->getActiveSheet()->setCellValue('B1', 'Simple');
-$objPHPExcel->getActiveSheet()->setCellValue('C1', 'PHPExcel');
+echo date('H:i:s') , " Add some data" , EOL;
+$objPHPExcel->getActiveSheet()->setCellValue('A1', 'String')
+                              ->setCellValue('B1', 'Simple')
+                              ->setCellValue('C1', 'PHPExcel');
 
-$objPHPExcel->getActiveSheet()->setCellValue('A2', 'String');
-$objPHPExcel->getActiveSheet()->setCellValue('B2', 'Symbols');
-$objPHPExcel->getActiveSheet()->setCellValue('C2', '!+&=()~§±æþ');
+$objPHPExcel->getActiveSheet()->setCellValue('A2', 'String')
+                              ->setCellValue('B2', 'Symbols')
+                              ->setCellValue('C2', '!+&=()~§±æþ');
 
-$objPHPExcel->getActiveSheet()->setCellValue('A3', 'String');
-$objPHPExcel->getActiveSheet()->setCellValue('B3', 'UTF-8');
-$objPHPExcel->getActiveSheet()->setCellValue('C3', 'Создать MS Excel Книги из PHP скриптов');
+$objPHPExcel->getActiveSheet()->setCellValue('A3', 'String')
+                              ->setCellValue('B3', 'UTF-8')
+                              ->setCellValue('C3', 'Создать MS Excel Книги из PHP скриптов');
 
-$objPHPExcel->getActiveSheet()->setCellValue('A4', 'Number');
-$objPHPExcel->getActiveSheet()->setCellValue('B4', 'Integer');
-$objPHPExcel->getActiveSheet()->setCellValue('C4', 12);
+$objPHPExcel->getActiveSheet()->setCellValue('A4', 'Number')
+                              ->setCellValue('B4', 'Integer')
+                              ->setCellValue('C4', 12);
 
-$objPHPExcel->getActiveSheet()->setCellValue('A5', 'Number');
-$objPHPExcel->getActiveSheet()->setCellValue('B5', 'Float');
-$objPHPExcel->getActiveSheet()->setCellValue('C5', 34.56);
+$objPHPExcel->getActiveSheet()->setCellValue('A5', 'Number')
+                              ->setCellValue('B5', 'Float')
+                              ->setCellValue('C5', 34.56);
 
-$objPHPExcel->getActiveSheet()->setCellValue('A6', 'Number');
-$objPHPExcel->getActiveSheet()->setCellValue('B6', 'Negative');
-$objPHPExcel->getActiveSheet()->setCellValue('C6', -7.89);
+$objPHPExcel->getActiveSheet()->setCellValue('A6', 'Number')
+                              ->setCellValue('B6', 'Negative')
+                              ->setCellValue('C6', -7.89);
 
-$objPHPExcel->getActiveSheet()->setCellValue('A7', 'Boolean');
-$objPHPExcel->getActiveSheet()->setCellValue('B7', 'True');
-$objPHPExcel->getActiveSheet()->setCellValue('C7', true);
+$objPHPExcel->getActiveSheet()->setCellValue('A7', 'Boolean')
+                              ->setCellValue('B7', 'True')
+                              ->setCellValue('C7', true);
 
-$objPHPExcel->getActiveSheet()->setCellValue('A8', 'Boolean');
-$objPHPExcel->getActiveSheet()->setCellValue('B8', 'False');
-$objPHPExcel->getActiveSheet()->setCellValue('C8', false);
+$objPHPExcel->getActiveSheet()->setCellValue('A8', 'Boolean')
+                              ->setCellValue('B8', 'False')
+                              ->setCellValue('C8', false);
 
 $dateTimeNow = time();
-$objPHPExcel->getActiveSheet()->setCellValue('A9', 'Date/Time');
-$objPHPExcel->getActiveSheet()->setCellValue('B9', 'Date');
-$objPHPExcel->getActiveSheet()->setCellValue('C9', PHPExcel_Shared_Date::PHPToExcel( $dateTimeNow ));
+$objPHPExcel->getActiveSheet()->setCellValue('A9', 'Date/Time')
+                              ->setCellValue('B9', 'Date')
+                              ->setCellValue('C9', PHPExcel_Shared_Date::PHPToExcel( $dateTimeNow ));
 $objPHPExcel->getActiveSheet()->getStyle('C9')->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDD2);
 
-$objPHPExcel->getActiveSheet()->setCellValue('A10', 'Date/Time');
-$objPHPExcel->getActiveSheet()->setCellValue('B10', 'Time');
-$objPHPExcel->getActiveSheet()->setCellValue('C10', PHPExcel_Shared_Date::PHPToExcel( $dateTimeNow ));
+$objPHPExcel->getActiveSheet()->setCellValue('A10', 'Date/Time')
+                              ->setCellValue('B10', 'Time')
+                              ->setCellValue('C10', PHPExcel_Shared_Date::PHPToExcel( $dateTimeNow ));
 $objPHPExcel->getActiveSheet()->getStyle('C10')->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4);
 
-$objPHPExcel->getActiveSheet()->setCellValue('A11', 'Date/Time');
-$objPHPExcel->getActiveSheet()->setCellValue('B11', 'Date and Time');
-$objPHPExcel->getActiveSheet()->setCellValue('C11', PHPExcel_Shared_Date::PHPToExcel( $dateTimeNow ));
+$objPHPExcel->getActiveSheet()->setCellValue('A11', 'Date/Time')
+                              ->setCellValue('B11', 'Date and Time')
+                              ->setCellValue('C11', PHPExcel_Shared_Date::PHPToExcel( $dateTimeNow ));
 $objPHPExcel->getActiveSheet()->getStyle('C11')->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_DATE_DATETIME);
 
 $objPHPExcel->getActiveSheet()->getColumnDimension('B')->setAutoSize(true);
 $objPHPExcel->getActiveSheet()->getColumnDimension('C')->setAutoSize(true);
 
 // Rename worksheet
-echo date('H:i:s') , " Rename worksheet" , PHP_EOL;
+echo date('H:i:s') , " Rename worksheet" , EOL;
 $objPHPExcel->getActiveSheet()->setTitle('Datatypes');
 
 
@@ -116,20 +119,21 @@
 
 
 // Save Excel 2007 file
-echo date('H:i:s') , " Write to Excel5 format" , PHP_EOL;
+echo date('H:i:s') , " Write to Excel5 format" , EOL;
 $objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5');
 $objWriter->save(str_replace('.php', '.xls', __FILE__));
-echo date('H:i:s') , " File written to " , str_replace('.php', '.xls', __FILE__) , PHP_EOL;
+echo date('H:i:s') , " File written to " , str_replace('.php', '.xls', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
 
 
-echo date('H:i:s') , " Reload workbook from saved file" , PHP_EOL;
+echo date('H:i:s') , " Reload workbook from saved file" , EOL;
 $objPHPExcel = PHPExcel_IOFactory::load(str_replace('.php', '.xls', __FILE__));
 
 var_dump($objPHPExcel->getActiveSheet()->toArray());
 
 
 // Echo memory peak usage
-echo date('H:i:s') , " Peak memory usage: " , (memory_get_peak_usage(true) / 1024 / 1024) , " MB" , PHP_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 file" , PHP_EOL;
+echo date('H:i:s') , " Done writing file" , EOL;
+echo 'File has been created in ' , getcwd() , EOL;