From 5dbe3a2dd2515e2d0814c50cfc73a7ec9faa2028 Mon Sep 17 00:00:00 2001
From: Brandon Hubbard <bhubbard@users.noreply.github.com>
Date: Wed, 10 Dec 2025 15:14:09 -0800
Subject: [PATCH] Take 2: Added editorconifg, and ran phpcs fixes for uninstall
 file

- Updated composer packages
- Added editorconfig file
- Ran phpcs fixes for uninstall.php

There is one remaining issue which is a commented out line to include one file:
```include_once ('remove_mu_plugins_batcache_on_uninstall.php');```
---
 .editorconfig | 24 +++++++++++++
 composer.lock | 79 +++++++++++++++++++----------------------
 uninstall.php | 98 ++++++++++++++++++++++++---------------------------
 3 files changed, 108 insertions(+), 93 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..d22b247
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,24 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+
+# WordPress Coding Standards
+# https://make.wordpress.org/core/handbook/coding-standards/
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = tab
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
+
+[{*.txt,wp-config-sample.php}]
+end_of_line = crlf
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index cedb88f..b070ee5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -9,29 +9,29 @@
     "packages-dev": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
-            "version": "v1.1.2",
+            "version": "v1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/composer-installer.git",
-                "reference": "e9cf5e4bbf7eeaf9ef5db34938942602838fc2b1"
+                "reference": "845eb62303d2ca9b289ef216356568ccc075ffd1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/e9cf5e4bbf7eeaf9ef5db34938942602838fc2b1",
-                "reference": "e9cf5e4bbf7eeaf9ef5db34938942602838fc2b1",
+                "url": "https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/845eb62303d2ca9b289ef216356568ccc075ffd1",
+                "reference": "845eb62303d2ca9b289ef216356568ccc075ffd1",
                 "shasum": ""
             },
             "require": {
                 "composer-plugin-api": "^2.2",
                 "php": ">=5.4",
-                "squizlabs/php_codesniffer": "^2.0 || ^3.1.0 || ^4.0"
+                "squizlabs/php_codesniffer": "^3.1.0 || ^4.0"
             },
             "require-dev": {
                 "composer/composer": "^2.2",
                 "ext-json": "*",
                 "ext-zip": "*",
                 "php-parallel-lint/php-parallel-lint": "^1.4.0",
-                "phpcompatibility/php-compatibility": "^9.0",
+                "phpcompatibility/php-compatibility": "^9.0 || ^10.0.0@dev",
                 "yoast/phpunit-polyfills": "^1.0"
             },
             "type": "composer-plugin",
@@ -101,31 +101,31 @@
                     "type": "thanks_dev"
                 }
             ],
-            "time": "2025-07-17T20:45:56+00:00"
+            "time": "2025-11-11T04:32:07+00:00"
         },
         {
             "name": "phpcsstandards/phpcsextra",
-            "version": "1.4.2",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHPCSExtra.git",
-                "reference": "8e89a01c7b8fed84a12a2a7f5a23a44cdbe4f62e"
+                "reference": "b598aa890815b8df16363271b659d73280129101"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHPCSExtra/zipball/8e89a01c7b8fed84a12a2a7f5a23a44cdbe4f62e",
-                "reference": "8e89a01c7b8fed84a12a2a7f5a23a44cdbe4f62e",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHPCSExtra/zipball/b598aa890815b8df16363271b659d73280129101",
+                "reference": "b598aa890815b8df16363271b659d73280129101",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4",
-                "phpcsstandards/phpcsutils": "^1.1.2",
-                "squizlabs/php_codesniffer": "^3.13.4 || ^4.0"
+                "phpcsstandards/phpcsutils": "^1.2.0",
+                "squizlabs/php_codesniffer": "^3.13.5 || ^4.0.1"
             },
             "require-dev": {
                 "php-parallel-lint/php-console-highlighter": "^1.0",
                 "php-parallel-lint/php-parallel-lint": "^1.4.0",
-                "phpcsstandards/phpcsdevcs": "^1.1.6",
+                "phpcsstandards/phpcsdevcs": "^1.2.0",
                 "phpcsstandards/phpcsdevtools": "^1.2.1",
                 "phpunit/phpunit": "^4.5 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
             },
@@ -183,32 +183,32 @@
                     "type": "thanks_dev"
                 }
             ],
