Merge pull request #30 from ProgressPlanner/develop

v1.3

Author: jdevalk

.github/workflows/cs.yml

@@ -34,7 +34,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2

.github/workflows/deploy.yml

@@ -9,10 +9,11 @@ jobs:
   tag:
     name: New tag
     runs-on: ubuntu-latest
+    if: ${{ github.ref == 'refs/heads/main' }}
     steps:
       - uses: actions/checkout@main
       - name: WordPress Plugin Deploy
-        uses: 10up/action-wordpress-plugin-deploy@stable
+        uses: 10up/action-wordpress-plugin-deploy@develop
         env:
           SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
           SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

.github/workflows/lint.yml

@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP for the composer install
         uses: shivammathur/setup-php@v2

README.md

@@ -3,6 +3,8 @@
 [![Lint](https://github.com/emilia-capital/aaa-option-optimizer/actions/workflows/lint.yml/badge.svg)](https://github.com/emilia-capital/aaa-option-optimizer/actions/workflows/lint.yml)
 [![Security](https://github.com/emilia-capital/aaa-option-optimizer/actions/workflows/security.yml/badge.svg)](https://github.com/emilia-capital/aaa-option-optimizer/actions/workflows/security.yml)
 
+[![Try this plugin on the WordPress playground](https://img.shields.io/badge/Try%20this%20plugin%20on%20the%20WordPress%20Playground-%23117AC9.svg?style=for-the-badge&logo=WordPress&logoColor=ddd)](https://playground.wordpress.net/#%7B%22landingPage%22:%22/wp-admin/tools.php?page=aaa-option-optimizer%22,%22features%22:%7B%22networking%22:true%7D,%22steps%22:%5B%7B%22step%22:%22defineWpConfigConsts%22,%22consts%22:%7B%22IS_PLAYGROUND_PREVIEW%22:true%7D%7D,%7B%22step%22:%22login%22,%22username%22:%22admin%22,%22password%22:%22password%22%7D,%7B%22step%22:%22installPlugin%22,%22pluginZipFile%22:%7B%22resource%22:%22url%22,%22url%22:%22https://bypass-cors.altha.workers.dev/https://github.com/Emilia-Capital/aaa-option-optimizer/archive/refs/heads/develop.zip%22%7D,%22options%22:%7B%22activate%22:true%7D%7D%5D%7D)
+
 # AAA Option Optimizer
 This plugin tracks which of the autoloaded options are used on a page, and stores that data at the end of page render. It keeps an array of options that it has seen as being used. On the admin page, it compares all the autoloaded options to the array of stored options, and shows the autoloaded options that have not been used as you were browsing the site. If you've been to every page on your site, or you've kept the plugin around for a week or so, this means that those options probably don't need to be autoloaded.
 

aaa-option-optimizer.php

@@ -7,7 +7,7 @@
  * Plugin Name: AAA Option Optimizer
  * Plugin URI: https://joost.blog/plugins/aaa-option-optimizer/
  * Description: Tracks autoloaded options usage and allows the user to optimize them.
- * Version: 1.2.1
+ * Version: 1.3
  * License: GPL-3.0+
  * Author: Joost de Valk
  * Author URI: https://joost.blog/
@@ -24,6 +24,7 @@
 require_once __DIR__ . '/src/autoload.php';
 
 register_activation_hook( __FILE__, 'aaa_option_optimizer_activation' );
+register_deactivation_hook( __FILE__, 'aaa_option_optimizer_deactivation' );
 
 /**
  * Activation hooked function to store start stats.
@@ -32,8 +33,15 @@
  */
 function aaa_option_optimizer_activation() {
 	global $wpdb;
-	//phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching -- one time query, no caching needed.
-	$result = $wpdb->get_row( "SELECT count(*) AS count, SUM(LENGTH(option_value)) as autoload_size FROM {$wpdb->options} WHERE autoload='yes'" );
+	$autoload_values = \wp_autoload_values_to_autoload();
+	$placeholders    = implode( ',', array_fill( 0, count( $autoload_values ), '%s' ) );
+
+	// phpcs:disable WordPress.DB
+	$result = $wpdb->get_row(
+		$wpdb->prepare( "SELECT count(*) AS count, SUM( LENGTH( option_value ) ) as autoload_size FROM {$wpdb->options} WHERE autoload IN ( $placeholders )", $autoload_values )
+	);
+	// phpcs:enable WordPress.DB
+
 	update_option(
 		'option_optimizer',
 		[
@@ -46,6 +54,16 @@ function aaa_option_optimizer_activation() {
 	);
 }
 
+/**
+ * Deactivation hooked function to remove autoload from the plugin option.
+ *
+ * @return void
+ */
+function aaa_option_optimizer_deactivation() {
+	$aaa_option_value = get_option( 'option_optimizer' );
+	update_option( 'option_optimizer', $aaa_option_value, false );
+}
+
 /**
  * Initializes the plugin.
  *