Merge pull request #197 from mihdan/v7.0.2

V7.0.2

Author: kagg-design

changelog.txt

@@ -1,3 +1,6 @@
+= 7.0.2 (24.05.2026) =
+* Fixed legacy WooCommerce local variation attributes with punctuation in attribute names after upgrading from versions before 7.0.
+
 = 7.0.1 (20.05.2026) =
 * Changed legacy sanitize_title bridge diagnostics to use the dedicated CYR_TO_LAT_DEBUG_LEGACY_SANITIZE_TITLE_BRIDGE constant instead of WP_DEBUG.
 * Fixed legacy WooCommerce local variation attributes, including `Any` variations, after upgrading from versions before 7.0.

cyr-to-lat.php

@@ -10,7 +10,7 @@
  * Plugin Name:       Cyr-To-Lat
  * Plugin URI:        https://kagg.eu/cyr-to-lat/
  * Description:       Convert Non-Latin characters in post and term slugs to Latin characters. Useful for creating human-readable URLs. Based on the original plugin by Anton Skorobogatov.
- * Version:           7.0.1
+ * Version:           7.0.2
  * Requires at least: 6.0
  * Requires PHP:      7.4
  * Author:            Sergey Biryukov, Mikhail Kobzarev, Igor Gergel
@@ -37,7 +37,7 @@
 /**
  * Plugin version.
  */
