From 66c8c53bac9ae2cd2b4a1b8ae603b2cf3f75947e Mon Sep 17 00:00:00 2001 From: Brandon Kraft Date: Fri, 7 Mar 2025 13:22:08 -0600 Subject: [PATCH 1/3] Ignore include of WP file. Fixes #50 --- acf.php | 1 + bin/baseline.neon | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/acf.php b/acf.php index 53dcfd52..a812d18b 100644 --- a/acf.php +++ b/acf.php @@ -13,6 +13,7 @@ } if ( is_admin() ) { + /** @phpstan-ignore-next-line */ // phpcs:ignore include_once ABSPATH . 'wp-admin/includes/plugin.php'; // Network activations first since is_plugin_active will return true for network activated plugins, whereas this won't for single. diff --git a/bin/baseline.neon b/bin/baseline.neon index e98ddcf3..1da7655a 100644 --- a/bin/baseline.neon +++ b/bin/baseline.neon @@ -1,11 +1,5 @@ parameters: ignoreErrors: - - - message: '#^Path in include_once\(\) "\./wp\-admin/includes/plugin\.php" is not a file or it does not exist\.$#' - identifier: includeOnce.fileNotFound - count: 1 - path: ../acf.php - - message: '#^Action callback returns array but should not return anything\.$#' identifier: return.void From 191eaa7461875bfa36436e112a85290b9aeff806 Mon Sep 17 00:00:00 2001 From: Brandon Kraft Date: Fri, 7 Mar 2025 13:32:33 -0600 Subject: [PATCH 2/3] secure-custom-fields.php. Fixes #69 --- bin/baseline.neon | 12 ------------ secure-custom-fields.php | 19 ++++++++----------- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/bin/baseline.neon b/bin/baseline.neon index 1da7655a..9a92239f 100644 --- a/bin/baseline.neon +++ b/bin/baseline.neon @@ -581,15 +581,3 @@ parameters: identifier: property.notFound count: 1 path: ../includes/wpml.php - - - - message: '#^One or more @param tags has an invalid name or invalid syntax\.$#' - identifier: phpDoc.parseError - count: 7 - path: ../secure-custom-fields.php - - - - message: '#^Path in require_once\(\) "\./wp\-admin/includes/plugin\.php" is not a file or it does not exist\.$#' - identifier: requireOnce.fileNotFound - count: 1 - path: ../secure-custom-fields.php diff --git a/secure-custom-fields.php b/secure-custom-fields.php index ad3ea070..6dc24f50 100644 --- a/secure-custom-fields.php +++ b/secure-custom-fields.php @@ -332,10 +332,9 @@ public function init() { /** * Fires after field types have been included. * - * @date 28/09/13 * @since ACF 5.0.0 * - * @param int ACF_FIELD_API_VERSION The field API version. + * @param int $version The field API version. */ do_action( 'acf/include_field_types', ACF_FIELD_API_VERSION ); @@ -367,20 +366,18 @@ public function init() { /** * Fires after location types have been included. * - * @date 28/09/13 * @since ACF 5.0.0 * - * @param int ACF_FIELD_API_VERSION The field API version. + * @param int $version The field API version. */ do_action( 'acf/include_location_rules', ACF_FIELD_API_VERSION ); /** * Fires during initialization. Used to add local fields. * - * @date 28/09/13 * @since ACF 5.0.0 * - * @param int ACF_FIELD_API_VERSION The field API version. + * @param int $version The field API version. */ do_action( 'acf/include_fields', ACF_FIELD_API_VERSION ); @@ -389,7 +386,7 @@ public function init() { * * @since ACF 6.1 * - * @param int ACF_MAJOR_VERSION The major version of ACF. + * @param int $version The major version of ACF. */ do_action( 'acf/include_post_types', ACF_MAJOR_VERSION ); @@ -398,14 +395,14 @@ public function init() { * * @since ACF 6.1 * - * @param int ACF_MAJOR_VERSION The major version of ACF. + * @param int $version The major version of ACF. */ do_action( 'acf/include_taxonomies', ACF_MAJOR_VERSION ); /** * Fires during initialization. Used to add local option pages. * - * @param int ACF_MAJOR_VERSION The major version of ACF. + * @param int $version The major version of ACF. */ do_action( 'acf/include_options_pages', ACF_MAJOR_VERSION ); @@ -418,10 +415,9 @@ public function init() { /** * Fires after ACF is completely "initialized". * - * @date 28/09/13 * @since ACF 5.0.0 * - * @param int ACF_MAJOR_VERSION The major version of ACF. + * @param int $version The major version of ACF. */ do_action( 'acf/init', ACF_MAJOR_VERSION ); } @@ -788,6 +784,7 @@ function scf_deactivate_other_instances() { } elseif ( is_plugin_active( 'advanced-custom-fields/acf.php' ) ) { // Check if the plugin to deactivate is 'advanced-custom-fields/acf.php' but the title is 'Secure Custom Fields'. if ( ! function_exists( 'get_plugin_data' ) ) { + /** @phpstan-ignore-next-line */ // phpcs:ignore require_once ABSPATH . 'wp-admin/includes/plugin.php'; } $plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin_to_deactivate ); From 93cc1acd1a0ba2bd56796d1cd057ed923a5ebf68 Mon Sep 17 00:00:00 2001 From: Brandon Kraft Date: Fri, 7 Mar 2025 16:37:45 -0600 Subject: [PATCH 3/3] See #65 --- bin/baseline.neon | 30 ----- includes/class-acf-data.php | 150 ++++++++++++++-------- includes/class-acf-internal-post-type.php | 2 +- includes/locations.php | 10 +- includes/wpml.php | 7 + 5 files changed, 110 insertions(+), 89 deletions(-) diff --git a/bin/baseline.neon b/bin/baseline.neon index 9a92239f..85453a06 100644 --- a/bin/baseline.neon +++ b/bin/baseline.neon @@ -318,24 +318,6 @@ parameters: count: 1 path: ../includes/api/api-term.php - - - message: '#^Access to an undefined property ACF_Data\:\:\$site_aliases\.$#' - identifier: property.notFound - count: 2 - path: ../includes/class-acf-data.php - - - - message: '#^Access to an undefined property ACF_Data\:\:\$site_data\.$#' - identifier: property.notFound - count: 1 - path: ../includes/class-acf-data.php - - - - message: '#^Action callback returns array but should not return anything\.$#' - identifier: return.void - count: 1 - path: ../includes/class-acf-internal-post-type.php - - message: '#^Action callback returns string but should not return anything\.$#' identifier: return.void @@ -528,12 +510,6 @@ parameters: count: 1 path: ../includes/local-meta.php - - - message: '#^Expected 2 @param tags, found 1\.$#' - identifier: paramTag.count - count: 2 - path: ../includes/locations.php - - message: '#^Access to an undefined property \$this\(ACF_Legacy_Location\)\:\:\$name\.$#' identifier: property.notFound @@ -575,9 +551,3 @@ parameters: identifier: property.notFound count: 3 path: ../includes/validation.php - - - - message: '#^Access to an undefined property ACF_WPML_Compatibility\:\:\$trid_ref\.$#' - identifier: property.notFound - count: 1 - path: ../includes/wpml.php diff --git a/includes/class-acf-data.php b/includes/class-acf-data.php index 8197f344..a0de7286 100644 --- a/includes/class-acf-data.php +++ b/includes/class-acf-data.php @@ -1,4 +1,11 @@ cid = acf_uniqid(); @@ -46,7 +90,7 @@ function __construct( $data = false ) { } /** - * initialize + * Initialize * * Called during constructor to setup class functionality. * @@ -55,12 +99,12 @@ function __construct( $data = false ) { * * @return void */ - function initialize() { + public function initialize() { // Do nothing. } /** - * prop + * Prop * * Sets a property for the given name and returns $this for chaining. * @@ -71,7 +115,7 @@ function initialize() { * @param mixed $value The data value. * @return ACF_Data */ - function prop( $name = '', $value = null ) { + public function prop( $name = '', $value = null ) { // Update property. $this->{$name} = $value; @@ -81,22 +125,22 @@ function prop( $name = '', $value = null ) { } /** - * _key + * Key * * Returns a key for the given name allowing aliasses to work. * * @date 18/1/19 * @since ACF 5.7.10 * - * @param type $var Description. Default. - * @return type Description. + * @param string $name The name to get key for. + * @return string The key for the given name. */ - function _key( $name = '' ) { + public function _key( $name = '' ) { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore return isset( $this->aliases[ $name ] ) ? $this->aliases[ $name ] : $name; } /** - * has + * Has * * Returns true if this has data for the given name. * @@ -106,28 +150,28 @@ function _key( $name = '' ) { * @param string $name The data name. * @return boolean */ - function has( $name = '' ) { + public function has( $name = '' ) { $key = $this->_key( $name ); return isset( $this->data[ $key ] ); } /** - * is + * Is * * Similar to has() but does not check aliases. * * @date 7/2/19 * @since ACF 5.7.11 * - * @param type $var Description. Default. - * @return type Description. + * @param string $key The key to check. + * @return boolean True if key exists. */ - function is( $key = '' ) { + public function is( $key = '' ) { return isset( $this->data[ $key ] ); } /** - * get + * Get * * Returns data for the given name of null if doesn't exist. * @@ -137,10 +181,10 @@ function is( $key = '' ) { * @param string $name The data name. * @return mixed */ - function get( $name = false ) { + public function get( $name = false ) { // Get all. - if ( $name === false ) { + if ( false === $name ) { return $this->data; // Get specific. @@ -151,7 +195,7 @@ function get( $name = false ) { } /** - * get_data + * Get Data * * Returns an array of all data. * @@ -160,12 +204,12 @@ function get( $name = false ) { * * @return array */ - function get_data() { + public function get_data() { return $this->data; } /** - * set + * Set * * Sets data for the given name and returns $this for chaining. * @@ -176,7 +220,7 @@ function get_data() { * @param mixed $value The data value. * @return ACF_Data */ - function set( $name = '', $value = null ) { + public function set( $name = '', $value = null ) { // Set multiple. if ( is_array( $name ) ) { @@ -192,7 +236,7 @@ function set( $name = '', $value = null ) { } /** - * append + * Append * * Appends data for the given name and returns $this for chaining. * @@ -202,7 +246,7 @@ function set( $name = '', $value = null ) { * @param mixed $value The data value. * @return ACF_Data */ - function append( $value = null ) { + public function append( $value = null ) { // Append. $this->data[] = $value; @@ -212,7 +256,7 @@ function append( $value = null ) { } /** - * remove + * Remove * * Removes data for the given name. * @@ -222,7 +266,7 @@ function append( $value = null ) { * @param string $name The data name. * @return ACF_Data */ - function remove( $name = '' ) { + public function remove( $name = '' ) { // Remove data. unset( $this->data[ $name ] ); @@ -232,7 +276,7 @@ function remove( $name = '' ) { } /** - * reset + * Reset * * Resets the data. * @@ -241,13 +285,13 @@ function remove( $name = '' ) { * * @return void */ - function reset() { + public function reset() { $this->data = array(); $this->aliases = array(); } /** - * count + * Count * * Returns the data count. * @@ -256,41 +300,39 @@ function reset() { * * @return integer */ - function count() { + public function count() { return count( $this->data ); } /** - * query + * Query * * Returns a filtered array of data based on the set of key => value arguments. * * @date 23/1/19 * @since ACF 5.7.10 * - * @return integer + * @param array $args The query arguments. + * @param string $operator The logical operator. Accepts 'AND' or 'OR'. + * @return array */ - function query( $args, $operator = 'AND' ) { + public function query( $args, $operator = 'AND' ) { return wp_list_filter( $this->data, $args, $operator ); } /** - * alias + * Alias * * Sets an alias for the given name allowing data to be found via multiple identifiers. * * @date 18/1/19 * @since ACF 5.7.10 * - * @param type $var Description. Default. - * @return type Description. + * @param string $name The name to create aliases for. + * @param string ...$args Additional aliases to map to the name. + * @return ACF_Data */ - function alias( $name = '' /*, $alias, $alias2, etc */ ) { - - // Get all aliases. - $args = func_get_args(); - array_shift( $args ); - + public function alias( $name = '', ...$args ) { // Loop over aliases and add to data. foreach ( $args as $alias ) { $this->aliases[ $alias ] = $name; @@ -301,18 +343,18 @@ function alias( $name = '' /*, $alias, $alias2, etc */ ) { } /** - * switch_site + * Switch Site * * Triggered when switching between sites on a multisite installation. * * @date 13/2/19 * @since ACF 5.7.11 * - * @param integer $site_id New blog ID. - * @param int prev_blog_id Prev blog ID. + * @param integer $site_id New blog ID. + * @param integer $prev_site_id Previous blog ID. * @return void */ - function switch_site( $site_id, $prev_site_id ) { + public function switch_site( $site_id, $prev_site_id ) { // Bail early if not multisite compatible. if ( ! $this->multisite ) { diff --git a/includes/class-acf-internal-post-type.php b/includes/class-acf-internal-post-type.php index ee1092da..0d72307d 100644 --- a/includes/class-acf-internal-post-type.php +++ b/includes/class-acf-internal-post-type.php @@ -71,7 +71,7 @@ public function __construct() { $internal_post_types_store->set( $this->post_type, get_class( $this ) ); - add_action( "acf/validate_{$this->hook_name}", array( $this, 'translate_post' ) ); + add_filter( "acf/validate_{$this->hook_name}", array( $this, 'translate_post' ) ); add_filter( 'wp_unique_post_slug', array( $this, 'apply_unique_post_slug' ), 999, 6 ); add_action( 'wp_untrash_post_status', array( $this, 'untrash_post_status' ), 10, 3 ); diff --git a/includes/locations.php b/includes/locations.php index b8079869..f2d69cdf 100644 --- a/includes/locations.php +++ b/includes/locations.php @@ -192,7 +192,8 @@ function acf_get_location_rule_operators( $rule ) { * @date 30/5/17 * @since ACF 5.6.0 * - * @param array $types The location rule operators. + * @param array $operators The location rule operators. + * @param array $rule The location rule. */ $operators = apply_filters( "acf/location/rule_operators/type={$rule['param']}", $operators, $rule ); $operators = apply_filters( "acf/location/rule_operators/{$rule['param']}", $operators, $rule ); @@ -224,7 +225,8 @@ function acf_get_location_rule_values( $rule ) { * @date 30/5/17 * @since ACF 5.6.0 * - * @param array $types The location rule values. + * @param array $values The location rule values. + * @param array $rule The location rule. */ $values = apply_filters( "acf/location/rule_values/type={$rule['param']}", $values, $rule ); $values = apply_filters( "acf/location/rule_values/{$rule['param']}", $values, $rule ); @@ -240,7 +242,7 @@ function acf_get_location_rule_values( $rule ) { * * @param array $rule The location rule. * @param array $screen The screen args. - * @param array $field The field group array. + * @param array $field_group The field group array. * @return boolean */ function acf_match_location_rule( $rule, $screen, $field_group ) { @@ -277,7 +279,7 @@ function acf_match_location_rule( $rule, $screen, $field_group ) { * @since ACF 5.9.0 * * @param array $screen The screen args. - * @param array $deprecated The field group array. + * @param array $deprecated Deprecated. * @return array */ function acf_get_location_screen( $screen = array(), $deprecated = false ) { diff --git a/includes/wpml.php b/includes/wpml.php index efba522e..e8628565 100644 --- a/includes/wpml.php +++ b/includes/wpml.php @@ -21,6 +21,13 @@ */ class ACF_WPML_Compatibility { + /** + * Translation ID reference mapping. + * + * @var array Storage for translation ID references + */ + public $trid_ref = array(); + /** * Sets up the class functionality. *