← All changes
|
modules/mcp/abilities/utils/composition-compiler.php
+13
-1
4.3.0-beta2
→
4.3.2
View file →
| @@ -134,8 +134,14 @@ | ||
| 134 | 134 | |
| 135 | 135 | return [ |
| 136 | 136 | 'elements' => $subtrees, |
| 137 | 137 | 'warnings' => array_merge( $wrapping_result['warnings'], $config_result['warnings'], $style_result['warnings'], $interactions_result['warnings'] ), |
| 138 | + 'warning_codes' => array_values( array_unique( array_merge( | |
| 139 | + $wrapping_result['warning_codes'] ?? [], | |
| 140 | + $config_result['warning_codes'] ?? [], | |
| 141 | + $style_result['warning_codes'] ?? [], | |
| 142 | + $interactions_result['warning_codes'] ?? [] | |
| 143 | + ) ) ), | |
| 138 | 144 | 'dom' => $dom, |
| 139 | 145 | 'xml_parser' => $xml_parser, |
| 140 | 146 | ]; |
| 141 | 147 | } |
| @@ -203,8 +209,9 @@ | ||
| 203 | 209 | if ( self::DEFAULT_PARENT_ID !== $parent_id ) { |
| 204 | 210 | return [ |
| 205 | 211 | 'widget_configs' => $widget_configs, |
| 206 | 212 | 'warnings' => [], |
| 213 | + 'warning_codes' => [], | |
| 207 | 214 | ]; |
| 208 | 215 | } |
| 209 | 216 | |
| 210 | 217 | $root = $xml_parser->get_root( $dom ); |
| @@ -211,8 +218,9 @@ | ||
| 211 | 218 | if ( ! $root ) { |
| 212 | 219 | return [ |
| 213 | 220 | 'widget_configs' => $widget_configs, |
| 214 | 221 | 'warnings' => [], |
| 222 | + 'warning_codes' => [], | |
| 215 | 223 | ]; |
| 216 | 224 | } |
| 217 | 225 | |
| 218 | 226 | $root_children = $xml_parser->get_child_elements( $root ); |
| @@ -232,8 +240,9 @@ | ||
| 232 | 240 | if ( ! $has_widget ) { |
| 233 | 241 | return [ |
| 234 | 242 | 'widget_configs' => $widget_configs, |
| 235 | 243 | 'warnings' => [], |
| 244 | + 'warning_codes' => [], | |
| 236 | 245 | ]; |
| 237 | 246 | } |
| 238 | 247 | |
| 239 | 248 | $wrapper_config = $type_resolver->resolve_type_config( self::DOCUMENT_ROOT_WRAPPER ); |
| @@ -252,8 +261,9 @@ | ||
| 252 | 261 | |
| 253 | 262 | return [ |
| 254 | 263 | 'widget_configs' => $widget_configs, |
| 255 | 264 | 'warnings' => [ __( 'Direct document-root content was wrapped in an e-div-block element.', 'elementor' ) ], |
| 265 | + 'warning_codes' => [ 'root_auto_wrapped' ], | |
| 256 | 266 | ]; |
| 257 | 267 | } |
| 258 | 268 | |
| 259 | 269 | private function as_map( $value ): array { |
| @@ -312,8 +322,9 @@ | ||
| 312 | 322 | if ( empty( $interactions ) ) { |
| 313 | 323 | return [ |
| 314 | 324 | 'error' => null, |
| 315 | 325 | 'warnings' => [], |
| 326 | + 'warning_codes' => [], | |
| 316 | 327 | ]; |
| 317 | 328 | } |
| 318 | 329 | |
| 319 | 330 | if ( ! Plugin::$instance->experiments->is_feature_active( Interactions_Module::EXPERIMENT_NAME ) ) { |
| @@ -319,14 +330,15 @@ | ||
| 319 | 330 | if ( ! Plugin::$instance->experiments->is_feature_active( Interactions_Module::EXPERIMENT_NAME ) ) { |
| 320 | 331 | return [ |
| 321 | 332 | 'error' => null, |
| 322 | 333 | 'warnings' => [ __( 'Interactions experiment is not active. Interactions were not applied.', 'elementor' ) ], |
| 334 | + 'warning_codes' => [ 'interactions_experiment_off' ], | |
| 323 | 335 | ]; |
| 324 | 336 | } |
| 325 | 337 | |
| 326 | 338 | $applier = new Interactions_Applier( $this->get_plain_values_resolver() ); |
| 327 | 339 | |
| 328 | - return $applier->apply( $index, $interactions ); | |
| 340 | + return $applier->apply( $index, $interactions ) + [ 'warning_codes' => [] ]; | |
| 329 | 341 | } |
| 330 | 342 | |
| 331 | 343 | private function is_variables_active(): bool { |
| 332 | 344 | $experiments = Plugin::$instance->experiments; |