summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore6
-rw-r--r--composer.json2
-rw-r--r--composer.lock156
-rw-r--r--public/index.php4
-rw-r--r--public/wp-config.php11
-rw-r--r--wp-cli.yml2
-rw-r--r--wp-config.example.php7
7 files changed, 99 insertions, 89 deletions
diff --git a/.gitignore b/.gitignore
index ea3b049..d9003b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
-vendor/
+/vendor/
+/wp-config.php
# WordPress
-public/*
-!public/wp-content/
+public/wp
public/wp-content/*
!public/wp-content/plugins/
public/wp-content/plugins/*
diff --git a/composer.json b/composer.json
index 0825fa8..6422c41 100644
--- a/composer.json
+++ b/composer.json
@@ -25,6 +25,6 @@
]
},
"extra": {
- "wordpress-install-dir": "public"
+ "wordpress-install-dir": "public/wp"
}
}
diff --git a/composer.lock b/composer.lock
index 1b70a63..c915aae 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": "90d26c4a381ef0315fe70003f6f39885",
+ "content-hash": "1eac42c8ca49a334a100c6e05c5a52cb",
"packages": [
{
"name": "composer/ca-bundle",
@@ -84,16 +84,16 @@
},
{
"name": "composer/composer",
- "version": "1.10.19",
+ "version": "1.10.20",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
- "reference": "196601d50c08c3fae389a417a7689367fcf37cef"
+ "reference": "e55d297525f0ecc805c813a0f63a40114fd670f6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/composer/zipball/196601d50c08c3fae389a417a7689367fcf37cef",
- "reference": "196601d50c08c3fae389a417a7689367fcf37cef",
+ "url": "https://api.github.com/repos/composer/composer/zipball/e55d297525f0ecc805c813a0f63a40114fd670f6",
+ "reference": "e55d297525f0ecc805c813a0f63a40114fd670f6",
"shasum": ""
},
"require": {
@@ -163,7 +163,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/composer/issues",
- "source": "https://github.com/composer/composer/tree/1.10.19"
+ "source": "https://github.com/composer/composer/tree/1.10.20"
},
"funding": [
{
@@ -179,7 +179,7 @@
"type": "tidelift"
}
],
- "time": "2020-12-04T08:14:16+00:00"
+ "time": "2021-01-27T14:41:06+00:00"
},
{
"name": "composer/installers",
@@ -685,20 +685,20 @@
},
{
"name": "johnpbloch/wordpress",
- "version": "5.6.0",
+ "version": "5.6.1",
"source": {
"type": "git",
"url": "https://github.com/johnpbloch/wordpress.git",
- "reference": "3055975734646c8d0b8caf7b5af168ced6ec4309"
+ "reference": "d7a597988102967cdfc28851b6b897d018613823"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/johnpbloch/wordpress/zipball/3055975734646c8d0b8caf7b5af168ced6ec4309",
- "reference": "3055975734646c8d0b8caf7b5af168ced6ec4309",
+ "url": "https://api.github.com/repos/johnpbloch/wordpress/zipball/d7a597988102967cdfc28851b6b897d018613823",
+ "reference": "d7a597988102967cdfc28851b6b897d018613823",
"shasum": ""
},
"require": {
- "johnpbloch/wordpress-core": "5.6.0",
+ "johnpbloch/wordpress-core": "5.6.1",
"johnpbloch/wordpress-core-installer": "^1.0 || ^2.0",
"php": ">=5.6.20"
},
@@ -727,20 +727,20 @@
"source": "http://core.trac.wordpress.org/browser",
"wiki": "http://codex.wordpress.org/"
},
- "time": "2020-12-08T22:34:35+00:00"
+ "time": "2021-02-03T21:27:41+00:00"
},
{
"name": "johnpbloch/wordpress-core",
- "version": "5.6.0",
+ "version": "5.6.1",
"source": {
"type": "git",
"url": "https://github.com/johnpbloch/wordpress-core.git",
- "reference": "f074617dd69f466302836d1ae5de75c0bd7b6dfd"
+ "reference": "82592ec73d42cf784da38adb0028a24dbacab1b4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/johnpbloch/wordpress-core/zipball/f074617dd69f466302836d1ae5de75c0bd7b6dfd",
- "reference": "f074617dd69f466302836d1ae5de75c0bd7b6dfd",
+ "url": "https://api.github.com/repos/johnpbloch/wordpress-core/zipball/82592ec73d42cf784da38adb0028a24dbacab1b4",
+ "reference": "82592ec73d42cf784da38adb0028a24dbacab1b4",
"shasum": ""
},
"require": {
@@ -748,7 +748,7 @@
"php": ">=5.6.20"
},
"provide": {
- "wordpress/core-implementation": "5.6.0"
+ "wordpress/core-implementation": "5.6.1"
},
"type": "wordpress-core",
"notification-url": "https://packagist.org/downloads/",
@@ -775,7 +775,7 @@
"source": "https://core.trac.wordpress.org/browser",
"wiki": "https://codex.wordpress.org/"
},
- "time": "2020-12-08T22:34:23+00:00"
+ "time": "2021-02-03T21:27:35+00:00"
},
{
"name": "johnpbloch/wordpress-core-installer",
@@ -1426,16 +1426,16 @@
},
{
"name": "symfony/console",
- "version": "v5.2.1",
+ "version": "v5.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "47c02526c532fb381374dab26df05e7313978976"
+ "reference": "89d4b176d12a2946a1ae4e34906a025b7b6b135a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/47c02526c532fb381374dab26df05e7313978976",
- "reference": "47c02526c532fb381374dab26df05e7313978976",
+ "url": "https://api.github.com/repos/symfony/console/zipball/89d4b176d12a2946a1ae4e34906a025b7b6b135a",
+ "reference": "89d4b176d12a2946a1ae4e34906a025b7b6b135a",
"shasum": ""
},
"require": {
@@ -1494,7 +1494,7 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Console Component",
+ "description": "Eases the creation of beautiful and testable command line interfaces",
"homepage": "https://symfony.com",
"keywords": [
"cli",
@@ -1503,7 +1503,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v5.2.1"
+ "source": "https://github.com/symfony/console/tree/v5.2.3"
},
"funding": [
{
@@ -1519,20 +1519,20 @@
"type": "tidelift"
}
],
- "time": "2020-12-18T08:03:05+00:00"
+ "time": "2021-01-28T22:06:19+00:00"
},
{
"name": "symfony/filesystem",
- "version": "v5.2.1",
+ "version": "v5.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "fa8f8cab6b65e2d99a118e082935344c5ba8c60d"
+ "reference": "262d033b57c73e8b59cd6e68a45c528318b15038"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/fa8f8cab6b65e2d99a118e082935344c5ba8c60d",
- "reference": "fa8f8cab6b65e2d99a118e082935344c5ba8c60d",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/262d033b57c73e8b59cd6e68a45c528318b15038",
+ "reference": "262d033b57c73e8b59cd6e68a45c528318b15038",
"shasum": ""
},
"require": {
@@ -1562,10 +1562,10 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Filesystem Component",
+ "description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/filesystem/tree/v5.2.1"
+ "source": "https://github.com/symfony/filesystem/tree/v5.2.3"
},
"funding": [
{
@@ -1581,20 +1581,20 @@
"type": "tidelift"
}
],
- "time": "2020-11-30T17:05:38+00:00"
+ "time": "2021-01-27T10:01:46+00:00"
},
{
"name": "symfony/finder",
- "version": "v5.2.1",
+ "version": "v5.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "0b9231a5922fd7287ba5b411893c0ecd2733e5ba"
+ "reference": "4adc8d172d602008c204c2e16956f99257248e03"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/0b9231a5922fd7287ba5b411893c0ecd2733e5ba",
- "reference": "0b9231a5922fd7287ba5b411893c0ecd2733e5ba",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/4adc8d172d602008c204c2e16956f99257248e03",
+ "reference": "4adc8d172d602008c204c2e16956f99257248e03",
"shasum": ""
},
"require": {
@@ -1623,10 +1623,10 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Finder Component",
+ "description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v5.2.1"
+ "source": "https://github.com/symfony/finder/tree/v5.2.3"
},
"funding": [
{
@@ -1642,11 +1642,11 @@
"type": "tidelift"
}
],
- "time": "2020-12-08T17:02:38+00:00"
+ "time": "2021-01-28T22:06:19+00:00"
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.22.0",
+ "version": "v1.22.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
@@ -1705,7 +1705,7 @@
"portable"
],
"support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.0"
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1"
},
"funding": [
{
@@ -1725,16 +1725,16 @@
},
{
"name": "symfony/polyfill-intl-grapheme",
- "version": "v1.22.0",
+ "version": "v1.22.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
- "reference": "267a9adeb8ecb8071040a740930e077cdfb987af"
+ "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/267a9adeb8ecb8071040a740930e077cdfb987af",
- "reference": "267a9adeb8ecb8071040a740930e077cdfb987af",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/5601e09b69f26c1828b13b6bb87cb07cddba3170",
+ "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170",
"shasum": ""
},
"require": {
@@ -1786,7 +1786,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.22.0"
+ "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.22.1"
},
"funding": [
{
@@ -1802,20 +1802,20 @@
"type": "tidelift"
}
],
- "time": "2021-01-07T16:49:33+00:00"
+ "time": "2021-01-22T09:19:47+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
- "version": "v1.22.0",
+ "version": "v1.22.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
- "reference": "6e971c891537eb617a00bb07a43d182a6915faba"
+ "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/6e971c891537eb617a00bb07a43d182a6915faba",
- "reference": "6e971c891537eb617a00bb07a43d182a6915faba",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248",
+ "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248",
"shasum": ""
},
"require": {
@@ -1870,7 +1870,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.0"
+ "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.1"
},
"funding": [
{
@@ -1886,20 +1886,20 @@
"type": "tidelift"
}
],
- "time": "2021-01-07T17:09:11+00:00"
+ "time": "2021-01-22T09:19:47+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.22.0",
+ "version": "v1.22.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13"
+ "reference": "5232de97ee3b75b0360528dae24e73db49566ab1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f377a3dd1fde44d37b9831d68dc8dea3ffd28e13",
- "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1",
+ "reference": "5232de97ee3b75b0360528dae24e73db49566ab1",
"shasum": ""
},
"require": {
@@ -1950,7 +1950,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1"
},
"funding": [
{
@@ -1966,11 +1966,11 @@
"type": "tidelift"
}
],
- "time": "2021-01-07T16:49:33+00:00"
+ "time": "2021-01-22T09:19:47+00:00"
},
{
"name": "symfony/polyfill-php73",
- "version": "v1.22.0",
+ "version": "v1.22.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
@@ -2029,7 +2029,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.0"
+ "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.1"
},
"funding": [
{
@@ -2049,7 +2049,7 @@
},
{
"name": "symfony/polyfill-php80",
- "version": "v1.22.0",
+ "version": "v1.22.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
@@ -2112,7 +2112,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.0"
+ "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1"
},
"funding": [
{
@@ -2132,16 +2132,16 @@
},
{
"name": "symfony/process",
- "version": "v5.2.1",
+ "version": "v5.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "bd8815b8b6705298beaa384f04fabd459c10bedd"
+ "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/bd8815b8b6705298beaa384f04fabd459c10bedd",
- "reference": "bd8815b8b6705298beaa384f04fabd459c10bedd",
+ "url": "https://api.github.com/repos/symfony/process/zipball/313a38f09c77fbcdc1d223e57d368cea76a2fd2f",
+ "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f",
"shasum": ""
},
"require": {
@@ -2171,10 +2171,10 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Process Component",
+ "description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v5.2.1"
+ "source": "https://github.com/symfony/process/tree/v5.2.3"
},
"funding": [
{
@@ -2190,7 +2190,7 @@
"type": "tidelift"
}
],
- "time": "2020-12-08T17:03:37+00:00"
+ "time": "2021-01-27T10:15:41+00:00"
},
{
"name": "symfony/service-contracts",
@@ -2273,16 +2273,16 @@
},
{
"name": "symfony/string",
- "version": "v5.2.1",
+ "version": "v5.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "5bd67751d2e3f7d6f770c9154b8fbcb2aa05f7ed"
+ "reference": "c95468897f408dd0aca2ff582074423dd0455122"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/5bd67751d2e3f7d6f770c9154b8fbcb2aa05f7ed",
- "reference": "5bd67751d2e3f7d6f770c9154b8fbcb2aa05f7ed",
+ "url": "https://api.github.com/repos/symfony/string/zipball/c95468897f408dd0aca2ff582074423dd0455122",
+ "reference": "c95468897f408dd0aca2ff582074423dd0455122",
"shasum": ""
},
"require": {
@@ -2325,7 +2325,7 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony String component",
+ "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
"homepage": "https://symfony.com",
"keywords": [
"grapheme",
@@ -2336,7 +2336,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v5.2.1"
+ "source": "https://github.com/symfony/string/tree/v5.2.3"
},
"funding": [
{
@@ -2352,7 +2352,7 @@
"type": "tidelift"
}
],
- "time": "2020-12-05T07:33:16+00:00"
+ "time": "2021-01-25T15:14:59+00:00"
},
{
"name": "wp-cli/cache-command",
diff --git a/public/index.php b/public/index.php
new file mode 100644
index 0000000..c2dcbbf
--- /dev/null
+++ b/public/index.php
@@ -0,0 +1,4 @@
+<?php
+
+define('WP_USE_THEMES', true);
+require(__DIR__ . '/wp/wp-blog-header.php');
diff --git a/public/wp-config.php b/public/wp-config.php
new file mode 100644
index 0000000..8503bb3
--- /dev/null
+++ b/public/wp-config.php
@@ -0,0 +1,11 @@
+<?php
+
+if (! defined('ABSPATH')) {
+ define('ABSPATH', __DIR__ . '/wp/');
+}
+
+define('WP_CONTENT_DIR', __DIR__ . '/wp-content');
+
+require_once dirname(__DIR__) . '/vendor/autoload.php';
+require_once dirname(__DIR__) . '/wp-config.php';
+require_once ABSPATH . 'wp-settings.php';
diff --git a/wp-cli.yml b/wp-cli.yml
new file mode 100644
index 0000000..ef70a51
--- /dev/null
+++ b/wp-cli.yml
@@ -0,0 +1,2 @@
+path: public/wp
+config-file: wp-config.php
diff --git a/wp-config.example.php b/wp-config.example.php
index 7003c2e..6f6f9b4 100644
--- a/wp-config.example.php
+++ b/wp-config.example.php
@@ -37,10 +37,3 @@ if (WP_ENVIRONMENT_TYPE === 'development') {
define('SCRIPT_DEBUG', false);
define('DISALLOW_FILE_MODS', true);
}
-
-if (! defined('ABSPATH')) {
- define('ABSPATH', __DIR__ . '/public/');
-}
-
-require_once __DIR__ . '/vendor/autoload.php';
-require_once ABSPATH . 'wp-settings.php';