[core] make config.php supported consistently

shish · Dec 16, 2024 · d919b40 · d919b40
1 parent bc591a4
commit d919b40
Show file tree

Hide file tree

Showing 32 changed files with 21 additions and 43 deletions.
diff --git a/core/config.php b/core/config.php
@@ -320,3 +320,7 @@ protected function save(string $name): void
         $this->database->notify($this->cache_name);
     }
 }
+
+abstract class ConfigGroup
+{
+}
diff --git a/core/util.php b/core/util.php
@@ -600,7 +600,8 @@ function _load_core_files(): void
     require_all(array_merge(
         zglob("core/*.php"),
         zglob("core/imageboard/*.php"),
-        zglob("ext/*/info.php")
+        zglob("ext/*/info.php"),
+        zglob("ext/*/config.php"),
     ));
 }
 

diff --git a/ext/auto_tagger/config.php b/ext/auto_tagger/config.php
@@ -4,7 +4,7 @@
 
 namespace Shimmie2;
 
-abstract class AutoTaggerConfig
+class AutoTaggerConfig extends ConfigGroup
 {
     public const VERSION = "ext_auto_tagger_ver";
     public const ITEMS_PER_PAGE = "auto_tagger_items_per_page";

diff --git a/ext/auto_tagger/main.php b/ext/auto_tagger/main.php
@@ -4,8 +4,6 @@
 
 namespace Shimmie2;
 
-require_once 'config.php';
-
 use MicroCRUD\ActionColumn;
 use MicroCRUD\TextColumn;
 use MicroCRUD\Table;

diff --git a/ext/cron_uploader/config.php b/ext/cron_uploader/config.php
@@ -4,7 +4,7 @@
 
 namespace Shimmie2;
 
-abstract class CronUploaderConfig
+class CronUploaderConfig extends ConfigGroup
 {
     public const DEFAULT_PATH = "cron_uploader";
 

diff --git a/ext/cron_uploader/main.php b/ext/cron_uploader/main.php
@@ -4,8 +4,6 @@
 
 namespace Shimmie2;
 
-require_once "config.php";
-
 class CronUploader extends Extension
 {
     /** @var CronUploaderTheme */

diff --git a/ext/image/config.php b/ext/image/config.php
@@ -4,7 +4,7 @@
 
 namespace Shimmie2;
 
-abstract class ImageConfig
+class ImageConfig extends ConfigGroup
 {
     public const VERSION =          'ext_image_version';
 

diff --git a/ext/image/main.php b/ext/image/main.php
@@ -10,8 +10,6 @@
 
 use function MicroHTML\{INPUT, emptyHTML, STYLE};
 
-require_once "config.php";
-
 /**
  * A class to handle adding / getting / removing image files from the disk.
  */

diff --git a/ext/image_view_counter/config.php b/ext/image_view_counter/config.php
@@ -4,7 +4,7 @@
 
 namespace Shimmie2;
 
-abstract class ImageViewCounterConfig
+class ImageViewCounterConfig extends ConfigGroup
 {
     public const VERSION =          'ext_image_view_counter';
 }
diff --git a/ext/image_view_counter/main.php b/ext/image_view_counter/main.php
@@ -4,10 +4,6 @@
 
 namespace Shimmie2;
 
-use function MicroHTML\{TD,TH,TR};
-
-require_once "config.php";
-
 class ImageViewCounter extends Extension
 {
     /** @var ImageViewCounterTheme */

diff --git a/ext/index/config.php b/ext/index/config.php
@@ -4,7 +4,7 @@
 
 namespace Shimmie2;
 
-class IndexConfig
+class IndexConfig extends ConfigGroup
 {
     public const IMAGES = "index_images";
     public const SHOW_PAGE_SIZES = "index_show_page_sizes";

diff --git a/ext/index/main.php b/ext/index/main.php
@@ -11,7 +11,6 @@
 
 use function MicroHTML\rawHTML;
 
-require_once "config.php";
 require_once "events.php";
 
 class Index extends Extension

diff --git a/ext/media/config.php b/ext/media/config.php
@@ -4,7 +4,7 @@
 
 namespace Shimmie2;
 
-abstract class MediaConfig
+class MediaConfig extends ConfigGroup
 {
     public const FFMPEG_PATH = "media_ffmpeg_path";
     public const FFPROBE_PATH = "media_ffprobe_path";

diff --git a/ext/media/main.php b/ext/media/main.php
@@ -8,7 +8,6 @@
 use Symfony\Component\Console\Input\{InputInterface,InputArgument};
 use Symfony\Component\Console\Output\OutputInterface;
 
-require_once "config.php";
 require_once "events.php";
 require_once "media_engine.php";
 require_once "video_codecs.php";

diff --git a/ext/post_titles/config.php b/ext/post_titles/config.php
@@ -4,7 +4,7 @@
 
 namespace Shimmie2;
 
-abstract class PostTitlesConfig
+class PostTitlesConfig extends ConfigGroup
 {
     public const VERSION = "ext_post_titles_version";
     public const DEFAULT_TO_FILENAME = "post_titles_default_to_filename";

diff --git a/ext/post_titles/main.php b/ext/post_titles/main.php
@@ -4,7 +4,6 @@
 
 namespace Shimmie2;
 
-require_once "config.php";
 require_once "events/post_title_set_event.php";
 
 class PostTitles extends Extension

diff --git a/ext/s3/config.php b/ext/s3/config.php
@@ -4,7 +4,7 @@
 
 namespace Shimmie2;
 
-abstract class S3Config
+class S3Config extends ConfigGroup
 {
     public const ACCESS_KEY_ID =     's3_access_key_id';
     public const ACCESS_KEY_SECRET = 's3_access_key_secret';

diff --git a/ext/s3/main.php b/ext/s3/main.php
@@ -10,8 +10,6 @@
 
 use function MicroHTML\INPUT;
 
-require_once "config.php";
-
 class S3 extends Extension
 {
     public int $synced = 0;

diff --git a/ext/setup/config.php b/ext/setup/config.php
@@ -4,7 +4,7 @@
 
 namespace Shimmie2;
 
-class SetupConfig
+class SetupConfig extends ConfigGroup
 {
     public const TITLE = "title";
     public const FRONT_PAGE = "front_page";

diff --git a/ext/setup/main.php b/ext/setup/main.php
@@ -10,8 +10,6 @@
 
 use function MicroHTML\rawHTML;
 
-require_once "config.php";
-
 /*
  * Sent when the setup screen's 'set' button has been activated
  */

diff --git a/ext/tag_categories/config.php b/ext/tag_categories/config.php
@@ -4,7 +4,7 @@
 
 namespace Shimmie2;
 
-abstract class TagCategoriesConfig
+class TagCategoriesConfig extends ConfigGroup
 {
     public const VERSION = "ext_tag_categories_version";
 

diff --git a/ext/tag_categories/main.php b/ext/tag_categories/main.php
@@ -4,8 +4,6 @@
 
 namespace Shimmie2;
 
-require_once "config.php";
-
 class TagCategories extends Extension
 {
     /** @var TagCategoriesTheme */

diff --git a/ext/tag_list/config.php b/ext/tag_list/config.php
@@ -4,7 +4,7 @@
 
 namespace Shimmie2;
 
-class TagListConfig
+class TagListConfig extends ConfigGroup
 {
     public const LENGTH = "tag_list_length";
     public const POPULAR_TAG_LIST_LENGTH = "popular_tag_list_length";

diff --git a/ext/tag_list/main.php b/ext/tag_list/main.php
@@ -4,8 +4,6 @@
 
 namespace Shimmie2;
 
-require_once "config.php";
-
 class TagList extends Extension
 {
     /** @var TagListTheme */

diff --git a/ext/tag_map/config.php b/ext/tag_map/config.php
@@ -4,7 +4,7 @@
 
 namespace Shimmie2;
 
-class TagMapConfig
+class TagMapConfig extends ConfigGroup
 {
     public const TAGS_MIN = "tags_min";
     public const PAGES = "tag_list_pages";

diff --git a/ext/tag_map/main.php b/ext/tag_map/main.php
@@ -4,8 +4,6 @@
 
 namespace Shimmie2;
 
-require_once "config.php";
-
 class TagMap extends Extension
 {
     /** @var TagMapTheme */

diff --git a/ext/transcode/config.php b/ext/transcode/config.php
@@ -4,7 +4,7 @@
 
 namespace Shimmie2;
 
-class TranscodeConfig
+class TranscodeConfig extends ConfigGroup
 {
     public const VERSION = "ext_transcode_version";
     public const ENGINE = "transcode_engine";

diff --git a/ext/transcode/main.php b/ext/transcode/main.php
@@ -4,7 +4,6 @@
 
 namespace Shimmie2;
 
-require_once "config.php";
 /*
 * This is used by the image transcoding code when there is an error while transcoding
 */

diff --git a/ext/transcode_video/config.php b/ext/transcode_video/config.php
@@ -4,7 +4,7 @@
 
 namespace Shimmie2;
 
-class TranscodeVideoConfig
+class TranscodeVideoConfig extends ConfigGroup
 {
     public const ENABLED = "transcode_video_enabled";
     public const UPLOAD_TO_NATIVE_CONTAINER = "transcode_video_upload_to_native_container";

diff --git a/ext/transcode_video/main.php b/ext/transcode_video/main.php
@@ -4,7 +4,6 @@
 
 namespace Shimmie2;
 
-require_once "config.php";
 /*
 * This is used by the image transcoding code when there is an error while transcoding
 */

diff --git a/ext/upload/config.php b/ext/upload/config.php
@@ -4,7 +4,7 @@
 
 namespace Shimmie2;
 
-class UploadConfig
+class UploadConfig extends ConfigGroup
 {
     public const COUNT = "upload_count";
     public const SIZE = "upload_size";

diff --git a/ext/upload/main.php b/ext/upload/main.php
@@ -4,8 +4,6 @@
 
 namespace Shimmie2;
 
-require_once "config.php";
-
 /**
  * Occurs when some data is being uploaded.
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -320,3 +320,7 @@ protected function save(string $name): void @@
             $this->database->notify($this->cache_name);
         }
     }
+    abstract class ConfigGroup
+    {
+    }