Merge pull request #38 from boxuk/fix/dependabot-changes

[FIX] Update Dependabot Configuration

.github/dependabot.yml

@@ -1,10 +1,13 @@
 version: 2
 updates:
+ # PHP Deps
  - package-ecosystem: composer
  directory: "/"
  registries: "*"
  schedule:
  interval: daily
+
+ # NodeJS Deps
  - package-ecosystem: npm
  directory: "/"
  registries: "*"
@@ -20,9 +23,14 @@ updates:
  commit-message:
  prefix: "[DEPS][GHA]"
 
- # Docker PHP image
+ # Docker images
  - package-ecosystem: docker
- directory: "/docker"
+ directory: "/docker/nodejs"
+ registries: "*"
+ schedule:
+ interval: daily
+ - package-ecosystem: docker
+ directory: "/docker/php"
  registries: "*"
  schedule:
  interval: daily

composer.json

@@ -15,6 +15,10 @@
  ],
  "type": "composer",
  "url": "https://wpackagist.org"
+ },
+ {
+ "type": "vcs",
+ "url": "https://github.com/wordpress/sqlite-database-integration.git"
  }
  ],
  "require": {
@@ -37,8 +41,9 @@
  "phpcompatibility/phpcompatibility-wp": "^2.1",
  "symplify/monorepo-builder": "^11.2",
  "szepeviktor/phpstan-wordpress": "^1.3",
- "wpackagist-plugin/sqlite-database-integration": "^2.0",
- "wpackagist-theme/twentytwentyfour": "^1.0"
+ "wordpress/sqlite-database-integration": "^2.0",
+ "wpackagist-theme/twentytwentyfour": "^1.0",
+ "composer/installers": "^2.2"
  },
  "autoload": {
  "psr-4": {

docker/php/Dockerfile

@@ -1,8 +1,8 @@
-FROM php
-COPY --from=composer /usr/bin/composer /usr/bin/composer
+FROM php:8.2.20
+COPY --from=composer:2.7.7 /usr/bin/composer /usr/bin/composer
 
 # PECL for code coverage
 RUN pecl install pcov && docker-php-ext-enable pcov
 
 # git and zip for composer
-RUN apt-get update && apt-get install -y git zip
+RUN apt-get update && apt-get install -y git zip && apt-get clean && rm -rf /var/lib/apt/lists/*

docker/wordpress/db.php

@@ -14,7 +14,7 @@
 define( 'SQLITE_DB_DROPIN_VERSION', '1.8.0' );
 
 // Bail early if the SQLite implementation was not located in the plugin.
-if ( ! file_exists( ABSPATH . 'wp-content/mu-plugins/sqlite-database-integration/wp-includes/sqlite/db.php' ) ) {
+if ( ! file_exists( ABSPATH . 'wp-content/plugins/vendor/wordpress/sqlite-database-integration/wp-includes/sqlite/db.php' ) ) {
  return;
 }
 
@@ -24,7 +24,7 @@
 }
 
 // Require the implementation from the plugin.
-require_once ABSPATH . 'wp-content/mu-plugins/sqlite-database-integration/wp-includes/sqlite/db.php';
+require_once ABSPATH . 'wp-content/plugins/vendor/wordpress/sqlite-database-integration/wp-includes/sqlite/db.php';
 
 // Activate the performance-lab plugin if it is not already activated.
 add_action(

docker/wordpress/mu-plugins/plugin-loader.php

@@ -10,4 +10,4 @@
 
 /**
  * Nothing fancy here. Just `require_once` the necessary plugin files.
- */
+ */