ghost 5.130.0 → 6.0.0-alpha.1

package/core/server/data/migrations/versions/5.100/2024-11-06-04-45-15-add-activitypub-integration.js

@@ -1,7 +1,9 @@
 const logging = require('@tryghost/logging');
-const {createTransactionalMigration, meta} = require('../../utils');
+const {createTransactionalMigration} = require('../../utils');
 const ObjectID = require('bson-objectid').default;
 
+const MIGRATION_USER = 1;
+
 module.exports = createTransactionalMigration(
     async function up(knex) {
         logging.info('Adding Ghost ActivityPub integration');
@@ -25,7 +27,7 @@ module.exports = createTransactionalMigration(
                 name: 'Ghost ActivityPub',
                 description: 'Internal Integration for ActivityPub',
                 created_at: knex.raw('current_timestamp'),
-                created_by: meta.MIGRATION_USER
+                created_by: MIGRATION_USER
             })
             .into('integrations');
     },

package/core/server/data/migrations/versions/5.113/2025-03-07-12-24-00-add-super-editor.js

@@ -1,6 +1,8 @@
 const logging = require('@tryghost/logging');
 const {default: ObjectID} = require('bson-objectid');
-const {createTransactionalMigration, meta} = require('../../utils');
+const {createTransactionalMigration} = require('../../utils');
+
+const MIGRATION_USER = 1;
 
 module.exports = createTransactionalMigration(
     async function up(knex) {
@@ -18,7 +20,7 @@ module.exports = createTransactionalMigration(
             id: (new ObjectID()).toHexString(),
             name: 'Super Editor',
             description: 'Editor plus member management',
-            created_by: meta.MIGRATION_USER,
+            created_by: MIGRATION_USER,
             created_at: knex.raw('current_timestamp')
         });
     },

package/core/server/data/migrations/versions/5.3/2022-07-06-07-58-add-ghost-explore-integration-role.js

@@ -1,6 +1,8 @@
 const logging = require('@tryghost/logging');
 const {default: ObjectID} = require('bson-objectid');
-const {createTransactionalMigration, meta} = require('../../utils');
+const {createTransactionalMigration} = require('../../utils');
+
+const MIGRATION_USER = 1;
 
 module.exports = createTransactionalMigration(
     async function up(knex) {
@@ -18,7 +20,7 @@ module.exports = createTransactionalMigration(
             id: (new ObjectID()).toHexString(),
             name: 'Ghost Explore Integration',
             description: 'Internal Integration for the Ghost Explore directory',
-            created_by: meta.MIGRATION_USER,
+            created_by: MIGRATION_USER,
             created_at: knex.raw('current_timestamp')
         });
     },

package/core/server/data/migrations/versions/5.3/2022-07-06-09-17-add-ghost-explore-integration.js

@@ -1,6 +1,8 @@
 const logging = require('@tryghost/logging');
 const {default: ObjectID} = require('bson-objectid');
