Merge pull request #674 from mindline-analytics/feat-sort-samples

Adds nat sortation to sample files menu and fixes "markAsFinal"
PHPOffice · Sep 7, 2021 · 3a9d316 · 3a9d316
2 parents 0116c89 + 7b04d83
commit 3a9d316
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/samples/Sample_13_MarkAsFinal.php b/samples/Sample_13_MarkAsFinal.php
@@ -9,7 +9,7 @@
 $objPHPPresentation = new PhpPresentation();
 
 // Mark the document as final
-$objPHPPresentation->markAsFinal(true);
+$objPHPPresentation->getPresentationProperties()->markAsFinal(true);
 
 // Create slide
 echo date('H:i:s') . ' Create slide' . EOL;

diff --git a/samples/Sample_Header.php b/samples/Sample_Header.php
@@ -88,12 +88,17 @@
             $name = str_replace('_', ' ', preg_replace('/(Sample_|\.php)/', '', $file));
             $group = substr($name, 0, 1);
             if (!isset($files[$group])) {
-                $files[$group] = '';
+                $files[$group] = [];
             }
-            $files[$group] .= "<li><a href='{$file}'>{$name}</a></li>";
+            $files[$group][$name] = "<li><a href='{$file}'>{$name}</a></li>";
         }
     }
     closedir($handle);
+
+    foreach ($files as $group => $a) {
+        natsort($files[$group]);
+    }
+    ksort($files);
 }
 
 /**
@@ -497,10 +502,10 @@ protected function getConstantName($class, $search, $startWith = '')
         </div>
         <div class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
-                <?php foreach ($files as $key => $fileStr) { ?>
+                <?php foreach ($files as $key => $groupfiles) { ?>
                 <li class="dropdown active">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-code fa-lg"></i>&nbsp;Samples <?php echo $key; ?>x<strong class="caret"></strong></a>
-                    <ul class="dropdown-menu"><?php echo $fileStr; ?></ul>
+                    <ul class="dropdown-menu"><?php echo implode('', $groupfiles); ?></ul>
                 </li>
                 <?php } ?>
             </ul>