diff --git a/composer.json b/composer.json
index d33dbf6e563cb5290fd7986f40695d306151f9a3..fca03f5cef887253538b9edf577caa36b9a7ef8c 100644
--- a/composer.json
+++ b/composer.json
@@ -31,10 +31,11 @@
"allow-plugins": {
"bjornjohansen/wplang": true,
"cweagans/composer-patches": true,
- "johnpbloch/wordpress-core-installer": true,
+ "roots/wordpress-core-installer": true,
"koodimonni/composer-dropin-installer": true,
"composer/installers": true,
- "oomphinc/composer-installers-extender": true
+ "oomphinc/composer-installers-extender": true,
+ "johnpbloch/wordpress-core-installer": false
}
},
"require": {
@@ -43,7 +44,6 @@
"oomphinc/composer-installers-extender": "2.0.1",
"cweagans/composer-patches": "1.7.3",
"koodimonni/composer-dropin-installer": "1.4",
- "johnpbloch/wordpress": "6.5.4",
"bjornjohansen/wplang": "0.2.0",
"wpackagist-plugin/disable-wordpress-updates": "1.7.1",
"wpackagist-plugin/more-privacy-options": "4.6",
@@ -103,7 +103,6 @@
"humanmade/ludicrousdb": "5.0.6",
"wpackagist-plugin/creative-commons": "^2021.04",
"wpackagist-plugin/disable-remove-google-fonts": "1.5.7",
- "wpackagist-plugin/footnotes": "2.7.3",
"wpackagist-plugin/wpuntexturize": "2.2.1",
"wpackagist-theme/seedlet": "1.1.13",
"wpackagist-theme/enjoyblog": "1.0.8",
@@ -122,7 +121,8 @@
"noblogs/wp-mat": "0.1.4",
"wpackagist-plugin/secure-encrypted-form": "1.0.1",
"wpackagist-theme/twentytwentyone": "2.2",
- "wpackagist-plugin/wpgancio": "1.12"
+ "wpackagist-plugin/wpgancio": "1.12",
+ "roots/wordpress": "6.5.4"
},
"extra": {
"wordpress-install-dir": "app",
diff --git a/composer.lock b/composer.lock
index e1aecdf0e37b0aea2746cdde381eba37972ed054..4c0183b47fdad5564440596a38251b2d0cb8aa49 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "15ce2e5f19a5be2fcb78918e5f79b7dd",
+ "content-hash": "3d637c027fbee8c266043e73acc2d641",
"packages": [
{
"name": "bjornjohansen/wplang",
@@ -295,154 +295,6 @@
},
"time": "2023-05-19T19:41:28+00:00"
},
- {
- "name": "johnpbloch/wordpress",
- "version": "6.5.4",
- "source": {
- "type": "git",
- "url": "https://github.com/johnpbloch/wordpress.git",
- "reference": "435a5320201357f7232fb5745024a123cbfb69c0"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/johnpbloch/wordpress/zipball/435a5320201357f7232fb5745024a123cbfb69c0",
- "reference": "435a5320201357f7232fb5745024a123cbfb69c0",
- "shasum": ""
- },
- "require": {
- "johnpbloch/wordpress-core": "6.5.4",
- "johnpbloch/wordpress-core-installer": "^1.0 || ^2.0",
- "php": ">=7.0.0"
- },
- "type": "package",
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "GPL-2.0-or-later"
- ],
- "authors": [
- {
- "name": "WordPress Community",
- "homepage": "https://wordpress.org/about/"
- }
- ],
- "description": "WordPress is open source software you can use to create a beautiful website, blog, or app.",
- "homepage": "https://wordpress.org/",
- "keywords": [
- "blog",
- "cms",
- "wordpress"
- ],
- "support": {
- "docs": "https://developer.wordpress.org/",
- "forum": "https://wordpress.org/support/",
- "irc": "irc://irc.freenode.net/wordpress",
- "issues": "https://core.trac.wordpress.org/",
- "source": "https://core.trac.wordpress.org/browser"
- },
- "time": "2024-06-05T15:31:11+00:00"
- },
- {
- "name": "johnpbloch/wordpress-core",
- "version": "6.5.4",
- "source": {
- "type": "git",
- "url": "https://github.com/johnpbloch/wordpress-core.git",
- "reference": "3ca1d2c88cc4b4d06e860424b38ff9ac9a6e200c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/johnpbloch/wordpress-core/zipball/3ca1d2c88cc4b4d06e860424b38ff9ac9a6e200c",
- "reference": "3ca1d2c88cc4b4d06e860424b38ff9ac9a6e200c",
- "shasum": ""
- },
- "require": {
- "ext-json": "*",
- "php": ">=7.0.0"
- },
- "provide": {
- "wordpress/core-implementation": "6.5.4"
- },
- "type": "wordpress-core",
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "GPL-2.0-or-later"
- ],
- "authors": [
- {
- "name": "WordPress Community",
- "homepage": "https://wordpress.org/about/"
- }
- ],
- "description": "WordPress is open source software you can use to create a beautiful website, blog, or app.",
- "homepage": "https://wordpress.org/",
- "keywords": [
- "blog",
- "cms",
- "wordpress"
- ],
- "support": {
- "forum": "https://wordpress.org/support/",
- "irc": "irc://irc.freenode.net/wordpress",
- "issues": "https://core.trac.wordpress.org/",
- "source": "https://core.trac.wordpress.org/browser",
- "wiki": "https://codex.wordpress.org/"
- },
- "time": "2024-06-05T15:31:06+00:00"
- },
- {
- "name": "johnpbloch/wordpress-core-installer",
- "version": "2.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/johnpbloch/wordpress-core-installer.git",
- "reference": "237faae9a60a4a2e1d45dce1a5836ffa616de63e"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/johnpbloch/wordpress-core-installer/zipball/237faae9a60a4a2e1d45dce1a5836ffa616de63e",
- "reference": "237faae9a60a4a2e1d45dce1a5836ffa616de63e",
- "shasum": ""
- },
- "require": {
- "composer-plugin-api": "^1.0 || ^2.0",
- "php": ">=5.6.0"
- },
- "conflict": {
- "composer/installers": "<1.0.6"
- },
- "require-dev": {
- "composer/composer": "^1.0 || ^2.0",
- "phpunit/phpunit": ">=5.7.27"
- },
- "type": "composer-plugin",
- "extra": {
- "class": "johnpbloch\\Composer\\WordPressCorePlugin"
- },
- "autoload": {
- "psr-0": {
- "johnpbloch\\Composer\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "GPL-2.0-or-later"
- ],
- "authors": [
- {
- "name": "John P. Bloch",
- "email": "me@johnpbloch.com"
- }
- ],
- "description": "A custom installer to handle deploying WordPress with composer",
- "keywords": [
- "wordpress"
- ],
- "support": {
- "issues": "https://github.com/johnpbloch/wordpress-core-installer/issues",
- "source": "https://github.com/johnpbloch/wordpress-core-installer/tree/master"
- },
- "time": "2020-04-16T21:44:57+00:00"
- },
{
"name": "koodimonni/composer-dropin-installer",
"version": "1.4",
@@ -860,6 +712,190 @@
},
"time": "2021-12-15T12:32:42+00:00"
},
+ {
+ "name": "roots/wordpress",
+ "version": "6.5.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/roots/wordpress.git",
+ "reference": "41ff6e23ccbc3a1691406d69fe8c211a225514e2"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/roots/wordpress/zipball/41ff6e23ccbc3a1691406d69fe8c211a225514e2",
+ "reference": "41ff6e23ccbc3a1691406d69fe8c211a225514e2",
+ "shasum": ""
+ },
+ "require": {
+ "roots/wordpress-core-installer": "^1.0.0",
+ "roots/wordpress-no-content": "self.version"
+ },
+ "type": "metapackage",
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT",
+ "GPL-2.0-or-later"
+ ],
+ "description": "WordPress is open source software you can use to create a beautiful website, blog, or app.",
+ "homepage": "https://wordpress.org/",
+ "keywords": [
+ "blog",
+ "cms",
+ "wordpress"
+ ],
+ "support": {
+ "issues": "https://github.com/roots/wordpress/issues",
+ "source": "https://github.com/roots/wordpress/tree/6.5.4"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/roots",
+ "type": "github"
+ }
+ ],
+ "time": "2022-06-01T16:54:37+00:00"
+ },
+ {
+ "name": "roots/wordpress-core-installer",
+ "version": "1.100.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/roots/wordpress-core-installer.git",
+ "reference": "73f8488e5178c5d54234b919f823a9095e2b1847"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/roots/wordpress-core-installer/zipball/73f8488e5178c5d54234b919f823a9095e2b1847",
+ "reference": "73f8488e5178c5d54234b919f823a9095e2b1847",
+ "shasum": ""
+ },
+ "require": {
+ "composer-plugin-api": "^1.0 || ^2.0",
+ "php": ">=5.6.0"
+ },
+ "conflict": {
+ "composer/installers": "<1.0.6"
+ },
+ "replace": {
+ "johnpbloch/wordpress-core-installer": "*"
+ },
+ "require-dev": {
+ "composer/composer": "^1.0 || ^2.0",
+ "phpunit/phpunit": ">=5.7.27"
+ },
+ "type": "composer-plugin",
+ "extra": {
+ "class": "Roots\\Composer\\WordPressCorePlugin"
+ },
+ "autoload": {
+ "psr-4": {
+ "Roots\\Composer\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "GPL-2.0-or-later"
+ ],
+ "authors": [
+ {
+ "name": "John P. Bloch",
+ "email": "me@johnpbloch.com"
+ },
+ {
+ "name": "Roots",
+ "email": "team@roots.io"
+ }
+ ],
+ "description": "A custom installer to handle deploying WordPress with composer",
+ "keywords": [
+ "wordpress"
+ ],
+ "support": {
+ "issues": "https://github.com/roots/wordpress-core-installer/issues",
+ "source": "https://github.com/roots/wordpress-core-installer/tree/master"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/roots",
+ "type": "github"
+ },
+ {
+ "url": "https://www.patreon.com/rootsdev",
+ "type": "patreon"
+ }
+ ],
+ "time": "2020-08-20T00:27:30+00:00"
+ },
+ {
+ "name": "roots/wordpress-no-content",
+ "version": "6.5.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/WordPress/WordPress.git",
+ "reference": "6.5.4"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://downloads.wordpress.org/release/wordpress-6.5.4-no-content.zip",
+ "shasum": "bb4d48b2f6f47f4c06061460c83f8453e9809af5"
+ },
+ "require": {
+ "php": ">= 7.0.0"
+ },
+ "provide": {
+ "wordpress/core-implementation": "6.5.4"
+ },
+ "suggest": {
+ "ext-curl": "Performs remote request operations.",
+ "ext-dom": "Used to validate Text Widget content and to automatically configuring IIS7+.",
+ "ext-exif": "Works with metadata stored in images.",
+ "ext-fileinfo": "Used to detect mimetype of file uploads.",
+ "ext-hash": "Used for hashing, including passwords and update packages.",
+ "ext-imagick": "Provides better image quality for media uploads.",
+ "ext-json": "Used for communications with other servers.",
+ "ext-libsodium": "Validates Signatures and provides securely random bytes.",
+ "ext-mbstring": "Used to properly handle UTF8 text.",
+ "ext-mysqli": "Connects to MySQL for database interactions.",
+ "ext-openssl": "Permits SSL-based connections to other hosts.",
+ "ext-pcre": "Increases performance of pattern matching in code searches.",
+ "ext-xml": "Used for XML parsing, such as from a third-party site.",
+ "ext-zip": "Used for decompressing Plugins, Themes, and WordPress update packages."
+ },
+ "type": "wordpress-core",
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "GPL-2.0-or-later"
+ ],
+ "authors": [
+ {
+ "name": "WordPress Community",
+ "homepage": "https://wordpress.org/about/"
+ }
+ ],
+ "description": "WordPress is open source software you can use to create a beautiful website, blog, or app.",
+ "homepage": "https://wordpress.org/",
+ "keywords": [
+ "blog",
+ "cms",
+ "wordpress"
+ ],
+ "support": {
+ "docs": "https://developer.wordpress.org/",
+ "forum": "https://wordpress.org/support/",
+ "irc": "irc://irc.freenode.net/wordpress",
+ "issues": "https://core.trac.wordpress.org/",
+ "rss": "https://wordpress.org/news/feed/",
+ "source": "https://core.trac.wordpress.org/browser",
+ "wiki": "https://codex.wordpress.org/"
+ },
+ "funding": [
+ {
+ "url": "https://wordpressfoundation.org/donate/",
+ "type": "other"
+ }
+ ],
+ "time": "2024-06-06T12:30:39+00:00"
+ },
{
"name": "wpackagist-plugin/activitypub",
"version": "2.4.0",
@@ -1076,24 +1112,6 @@
"type": "wordpress-plugin",
"homepage": "https://wordpress.org/plugins/footnotation/"
},
- {
- "name": "wpackagist-plugin/footnotes",
- "version": "2.7.3",
- "source": {
- "type": "svn",
- "url": "https://plugins.svn.wordpress.org/footnotes/",
- "reference": "tags/2.7.3"
- },
- "dist": {
- "type": "zip",
- "url": "https://downloads.wordpress.org/plugin/footnotes.2.7.3.zip"
- },
- "require": {
- "composer/installers": "^1.0 || ^2.0"
- },
- "type": "wordpress-plugin",
- "homepage": "https://wordpress.org/plugins/footnotes/"
- },
{
"name": "wpackagist-plugin/gallery-block-lightbox",
"version": "1.13",
@@ -2023,5 +2041,5 @@
"php": ">=7.1"
},
"platform-dev": [],
- "plugin-api-version": "2.2.0"
+ "plugin-api-version": "2.3.0"
}
diff --git a/composer.patches.json b/composer.patches.json
index d18c4dbaa82e0ef866e2b5f87202480e270ecd3f..899c61b43f0d76295fbac4cb57b1304f428e6909 100644
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -1,6 +1,6 @@
{
"patches": {
- "johnpbloch/wordpress-core": {
+ "roots/wordpress-core": {
"Anonymize requests to api.wordpress.org for updates": "patches/core/anonymize-update.php.patch",
"Do not perform pingbacks and trackbacks when we update via cron": "patches/core/0103-Remove-pingback-trackback.patch",
"Load JS library locally instead than from Googleapis": "patches/core/0155-Removing-reference-to-googleapis-from-wp-includes-up.patch",