Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

1 files changed, 7 insertions, 4 deletions

diff --git a/databases/adminer/files/makephar.php b/databases/adminer/files/makephar.php
index ad54a3cfe4cb..b8fdadf1dfbc 100644
--- a/databases/adminer/files/makephar.php
+++ b/databases/adminer/files/makephar.php
@@ -15,14 +15,16 @@ $stub = <<<STUB
 <?php
 /******************************************************************************
  *  
- *  All Adminer plugins are now included in this
+ *  Adminer plugins are now included in this
  *  FreeBSD ports edition, no need to download
  *  them separately.
  *  https://www.adminer.org/en/plugins/
  *  
  *  copyright Paavo-Einari Kaipila (FreeBSD ports edition)
- *  copyright Jakub Vrana          (original Adminer)
- * 
+ *  copyright Jakub Vrana          (Adminer)
+ *  copyright MirLach              (ForcedServer plugin)
+ *  copyright Pematon              (Collations, JsonPreview, LoginServers and SimpleMenu plugins)
+ *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
  *  You may obtain a copy of the License at
@@ -68,7 +70,7 @@ foreach(new DirectoryIterator(__DIR__ . '/plugins') as $file)
              * in Adminer editor.
              */
             && !str_starts_with($fileName, 'editor')
-            && preg_match('/class\s(A[a-zA-Z0-9]+)\sextends\sAdminer/', $contents, $m)
+            && preg_match('/class\s(A[a-zA-Z0-9]+)\s(extends\sAdminer|\{)/', $contents, $m)
         ) {
             $plugins[$pharFile] = $contents;
             $classMap[$m[1]] = $file->getFileName();
@@ -110,6 +112,7 @@ foreach($plugins as $file => $contents)
         $contents
     );
 }
+$phar->compressFiles(Phar::GZ);
 
 $phar->addFromString(
     'adminer.php',