Merge branch 'core' into manage-refresh/core

Author: sheabunge

.browserslistrc

@@ -1,5 +1,19 @@
 # Changelog
 
+## [3.9.2] (2025-11-17)
+
+### Changed
+* Introduced a custom scissors icon and updated button title for the TinyMCE extension.
+* Improved back-navigation styling on the edit page.
+* Refined layout for column names and action buttons in the Cloud Snippets list.
+* Enhanced overall styling of cloud-related UI components.
+* Optimized cloud search with more efficient pagination and snippet retrieval.
+* Introduced groundwork to prevent Composer dependency collisions with other plugins.
+
+### Fixed
+* Improved sanitization and normalization across Cloud API and pagination outputs.
+* Resolved various TinyMCE issues reported in the WordPress support forum.
+
 ## [3.9.1] (2025-11-14)
 
 ### Changed

CHANGELOG.md

@@ -69,6 +69,45 @@ command:
 npm run watch
 ```
 
+## Managing Composer dependencies
+
+Code Snippets uses the [Imposter plugin](https://github.com/TypistTech/imposter) to namespace-prefix all vendor
+dependencies under `Code_Snippets\Vendor\`. This prevents conflicts with other WordPress plugins that might use the
+same libraries (e.g., Guzzle, Minify, Monolog).
+
+### Adding a new dependency
+
+When adding a new Composer dependency that might exist in other plugins:
+
+1. Add the package to `src/composer.json` as usual:
+   ```shell
+   cd src
+   composer require vendor/package
+   ```
+
+2. Add corresponding PSR-4 autoload entries for the prefixed namespace in `src/composer.json`:
+   ```json
+   "autoload": {
+       "psr-4": {
+           "Code_Snippets\\Vendor\\OriginalVendor\\PackageName\\": "vendor/vendor-name/package-name/src/"
+       }
+   }
+   ```
+
+3. Run `composer dump-autoload -o` to regenerate autoload files.
+
+4. The Imposter plugin will automatically rewrite the namespaces during `post-install-cmd` and `post-update-cmd` hooks.
+
+5. Our autoloader in `src/php/load.php` automatically removes original (non-prefixed) namespace mappings to prevent
+   collisions, so no code changes are needed.
+
+### How it works
+
+- Imposter rewrites all vendor code from `Vendor\Package\Class` to `Code_Snippets\Vendor\Vendor\Package\Class`
+- The `load.php` file dynamically detects and removes original namespace PSR-4 mappings at runtime
+- Other plugins can load their own versions of the same libraries without conflicts
+- Your code should always use the prefixed namespace: `use Code_Snippets\Vendor\Vendor\Package\Class;`
+
 ## Preparing for release
 
 The plugin repository includes a number of files that are unnecessary when distributing the plugin files for

CONTRIBUTING.md

@@ -8,11 +8,19 @@
  * License:      GPL-2.0-or-later
  * License URI:  license.txt
  * Text Domain:  code-snippets
+<<<<<<< HEAD
  * Version:      3.10.0-dev.1
+=======
+ * Version:      3.9.2
+>>>>>>> core
  * Requires PHP: 7.4
  * Requires at least: 5.5
  *
+<<<<<<< HEAD
  * @version   3.10.0-dev.1
+=======
+ * @version   3.9.2
+>>>>>>> core
  * @package   Code_Snippets
  * @author    Shea Bunge <shea@codesnippets.pro>
  * @copyright 2012-2024 Code Snippets Pro

src/code-snippets.php

@@ -22,7 +22,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Code_Snippets\\": "php/"
+          "Code_Snippets\\": "php/"
         }
     },
     "require": {

src/composer.json

@@ -20,12 +20,12 @@
 	gap: 5px;
 	line-height: 1;
 
-  @at-root .row-actions & {
-    color: #8c8c8c;
-    padding-inline: 0px;
-    text-transform: capitalize;
-    font-weight: 500;
-  }
+	@at-root .row-actions & {
+		color: #8c8c8c;
+		padding-inline: 0;
+		text-transform: capitalize;
+		font-weight: 500;
+	}
 
 	.dashicons {
 		font-size: 18px;
@@ -37,7 +37,7 @@
 .network-shared {
 	color: #2271b1; 
 	font-size: 22px;
-	width: 100%;
+	inline-size: 100%;
 	cursor: help;
 }
 
@@ -89,9 +89,9 @@
 	background-color: #a7aaad;
 	border-color: #fff !important;
 
-  .dashicons {
-    color: #fff;
-  }
+	.dashicons {
+		color: #fff;
+	}
 }
 
 .nav-tab-inactive {

src/css/common/_badges.scss

@@ -96,3 +96,13 @@
 form.condition-snippet .snippet-code-container {
 	display: none;
 }
+
+.cs-back {
+	cursor: pointer;
+
+	&::before {
+		content: '<';
+		color: #2271b1;
+		margin-inline-end: 3px;
+	}
+}

src/css/edit.scss

@@ -20,30 +20,66 @@
 .generate-button {
 	display: flex;
 	align-items: center;
+	gap: 5px;
 
 	.dashicons-warning {
 		color: #b32d2e;
 	}
+
+	.snippet-tags-container &,
+	.snippet-description-container & {
+		float: inline-end;
+	}
 }
 
 .code-line-explanation {
 	display: flex;
-	align-items: center;
-	font-size: 13px;
+	cursor: default;
+	font-size: inherit;
 	margin: 0;
-	padding-block: 0;
-	padding-inline: 8px;
-	background-color: #fff;
-	border: 1px solid #bbb;
-	border-inline-start: 0;
-	border-inline-end: 0;
+	padding-inline: 6px;
+	border-inline-start: none;
+	border-inline-end: none;
+	border-block-start: 1px solid rgb(0 0 0 / 15%);
+	border-block-end: 1px solid rgb(0 0 0 / 15%);
+	border-image-slice: 1;
+	border-image-width: 1;
+	border-image-repeat: stretch;
 	color: #666;
 	font-style: italic;
-	font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif;
+	font-family: monospace;
+	gap: 5px;
+	align-items: center;
 
 	img {
 		block-size: 1rem;
-		padding-inline-end: 5px;
+		opacity: 0.7;
+	}
+
+	.code-line-actions {
+		cursor: default;
+		gap: 7px;
+		display: inline-flex;
+		margin-inline-start: 5px;
+		font-family: system-ui;
+		font-style: normal;
+
+		.commit {
+			color: #3d9970;
+		}
+
+		.remove {
+			color: #b32d2e;
+		}
+
+		.action {
+			cursor: pointer;
+			opacity: 0.6;
+
+			&:hover {
+				opacity: 1;
+			}
+		}
 	}
 }