| @@ -1,9 +1,8 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | namespace Elementor\Core\Experiments; |
| 3 | 3 | |
| 4 | 4 | use Elementor\Core\Base\Base_Object; |
| 5 | -use Elementor\Core\Experiments\Exceptions\Dependency_Exception; | |
| 6 | 5 | use Elementor\Core\Upgrade\Manager as Upgrade_Manager; |
| 7 | 6 | use Elementor\Core\Utils\Collection; |
| 8 | 7 | use Elementor\Modules\System_Info\Module as System_Info; |
| 9 | 8 | use Elementor\Plugin; |
| @@ -11,9 +10,9 @@ | ||
| 11 | 10 | use Elementor\Tracker; |
| 12 | 11 | use Elementor\Utils; |
| 13 | 12 | |
| 14 | 13 | if ( ! defined( 'ABSPATH' ) ) { |
| 15 | - exit; // Exit if accessed directly. | |
| 14 | + exit; // Exit if accessed directly | |
| 16 | 15 | } |
| 17 | 16 | |
| 18 | 17 | class Manager extends Base_Object { |
| 19 | 18 | |
| @@ -22,8 +21,10 @@ | ||
| 22 | 21 | const RELEASE_STATUS_ALPHA = 'alpha'; |
| 23 | 22 | |
| 24 | 23 | const RELEASE_STATUS_BETA = 'beta'; |
| 25 | 24 | |
| 25 | + const RELEASE_STATUS_RC = 'rc'; | |
| 26 | + | |
| 26 | 27 | const RELEASE_STATUS_STABLE = 'stable'; |
| 27 | 28 | |
| 28 | 29 | const STATE_DEFAULT = 'default'; |
| 29 | 30 | |
| @@ -43,26 +44,24 @@ | ||
| 43 | 44 | |
| 44 | 45 | /** |
| 45 | 46 | * Add Feature |
| 46 | 47 | * |
| 47 | - * Each feature has to provide the following information: | |
| 48 | - * [ | |
| 49 | - * 'name' => string, | |
| 50 | - * 'title' => string, | |
| 51 | - * 'description' => string, | |
| 52 | - * 'tag' => string, | |
| 53 | - * 'release_status' => string, | |
| 54 | - * 'default' => string, | |
| 55 | - * 'new_site' => array, | |
| 56 | - * ] | |
| 57 | - * | |
| 58 | 48 | * @since 3.1.0 |
| 59 | 49 | * @access public |
| 60 | 50 | * |
| 61 | - * @param array $options Feature options. | |
| 51 | + * @param array $options { | |
| 52 | + * @type string $name | |
| 53 | + * @type string $title | |
| 54 | + * @type string $tag | |
| 55 | + * @type array $tags | |
| 56 | + * @type string $description | |
| 57 | + * @type string $release_status | |
| 58 | + * @type string $default | |
| 59 | + * @type callable $on_state_change | |
| 60 | + * } | |
| 61 | + * | |
| 62 | 62 | * @return array|null |
| 63 | - * | |
| 64 | - * @throws Dependency_Exception If can't change feature state. | |
| 63 | + * @throws \Exception | |
| 65 | 64 | */ |
| 66 | 65 | public function add_feature( array $options ) { |
| 67 | 66 | if ( isset( $this->features[ $options['name'] ] ) ) { |
| 68 | 67 | return null; |
| @@ -67,14 +66,48 @@ | ||
| 67 | 66 | if ( isset( $this->features[ $options['name'] ] ) ) { |
| 68 | 67 | return null; |
| 69 | 68 | } |
| 70 | 69 | |
| 71 | - $experimental_data = $this->set_feature_initial_options( $options ); | |
| 70 | + $default_experimental_data = [ | |
| 71 | + 'tag' => '', // Deprecated, use 'tags' instead. | |
| 72 | + 'tags' => [], | |
| 73 | + 'description' => '', | |
| 74 | + 'release_status' => self::RELEASE_STATUS_ALPHA, | |
| 75 | + 'default' => self::STATE_INACTIVE, | |
| 76 | + 'mutable' => true, | |
| 77 | + static::TYPE_HIDDEN => false, | |
| 78 | + 'new_site' => [ | |
| 79 | + 'always_active' => false, | |
| 80 | + 'default_active' => false, | |
| 81 | + 'default_inactive' => false, | |
| 82 | + 'minimum_installation_version' => null, | |
| 83 | + ], | |
| 84 | + 'on_state_change' => null, | |
| 85 | + 'generator_tag' => false, | |
| 86 | + ]; | |
| 72 | 87 | |
| 88 | + $allowed_options = [ 'name', 'title', 'tag', 'tags', 'description', 'release_status', 'default', 'mutable', static::TYPE_HIDDEN, 'new_site', 'on_state_change', 'dependencies', 'generator_tag', 'messages' ]; | |
| 89 | + | |
| 90 | + $experimental_data = $this->merge_properties( $default_experimental_data, $options, $allowed_options ); | |
| 91 | + | |
| 92 | + $experimental_data = $this->unify_feature_tags( $experimental_data ); | |
| 93 | + | |
| 73 | 94 | $new_site = $experimental_data['new_site']; |
| 74 | 95 | |
| 75 | 96 | if ( $new_site['default_active'] || $new_site['always_active'] || $new_site['default_inactive'] ) { |
| 76 | - $experimental_data = $this->set_new_site_default_state( $new_site, $experimental_data ); | |
| 97 | + $is_new_installation = $this->install_compare( $new_site['minimum_installation_version'] ); | |
| 98 | + | |
| 99 | + if ( $is_new_installation ) { | |
| 100 | + if ( $new_site['always_active'] ) { | |
| 101 | + $experimental_data['state'] = self::STATE_ACTIVE; | |
| 102 | + | |
| 103 | + $experimental_data['mutable'] = false; | |
| 104 | + } elseif ( $new_site['default_active'] ) { | |
| 105 | + $experimental_data['default'] = self::STATE_ACTIVE; | |
| 106 | + } elseif ( $new_site['default_inactive'] ) { | |
| 107 | + $experimental_data['default'] = self::STATE_INACTIVE; | |
| 108 | + } | |
| 109 | + } | |
| 77 | 110 | } |
| 78 | 111 | |
| 79 | 112 | if ( $experimental_data['mutable'] ) { |
| 80 | 113 | $experimental_data['state'] = $this->get_saved_feature_state( $options['name'] ); |
| @@ -84,9 +117,17 @@ | ||
| 84 | 117 | $experimental_data['state'] = self::STATE_DEFAULT; |
| 85 | 118 | } |
| 86 | 119 | |
| 87 | 120 | if ( ! empty( $experimental_data['dependencies'] ) ) { |
| 88 | - $experimental_data = $this->initialize_feature_dependencies( $experimental_data ); | |
| 121 | + foreach ( $experimental_data['dependencies'] as $key => $dependency ) { | |
| 122 | + $feature = $this->get_features( $dependency ); | |
| 123 | + | |
| 124 | + if ( ! empty( $feature[ static::TYPE_HIDDEN ] ) ) { | |
| 125 | + throw new Exceptions\Dependency_Exception( 'Depending on a hidden experiment is not allowed.' ); | |
| 126 | + } | |
| 127 | + | |
| 128 | + $experimental_data['dependencies'][ $key ] = $this->create_dependency_class( $dependency, $feature ); | |
| 129 | + } | |
| 89 | 130 | } |
| 90 | 131 | |
| 91 | 132 | $this->features[ $options['name'] ] = $experimental_data; |
| 92 | 133 | |
| @@ -120,11 +161,9 @@ | ||
| 120 | 161 | private function install_compare( $version ) { |
| 121 | 162 | $installs_history = Upgrade_Manager::get_installs_history(); |
| 122 | 163 | |
| 123 | 164 | if ( empty( $installs_history ) ) { |
| 124 | - // Fresh installation: upgrade manager hasn't written history yet on this first request. | |
| 125 | - // Use the current plugin version as the effective first-install version. | |
| 126 | - return version_compare( ELEMENTOR_VERSION, $version, '>=' ); | |
| 165 | + return false; | |
| 127 | 166 | } |
| 128 | 167 | |
| 129 | 168 | $cleaned_version = preg_replace( '/-(beta|cloud|dev)\d*$/', '', key( $installs_history ) ); |
| 130 | 169 | |
| @@ -141,9 +180,9 @@ | ||
| 141 | 180 | * @param array $experimental_data |
| 142 | 181 | * |
| 143 | 182 | * @return array |
| 144 | 183 | */ |
| 145 | - private function unify_feature_tags( array $experimental_data ): array { | |
| 184 | + private function unify_feature_tags( array $experimental_data ) : array { | |
| 146 | 185 | foreach ( [ 'tag', 'tags' ] as $key ) { |
| 147 | 186 | if ( empty( $experimental_data[ $key ] ) ) { |
| 148 | 187 | continue; |
| 149 | 188 | } |
| @@ -160,21 +199,18 @@ | ||
| 160 | 199 | |
| 161 | 200 | /** |
| 162 | 201 | * Format feature tags into the right format. |
| 163 | 202 | * |
| 164 | - * If an array of tags provided, each tag has to provide the following information: | |
| 165 | - * [ | |
| 166 | - * [ | |
| 167 | - * 'type' => string, | |
| 168 | - * 'label' => string, | |
| 169 | - * ] | |
| 170 | - * ] | |
| 203 | + * @param string|array[ | |
| 204 | + * [ | |
| 205 | + * 'type' => string, | |
| 206 | + * 'label' => string | |
| 207 | + * ] | |
| 208 | + * ] $tag | |
| 171 | 209 | * |
| 172 | - * @param string|array $tags A string of comma separated tags, or an array of tags. | |
| 173 | - * | |
| 174 | 210 | * @return array |
| 175 | 211 | */ |
| 176 | - private function format_feature_tags( $tags ): array { | |
| 212 | + private function format_feature_tags( $tags ) : array { | |
| 177 | 213 | if ( ! is_string( $tags ) && ! is_array( $tags ) ) { |
| 178 | 214 | return []; |
| 179 | 215 | } |
| 180 | 216 | |
| @@ -223,9 +259,9 @@ | ||
| 223 | 259 | * |
| 224 | 260 | * @since 3.1.0 |
| 225 | 261 | * @access public |
| 226 | 262 | * |
| 227 | - * @param string $feature_name Optional. Default is null. | |
| 263 | + * @param string $feature_name Optional. Default is null | |
| 228 | 264 | * |
| 229 | 265 | * @return array|null |
| 230 | 266 | */ |
| 231 | 267 | public function get_features( $feature_name = null ) { |
| @@ -249,42 +285,20 @@ | ||
| 249 | 285 | * |
| 250 | 286 | * @since 3.1.0 |
| 251 | 287 | * @access public |
| 252 | 288 | * |
| 253 | - * @param string $feature_name Experiment feature name. | |
| 254 | - * @param bool $check_dependencies When true, also require dependency experiments to be active. | |
| 255 | - * Missing or hidden dependencies are treated as active for compatibility. | |
| 289 | + * @param string $feature_name | |
| 256 | 290 | * |
| 257 | 291 | * @return bool |
| 258 | 292 | */ |
| 259 | - public function is_feature_active( $feature_name, $check_dependencies = false ) { | |
| 293 | + public function is_feature_active( $feature_name ) { | |
| 260 | 294 | $feature = $this->get_features( $feature_name ); |
| 261 | 295 | |
| 262 | - if ( ! $feature || self::STATE_ACTIVE !== $this->get_feature_actual_state( $feature ) ) { | |
| 296 | + if ( ! $feature ) { | |
| 263 | 297 | return false; |
| 264 | 298 | } |
| 265 | 299 | |
| 266 | - if ( $check_dependencies && isset( $feature['dependencies'] ) && is_array( $feature['dependencies'] ) ) { | |
| 267 | - foreach ( $feature['dependencies'] as $dependency ) { | |
| 268 | - if ( $dependency instanceof Non_Existing_Dependency ) { | |
| 269 | - continue; | |
| 270 | - } | |
| 271 | - | |
| 272 | - $dependent_feature = $this->get_features( $dependency->get_name() ); | |
| 273 | - | |
| 274 | - if ( $this->is_removed_or_hidden_dependency( $dependent_feature ) ) { | |
| 275 | - continue; | |
| 276 | - } | |
| 277 | - | |
| 278 | - $feature_state = self::STATE_ACTIVE === $this->get_feature_actual_state( $dependent_feature ); | |
| 279 | - | |
| 280 | - if ( ! $feature_state ) { | |
| 281 | - return false; | |
| 282 | - } | |
| 283 | - } | |
| 284 | - } | |
| 285 | - | |
| 286 | - return true; | |
| 300 | + return self::STATE_ACTIVE === $this->get_feature_actual_state( $feature ); | |
| 287 | 301 | } |
| 288 | 302 | |
| 289 | 303 | /** |
| 290 | 304 | * Set Feature Default State |
| @@ -320,8 +334,25 @@ | ||
| 320 | 334 | } |
| 321 | 335 | |
| 322 | 336 | private function add_default_features() { |
| 323 | 337 | $this->add_feature( [ |
| 338 | + 'name' => 'e_optimized_css_loading', | |
| 339 | + 'title' => esc_html__( 'Improved CSS Loading', 'elementor' ), | |
| 340 | + 'tag' => esc_html__( 'Performance', 'elementor' ), | |
| 341 | + 'description' => sprintf( | |
| 342 | + '%1$s <a href="https://go.elementor.com/wp-dash-improved-css-loading/" target="_blank">%2$s</a>', | |
| 343 | + esc_html__( 'Please Note! The “Improved CSS Loading” mode reduces the amount of CSS code that is loaded on the page by default. When activated, the CSS code will be loaded, rather inline or in a dedicated file, only when needed. Activating this experiment may cause conflicts with incompatible plugins.', 'elementor' ), | |
| 344 | + esc_html__( 'Learn more', 'elementor' ) | |
| 345 | + ), | |
| 346 | + 'release_status' => self::RELEASE_STATUS_STABLE, | |
| 347 | + 'new_site' => [ | |
| 348 | + 'default_active' => true, | |
| 349 | + 'minimum_installation_version' => '3.3.0', | |
| 350 | + ], | |
| 351 | + 'generator_tag' => true, | |
| 352 | + ] ); | |
| 353 | + | |
| 354 | + $this->add_feature( [ | |
| 324 | 355 | 'name' => 'e_font_icon_svg', |
| 325 | 356 | 'title' => esc_html__( 'Inline Font Icons', 'elementor' ), |
| 326 | 357 | 'tag' => esc_html__( 'Performance', 'elementor' ), |
| 327 | 358 | 'description' => sprintf( |
| @@ -351,15 +382,19 @@ | ||
| 351 | 382 | ] ); |
| 352 | 383 | |
| 353 | 384 | $this->add_feature( [ |
| 354 | 385 | 'name' => 'container', |
| 355 | - 'title' => esc_html__( 'Container', 'elementor' ), | |
| 386 | + 'title' => esc_html__( 'Flexbox Container', 'elementor' ), | |
| 356 | 387 | 'description' => sprintf( |
| 357 | - /* translators: 1: Link opening tag, 2: Link closing tag, 3: Link opening tag, 4: Link closing tag */ | |
| 358 | - esc_html__( 'Create advanced layouts and responsive designs with %1$sFlexbox%2$s and %3$sGrid%4$s container elements.', 'elementor' ), | |
| 388 | + esc_html__( | |
| 389 | + 'Create advanced layouts and responsive designs with the new %1$sFlexbox Container element%2$s. | |
| 390 | + This experiment replaces the current section/column structure, but you\'ll still keep your existing | |
| 391 | + Sections, Inner Sections and Columns and be able to edit them. Ready to give it a try? Check out the %3$sFlexbox playground%4$s.', | |
| 392 | + 'elementor' | |
| 393 | + ), | |
| 359 | 394 | '<a target="_blank" href="https://go.elementor.com/wp-dash-flex-container/">', |
| 360 | 395 | '</a>', |
| 361 | - '<a target="_blank" href="https://go.elementor.com/wp-dash-grid-container/">', | |
| 396 | + '<a target="_blank" href="https://go.elementor.com/wp-dash-flex-container-playground/">', | |
| 362 | 397 | '</a>' |
| 363 | 398 | ), |
| 364 | 399 | 'release_status' => self::RELEASE_STATUS_STABLE, |
| 365 | 400 | 'default' => self::STATE_INACTIVE, |
| @@ -376,28 +411,72 @@ | ||
| 376 | 411 | ], |
| 377 | 412 | ] ); |
| 378 | 413 | |
| 379 | 414 | $this->add_feature( [ |
| 380 | - 'name' => 'e_optimized_markup', | |
| 381 | - 'title' => esc_html__( 'Optimized Markup', 'elementor' ), | |
| 415 | + 'name' => 'container_grid', | |
| 416 | + 'title' => esc_html__( 'Grid Container', 'elementor' ), | |
| 417 | + 'tag' => esc_html__( 'Feature', 'elementor' ), | |
| 418 | + 'description' => sprintf( | |
| 419 | + '%1$s <a target="_blank" href="https://go.elementor.com/wp-dash-grid-container/">%2$s</a>', | |
| 420 | + esc_html__( 'Create pixel perfect layouts by placing elements in a customizable grid. Activate to add the CSS Grid option to container elements.', 'elementor' ), | |
| 421 | + esc_html__( 'Learn more', 'elementor' ), | |
| 422 | + ), | |
| 423 | + 'release_status' => self::RELEASE_STATUS_STABLE, | |
| 424 | + 'default' => self::STATE_ACTIVE, | |
| 425 | + 'dependencies' => [ | |
| 426 | + 'container', | |
| 427 | + ], | |
| 428 | + ] ); | |
| 429 | + | |
| 430 | + $this->add_feature( [ | |
| 431 | + 'name' => 'e_swiper_latest', | |
| 432 | + 'title' => esc_html__( 'Upgrade Swiper Library', 'elementor' ), | |
| 433 | + 'description' => esc_html__( 'Prepare your website for future improvements to carousel features by upgrading the Swiper library integrated into your site from v5.36 to v8.45. This experiment includes markup changes so it might require updating custom code and cause compatibility issues with third party plugins.', 'elementor' ), | |
| 434 | + 'release_status' => self::RELEASE_STATUS_STABLE, | |
| 435 | + 'default' => self::STATE_ACTIVE, | |
| 436 | + ] ); | |
| 437 | + | |
| 438 | + $this->add_feature( [ | |
| 439 | + 'name' => 'e_nested_atomic_repeaters', | |
| 440 | + 'title' => esc_html__( 'Nested Elements Performance', 'elementor' ), | |
| 382 | 441 | 'tag' => esc_html__( 'Performance', 'elementor' ), |
| 383 | - 'description' => esc_html__( 'Reduce the DOM size by eliminating HTML tags in various elements and widgets. This experiment includes markup changes so it might require updating custom CSS/JS code and cause compatibility issues with third party plugins.', 'elementor' ), | |
| 384 | - 'release_status' => self::RELEASE_STATUS_STABLE, | |
| 442 | + 'description' => esc_html__( 'Improve the performance of the Nested widgets.', 'elementor' ), | |
| 443 | + static::TYPE_HIDDEN => true, | |
| 444 | + 'release_status' => self::RELEASE_STATUS_DEV, | |
| 445 | + 'default' => self::STATE_ACTIVE, | |
| 446 | + ] ); | |
| 447 | + | |
| 448 | + $this->add_feature( [ | |
| 449 | + 'name' => 'e_optimized_control_loading', | |
| 450 | + 'title' => esc_html__( 'Optimized Control Loading', 'elementor' ), | |
| 451 | + 'tag' => esc_html__( 'Performance', 'elementor' ), | |
| 452 | + 'description' => esc_html__( 'Use this experiment to improve control loading. This experiment improves site performance by loading controls only when needed.', 'elementor' ), | |
| 453 | + 'release_status' => self::RELEASE_STATUS_BETA, | |
| 385 | 454 | 'default' => self::STATE_INACTIVE, |
| 386 | 455 | 'new_site' => [ |
| 387 | 456 | 'default_active' => true, |
| 388 | - 'minimum_installation_version' => '3.30.0', | |
| 457 | + 'minimum_installation_version' => '3.22.0', | |
| 389 | 458 | ], |
| 459 | + 'generator_tag' => true, | |
| 390 | 460 | ] ); |
| 391 | 461 | |
| 392 | 462 | $this->add_feature( [ |
| 393 | - 'name' => 'e_optimized_css_files', | |
| 394 | - 'title' => esc_html__( 'Optimized CSS Files', 'elementor' ), | |
| 463 | + 'name' => 'e_optimized_markup', | |
| 464 | + 'title' => esc_html__( 'Optimized Markup', 'elementor' ), | |
| 395 | 465 | 'tag' => esc_html__( 'Performance', 'elementor' ), |
| 396 | - 'description' => esc_html__( 'Keeps external CSS files available and consistent for sites behind page caching or a CDN.', 'elementor' ), | |
| 466 | + 'description' => esc_html__( 'Reduce the DOM size by eliminating HTML tags in various elements and widgets. This experiment includes markup changes so it might require updating custom CSS/JS code and cause compatibility issues with third party plugins.', 'elementor' ), | |
| 467 | + static::TYPE_HIDDEN => true, | |
| 468 | + 'release_status' => self::RELEASE_STATUS_DEV, | |
| 469 | + 'default' => self::STATE_INACTIVE, | |
| 470 | + ] ); | |
| 471 | + | |
| 472 | + $this->add_feature( [ | |
| 473 | + 'name' => 'e_onboarding', | |
| 474 | + 'title' => esc_html__( 'Plugin Onboarding', 'elementor' ), | |
| 475 | + 'description' => esc_html__( 'New plugin onboarding.', 'elementor' ), | |
| 476 | + static::TYPE_HIDDEN => true, | |
| 397 | 477 | 'release_status' => self::RELEASE_STATUS_ALPHA, |
| 398 | - 'default' => self::STATE_INACTIVE, | |
| 399 | - 'generator_tag' => true, | |
| 478 | + 'default' => self::STATE_ACTIVE, | |
| 400 | 479 | ] ); |
| 401 | 480 | } |
| 402 | 481 | |
| 403 | 482 | /** |
| @@ -424,8 +503,9 @@ | ||
| 424 | 503 | $this->release_statuses = [ |
| 425 | 504 | self::RELEASE_STATUS_DEV => esc_html__( 'Development', 'elementor' ), |
| 426 | 505 | self::RELEASE_STATUS_ALPHA => esc_html__( 'Alpha', 'elementor' ), |
| 427 | 506 | self::RELEASE_STATUS_BETA => esc_html__( 'Beta', 'elementor' ), |
| 507 | + self::RELEASE_STATUS_RC => esc_html__( 'Release Candidate', 'elementor' ), | |
| 428 | 508 | self::RELEASE_STATUS_STABLE => esc_html__( 'Stable', 'elementor' ), |
| 429 | 509 | ]; |
| 430 | 510 | } |
| 431 | 511 | |
| @@ -449,8 +529,9 @@ | ||
| 449 | 529 | * @param Settings $settings |
| 450 | 530 | * |
| 451 | 531 | * @since 3.1.0 |
| 452 | 532 | * @access private |
| 533 | + * | |
| 453 | 534 | */ |
| 454 | 535 | private function register_settings_fields( Settings $settings ) { |
| 455 | 536 | $features = $this->get_features(); |
| 456 | 537 | |
| @@ -538,9 +619,9 @@ | ||
| 538 | 619 | <?php echo esc_html__( 'Experiments and Features', 'elementor' ); ?> |
| 539 | 620 | </h2> |
| 540 | 621 | <p class="e-experiment__description"> |
| 541 | 622 | <?php |
| 542 | - printf( | |
| 623 | + echo sprintf( | |
| 543 | 624 | /* translators: %1$s Link open tag, %2$s: Link close tag. */ |
| 544 | 625 | esc_html__( 'Personalize your Elementor experience by controlling which features and experiments are active on your site. Help make Elementor better by %1$ssharing your experience and feedback with us%2$s.', 'elementor' ), |
| 545 | 626 | '<a href="https://go.elementor.com/wp-dash-experiments-report-an-issue/" target="_blank">', |
| 546 | 627 | '</a>' |
| @@ -548,9 +629,9 @@ | ||
| 548 | 629 | ?> |
| 549 | 630 | </p> |
| 550 | 631 | <p class="e-experiment__description"> |
| 551 | 632 | <?php |
| 552 | - printf( | |
| 633 | + echo sprintf( | |
| 553 | 634 | '%1$s <a href="https://go.elementor.com/wp-dash-experiments/" target="_blank">%2$s</a>', |
| 554 | 635 | esc_html__( 'To use an experiment or feature on your site, simply click on the dropdown next to it and switch to Active. You can always deactivate them at any time.', 'elementor' ), |
| 555 | 636 | esc_html__( 'Learn more', 'elementor' ), |
| 556 | 637 | ); |
| @@ -642,13 +723,13 @@ | ||
| 642 | 723 | ->find( function ( $dependency ) { |
| 643 | 724 | return $dependency instanceof Non_Existing_Dependency; |
| 644 | 725 | } ); |
| 645 | 726 | |
| 646 | - return (bool) $non_existing_dep; | |
| 727 | + return ! ! $non_existing_dep; | |
| 647 | 728 | } |
| 648 | 729 | |
| 649 | 730 | /** |
| 650 | - * Get Feature Settings Label HTML. | |
| 731 | + * Get Feature Settings Label HTML | |
| 651 | 732 | * |
| 652 | 733 | * @since 3.1.0 |
| 653 | 734 | * @access private |
| 654 | 735 | * |
| @@ -673,16 +754,10 @@ | ||
| 673 | 754 | <div class="e-experiment__title"> |
| 674 | 755 | <div class="<?php echo $indicator_classes; ?>" data-tooltip="<?php echo $indicator_tooltip; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>"></div> |
| 675 | 756 | <label class="e-experiment__title__label" for="e-experiment-<?php echo $feature['name']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>"><?php echo $feature['title']; ?></label> |
| 676 | 757 | <?php foreach ( $feature['tags'] as $tag ) { ?> |
| 677 | - <?php | |
| 678 | - $tag_classes = 'e-experiment__title__tag e-experiment__title__tag__' . $tag['type'] . ' e-editor-one'; | |
| 679 | - ?> | |
| 680 | - <span class="<?php echo esc_attr( $tag_classes ); ?>"><?php echo $tag['label']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></span> | |
| 758 | + <span class="e-experiment__title__tag e-experiment__title__tag__<?php echo $tag['type']; ?>"><?php echo $tag['label']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></span> | |
| 681 | 759 | <?php } ?> |
| 682 | - <?php if ( $feature['deprecated'] ) { ?> | |
| 683 | - <span class="e-experiment__title__tag e-experiment__title__tag__deprecated"><?php echo esc_html__( 'Deprecated', 'elementor' ); ?></span> | |
| 684 | - <?php } ?> | |
| 685 | 760 | </div> |
| 686 | 761 | <?php |
| 687 | 762 | |
| 688 | 763 | return ob_get_clean(); |
| @@ -746,11 +821,12 @@ | ||
| 746 | 821 | * |
| 747 | 822 | * @since 3.1.0 |
| 748 | 823 | * @access private |
| 749 | 824 | * |
| 750 | - * @param array $old_feature_data | |
| 825 | + * @param array $old_feature_data | |
| 751 | 826 | * @param string $new_state |
| 752 | - * @param string $old_state | |
| 827 | + * | |
| 828 | + * @throws \Elementor\Core\Experiments\Exceptions\Dependency_Exception | |
| 753 | 829 | */ |
| 754 | 830 | private function on_feature_state_change( array $old_feature_data, $new_state, $old_state ) { |
| 755 | 831 | $new_feature_data = $this->get_features( $old_feature_data['name'] ); |
| 756 | 832 | $this->validate_dependency( $new_feature_data, $new_state ); |
| @@ -767,9 +843,9 @@ | ||
| 767 | 843 | do_action( 'elementor/experiments/feature-state-change/' . $old_feature_data['name'], $old_state, $new_state ); |
| 768 | 844 | } |
| 769 | 845 | |
| 770 | 846 | /** |
| 771 | - * @throws Exceptions\Dependency_Exception If the feature dependency is not available or not active. | |
| 847 | + * @throws \Elementor\Core\Experiments\Exceptions\Dependency_Exception | |
| 772 | 848 | */ |
| 773 | 849 | private function validate_dependency( array $feature, $new_state ) { |
| 774 | 850 | $rollback = function ( $feature_option_key, $state ) { |
| 775 | 851 | remove_all_actions( 'add_option_' . $feature_option_key ); |
| @@ -790,41 +866,20 @@ | ||
| 790 | 866 | } |
| 791 | 867 | |
| 792 | 868 | // Validate if the current feature dependency is available. |
| 793 | 869 | foreach ( $feature['dependencies'] as $dependency ) { |
| 794 | - if ( $dependency instanceof Non_Existing_Dependency ) { | |
| 795 | - $this->warn_removed_or_hidden_dependency( | |
| 796 | - sprintf( | |
| 797 | - 'The feature `%s` has a dependency `%s` that is not available in Core.', | |
| 798 | - esc_html( $feature['name'] ), | |
| 799 | - esc_html( $dependency->get_name() ) | |
| 800 | - ) | |
| 801 | - ); | |
| 802 | - continue; | |
| 803 | - } | |
| 804 | - | |
| 805 | 870 | $dependency_feature = $this->get_features( $dependency->get_name() ); |
| 806 | 871 | |
| 807 | 872 | if ( ! $dependency_feature ) { |
| 808 | - $this->warn_removed_or_hidden_dependency( | |
| 809 | - sprintf( | |
| 810 | - 'The feature `%s` has a dependency `%s` that is not available in Core.', | |
| 811 | - esc_html( $feature['name'] ), | |
| 812 | - esc_html( $dependency->get_name() ) | |
| 813 | - ) | |
| 814 | - ); | |
| 815 | - continue; | |
| 816 | - } | |
| 873 | + $rollback( $feature_option_key, self::STATE_INACTIVE ); | |
| 817 | 874 | |
| 818 | - if ( $this->is_removed_or_hidden_dependency( $dependency_feature ) ) { | |
| 819 | - $this->warn_removed_or_hidden_dependency( | |
| 875 | + throw new Exceptions\Dependency_Exception( | |
| 820 | 876 | sprintf( |
| 821 | - 'The feature `%1$s` depends on hidden experiment `%2$s`.', | |
| 822 | - esc_html( $feature['name'] ), | |
| 823 | - esc_html( $dependency_feature['name'] ) | |
| 877 | + 'The feature `%s` has a dependency `%s` that is not available.', | |
| 878 | + $feature['name'], | |
| 879 | + $dependency->get_name() | |
| 824 | 880 | ) |
| 825 | 881 | ); |
| 826 | - continue; | |
| 827 | 882 | } |
| 828 | 883 | |
| 829 | 884 | $dependency_state = $this->get_feature_actual_state( $dependency_feature ); |
| 830 | 885 | |
| @@ -834,10 +889,10 @@ | ||
| 834 | 889 | |
| 835 | 890 | throw new Exceptions\Dependency_Exception( |
| 836 | 891 | sprintf( |
| 837 | 892 | 'To turn on `%1$s`, Experiment: `%2$s` activity is required!', |
| 838 | - esc_html( $feature['name'] ), | |
| 839 | - esc_html( $dependency_feature['name'] ) | |
| 893 | + $feature['name'], | |
| 894 | + $dependency_feature['name'] | |
| 840 | 895 | ) |
| 841 | 896 | ); |
| 842 | 897 | } |
| 843 | 898 | } |
| @@ -882,9 +937,11 @@ | ||
| 882 | 937 | * This behavior interferes with the experiments dependency mechanism because the data that's being sent can be in any order, |
| 883 | 938 | * while the dependencies mechanism expects it to be in a specific order (dependencies should be activated before their dependents can). |
| 884 | 939 | * In order to solve this issue, we sort the experiments in the POST data based on their dependencies tree. |
| 885 | 940 | * |
| 886 | - * @param array $allowed_options | |
| 941 | + * @param $allowed_options | |
| 942 | + * | |
| 943 | + * @return mixed | |
| 887 | 944 | */ |
| 888 | 945 | private function sort_allowed_options_by_dependencies( $allowed_options ) { |
| 889 | 946 | if ( ! isset( $allowed_options['elementor'] ) ) { |
| 890 | 947 | return $allowed_options; |
| @@ -972,137 +1029,6 @@ | ||
| 972 | 1029 | // Register CLI commands. |
| 973 | 1030 | if ( Utils::is_wp_cli() ) { |
| 974 | 1031 | \WP_CLI::add_command( 'elementor experiments', WP_CLI::class ); |
| 975 | 1032 | } |
| 976 | - } | |
| 977 | - | |
| 978 | - /** | |
| 979 | - * @param array $experimental_data | |
| 980 | - * @return array | |
| 981 | - */ | |
| 982 | - private function initialize_feature_dependencies( array $experimental_data ): array { | |
| 983 | - foreach ( $experimental_data['dependencies'] as $key => $dependency ) { | |
| 984 | - $feature = $this->get_features( $dependency ); | |
| 985 | - | |
| 986 | - if ( ! isset( $feature ) ) { | |
| 987 | - $this->warn_removed_or_hidden_dependency( | |
| 988 | - sprintf( | |
| 989 | - 'Feature %1$s depends on experiment %2$s that is not registered in Core.', | |
| 990 | - esc_html( $experimental_data['name'] ), | |
| 991 | - esc_html( $dependency ) | |
| 992 | - ) | |
| 993 | - ); | |
| 994 | - | |
| 995 | - $experimental_data['dependencies'][ $key ] = $this->create_dependency_class( $dependency, null ); | |
| 996 | - continue; | |
| 997 | - } | |
| 998 | - | |
| 999 | - if ( ! empty( $feature[ static::TYPE_HIDDEN ] ) ) { | |
| 1000 | - $this->warn_removed_or_hidden_dependency( | |
| 1001 | - sprintf( | |
| 1002 | - 'Feature %1$s depends on hidden experiment %2$s.', | |
| 1003 | - esc_html( $experimental_data['name'] ), | |
| 1004 | - esc_html( $dependency ) | |
| 1005 | - ) | |
| 1006 | - ); | |
| 1007 | - } | |
| 1008 | - | |
| 1009 | - $experimental_data['dependencies'][ $key ] = $this->create_dependency_class( $dependency, $feature ); | |
| 1010 | - $experimental_data = $this->set_feature_default_state_to_match_dependencies( $feature, $experimental_data ); | |
| 1011 | - } | |
| 1012 | - | |
| 1013 | - return $experimental_data; | |
| 1014 | - } | |
| 1015 | - | |
| 1016 | - private function is_removed_or_hidden_dependency( $dependency_feature ): bool { | |
| 1017 | - if ( ! $dependency_feature ) { | |
| 1018 | - return true; | |
| 1019 | - } | |
| 1020 | - | |
| 1021 | - return ! empty( $dependency_feature[ static::TYPE_HIDDEN ] ); | |
| 1022 | - } | |
| 1023 | - | |
| 1024 | - private function warn_removed_or_hidden_dependency( string $message ): void { | |
| 1025 | - if ( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) { | |
| 1026 | - return; | |
| 1027 | - } | |
| 1028 | - | |
| 1029 | - // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Developer notice; message is escaped. | |
| 1030 | - _doing_it_wrong( __METHOD__, esc_html( $message ), ELEMENTOR_VERSION ); | |
| 1031 | - } | |
| 1032 | - | |
| 1033 | - /** | |
| 1034 | - * @param array $feature | |
| 1035 | - * @param array $experimental_data | |
| 1036 | - * @return array | |
| 1037 | - * | |
| 1038 | - * we must validate the state: | |
| 1039 | - * * A user can set a dependant feature to inactive and in upgrade we don't change users settings. | |
| 1040 | - * * A developer can set the default state to be invalid (e.g. dependant feature is inactive). | |
| 1041 | - * if one of the dependencies is inactive, the main feature should be inactive as well. | |
| 1042 | - */ | |
| 1043 | - private function set_feature_default_state_to_match_dependencies( array $feature, array $experimental_data ): array { | |
| 1044 | - if ( self::STATE_INACTIVE !== $this->get_feature_actual_state( $feature ) ) { | |
| 1045 | - return $experimental_data; | |
| 1046 | - } | |
| 1047 | - | |
| 1048 | - if ( self::STATE_ACTIVE === $experimental_data['state'] ) { | |
| 1049 | - $experimental_data['state'] = self::STATE_INACTIVE; | |
| 1050 | - } elseif ( self::STATE_DEFAULT === $experimental_data['state'] ) { | |
| 1051 | - $experimental_data['default'] = self::STATE_INACTIVE; | |
| 1052 | - } | |
| 1053 | - | |
| 1054 | - return $experimental_data; | |
| 1055 | - } | |
| 1056 | - | |
| 1057 | - /** | |
| 1058 | - * @param array $new_site | |
| 1059 | - * @param array $experimental_data | |
| 1060 | - * @return array | |
| 1061 | - */ | |
| 1062 | - private function set_new_site_default_state( $new_site, array $experimental_data ): array { | |
| 1063 | - if ( ! $this->install_compare( $new_site['minimum_installation_version'] ) ) { | |
| 1064 | - return $experimental_data; | |
| 1065 | - } | |
| 1066 | - | |
| 1067 | - if ( $new_site['always_active'] ) { | |
| 1068 | - $experimental_data['state'] = self::STATE_ACTIVE; | |
| 1069 | - $experimental_data['mutable'] = false; | |
| 1070 | - } elseif ( $new_site['default_active'] ) { | |
| 1071 | - $experimental_data['default'] = self::STATE_ACTIVE; | |
| 1072 | - } elseif ( $new_site['default_inactive'] ) { | |
| 1073 | - $experimental_data['default'] = self::STATE_INACTIVE; | |
| 1074 | - } | |
| 1075 | - | |
| 1076 | - return $experimental_data; | |
| 1077 | - } | |
| 1078 | - | |
| 1079 | - /** | |
| 1080 | - * @param array $options | |
| 1081 | - * @return array | |
| 1082 | - */ | |
| 1083 | - private function set_feature_initial_options( array $options ): array { | |
| 1084 | - $default_experimental_data = [ | |
| 1085 | - 'tag' => '', // Deprecated, use 'tags' instead. | |
| 1086 | - 'tags' => [], | |
| 1087 | - 'description' => '', | |
| 1088 | - 'release_status' => self::RELEASE_STATUS_ALPHA, | |
| 1089 | - 'default' => self::STATE_INACTIVE, | |
| 1090 | - 'mutable' => true, | |
| 1091 | - static::TYPE_HIDDEN => false, | |
| 1092 | - 'new_site' => [ | |
| 1093 | - 'always_active' => false, | |
| 1094 | - 'default_active' => false, | |
| 1095 | - 'default_inactive' => false, | |
| 1096 | - 'minimum_installation_version' => null, | |
| 1097 | - ], | |
| 1098 | - 'on_state_change' => null, | |
| 1099 | - 'generator_tag' => false, | |
| 1100 | - 'deprecated' => false, | |
| 1101 | - ]; | |
| 1102 | - | |
| 1103 | - $allowed_options = [ 'name', 'title', 'tag', 'tags', 'description', 'release_status', 'default', 'mutable', static::TYPE_HIDDEN, 'new_site', 'on_state_change', 'dependencies', 'generator_tag', 'messages', 'deprecated' ]; | |
| 1104 | - $experimental_data = $this->merge_properties( $default_experimental_data, $options, $allowed_options ); | |
| 1105 | - | |
| 1106 | - return $this->unify_feature_tags( $experimental_data ); | |
| 1107 | 1033 | } |
| 1108 | 1034 | } |