-const {createTransactionalMigration, meta} = require('../../utils');
+const {createTransactionalMigration} = require('../../utils');
+
+const MIGRATION_USER = 1;
 
 module.exports = createTransactionalMigration(
     async function up(knex) {
@@ -22,7 +24,7 @@ module.exports = createTransactionalMigration(
             description: 'Internal Integration for the Ghost Explore directory',
             slug: 'ghost-explore',
             created_at: knex.raw('current_timestamp'),
-            created_by: meta.MIGRATION_USER
+            created_by: MIGRATION_USER
         });
     },
     async function down(knex) {

package/core/server/data/migrations/versions/5.3/2022-07-06-09-26-add-ghost-explore-integration-api-key.js

@@ -2,7 +2,9 @@ const {InternalServerError} = require('@tryghost/errors');
 const logging = require('@tryghost/logging');
 const security = require('@tryghost/security');
 const {default: ObjectID} = require('bson-objectid');
-const {createTransactionalMigration, meta} = require('../../utils');
+const {createTransactionalMigration} = require('../../utils');
+
+const MIGRATION_USER = 1;
 
 module.exports = createTransactionalMigration(
     async function up(knex) {
@@ -46,7 +48,7 @@ module.exports = createTransactionalMigration(
             role_id: role.id,
             integration_id: integration.id,
             created_at: knex.raw('current_timestamp'),
-            created_by: meta.MIGRATION_USER
+            created_by: MIGRATION_USER
         });
     },
     async function down(knex) {

package/core/server/data/migrations/versions/5.40/2023-03-21-18-42-add-self-serve-integration-role.js

@@ -1,6 +1,8 @@
 const logging = require('@tryghost/logging');
 const {default: ObjectID} = require('bson-objectid');
-const {createTransactionalMigration, meta} = require('../../utils');
+const {createTransactionalMigration} = require('../../utils');
+
+const MIGRATION_USER = 1;
 
 module.exports = createTransactionalMigration(
     async function up(knex) {
@@ -18,7 +20,7 @@ module.exports = createTransactionalMigration(
             id: (new ObjectID()).toHexString(),
             name: 'Self-Serve Migration Integration',
             description: 'Core Integration for the Ghost Explore directory',
-            created_by: meta.MIGRATION_USER,
+            created_by: MIGRATION_USER,
             created_at: knex.raw('current_timestamp')
         });
     },

package/core/server/data/migrations/versions/5.40/2023-03-21-18-52-add-self-serve-integration.js

@@ -1,6 +1,8 @@
 const logging = require('@tryghost/logging');
 const {default: ObjectID} = require('bson-objectid');
-const {createTransactionalMigration, meta} = require('../../utils');
+const {createTransactionalMigration} = require('../../utils');
+
+const MIGRATION_USER = 1;
 
 module.exports = createTransactionalMigration(
     async function up(knex) {
@@ -22,7 +24,7 @@ module.exports = createTransactionalMigration(
             description: 'Core Integration for the Self-Serve migration tool',
             slug: 'self-serve-migration',
             created_at: knex.raw('current_timestamp'),
-            created_by: meta.MIGRATION_USER
+            created_by: MIGRATION_USER
         });
     },
     async function down(knex) {

package/core/server/data/migrations/versions/5.40/2023-03-21-19-02-add-self-serve-integration-api-key.js

@@ -2,7 +2,9 @@ const {InternalServerError} = require('@tryghost/errors');
 const logging = require('@tryghost/logging');
 const security = require('@tryghost/security');
 const {default: ObjectID} = require('bson-objectid');
-const {createTransactionalMigration, meta} = require('../../utils');
+const {createTransactionalMigration} = require('../../utils');
+
+const MIGRATION_USER = 1;
 
 module.exports = createTransactionalMigration(
     async function up(knex) {
@@ -46,7 +48,7 @@ module.exports = createTransactionalMigration(
             role_id: role.id,
             integration_id: integration.id,
             created_at: knex.raw('current_timestamp'),
-            created_by: meta.MIGRATION_USER
+            created_by: MIGRATION_USER
         });
     },
     async function down(knex) {

package/core/server/data/migrations/versions/5.63/2023-09-13-13-03-10-add-ghost-core-content-integration.js

@@ -2,7 +2,9 @@
 
 const logging = require('@tryghost/logging');
 const {default: ObjectID} = require('bson-objectid');
-const {createTransactionalMigration, meta} = require('../../utils');
+const {createTransactionalMigration} = require('../../utils');
+
+const MIGRATION_USER = 1;
 
 const coreContentIntegration = {
     slug: 'ghost-core-content',
@@ -26,7 +28,7 @@ const addIntegration = async (knex, integration) => {
     const now = knex.raw('CURRENT_TIMESTAMP');
     integration.id = (new ObjectID()).toHexString();
     integration.created_at = now;
-    integration.created_by = meta.MIGRATION_USER;
+    integration.created_by = MIGRATION_USER;
 
     await knex('integrations').insert(integration);
 };

package/core/server/data/migrations/versions/5.63/2023-09-13-13-34-11-add-ghost-core-content-integration-key.js

@@ -4,7 +4,9 @@ const {InternalServerError} = require('@tryghost/errors');
 const logging = require('@tryghost/logging');
 const security = require('@tryghost/security');
 const {default: ObjectID} = require('bson-objectid');
-const {createTransactionalMigration, meta} = require('../../utils');
+const {createTransactionalMigration} = require('../../utils');
+
+const MIGRATION_USER = 1;
 
 const coreContentIntegration = {
     slug: 'ghost-core-content',
@@ -45,7 +47,7 @@ const addIntegrationContentKey = async (knex, integration) => {
         role_id: null,
         integration_id: existingIntegration.id,
         created_at: knex.raw('current_timestamp'),
-        created_by: meta.MIGRATION_USER
+        created_by: MIGRATION_USER
     });
 };
 

package/core/server/data/migrations/versions/6.0/2025-06-20-01-41-54-remove-updated-by-column.js

@@ -0,0 +1,46 @@
+const logging = require('@tryghost/logging');
+const {createNonTransactionalMigration} = require('../../utils');
+
+async function dropUpdatedBy(knex, table) {
+    const hasUpdatedBy = await knex.schema.hasColumn(table, 'updated_by');
+
+    if (hasUpdatedBy) {
+        logging.info(`Dropping updated_by from ${table}`);
+
+        await knex.schema.alterTable(table, function (t) {
+            t.dropColumn('updated_by');
+        });
+    } else {
+        logging.info(`${table} does not have updated_by - skipping`);
+    }
+}
+
+module.exports = createNonTransactionalMigration(
+    async function up(knex) {
+        logging.info('Dropping updated_by from all tables');
+
+        await dropUpdatedBy(knex, 'posts');
+        await dropUpdatedBy(knex, 'users');
+        await dropUpdatedBy(knex, 'roles');
+        await dropUpdatedBy(knex, 'permissions');
+        await dropUpdatedBy(knex, 'settings');
+        await dropUpdatedBy(knex, 'tags');
+        await dropUpdatedBy(knex, 'invites');
+        await dropUpdatedBy(knex, 'integrations');
+        await dropUpdatedBy(knex, 'webhooks');
+        await dropUpdatedBy(knex, 'api_keys');
+        await dropUpdatedBy(knex, 'members');
+        await dropUpdatedBy(knex, 'labels');
+        await dropUpdatedBy(knex, 'members_stripe_customers');
+        await dropUpdatedBy(knex, 'members_stripe_customers_subscriptions');
+        await dropUpdatedBy(knex, 'emails');
+        await dropUpdatedBy(knex, 'snippets');
+
+        logging.info('updated_by dropped from all tables');
+    },
+
+    async function down() {
+        // Major version migrations are not reversible
+        logging.warn('Reverting removal of updated_by is not supported');
+    }
+);

package/core/server/data/migrations/versions/6.0/2025-06-20-13-41-55-remove-created-by-column.js

@@ -0,0 +1,47 @@
+const logging = require('@tryghost/logging');
+const {createNonTransactionalMigration} = require('../../utils');
+
+async function dropCreatedBy(knex, table) {
+    const hasCreatedBy = await knex.schema.hasColumn(table, 'created_by');
+
+    if (hasCreatedBy) {
+        logging.info(`Dropping created_by from ${table}`);
+
+        await knex.schema.alterTable(table, function (t) {
+            t.dropColumn('created_by');
+        });
+    } else {
+        logging.info(`${table} does not have created_by - skipping`);
+    }
+}
+
+module.exports = createNonTransactionalMigration(
+    async function up(knex) {
+        logging.info('Dropping created_by from all tables');
+
+        await dropCreatedBy(knex, 'posts');
+        await dropCreatedBy(knex, 'users');
+        await dropCreatedBy(knex, 'roles');
+        await dropCreatedBy(knex, 'permissions');
+        await dropCreatedBy(knex, 'settings');
+        await dropCreatedBy(knex, 'tags');
+        await dropCreatedBy(knex, 'invites');
+        await dropCreatedBy(knex, 'integrations');
+        await dropCreatedBy(knex, 'webhooks');
+        await dropCreatedBy(knex, 'api_keys');
+        await dropCreatedBy(knex, 'members');
+        await dropCreatedBy(knex, 'labels');
+        await dropCreatedBy(knex, 'members_stripe_customers');
+        await dropCreatedBy(knex, 'members_stripe_customers_subscriptions');
+        await dropCreatedBy(knex, 'emails');
+        await dropCreatedBy(knex, 'tokens');
+        await dropCreatedBy(knex, 'snippets');
+
+        logging.info('created_by dropped from all tables');
+    },
+
+    async function down() {
+        // Major version migrations are not reversible
+        logging.warn('Reverting removal of created_by is not supported');
+    }
+);

package/core/server/data/migrations/versions/6.0/2025-06-23-09-49-25-add-missing-member-uuids.js

@@ -0,0 +1,22 @@
+// For information on writing migrations, see https://www.notion.so/ghost/Database-migrations-eb5b78c435d741d2b34a582d57c24253
+
+const logging = require('@tryghost/logging');
+const crypto = require('crypto');
+
+// For DML - data changes
+const {createTransactionalMigration} = require('../../utils');
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        const membersWithoutUUID = await knex.select('id').from('members').whereNull('uuid');
+
+        logging.info(`Adding uuid field value to ${membersWithoutUUID.length} members.`);
+
+        // eslint-disable-next-line no-restricted-syntax
+        for (const member of membersWithoutUUID) {
+            await knex('members').update('uuid', crypto.randomUUID()).where('id', member.id);
+        }
+    },
+    // down is a no-op
+    async function down() {}
+);

package/core/server/data/migrations/versions/6.0/2025-06-23-10-03-26-members-nullable-uuid.js

@@ -0,0 +1,5 @@
+const {createDropNullableMigration} = require('../../utils');
+
+// Running drop nullable migration without foreign key checks disabled
+// This is because uuid isn't used as a foreign key anywhere in the schema
+module.exports = createDropNullableMigration('members', 'uuid');

package/core/server/data/migrations/versions/6.0/2025-06-24-09-19-42-use-object-id-for-hardcoded-user-id.js

@@ -0,0 +1,95 @@
+const logging = require('@tryghost/logging');
+const ObjectID = require('bson-objectid').default;
+
+const {createTransactionalMigration} = require('../../utils');
+
+const LEGACY_HARDCODED_USER_ID = '1';
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        const newId = (new ObjectID()).toHexString();
+
+        logging.info(`Updating hardcoded user ID ${LEGACY_HARDCODED_USER_ID} to ${newId}`);
+
+        const currentUserWithHardcodedId = await knex('users').where('id', LEGACY_HARDCODED_USER_ID).first();
+
+        if (!currentUserWithHardcodedId) {
+            logging.warn(`User with ID ${LEGACY_HARDCODED_USER_ID} not found, skipping migration`);
+
+            return;
+        }
+
+        const now = Date.now();
+        const email = currentUserWithHardcodedId.email;
+        const slug = currentUserWithHardcodedId.slug;
+        const temporaryEmail = `migrating-${now}@migration.local`;
+        const temporarySlug = `migrating-${now}`;
+
+        // Step 1: Create a clone of the current user using the new ID.
+        // This is so we can assign existing references to the new user ID
+        // without violating foreign key constraints. We also need to use a
+        // temporary email and slug to avoid duplicate constraint errors
+        const clonedUser = {
+            ...currentUserWithHardcodedId,
+            id: newId,
+            slug: temporarySlug,
+            email: temporaryEmail
+        };
+
+        await knex('users').insert(clonedUser);
+
+        logging.info(`Cloned existing user with updated properties - ID: ${newId}, email: ${temporaryEmail}, slug: ${temporarySlug}`);
+
+        // Step 2: Update all references to the current user ID to point
+        // to the cloned user ID. The order matters to avoid foreign key
+        // constraint violations.
+
+        // 1. Tables with user_id column
+        await knex('roles_users').where('user_id', LEGACY_HARDCODED_USER_ID).update({user_id: newId});
+        await knex('permissions_users').where('user_id', LEGACY_HARDCODED_USER_ID).update({user_id: newId});
+        await knex('sessions').where('user_id', LEGACY_HARDCODED_USER_ID).update({user_id: newId});
+        await knex('api_keys').where('user_id', LEGACY_HARDCODED_USER_ID).update({user_id: newId});
+
+        // 2. Tables with author_id column
+        await knex('posts_authors').where('author_id', LEGACY_HARDCODED_USER_ID).update({author_id: newId});
+        await knex('post_revisions').where('author_id', LEGACY_HARDCODED_USER_ID).update({author_id: newId});
+
+        // 3. Tables with published_by column (nullable)
+        await knex('posts').where('published_by', LEGACY_HARDCODED_USER_ID).update({published_by: newId});
+
+        // 4. Actions table with actor_id
+        await knex('actions')
+            .where('actor_id', LEGACY_HARDCODED_USER_ID)
+            .where('actor_type', 'user')
+            .update({actor_id: newId});
+
+        // 5. Update user_id inside session_data JSON
+        await knex.raw(`
+            UPDATE sessions
+            SET session_data = JSON_SET(session_data, '$.user_id', ?)
+            WHERE JSON_VALID(session_data)
+            AND JSON_EXTRACT(session_data, '$.user_id') = ?
+        `, [newId, LEGACY_HARDCODED_USER_ID]);
+
+        // Step 3: Clean up the now redundant user record identified by the
+        // legacy user ID as there should be no references to it anymore
+        await knex('users').where('id', LEGACY_HARDCODED_USER_ID).del();
+
+        logging.info(`Removed user with ID ${LEGACY_HARDCODED_USER_ID}`);
+
+        // Step 4: Restore the original slug and email on the cloned user record
+        await knex('users').where('id', newId).update({
+            slug,
+            email
+        });
+
+        logging.info(`Restored user slug and email: ${slug}, ${email}`);
+
+        logging.info(`Successfully updated user ID from ${LEGACY_HARDCODED_USER_ID} to ${newId}`);
+    },
+
+    async function down() {
+        // Major version migrations are not reversible
+        logging.warn('Reverting migration of user ID to ObjectID is not supported');
+    }
+);

