Merge branch '1.x-1.x' into issue-111-update-command

Author: yorkshire-pudding

.gitattributes

@@ -0,0 +1,3 @@
+# Get PHP syntax highlighting for these file extensions.
+
+*.inc linguist-language=php

.github/workflows/phpcs.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: backdrop-ops/phpcs
-          ref: 1.0.0
+          ref: 1.1.0
           path: phpcs
       - name: Move standard outside current dir
         run: mv phpcs ..

.lando.yml

@@ -2,15 +2,18 @@ name: bee
 recipe: backdrop
 keys: false
 config:
-  php: 8.3
+  php: 8.4
   webroot: backdrop
-  database: mysql
+  database: mysql:8.0
   # Set Xdebug off by default. We use the tooling below to turn it on as needed.
   xdebug: false
   # Need to disable bee so can use the version in the repo.
   bee: false
 services:
   appserver:
+    # Allow scanner to fail faster; http paths often fail locally.
+    scanner:
+      retry: 5
     config:
       php: .lando/php.ini
     build_as_root:
@@ -42,8 +45,12 @@ services:
   database:
     healthcheck: mysql --defaults-extra-file=/app/.lando/mysql.cnf --silent --execute "SHOW DATABASES;"
   multisite:
-    type: php:8.3
+    type: php:8.4
     webroot: multisite
+    ssl: true
+    # Allow scanner to fail faster; http paths often fail locally.
+    scanner:
+      retry: 5
 events:
   pre-rebuild:
     # Run clean-up tasks.

.lando/setup.sh

