Skip to content

Commit 2af1415

Browse files
committed
Merge remote-tracking branch 'origin/trunk' into add/command-palette-support
2 parents 3b547c3 + 91945b7 commit 2af1415

File tree

74 files changed

+3355
-693
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+3355
-693
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ jspm_packages/
4141
*.njsproj
4242
*.sln
4343
.cursorrules
44+
.cursorignore
4445

4546
# Assets build directory
4647
assets/build/**/*.css

.phpcs.xml.dist

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,29 @@
88
<exclude-pattern>/lang/*</exclude-pattern>
99

1010
<!-- How to scan -->
11-
<arg value="sp"/> <!-- Show sniff and progress -->
11+
<arg value="sp"/>
12+
<!-- Show sniff and progress -->
1213
<arg name="colors"/>
1314
<arg name="extensions" value="php"/>
1415

1516
<!-- Rules: WordPress Coding Standards -->
1617
<config name="minimum_supported_wp_version" value="6.0"/>
1718
<rule ref="WordPress">
18-
<exclude name="WordPress.NamingConventions.ValidHookName.UseUnderscores" /> <!-- 'acf/hookname' is used throughout. -->
19-
<exclude name="Squiz.Commenting.InlineComment.InvalidEndChar" /> <!-- This is trivial and not really useful today. -->
20-
<exclude name="WordPress.Files.FileName.InvalidClassFileName" /> <!-- Refactoring of this scale is not in scope yet.-->
19+
<exclude name="WordPress.NamingConventions.ValidHookName.UseUnderscores" />
20+
<!-- 'acf/hookname' is used throughout. -->
21+
<exclude name="Squiz.Commenting.InlineComment.InvalidEndChar" />
22+
<!-- This is trivial and not really useful today. -->
23+
<exclude name="WordPress.Files.FileName.InvalidClassFileName" />
24+
<!-- Refactoring of this scale is not in scope yet.-->
25+
<exclude name="WordPress.Files.FileName" />
26+
<!-- Exclude the entire filename rule -->
2127
</rule>
2228

2329
<rule ref="WordPress.Security.EscapeOutput">
2430
<properties>
2531
<property name="customEscapingFunctions" type="array">
26-
<element value="acf_esc_attrs" /> <!-- This function takes an associated array and escapes both the attr title and attr value. -->
32+
<element value="acf_esc_attrs" />
33+
<!-- This function takes an associated array and escapes both the attr title and attr value. -->
2734
<element value="acf_esc_html" />
2835
</property>
2936
</properties>

assets/src/js/_acf-validation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
*
169169
* @since ACF 5.7.5
170170
*
171-
* @param {string} [location=before] - The location to add the error, before or after the input. Default before. Since 6.3.
171+
* @param {string} [location=before] - The location to add the error, before or after the input. Default before. Since ACF 6.3.
172172
* @return void
173173
*/
174174
showErrors: function ( location = 'before' ) {

bin/baseline.neon

Lines changed: 0 additions & 247 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,5 @@
11
parameters:
22
ignoreErrors:
3-
-
4-
message: '#^Access to an undefined property ACF_Admin_Field_Groups\:\:\$not_found_label\.$#'
5-
identifier: property.notFound
6-
count: 1
7-
path: ../includes/admin/post-types/admin-field-groups.php
8-
9-
-
10-
message: '#^Action callback returns array but should not return anything\.$#'
11-
identifier: return.void
12-
count: 1
13-
path: ../includes/admin/post-types/admin-field-groups.php
14-
15-
-
16-
message: '#^Class ACF_Admin_Post_type referenced with incorrect case\: ACF_Admin_Post_Type\.$#'
17-
identifier: class.nameCase
18-
count: 1
19-
path: ../includes/admin/post-types/admin-post-type.php
20-
21-
-
22-
message: '#^Access to an undefined property ACF_Admin_Post_Types\:\:\$not_found_label\.$#'
23-
identifier: property.notFound
24-
count: 1
25-
path: ../includes/admin/post-types/admin-post-types.php
26-
27-
-
28-
message: '#^Access to an undefined property ACF_Admin_Taxonomies\:\:\$not_found_label\.$#'
29-
identifier: property.notFound
30-
count: 1
31-
path: ../includes/admin/post-types/admin-taxonomies.php
32-
33-
-
34-
message: '#^Access to an undefined property ACF_Admin_UI_Options_Pages\:\:\$not_found_label\.$#'
35-
identifier: property.notFound
36-
count: 1
37-
path: ../includes/admin/post-types/class-acf-admin-ui-options-pages.php
38-
393
-
404
message: '#^Variable \$field might not be defined\.$#'
415
identifier: variable.undefined
@@ -126,18 +90,6 @@ parameters:
12690
count: 1
12791
path: ../includes/admin/views/upgrade/notice.php
12892

129-
-
130-
message: '#^Function remove_filter invoked with 4 parameters, 2\-3 required\.$#'
131-
identifier: arguments.count
132-
count: 1
133-
path: ../includes/api/api-helpers.php
134-
135-
-
136-
message: '#^One or more @param tags has an invalid name or invalid syntax\.$#'
137-
identifier: phpDoc.parseError
138-
count: 1
139-
path: ../includes/api/api-helpers.php
140-
14193
-
14294
message: '#^Path in include_once\(\) "\./wp\-admin/includes/plugin\.php" is not a file or it does not exist\.$#'
14395
identifier: includeOnce.fileNotFound
@@ -162,193 +114,18 @@ parameters:
162114
count: 1
163115
path: ../includes/api/api-helpers.php
164116

165-
-
166-
message: '#^Function remove_filter invoked with 4 parameters, 2\-3 required\.$#'
167-
identifier: arguments.count
168-
count: 1
169-
path: ../includes/api/api-term.php
170-
171-
-
172-
message: '#^Action callback returns string but should not return anything\.$#'
173-
identifier: return.void
174-
count: 1
175-
path: ../includes/class-acf-internal-post-type.php
176-
177-
-
178-
message: '#^Expected 2 @param tags, found 1\.$#'
179-
identifier: paramTag.count
180-
count: 1
181-
path: ../includes/class-acf-internal-post-type.php
182-
183-
-
184-
message: '#^Expected 3 @param tags, found 2\.$#'
185-
identifier: paramTag.count
186-
count: 1
187-
path: ../includes/class-acf-internal-post-type.php
188-
189-
-
190-
message: '#^Action callback returns array but should not return anything\.$#'
191-
identifier: return.void
192-
count: 1
193-
path: ../includes/class-acf-site-health.php
194-
195-
-
196-
message: '#^Action callback returns bool but should not return anything\.$#'
197-
identifier: return.void
198-
count: 2
199-
path: ../includes/class-acf-site-health.php
200-
201-
-
202-
message: '#^Access to an undefined property acf_field_checkbox\:\:\$_all_checked\.$#'
203-
identifier: property.notFound
204-
count: 3
205-
path: ../includes/fields/class-acf-field-checkbox.php
206-
207-
-
208-
message: '#^Access to an undefined property acf_field_checkbox\:\:\$_values\.$#'
209-
identifier: property.notFound
210-
count: 3
211-
path: ../includes/fields/class-acf-field-checkbox.php
212-
213-
-
214-
message: '#^Access to an undefined property acf_field_clone\:\:\$cloning\.$#'
215-
identifier: property.notFound
216-
count: 2
217-
path: ../includes/fields/class-acf-field-clone.php
218-
219-
-
220-
message: '#^Access to an undefined property acf_field_clone\:\:\$have_rows\.$#'
221-
identifier: property.notFound
222-
count: 1
223-
path: ../includes/fields/class-acf-field-clone.php
224-
225117
-
226118
message: '#^Offset ''thumb'' on array\{alt\: string, author\: string, authorName\: string, caption\: string, compat\: array, context\: string, date\: int, dateFormatted\: string, \.\.\.\}\|null in isset\(\) does not exist\.$#'
227119
identifier: isset.offset
228120
count: 1
229121
path: ../includes/fields/class-acf-field-gallery.php
230122

231-
-
232-
message: '#^Access to an undefined property acf_field_google_map\:\:\$default_values\.$#'
233-
identifier: property.notFound
234-
count: 6
235-
path: ../includes/fields/class-acf-field-google-map.php
236-
237-
-
238-
message: '#^Access to an undefined property acf_field__group\:\:\$have_rows\.$#'
239-
identifier: property.notFound
240-
count: 1
241-
path: ../includes/fields/class-acf-field-group.php
242-
243-
-
244-
message: '#^Access to an undefined property acf_field_oembed\:\:\$height\.$#'
245-
identifier: property.notFound
246-
count: 3
247-
path: ../includes/fields/class-acf-field-oembed.php
248-
249-
-
250-
message: '#^Access to an undefined property acf_field_oembed\:\:\$width\.$#'
251-
identifier: property.notFound
252-
count: 3
253-
path: ../includes/fields/class-acf-field-oembed.php
254-
255-
-
256-
message: '#^Action callback returns void\|WP_Error but should not return anything\.$#'
257-
identifier: return.void
258-
count: 1
259-
path: ../includes/fields/class-acf-field-repeater.php
260-
261-
-
262-
message: '#^Class acf_field referenced with incorrect case\: ACF_Field\.$#'
263-
identifier: class.nameCase
264-
count: 1
265-
path: ../includes/fields/class-acf-field-user.php
266-
267-
-
268-
message: '#^Expected 4 @param tags, found 3\.$#'
269-
identifier: paramTag.count
270-
count: 1
271-
path: ../includes/fields/class-acf-field-user.php
272-
273-
-
274-
message: '#^One or more @param tags has an invalid name or invalid syntax\.$#'
275-
identifier: phpDoc.parseError
276-
count: 1
277-
path: ../includes/fields/class-acf-field-user.php
278-
279123
-
280124
message: '#^Path in require\(\) "\./wp\-admin/includes/media\.php" is not a file or it does not exist\.$#'
281125
identifier: require.fileNotFound
282126
count: 1
283127
path: ../includes/fields/class-acf-field-wysiwyg.php
284128

285-
286-
-
287-
message: '#^Action callback returns type but should not return anything\.$#'
288-
identifier: return.void
289-
count: 1
290-
path: ../includes/forms/form-nav-menu.php
291-
292-
-
293-
message: '#^Method acf_form_nav_menu\:\:wp_nav_menu_item_custom_fields\(\) should return type but return statement is missing\.$#'
294-
identifier: return.missing
295-
count: 2
296-
path: ../includes/forms/form-nav-menu.php
297-
298-
-
299-
message: '#^Action callback returns int but should not return anything\.$#'
300-
identifier: return.void
301-
count: 1
302-
path: ../includes/forms/form-post.php
303-
304-
-
305-
message: '#^Access to an undefined property acf_form_widget\:\:\$preview_errors\.$#'
306-
identifier: property.notFound
307-
count: 1
308-
path: ../includes/forms/form-widget.php
309-
310-
-
311-
message: '#^Access to an undefined property acf_form_widget\:\:\$preview_reference\.$#'
312-
identifier: property.notFound
313-
count: 1
314-
path: ../includes/forms/form-widget.php
315-
316-
-
317-
message: '#^Access to an undefined property acf_form_widget\:\:\$preview_values\.$#'
318-
identifier: property.notFound
319-
count: 1
320-
path: ../includes/forms/form-widget.php
321-
322-
-
323-
message: '#^One or more @param tags has an invalid name or invalid syntax\.$#'
324-
identifier: phpDoc.parseError
325-
count: 1
326-
path: ../includes/l10n.php
327-
328-
-
329-
message: '#^Function acf_add_local_fields\(\) should return array but return statement is missing\.$#'
330-
identifier: return.missing
331-
count: 1
332-
path: ../includes/local-fields.php
333-
334-
-
335-
message: '#^Action callback returns bool but should not return anything\.$#'
336-
identifier: return.void
337-
count: 10
338-
path: ../includes/local-json.php
339-
340-
-
341-
message: '#^Function remove_filter invoked with 4 parameters, 2\-3 required\.$#'
342-
identifier: arguments.count
343-
count: 1
344-
path: ../includes/local-meta.php
345-
346-
-
347-
message: '#^Access to an undefined property \$this\(ACF_Legacy_Location\)\:\:\$name\.$#'
348-
identifier: property.notFound
349-
count: 3
350-
path: ../includes/locations/abstract-acf-legacy-location.php
351-
352129
-
353130
message: '#^Undefined variable\: \$method$#'
354131
identifier: variable.undefined
@@ -360,27 +137,3 @@ parameters:
360137
identifier: isset.variable
361138
count: 1
362139
path: ../includes/locations/abstract-acf-legacy-location.php
363-
364-
-
365-
message: '#^Access to an undefined property acf_loop\:\:\$loops\.$#'
366-
identifier: property.notFound
367-
count: 7
368-
path: ../includes/loop.php
369-
370-
-
371-
message: '#^Method acf_loop\:\:remove_loop\(\) should return bool but return statement is missing\.$#'
372-
identifier: return.missing
373-
count: 2
374-
path: ../includes/loop.php
375-
376-
-
377-
message: '#^Callback expects 1 parameter, \$accepted_args is set to 2\.$#'
378-
identifier: arguments.count
379-
count: 1
380-
path: ../includes/revisions.php
381-
382-
-
383-
message: '#^Access to an undefined property acf_validation\:\:\$errors\.$#'
384-
identifier: property.notFound
385-
count: 3
386-
path: ../includes/validation.php

bin/prepare-release.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ private function get_stable_tag() {
304304
private function update_stable_tag( $version ) {
305305
$readme = file_get_contents( 'readme.txt' );
306306
$readme = preg_replace(
307-
'/^Stable tag:.*$/m',
307+
'/^Stable tag:\s*.*$/m',
308308
'Stable tag: ' . $version,
309309
$readme
310310
);

0 commit comments

Comments
 (0)