-const CYR_TO_LAT_VERSION = '7.0.1';
+const CYR_TO_LAT_VERSION = '7.0.2';
 
 /**
  * Path to the plugin dir.

docs/manual-test-7.0.2-woocommerce-local-attribute.md

@@ -0,0 +1,47 @@
+# Ручное воспроизведение WooCommerce legacy local attributes
+
+## До фикса, на 7.0.1 / 7.0.2
+
+1. Включить WooCommerce.
+2. Переключить Cyr-To-Lat на `6.8.0`.
+3. Создать вариативный товар.
+4. Добавить локальный пользовательский атрибут с кириллицей и пунктуацией, например `Арт.`.
+5. Значения атрибута: `00074-1 | 00074-2 | 00074-3`.
+6. Использовать атрибут для вариаций.
+7. Создать несколько вариаций и назначить им конкретные значения:
+   - `00074-1`
+   - `00074-2`
+   - `00074-3`
+8. Сохранить товар.
+9. Проверить на `6.8.0`:
+   - во вкладке **Вариации** у каждой вариации выбрано свое значение атрибута;
+   - на фронтенде значения доступны в выпадающем списке;
+   - вариацию можно выбрать и добавить в корзину.
+10. Переключить Cyr-To-Lat на версию до фикса: `7.0.1` или старую `7.0.2`.
+11. Открыть тот же товар в админке.
+12. Проверить вкладку **Вариации**.
+
+Ожидаемая проблема до фикса:
+
+- вместо конкретных значений WooCommerce показывает `Арт. с любым значением`;
+- на фронтенде варианты могут не отображаться или не выбираться;
+- старые meta keys остаются в виде `attribute_%d0%b0%d1%80%d1%82`, а новый код частично ожидает `attribute_art`.
+
+## После фикса
+
+1. Оставить тот же товар, созданный на `6.8.0`.
+2. Переключить Cyr-To-Lat на версию с фиксом.
+3. Открыть товар в админке.
+4. Проверить вкладку **Вариации**.
+5. Открыть товар на фронтенде.
+
+Ожидаемое поведение после фикса:
+
+- во вкладке **Вариации** у каждой вариации снова выбрано конкретное значение: `00074-1`, `00074-2`, `00074-3`;
+- на фронтенде атрибут `Арт.` отображается и значения можно выбрать;
+- добавление выбранной вариации в корзину работает;
+- данные старого товара не мигрируются автоматически, но runtime-нормализация приводит legacy key `%d0%b0%d1%80%d1%82` к каноническому key `art`.
+
+## Контрольный признак
+
+Кейс должен обязательно использовать атрибут с пунктуацией в имени, например `Арт.`. Атрибуты без пунктуации, например `Цвет`, могли проходить проверку даже до этого фикса и не ловили проблему.

readme.txt

@@ -4,7 +4,7 @@ Tags: transliteration, cyrillic, slugs, translation, multilingual
 Requires at least: 6.0
 Tested up to: 7.0
 Requires PHP: 7.4
-Stable tag: 7.0.1
+Stable tag: 7.0.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -268,6 +268,9 @@ We will review your report and respond as quickly as possible.
 
 == Changelog ==
 
+= 7.0.2 (24.05.2026) =
+* Fixed legacy WooCommerce local variation attributes with punctuation in attribute names after upgrading from versions before 7.0.
+
 = 7.0.1 (20.05.2026) =
 * Changed legacy sanitize_title bridge diagnostics to use the dedicated CYR_TO_LAT_DEBUG_LEGACY_SANITIZE_TITLE_BRIDGE constant instead of WP_DEBUG.
 * Fixed legacy WooCommerce local variation attributes, including `Any` variations, after upgrading from versions before 7.0.
@@ -281,101 +284,4 @@ We will review your report and respond as quickly as possible.
 * Documented that existing WooCommerce attributes are not automatically migrated in 7.0; future migration work must be a separate dry-run-first workflow.
 * Documented the backend-first testing strategy without required Codeception or Playwright release dependencies.
 
-= 6.8.0 (10.05.2026) =
-* Fixed returning unexpected results by REST API in some cases.
-* Fixed import of WooCommerce products.
-* Fixed transliteration of product categories, brands, and tags.
-
-= 6.7.0 (01.04.2026) =
-* The minimum required PHP version is now 7.4.
-* The minimum required WordPress version is now 6.0.
-* Fixed a fatal error occurred with WP-CLI in a rare case.
-* Fixed transliteration of WC local attributes.
-* Tested with WordPress 7.0.
-
-= 6.6.0 (30.11.2025) =
-* Fixed the deprecated function message in Main.php with WordPress 6.9.
-* Tested with PHP 8.4.
-* Tested with WordPress 6.9.
-* Tested with WooCommerce 10.3.
-
-= 6.5.0 (24.10.2025) =
-* Fixed transliteration of tags during editing.
-
-= 6.4.1 (03.05.2025) =
-* Fixed the layout of messages on the Tables page.
-* Tested with WordPress 6.8.
-* Tested with WooCommerce 9.8.
-
-= 6.3.0 (22.12.2024) =
-* Added a warning message on the Tables page when the active table does not match the site locale.
-* Removed fix for translation after WordPress 6.5+ due to performance issues.
-
-= 6.2.3 (24.11.2024) =
-* Fixed the deprecation error with PHP 8.4.
-* Tested with PHP 8.4.
-
-= 6.2.2 (15.11.2024) =
-* Fixed _load_textdomain_just_in_time notice with WordPress 6.7.
-* Some translations were empty with WordPress 6.5+.
-
-= 6.2.1 (13.11.2024) =
-* Fixed the layout of the Converter page.
-* Fixed issues reported by Plugin Check Plugin.
-
-= 6.2.0 (13.11.2024) =
-* Dropped support for PHP 7.0 and 7.1. The minimum required PHP version is now 7.2.
-* The minimum required WordPress version is now 5.3.
-* Fixed the notice about the _load_textdomain_just_in_time function being called incorrectly.
-* Tested with WordPress 6.7.
-* Tested with WooCommerce 9.4.
-
-= 6.1.0 (09.03.2024) =
-* Tested with WordPress 6.5.
-* Tested with WooCommerce 8.6.
-* Fixed the error on the System Info tab when post types or post statuses are not set.
-
-= 6.0.8 (14.02.2024) =
-* Improved detection of the Gutenberg editor.
-* Fixed processing of product attributes.
-
-= 6.0.7 (11.02.2024) =
-* Tested with WooCommerce 8.5.
-* Added redirect from the cyrillic post title when creating a new post.
-* Added description of post types and post statuses on the Converter page.
-* Fixed displaying all file descriptions in the Theme Editor in the current locale.
-* Fixed PHP warning in the SettingsBase.
-* Fixed the output of variable product attributes.
-
-= 6.0.6 (14.01.2024) =
-* Tested with WordPress 6.4.
-* Tested with WooCommerce 8.4.
-* Tested with PHP 8.3.
-* Fixed documentation on ctl_allow filter.
-* Fixed the improper display of the "rate plugin" message on options.php.
-
-= 6.0.5 (09.10.2023) =
-* Fixed displaying file descriptions in the Theme Editor; now in the current locale.
-
-= 6.0.4 (23.09.2023) =
-* Fixed disappeared file descriptions on the Theme File Editor page.
-
-= 6.0.3 (29.07.2023) =
-* Fixed the fatal error with Jetpack sync.
-
-= 6.0.2 (26.07.2023) =
-* Fixed the fatal error in admin_footer_text().
-
-= 6.0.1 (26.07.2023) =
-* Fixed the fatal error on the System Info page with empty options.
-
-= 6.0.0 (26.07.2023) =
-* Dropped support of PHP 5.6. The Minimum required PHP version is 7.0 now.
-* Tested with WordPress 6.3.
-* Tested with WooCommerce 7.9.
-* Added System Info tab.
-* Added filter 'ctl_allow'
-* Fixed the console error when saving table data.
-* Fixed the current table setting on the Tables page with WPML.
-
 [See changelog for all versions](https://plugins.svn.wordpress.org/cyr2lat/trunk/changelog.txt).

src/php/Main.php

@@ -280,6 +280,9 @@ protected function init_hooks(): void {
 		add_filter( 'woocommerce_available_variation', [ $this, 'normalize_wc_available_variation_attributes' ], 10, 3 );
 		add_filter( 'woocommerce_cart_item_data_to_validate', [ $this, 'normalize_wc_cart_item_data_to_validate' ], 10, 2 );
 		add_filter( 'woocommerce_add_cart_item', [ $this, 'normalize_wc_cart_item_variation_attributes' ] );
+		add_action( 'woocommerce_product_read', [ $this, 'normalize_wc_read_product_attribute_keys' ], 10, 2 );
+		add_filter( 'woocommerce_product_get_attributes', [ $this, 'normalize_wc_product_get_attribute_keys' ], 10, 2 );
+		add_filter( 'woocommerce_product_object_query', [ $this, 'normalize_wc_product_object_query_variation_attributes' ], 10, 2 );
 		add_action( 'wp_loaded', [ $this, 'normalize_wc_add_to_cart_request_attributes' ], 15 );
 
 		if ( ! $this->request->is_allowed() ) {
@@ -297,8 +300,6 @@ protected function init_hooks(): void {
 		add_filter( 'post_updated', [ $this, 'check_for_changed_slugs' ], 10, 3 );
 		add_action( 'woocommerce_before_product_object_save', [ $this, 'normalize_wc_product_attribute_keys' ] );
 		add_action( 'woocommerce_product_attributes_updated', [ $this, 'normalize_wc_product_attribute_meta' ] );
-		add_action( 'woocommerce_product_read', [ $this, 'normalize_wc_read_product_attribute_keys' ], 10, 2 );
-		add_filter( 'woocommerce_product_get_attributes', [ $this, 'normalize_wc_product_get_attribute_keys' ], 10, 2 );
 
 		add_action( 'before_woocommerce_init', [ $this, 'declare_wc_compatibility' ] );
 
@@ -424,6 +425,7 @@ public function normalize_wc_product_attribute_meta( object $product ): void {
 	 */
 	public function normalize_wc_read_product_attribute_keys( int $product_id, object $product ): void {
 		$this->local_attribute_service()->normalize_read_product_attributes( $product );
+		$this->variation_attribute_service()->normalize_read_variation_attributes( $product );
 	}
 
 	/**
@@ -440,7 +442,36 @@ public function normalize_wc_product_get_attribute_keys( $attributes, object $pr
 			return $attributes;
 		}
 
-		return $this->local_attribute_service()->normalize_product_attribute_array( $attributes );
+		$attributes = $this->local_attribute_service()->normalize_read_product_attribute_array( $product, $attributes );
+
+		if ( method_exists( $product, 'get_type' ) && 'variation' === $product->get_type() ) {
+			return $this->variation_attribute_service()->normalize_read_variation_attribute_array( $product, $attributes );
+		}
+
+		return $attributes;
+	}
+
+	/**
+	 * Normalize WooCommerce variation attribute keys in product object query results.
+	 *
+	 * @param array|mixed $products   Products.
+	 * @param array       $query_vars Query vars.
+	 *
+	 * @return array|mixed
+	 * @noinspection PhpUnusedParameterInspection
+	 */
+	public function normalize_wc_product_object_query_variation_attributes( $products, array $query_vars ) {
+		if ( ! is_array( $products ) ) {
+			return $products;
+		}
+
+		foreach ( $products as $product ) {
+			if ( is_object( $product ) && method_exists( $product, 'get_type' ) && 'variation' === $product->get_type() ) {
+				$this->variation_attribute_service()->normalize_read_variation_attributes( $product );
+			}
+		}
+
+		return $products;
 	}
 
 	/**