@@ -22,10 +22,11 @@ set_up() {
   cd /app
 
   # Create databases.
-  mysql -h database -u root -e "CREATE DATABASE IF NOT EXISTS backdrop; GRANT ALL PRIVILEGES ON backdrop.* TO 'backdrop'@'%' IDENTIFIED by 'backdrop';"
-  mysql -h database -u root -e "CREATE DATABASE multi_one; GRANT ALL PRIVILEGES ON multi_one.* TO 'backdrop'@'%' IDENTIFIED by 'backdrop';"
-  mysql -h database -u root -e "CREATE DATABASE multi_two; GRANT ALL PRIVILEGES ON multi_two.* TO 'backdrop'@'%' IDENTIFIED by 'backdrop';"
-  mysql -h database -u root -e "CREATE DATABASE install_test; GRANT ALL PRIVILEGES ON install_test.* TO 'backdrop'@'%' IDENTIFIED by 'backdrop';"
+  mysql -h database -u root -e "CREATE USER IF NOT EXISTS 'backdrop'@'%' IDENTIFIED BY 'backdrop';"
+  mysql -h database -u root -e "CREATE DATABASE IF NOT EXISTS backdrop; GRANT ALL PRIVILEGES ON backdrop.* TO 'backdrop'@'%';"
+  mysql -h database -u root -e "CREATE DATABASE IF NOT EXISTS multi_one; GRANT ALL PRIVILEGES ON multi_one.* TO 'backdrop'@'%';"
+  mysql -h database -u root -e "CREATE DATABASE IF NOT EXISTS multi_two; GRANT ALL PRIVILEGES ON multi_two.* TO 'backdrop'@'%';"
+  mysql -h database -u root -e "CREATE DATABASE IF NOT EXISTS install_test; GRANT ALL PRIVILEGES ON install_test.* TO 'backdrop'@'%';"
   mysql -h database -u root -e "FLUSH PRIVILEGES;"
 
   # Configure Backdrop installation.

CHANGELOG.md

@@ -8,7 +8,7 @@ and this project follows the
 which is based on the major version of Backdrop CMS with a semantic version
 system for each contributed module, theme and layout.
 
-## [Unreleased] - 2025-07-08
+## [Unreleased] - 2026-02-23
 
 ### Added
 - An option for the `db-import` command to allow import from newer MariaDB
@@ -18,18 +18,24 @@ database or client does not support it.
 - The ability to download specified releases or branches of modules, themes,
 layout templates or Backdrop itself.
 - Command to convert database to UTF8MB4.
+- Support for PHP 8.4
+- Defensive coding to prevent warnings if a module or theme exists in the
+`system` table but not in the file system.
 
 ### Fixed
 - Unhandled errors and warnings if commands run outside Backdrop root and/or
 before installing Backdrop.
 - Error if importing config to database config storage.
+- Deprecations within error handling for PHP 8.4.
 
 ### Changed
 - Bee will now notify the user of additional modules that will be enabled or disabled
 based on module dependencies when using the enable and disable commands.
 - The functions within the download command have been made more flexible and
 better able to support the coming 'update' command.
 - Provide default terminal width if `tput cols` fails to get the value.
+- The `config-import` command will now import `system.extensions` config updates first
+if there are any.
 
 ## [1.x-1.1.0] - 2024-09-07
 

README.md

@@ -31,13 +31,14 @@ database operations (i.e. `db-export`, `db-import`, `db-drop`, `sql` but NOT
 
 ### PHP
 ![Static Badge](https://img.shields.io/badge/php%20compatibility-555555?logo=php&logoColor=white&style=flat-square)
+![Static Badge](https://img.shields.io/badge/8.4-blue?style=flat-square)
 ![Static Badge](https://img.shields.io/badge/8.3-blue?style=flat-square)
 ![Static Badge](https://img.shields.io/badge/8.2-blue?style=flat-square)
 ![Static Badge](https://img.shields.io/badge/8.1-blue?style=flat-square)
 ![Static Badge](https://img.shields.io/badge/8.0-blue?style=flat-square)
 ![Static Badge](https://img.shields.io/badge/7.4-blue?style=flat-square)
 
-- Bee is tested and works from `7.4` up to `8.3`.
+- Bee is tested and works from `7.4` up to `8.4`.
 
 ## Installation
 

bee.php

@@ -46,15 +46,15 @@
  *   The file that the error came from.
  * @param int $line
  *   The line number the error came from.
- * @param array $context
+ * @param array|null $context
  *   An array of all variables from where the error was triggered.
  *
  * @see https://www.php.net/manual/en/function.set-error-handler.php
  * @see _backdrop_error_handler()
  */
-function bee_error_handler($error_level, $message, $filename, $line, array $context = NULL) {
+function bee_error_handler($error_level, $message, $filename, $line, ?array $context = NULL) {
   require_once __DIR__ . '/includes/errors.inc';
-  _bee_error_handler_real($error_level, $message, $filename, $line, $context);
+  _bee_error_handler_real($error_level, $message, $filename, $line);
 }
 
 /**

commands/config.bee.inc

@@ -299,6 +299,25 @@ function config_import_bee_callback($arguments, $options) {
     return;
   }
 
+  // As of Backdrop 1.32.0, modules and themes may be enabled via config import.
+  // Import the special system.extensions config file first if it exists.
+  if (isset($statuses['system.extensions']) && $statuses['system.extensions'] == 'update') {
+    config_sync_file('system.extensions', 'update');
+
+    // Revalidate the configuration after new modules have been enabled.
+    // Hooks such as hook_config_import_validate() in the newly enabled modules
+    // will be included as module_enable() clears the module_implements() cache.
+    try {
+      foreach ($rows as $row) {
+        config_sync_validate_file($row[0]['value'], $row[1]['value'], $statuses);
+      }
+    }
+    catch (ConfigValidateException $e) {
+      bee_message($e->getMessage(), 'error');
+      return;
+    }
+  }
+
   // Import config.
   foreach ($rows as $row) {
     config_sync_file($row[0]['value'], $row[1]['value']);

commands/db.bee.inc

@@ -422,7 +422,7 @@ function db_bee_mysql_options(array $db_info, $include_db = TRUE) {
 
   // Create an array for the connection string and filename.
   $options = array();
-  $options['connection'] = "--defaults-file=$temp_filename ";
+  $options['connection'] = "--defaults-extra-file=$temp_filename ";
   $options['connection'] .= ($include_db) ? rawurldecode($db_info['database']) : '';
   $options['filename'] = $temp_filename;
 

commands/projects.bee.inc

@@ -214,7 +214,13 @@ function enable_bee_callback($arguments, $options) {
     switch ($type) {
       case 'module':
         // Get module info.
-        $module = $modules[$project];
+        $module = $modules[$project] ?? FALSE;
+        if (!$module) {
+          bee_message(bt("Project '!name' could not be found.", array(
+            '!name' => $project,
+          )), 'error');
+          continue 2;
+        }
         $name = $module->info['name'];
 
         // Check if already enabled.
@@ -260,7 +266,13 @@ function enable_bee_callback($arguments, $options) {
         break;
       case 'theme':
         // Get theme info.
-        $theme = $themes[$project];
+        $theme = $themes[$project] ?? FALSE;
+        if (!$theme) {
+          bee_message(bt("Project '!name' could not be found.", array(
+            '!name' => $project,
+          )), 'error');
+          continue 2;
+        }
         $name = $theme->info['name'];
 
         // Check if already enabled.