Skip to content

Commit

Permalink
[MOOSE-168]: Resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
MlKilderkin committed Dec 6, 2024
2 parents bde205e + c0e8a14 commit 0a49802
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 15 deletions.
25 changes: 17 additions & 8 deletions .lando.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: moose
recipe: wordpress
config:
php: '8.2'
database: mariadb
php: '8.3'
database: mariadb:11.5
composer_version: 2-latest
via: nginx
xdebug: false
Expand All @@ -12,12 +12,21 @@ services:
overrides:
environment:
- XDEBUG_TRIGGER=1
mailhog:
type: mailhog
portforward: true
hogfrom:
- appserver_nginx
- appserver

# Enabling MailHog will cause an error on start: `/bin/sh: 1: curl: not found`.
# Related GH Issue: https://github.com/lando/mailhog/issues/35
#
# The error doesn't actually cause any issues, but prevents lando from starting cleanly.
# If you need access to email from this site, enable the Mailhog service below.
# Otherwise, It's safe to keep this service disabled.

# mailhog:
# type: mailhog
# portforward: true
# hogfrom:
# - appserver_nginx
# - appserver

tooling:
xdebug-on:
service: appserver
Expand Down
9 changes: 4 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"phpstan/extension-installer": true
},
"platform": {
"php": "8.2"
"php": "8.3"
},
"platform-check": false
},
Expand Down Expand Up @@ -96,11 +96,10 @@
"php-stubs/wordpress-tests-stubs": "^6.2",
"phpstan/extension-installer": "^1.3",
"phpstan/phpstan": "^1.10",
"szepeviktor/phpstan-wordpress": "^1.3",
"wpackagist-plugin/debug-bar": "^1.1"
"szepeviktor/phpstan-wordpress": "^1.3"
},
"require": {
"php": "^8.2",
"php": "^8.3",
"ext-exif": "*",
"ext-gd": "*",
"ext-intl": "*",
Expand All @@ -115,14 +114,14 @@
"vinkla/extended-acf": "^13.6",
"vlucas/phpdotenv": "^5.5",
"wp-cli/wp-cli-bundle": "^2.8",
"wpackagist-plugin/debug-bar": "^1.1",
"wpackagist-plugin/disable-emojis": "1.7.6",
"wpackagist-plugin/duracelltomi-google-tag-manager": "1.20.2",
"wpackagist-plugin/limit-login-attempts-reloaded": "2.26.16",
"wpackagist-plugin/safe-svg": "2.2.6",
"wpackagist-plugin/seo-by-rank-math": "1.0.232",
"wpackagist-plugin/social-sharing-block": "^1.0",
"wpackagist-plugin/user-switching": "1.9.0",
"wpackagist-plugin/wp-tota11y": "^1.2",
"wpengine/advanced-custom-fields-pro": "6.3.11"
},
"extra": {
Expand Down
2 changes: 0 additions & 2 deletions wp-content/mu-plugins/force-plugin-activation.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ final class ForcePluginActivation {
'debug-bar/debug-bar.php' => [ 'local', 'development' ],
'limit-login-attempts-reloaded/limit-login-attempts-reloaded.php' => [ 'development', 'staging', 'production' ],
'tribe-glomar/tribe-glomar.php' => [ 'development', 'staging' ],
'wp-tota11y/wp-tota11y.php' => [ 'local', 'development', 'staging' ],
];

/**
Expand All @@ -64,7 +63,6 @@ final class ForcePluginActivation {
private array $networkOnlyPlugins = [
'advanced-custom-fields-pro/acf.php' => [ 'all' ],
'debug-bar/debug-bar.php' => [ 'local', 'development' ],
'wp-tota11y/wp-tota11y.php' => [ 'local', 'development', 'staging' ],
];

/**
Expand Down

0 comments on commit 0a49802

Please sign in to comment.