Fix PHP8.2 deprecations, shorthand array notation (#122)

* Fix PHP8.2 deprecations, shorthand array notation

* Add parent attribute to Layout class

* Echo the output of acf_esc_attrs

* Fix type, remove unused variables

Author: HPiirainen

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 [Unreleased]
 
+### Fixed
+- Fix PHP 8.2 deprecations (no dynamic properties, string interpolation {$var} instead of ${var}).
+- Replace deprecated acf_esc_attr_e with acf_esc_attrs.
+- Use shorthand array notation.
+
 ## [1.39.0]
 
 ### Added

composer.json

@@ -35,5 +35,11 @@
     },
     "require-dev": {
         "victorjonsson/markdowndocs": "^1.3"
+    },
+    "config": {
+        "allow-plugins": {
+            "composer/installers": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }

composer.lock

@@ -37,6 +37,48 @@ abstract class Field {
      */
     protected $instructions;
 
+    /**
+     * Field type.
+     *
+     * @var string
+     */
+    protected $type;
+
+    /**
+     * Field wrapper.
+     *
+     * @var array
+     */
+    protected $wrapper = [];
+
+    /**
+     * Registered.
+     *
+     * @var string
+     */
+    protected $registered;
+
+    /**
+     * No key.
+     *
+     * @var boolean
+     */
+    protected $no_key;
+
+    /**
+     * Parent.
+     *
+     * @var mixed
+     */
+    protected $parent;
+
+    /**
+     * Fields var.
+     *
+     * @var mixed
+     */
+    protected $fields_var;
+
     /**
      * Field required status.
      *
@@ -135,6 +177,13 @@ abstract class Field {
      */
     protected $redipress_field_type = 'Text';
 
+    /**
+     * Codifier unique ID.
+     *
+     * @var string
+     */
+    protected $codifier_unique_id;
+
     /**
      * Store registered field keys to warn if there are duplicates.
      *
@@ -841,10 +890,10 @@ public function redipress_add_queryable(
             return $this;
         }
 
-        $this->redipress_add_queryable            = true;
-        $this->redipress_add_queryable_field_name = $field_name;
-        $this->redipress_add_queryable_weight     = $weight;
-        $this->redipress_add_queryable_method     = $method;
+        $this->redipress_add_queryable              = true;
+        $this->redipress_add_queryable_field_name   = $field_name;
+        $this->redipress_add_queryable_field_weight = $weight;
+        $this->redipress_add_queryable_method       = $method;
 
         add_action( 'codifier/export/key=' . $this->key, \Closure::fromCallable( [ $this, 'redipress_add_queryable_internal' ] ) );
 
@@ -855,8 +904,6 @@ public function redipress_add_queryable(
      * An internal function to be run with the add queryable functionality.
      */
     private function redipress_add_queryable_internal() {
-        $field_name = $this->redipress_add_queryable_field_name;
-        $weight     = $this->redipress_add_queryable_weight;
         $method     = $this->redipress_add_queryable_method;
 
         if ( ! $method ) {
@@ -973,7 +1020,7 @@ private function redipress_add_queryable_internal() {
                 ];
 
                 if ( $this->redipress_field_type === 'Text' ) {
-                    $field_args['weight'] = $this->redipress_add_queryable_weight;
+                    $field_args['weight'] = $this->redipress_add_queryable_field_weight;
                 }
 
                 if ( class_exists( $type ) ) {

src/Field.php

@@ -16,6 +16,13 @@ class Accordion extends GroupableField implements PseudoGroupableField {
      */
     protected $type = 'accordion';
 
+    /**
+     * Field layout
+     *
+     * @var string
+     */
+    protected $layout;
+
     /**
      * Fields inside the tab
      *

src/Field/Accordion.php

@@ -46,6 +46,20 @@ class Layout implements GroupableInterface {
      */
     protected $name;
 
+    /**
+     * Field group parent.
+     *
+     * @var mixed
+     */
+    protected $parent;
+
+    /**
+     * Layout active
+     *
+     * @var integer
+     */
+    protected $active;
+
     /**
      * Layout subfields
      *

src/Field/Flexible/Layout.php

@@ -16,6 +16,13 @@ class Tab extends GroupableField implements PseudoGroupableField {
      */
     protected $type = 'tab';
 
+    /**
+     * Field layout.
+     *
+     * @var string
+     */
+    protected $layout;
+
     /**
      * Fields inside the tab
      *

src/Field/Tab.php

@@ -63,6 +63,13 @@ class Taxonomy extends \Geniem\ACF\Field {
      */
     protected $add_term;
 
+    /**
+     * Return format.
+     *
+     * @var string
+     */
+    protected $return_format;
+
     /**
      * Set taxonomy
      *

src/Field/Taxonomy.php

@@ -19,14 +19,14 @@ public function initialize() {
 
             $this->name     = 'extended_wysiwyg';
             $this->label    = 'ACF Codifier Extended Wysiwyg Editor';
-            $this->defaults = array(
+            $this->defaults = [
                 'tabs'      	=> 'all',
                 'toolbar'		=> 'full',
                 'media_upload' 	=> 1,
                 'default_value'	=> '',
                 'delay'			=> 0,
                 'height'        => 300,
-            );
+            ];
         }
 
         /**
@@ -44,7 +44,7 @@ public function render_field( $field ) {
             $height = acf_get_user_setting( 'wysiwyg_height', 300 );
             $height = max( $height, 300 );
 
-            echo str_replace( "height:${height}px;", 'height:'. $field['height'] . 'px;', $return );
+            echo str_replace( "height:{$height}px;", 'height:'. $field['height'] . 'px;', $return );
 
             static $min_height_zero = false;
 
@@ -70,4 +70,4 @@ public function input_admin_enqueue_scripts() {
     }
 
     new ACF_Field_Extended_Wysiwyg();
-});
+});

src/Fields/CodifierWysiwyg.php

@@ -59,7 +59,7 @@ public function input_admin_enqueue_scripts() {
              *
              * @return mixed
              */
-            public function get_ajax_query( $options = array() ) {
+            public function get_ajax_query( $options = [] ) {
                 $field   = acf_get_field( $options['field_key'] );
                 $blog_id = $field['blog_id'];