-            "time": "2025-10-28T17:00:02+00:00"
+            "time": "2025-11-12T23:06:57+00:00"
         },
         {
             "name": "phpcsstandards/phpcsutils",
-            "version": "1.1.3",
+            "version": "1.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHPCSUtils.git",
-                "reference": "8b8e17615d04f2fc2cd46fc1d2fd888fa21b3cf9"
+                "reference": "c216317e96c8b3f5932808f9b0f1f7a14e3bbf55"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/8b8e17615d04f2fc2cd46fc1d2fd888fa21b3cf9",
-                "reference": "8b8e17615d04f2fc2cd46fc1d2fd888fa21b3cf9",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/c216317e96c8b3f5932808f9b0f1f7a14e3bbf55",
+                "reference": "c216317e96c8b3f5932808f9b0f1f7a14e3bbf55",
                 "shasum": ""
             },
             "require": {
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7 || ^1.0",
                 "php": ">=5.4",
-                "squizlabs/php_codesniffer": "^3.13.3 || ^4.0"
+                "squizlabs/php_codesniffer": "^3.13.5 || ^4.0.1"
             },
             "require-dev": {
                 "ext-filter": "*",
                 "php-parallel-lint/php-console-highlighter": "^1.0",
                 "php-parallel-lint/php-parallel-lint": "^1.4.0",
-                "phpcsstandards/phpcsdevcs": "^1.1.6",
+                "phpcsstandards/phpcsdevcs": "^1.2.0",
                 "yoast/phpunit-polyfills": "^1.1.0 || ^2.0.0 || ^3.0.0"
             },
             "type": "phpcodesniffer-standard",
@@ -276,20 +276,20 @@
                     "type": "thanks_dev"
                 }
             ],
-            "time": "2025-10-16T16:39:32+00:00"
+            "time": "2025-12-08T14:27:58+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.13.4",
+            "version": "3.13.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119"
+                "reference": "0ca86845ce43291e8f5692c7356fccf3bcf02bf4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ad545ea9c1b7d270ce0fc9cbfb884161cd706119",
-                "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/0ca86845ce43291e8f5692c7356fccf3bcf02bf4",
+                "reference": "0ca86845ce43291e8f5692c7356fccf3bcf02bf4",
                 "shasum": ""
             },
             "require": {
@@ -306,11 +306,6 @@
                 "bin/phpcs"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
@@ -360,20 +355,20 @@
                     "type": "thanks_dev"
                 }
             ],
-            "time": "2025-09-05T05:47:09+00:00"
+            "time": "2025-11-04T16:30:35+00:00"
         },
         {
             "name": "wp-coding-standards/wpcs",
-            "version": "3.2.0",
+            "version": "3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/WordPress/WordPress-Coding-Standards.git",
-                "reference": "d2421de7cec3274ae622c22c744de9a62c7925af"
+                "reference": "7795ec6fa05663d716a549d0b44e47ffc8b0d4a6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/d2421de7cec3274ae622c22c744de9a62c7925af",
-                "reference": "d2421de7cec3274ae622c22c744de9a62c7925af",
+                "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/7795ec6fa05663d716a549d0b44e47ffc8b0d4a6",
+                "reference": "7795ec6fa05663d716a549d0b44e47ffc8b0d4a6",
                 "shasum": ""
             },
             "require": {
@@ -381,17 +376,17 @@
                 "ext-libxml": "*",
                 "ext-tokenizer": "*",
                 "ext-xmlreader": "*",
-                "php": ">=5.4",
-                "phpcsstandards/phpcsextra": "^1.4.0",
+                "php": ">=7.2",
+                "phpcsstandards/phpcsextra": "^1.5.0",
                 "phpcsstandards/phpcsutils": "^1.1.0",
-                "squizlabs/php_codesniffer": "^3.13.0"
+                "squizlabs/php_codesniffer": "^3.13.4"
             },
             "require-dev": {
                 "php-parallel-lint/php-console-highlighter": "^1.0.0",
                 "php-parallel-lint/php-parallel-lint": "^1.4.0",
-                "phpcompatibility/php-compatibility": "^9.0",
+                "phpcompatibility/php-compatibility": "^10.0.0@dev",
                 "phpcsstandards/phpcsdevtools": "^1.2.0",
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^8.0 || ^9.0"
             },
             "suggest": {
                 "ext-iconv": "For improved results",
@@ -426,7 +421,7 @@
                     "type": "custom"
                 }
             ],
-            "time": "2025-07-24T20:08:31+00:00"
+            "time": "2025-11-25T12:08:04+00:00"
         }
     ],
     "aliases": [],
diff --git a/uninstall.php b/uninstall.php
index 2cc2322..56f3cb9 100644
--- a/uninstall.php
+++ b/uninstall.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Runs on Uninstall of Pressable Cache Management
  *
@@ -9,57 +8,54 @@
  * @link      http://pressable.com
  */
 
-//include file containing function to remove batcache on wp-config.php
+// include file containing function to remove batcache on wp-config.php
 // include_once ('remove_mu_plugins_batcache_on_uninstall.php');
-include_once( plugin_dir_path( __FILE__ ) . 'remove_mu_plugins_batcache_on_uninstall.php' );
-
-// exit if uninstall constant is not defined
-if (!defined('WP_UNINSTALL_PLUGIN'))
-{
-
-    exit;
+require_once plugin_dir_path( __FILE__ ) . 'remove_mu_plugins_batcache_on_uninstall.php';
 
+// Exit if uninstall constant is not defined.
+if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+	exit;
 }
 
