Tweaks

Author: MarkBaker

samples/Wizards/NumberFormat/Accounting.php

@@ -1,6 +1,6 @@
 <?php
 
-use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
 use PhpOffice\PhpSpreadsheet\Helper\Sample;
 use PhpOffice\PhpSpreadsheet\Settings;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
@@ -90,13 +90,14 @@
                 (isset($_POST['thousands']) ? 'WITH_THOUSANDS_SEPARATOR' : 'WITHOUT_THOUSANDS_SEPARATOR') .
                 ', Wizard\Currency::' . (((bool) $_POST['position']) ? 'LEADING_SYMBOL' : 'TRAILING_SYMBOL') .
                 ', Wizard\Currency::' . (((bool) $_POST['spacing']) ? 'SYMBOL_WITH_SPACING' : 'SYMBOL_WITHOUT_SPACING') .
-                ')<br />'
+                ');<br />'
             );
+            $helper->log('echo (string) $mask;');
             $helper->log('<hr /><b>Mask:</b><br />');
             $helper->log($mask . '<br />');
             $helper->log('<br /><b>Example:</b><br />');
             $helper->log($example);
-        } catch (Exception $e) {
+        } catch (SpreadsheetException $e) {
             $helper->log("Exception: {$e->getMessage()}");
         }
     }

samples/Wizards/NumberFormat/Currency.php

@@ -1,6 +1,6 @@
 <?php
 
-use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
 use PhpOffice\PhpSpreadsheet\Helper\Sample;
 use PhpOffice\PhpSpreadsheet\Settings;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
@@ -90,13 +90,14 @@
                 (isset($_POST['thousands']) ? 'WITH_THOUSANDS_SEPARATOR' : 'WITHOUT_THOUSANDS_SEPARATOR') .
                 ', Wizard\Currency::' . (((bool) $_POST['position']) ? 'LEADING_SYMBOL' : 'TRAILING_SYMBOL') .
                 ', Wizard\Currency::' . (((bool) $_POST['spacing']) ? 'SYMBOL_WITH_SPACING' : 'SYMBOL_WITHOUT_SPACING') .
-                ')<br />'
+                ');<br />'
             );
+            $helper->log('echo (string) $mask;');
             $helper->log('<hr /><b>Mask:</b><br />');
             $helper->log($mask . '<br />');
             $helper->log('<br /><b>Example:</b><br />');
             $helper->log($example);
-        } catch (Exception $e) {
+        } catch (SpreadsheetException $e) {
             $helper->log("Exception: {$e->getMessage()}");
         }
     }

samples/Wizards/NumberFormat/Number.php

@@ -1,6 +1,6 @@
 <?php
 
-use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
 use PhpOffice\PhpSpreadsheet\Helper\Sample;
 use PhpOffice\PhpSpreadsheet\Settings;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
@@ -61,13 +61,14 @@
             $helper->log(
                 "\$mask = Wizard\\Number({$_POST['decimals']}, Wizard\\Number::" .
                 (isset($_POST['thousands']) ? 'WITH_THOUSANDS_SEPARATOR' : 'WITHOUT_THOUSANDS_SEPARATOR') .
-                ')<br />'
+                ');<br />'
             );
+            $helper->log('echo (string) $mask;');
             $helper->log('<hr /><b>Mask:</b>');
             $helper->log($mask);
             $helper->log('<b>Example:</b>');
             $helper->log($example);
-        } catch (Exception $e) {
+        } catch (SpreadsheetException $e) {
             $helper->log("Exception: {$e->getMessage()}");
         }
     }

samples/Wizards/NumberFormat/Percentage.php

@@ -1,6 +1,6 @@
 <?php
 
-use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
 use PhpOffice\PhpSpreadsheet\Helper\Sample;
 use PhpOffice\PhpSpreadsheet\Settings;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
@@ -52,12 +52,13 @@
             $example = (string) NumberFormat::toFormattedString((float) $_POST['number'], $mask);
             $helper->log('<hr /><b>Code:</b><br />');
             $helper->log('use PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;');
-            $helper->log("\$mask = Wizard\\Percentage({$_POST['decimals']})<br />");
+            $helper->log("\$mask = Wizard\\Percentage({$_POST['decimals']});<br />");
+            $helper->log('echo (string) $mask;');
             $helper->log('<hr /><b>Mask:</b><br />');
             $helper->log($mask . '<br />');
             $helper->log('<br /><b>Example:</b><br />');
             $helper->log($example);
-        } catch (Exception $e) {
+        } catch (SpreadsheetException $e) {
             $helper->log("Exception: {$e->getMessage()}");
         }
     }

samples/Wizards/NumberFormat/Scientific.php

@@ -1,6 +1,6 @@
 <?php
 
-use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
 use PhpOffice\PhpSpreadsheet\Helper\Sample;
 use PhpOffice\PhpSpreadsheet\Settings;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
@@ -52,12 +52,13 @@
             $example = (string) NumberFormat::toFormattedString((float) $_POST['number'], $mask);
             $helper->log('<hr /><b>Code:</b><br />');
             $helper->log('use PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;');
-            $helper->log("\$mask = Wizard\\Scientific({$_POST['decimals']})<br />");
+            $helper->log("\$mask = Wizard\\Scientific({$_POST['decimals']});<br />");
+            $helper->log('echo (string) $mask;');
             $helper->log('<hr /><b>Mask:</b><br />');
             $helper->log($mask . '<br />');
             $helper->log('<br /><b>Example:</b><br />');
             $helper->log($example);
-        } catch (Exception $e) {
+        } catch (SpreadsheetException $e) {
             $helper->log("Exception: {$e->getMessage()}");
         }
     }