Support passing addon optionSpecs in getAll()

Author: john-shaffer

src/Options.php

@@ -522,9 +522,15 @@ public static function getDefaultLineDelimitedBlobValue( string $name ): array {
      *
      * @return array<string, OptionData> array of option name to option object
      */
-    public static function getAll() {
+    public static function getAll(
+        ?array $option_specs = null
+    ) {
         global $wpdb;
 
+        if ( $option_specs === null ) {
+            $option_specs = self::optionSpecs();
+        }
+
         $table_name = self::getTableName();
 
         $sql = "SELECT name, value, blob_value FROM $table_name";
@@ -537,7 +543,7 @@ public static function getAll() {
         }
 
         $ret = [];
-        foreach ( self::optionSpecs() as $opt_spec ) {
+        foreach ( $option_specs as $opt_spec ) {
             $name = $opt_spec->name;
             $opt = $options_map[ $name ];
             if ( $opt ) {

src/S3/Controller.php

@@ -67,7 +67,7 @@ public static function renderS3Page(): void {
         $view['uploads_path'] = \WP2Static\SiteInfo::getPath( 'uploads' );
         $s3_path = \WP2Static\SiteInfo::getPath( 'uploads' ) . 'wp2static-processed-site.s3';
 
-        $view['options'] = Options::getAll();
+        $view['options'] = Options::getAll( S3Options::optionSpecs() );
 
         $view['s3_url'] =
             is_file( $s3_path ) ?