-// Delete the plugin options from the site database
-delete_option('pressable_cache_management_options');
-delete_option('cdn_settings_tab_options');
-delete_option('pressable_api_authentication_tab_options');
-delete_option('cdn-cache-purge-time-stamp');
-delete_option('edge-cache-purge-time-stamp');
-delete_option('flush-obj-cache-time-stamp');
-delete_option('flush-cache-on-page-post-delete-time-stamp');
-delete_option('flush-cache-on-comment-delete-time-stamp');
-delete_option('pressable_api_admin_notice__status');
-delete_option('pressable_cdn_connection_decactivated_notice');
-delete_option('pressable_api_enable_cdn_connection_admin_notice');
-delete_option('extend_batcache_activate_notice');
-delete_option('extend_cdn_activate_notice');
-delete_option('exclude_images_from_cdn_activate_notice');
-delete_option('exclude_json_js_from_cdn_notice');
-delete_option('flush-cache-page-edit-time-stamp');
-delete_option('flush-cache-theme-plugin-time-stamp');
-delete_option('flush-object-cache-for-single-page-notice');
-delete_option('exempt_batcache_activate_notice');
-delete_option('flush-object-cache-for-single-page-time-stamp');
-delete_option('exclude_json_js_from_cdn_activate_notice');
-delete_option('exempt_from_batcache');
-delete_option('exclude_css_from_cdn_activate_notice');
-delete_option('remove_pressable_branding_tab_options');
-delete_option('cache_wpp_cookies_pages_activate_notice');
-delete_option('exclude_fonts_from_cdn_activate_notice');
-delete_option('single-page-edge-cache-purge-time-stamp');
-delete_option('edge-cache-single-page-url-purged');
-delete_option('single-page-url-flushed');
-delete_option('pcm_site_id_added_activate_notice');
-delete_option('pcm_site_id_con_res');
-delete_option('cdnenabled');
-delete_option('cdn-api-state');
-delete_option('edge-cache-enabled');
-delete_option('edge-cache-status');
-delete_option('pressable_site_id');
-delete_option('pcm_client_id');
-delete_option('pcm_client_secret');
-delete_option('single-page-path-url');
-delete_option('page-title');
-delete_option('page-url');
+// Delete the plugin options from the site database.
+delete_option( 'pressable_cache_management_options' );
+delete_option( 'cdn_settings_tab_options' );
+delete_option( 'pressable_api_authentication_tab_options' );
+delete_option( 'cdn-cache-purge-time-stamp' );
+delete_option( 'edge-cache-purge-time-stamp' );
+delete_option( 'flush-obj-cache-time-stamp' );
+delete_option( 'flush-cache-on-page-post-delete-time-stamp' );
+delete_option( 'flush-cache-on-comment-delete-time-stamp' );
+delete_option( 'pressable_api_admin_notice__status' );
+delete_option( 'pressable_cdn_connection_decactivated_notice' );
+delete_option( 'pressable_api_enable_cdn_connection_admin_notice' );
+delete_option( 'extend_batcache_activate_notice' );
+delete_option( 'extend_cdn_activate_notice' );
+delete_option( 'exclude_images_from_cdn_activate_notice' );
+delete_option( 'exclude_json_js_from_cdn_notice' );
+delete_option( 'flush-cache-page-edit-time-stamp' );
+delete_option( 'flush-cache-theme-plugin-time-stamp' );
+delete_option( 'flush-object-cache-for-single-page-notice' );
+delete_option( 'exempt_batcache_activate_notice' );
+delete_option( 'flush-object-cache-for-single-page-time-stamp' );
+delete_option( 'exclude_json_js_from_cdn_activate_notice' );
+delete_option( 'exempt_from_batcache' );
+delete_option( 'exclude_css_from_cdn_activate_notice' );
+delete_option( 'remove_pressable_branding_tab_options' );
+delete_option( 'cache_wpp_cookies_pages_activate_notice' );
+delete_option( 'exclude_fonts_from_cdn_activate_notice' );
+delete_option( 'single-page-edge-cache-purge-time-stamp' );
+delete_option( 'edge-cache-single-page-url-purged' );
+delete_option( 'single-page-url-flushed' );
+delete_option( 'pcm_site_id_added_activate_notice' );
+delete_option( 'pcm_site_id_con_res' );
+delete_option( 'cdnenabled' );
+delete_option( 'cdn-api-state' );
+delete_option( 'edge-cache-enabled' );
+delete_option( 'edge-cache-status' );
+delete_option( 'pressable_site_id' );
+delete_option( 'pcm_client_id' );
+delete_option( 'pcm_client_secret' );
+delete_option( 'single-page-path-url' );
+delete_option( 'page-title' );
+delete_option( 'page-url' );