package/core/server/data/migrations/versions/6.0/2025-06-25-15-03-29-remove-amp-from-settings.js

@@ -0,0 +1,6 @@
+const {combineTransactionalMigrations, removeSetting} = require('../../utils');
+
+module.exports = combineTransactionalMigrations(
+    removeSetting('amp'),
+    removeSetting('amp_gtag_id')
+);

package/core/server/data/migrations/versions/6.0/2025-06-30-13-59-10-remove-mail-events-table.js

@@ -0,0 +1,3 @@
+const {dropTables} = require('../../utils');
+
+module.exports = dropTables(['temp_mail_events']);

package/core/server/data/migrations/versions/6.0/2025-06-30-14-00-00-update-feature-image-alt-length.js

@@ -0,0 +1,25 @@
+const logging = require('@tryghost/logging');
+const {createNonTransactionalMigration} = require('../../utils');
+const DatabaseInfo = require('@tryghost/database-info');
+
+module.exports = createNonTransactionalMigration(
+    async function up(knex) {
+        if (DatabaseInfo.isSQLite(knex)) {
+            logging.warn('Skipping migration for SQLite3 (fixed-length VARCHAR columns are not enforced)');
+            return;
+        }
+        
+        logging.info('Changing posts_meta.feature_image_alt column from VARCHAR(191) to VARCHAR(2000)');
+        await knex.schema.alterTable('posts_meta', function (table) {
+            table.string('feature_image_alt', 2000).alter();
+        });
+
+        logging.info('Changing post_revisions.feature_image_alt column from VARCHAR(191) to VARCHAR(2000)');
+        await knex.schema.alterTable('post_revisions', function (table) {
+            table.string('feature_image_alt', 2000).alter();
+        });
+    },
+    async function down() {
+        logging.warn('Reverting posts_meta.feature_image_alt and post_revisions.feature_image_alt column length increases is not supported (major version migrations are not reversible)');
+    }
+);

