From d5793afed162e77739ad4e11d37b5e60eedeb577 Mon Sep 17 00:00:00 2001 From: Kirtan Gajjar Date: Fri, 25 Dec 2020 15:07:28 +0530 Subject: [PATCH 1/4] =?UTF-8?q?Remove=20wp-cli=20autoloader=20=F0=9F=A5=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 39662ae2..6d68fc79 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,16 @@ "files": [ "src/helper/hooks.php", "src/helper/site-utils.php", - "site-command.php" + "site-command.php", + "src/helper/class-ee-site.php", + "src/helper/SimpleDnsCloudflareSolver.php", + "src/helper/Site_Self_Signed.php", + "src/helper/Site_Letsencrypt.php", + "src/helper/Shutdown_Handler.php", + "src/db/Site.php", + "src/db/Site-Meta.php", + "src/site-type/Site_HTML_Docker.php", + "src/site-type/html.php" ] }, "extra": { From 0d1c50cd4808c28640f46aa939a0b8c64d1ee8bc Mon Sep 17 00:00:00 2001 From: Kirtan Gajjar Date: Sat, 5 Jun 2021 14:52:00 +0530 Subject: [PATCH 2/4] Added files to psr-4 autoloading --- composer.json | 11 ++++------- src/site-type/{html.php => HTML.php} | 0 2 files changed, 4 insertions(+), 7 deletions(-) rename src/site-type/{html.php => HTML.php} (100%) diff --git a/composer.json b/composer.json index 6d68fc79..b3ef75d8 100644 --- a/composer.json +++ b/composer.json @@ -10,21 +10,18 @@ "autoload": { "psr-4": { "": "src/", + "EE\\Model\\": "src/db/", + "EE\\Site\\Type\\": "src/site-type/", "AcmePhp\\Cli\\": "AcmePhp/Cli" }, "files": [ - "src/helper/hooks.php", - "src/helper/site-utils.php", "site-command.php", + "src/helper/site-utils.php", "src/helper/class-ee-site.php", "src/helper/SimpleDnsCloudflareSolver.php", "src/helper/Site_Self_Signed.php", "src/helper/Site_Letsencrypt.php", - "src/helper/Shutdown_Handler.php", - "src/db/Site.php", - "src/db/Site-Meta.php", - "src/site-type/Site_HTML_Docker.php", - "src/site-type/html.php" + "src/helper/Shutdown_Handler.php" ] }, "extra": { diff --git a/src/site-type/html.php b/src/site-type/HTML.php similarity index 100% rename from src/site-type/html.php rename to src/site-type/HTML.php From b92ebcb8606827eab968c5fb4aa562476b4a55f6 Mon Sep 17 00:00:00 2001 From: Kirtan Gajjar Date: Wed, 9 Jun 2021 16:24:53 +0530 Subject: [PATCH 3/4] Make changes so tests/building phar would work --- site-command.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/site-command.php b/site-command.php index ca774d3a..6a8a5e71 100644 --- a/site-command.php +++ b/site-command.php @@ -15,17 +15,21 @@ define( 'GLOBAL_BACKEND_NETWORK', 'ee-global-backend-network' ); } +if ( ! defined( 'EE_ROOT_DIR' ) ) { + define( 'EE_ROOT_DIR', '/opt/easyengine' ); +} + if ( ! class_exists( 'EE' ) ) { return; } -$sites_path = EE_ROOT_DIR . '/sites'; +$sites_path = EE_ROOT_DIR . '/sites/'; if ( ! is_dir( $sites_path ) ) { mkdir( $sites_path ); } -define( 'WEBROOT', \EE\Utils\trailingslashit( $sites_path ) ); +define( 'WEBROOT', $sites_path ); $autoload = dirname( __FILE__ ) . '/vendor/autoload.php'; if ( file_exists( $autoload ) ) { From f2aa32606abf50fa64b3d86cfd4981d12189a12b Mon Sep 17 00:00:00 2001 From: Kirtan Gajjar Date: Thu, 10 Jun 2021 16:06:49 +0530 Subject: [PATCH 4/4] Add hooks.php to composer.json --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index b3ef75d8..6f6e8e6f 100644 --- a/composer.json +++ b/composer.json @@ -16,6 +16,7 @@ }, "files": [ "site-command.php", + "src/helper/hooks.php", "src/helper/site-utils.php", "src/helper/class-ee-site.php", "src/helper/SimpleDnsCloudflareSolver.php",