package/core/server/data/schema/default-settings/default-settings.json

@@ -427,19 +427,6 @@
             "flags": "RO"
         }
     },
-    "amp": {
-        "amp": {
-            "defaultValue": "false",
-            "validations": {
-                "isIn": [["true", "false"]]
-            },
-            "type": "boolean"
-        },
-        "amp_gtag_id": {
-            "defaultValue": null,
-            "type": "string"
-        }
-    },
     "firstpromoter": {
         "firstpromoter": {
             "defaultValue": "false",

package/core/server/data/schema/fixtures/FixtureManager.js

@@ -8,8 +8,39 @@ const baseUtils = require('../../../models/base/utils');
 const moment = require('moment');
 
 class FixtureManager {
-    constructor(fixtures) {
-        this.fixtures = fixtures;
+    /**
+     * Create a new FixtureManager instance
+     *
+     * @param {Object} fixtures - The fixture data
+     * @param {Object<string, Function>} placeholderMap - Map of placeholder
+     * strings to replacement functions that will be called with the models
+     * object. The replacement function will be called with the models object
+     * and should return the replacement value. The replacement function will
+     * only be called once and its value will be cached for subsequent calls.
+     * The placeholder string will be replaced with the replacement value in
+     * the fixtures.
+     * @example
+     * new FixtureManager(fixtures, {
+     *     __OWNER_USER_ID__: (models) => models.User.generateId()
+     * })
+     */
+    constructor(fixtures, placeholderMap = {}) {
+        this._fixtures = fixtures;
+        this.placeholderMap = placeholderMap;
+        this.hasProcessedFixtures = false;
+    }
+
+    /**
+     * Lazily get the fixtures, processing placeholders on first access
+     * @returns {Object}
+     */
+    get fixtures() {
+        if (!this.hasProcessedFixtures) {
+            this._fixtures = this.processFixtures(this._fixtures, this.placeholderMap);
+            this.hasProcessedFixtures = true;
+        }
+
+        return this._fixtures;
     }
 
     /**
@@ -68,9 +99,17 @@ class FixtureManager {
      * @returns
      */
     async addAllFixtures(options) {
+        const ownerUserId = this.findOwnerUserId();
+
         const localOptions = _.merge({
             autoRefresh: false,
-            context: {internal: true},
+            context: {
+                internal: true,
+                // Ensure the owner user is set in the context when creating
+                // the fixtures so that attribution gets correctly set (i.e
+                // the owner user is set as the `published_by` user on posts)
+                user: ownerUserId
+            },
             migrating: true
         }, options);
 
@@ -85,7 +124,6 @@ class FixtureManager {
 
         await sequence(this.fixtures.models.filter(m => !['User', 'Role'].includes(m.name)).map(model => () => {
             logging.info('Model: ' + model.name);
-
             return this.addFixturesForModel(model, localOptions);
         }));
 
@@ -175,9 +213,94 @@ class FixtureManager {
         return foundRelation;
     }
 
+    /**
+     * ### Find Owner User ID
+     * Find the owner user ID from the relation fixture
+     * @returns {string}
+     */
+    findOwnerUserId() {
+        const relation = this.findRelationFixture('User', 'Role');
+
+        return Object.keys(relation.entries).find(
+            key => relation.entries[key].includes('Owner')
+        );
+    }
+
     /******************************************************
      * From here down, the methods require access to models
-     * But aren't dependent on this.fixtures
+     ******************************************************/
+
+    /**
+     * Process fixtures by replacing placeholder strings with dynamic values
+     *
+     * @param {Object} fixtures - The fixture data to process
+     * @param {Object<string, Function>} placeholderMap - Map of placeholder
+     * strings to replacement functions that will be called with the models
+     * object. The replacement function will be called with the models object
+     * and should return the replacement value. The replacement function will
+     * only be called once and its value will be cached for subsequent calls.
+     * The placeholder string will be replaced with the replacement value in
+     * the fixtures.
+     * @returns {Object}
+     */
+    processFixtures(fixtures, placeholderMap) {
+        const cache = new Map();
+
+        const processString = (str, replacements) => {
+            let result = str;
+
+            for (const placeholder in replacements) {
+                if (result.includes(placeholder)) {
+                    if (!cache.has(placeholder)) {
+                        cache.set(placeholder, replacements[placeholder](models));
+                    }
+
+                    const processedValue = cache.get(placeholder);
+
+                    result = result.replaceAll(placeholder, processedValue);
+                }
+            }
+
+            return result;
+        };
+
+        const replacePlaceholders = (obj, replacements) => {
+            if (obj === null || obj === undefined) {
+                return obj;
+            }
+
+            if (typeof obj === 'string') {
+                return processString(obj, replacements);
+            }
+
+            if (Array.isArray(obj)) {
+                return obj.map(item => replacePlaceholders(item, replacements));
+            }
+
+            if (typeof obj === 'object') {
+                const result = {};
+
+                for (const key in obj) {
+                    if (Object.prototype.hasOwnProperty.call(obj, key)) {
+                        // Process the key itself for placeholders
+                        const newKey = processString(key, replacements);
+
+                        result[newKey] = replacePlaceholders(obj[key], replacements);
+                    }
+                }
+
+                return result;
+            }
+
+            return obj;
+        };
+
+        return replacePlaceholders(fixtures, placeholderMap);
+    }
+
+    /******************************************************
+     * From here down, the methods aren't dependent on
+     * this.fixtures
      ******************************************************/
 
     /**