Merge branch 'master' into components

Author: aerkkilae

CHANGELOG.md

@@ -16,6 +16,46 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
         * `Geniem\ACF\Renderer\PHP`: Uses PHP files as templates.
         * `Geniem\ACF\Renderer\Dust`: Uses Dust.js template files.
 
+## [1.41.2]
+
+### Fixed
+- Fix MultisiteTaxonomy and Multitaxonomy compatibility with ACF v6.3.1.
+
+## [1.41.1]
+
+### Fixed
+- Fix MultisitePostObject compatibility with ACF v6.3
+
+## [1.41.0]
+
+### Added
+- Support for ACF native bidirectional relationships. See https://www.advancedcustomfields.com/resources/bidirectional-relationships/.
+
+## [1.40.0]
+
+### Added
+- Added a filter `codifier/callable-renderer/render/data` for CallableRenderer->render() $data. For example this makes possible to identify fields inside commonly used custom renderer.
+
+## [1.39.1]
+
+### 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
+- Add support for block parent attribute.
+
+## [1.38.4]
+
+- Fix previous tag pointing to earlier commit.
+
+## [1.38.3]
+### Fixed
+- Fixes undefined method error in RediPress functionalities
+
 ## [1.38.2]
 ### Fixed
 - Fixes "Automatic conversion of false to array is deprecated" on Dust.php
@@ -468,7 +508,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [1.2.4] - 2018-01-31
 
 ### Fixed
-- Fixed a bug that occured after the change made in 1.2.3.
+- Fixed a bug that occurred after the change made in 1.2.3.
 
 ## [1.2.3] - 2018-01-30
 

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

@@ -3,7 +3,7 @@
 Plugin Name: ACF Codifier
 Plugin URI: https://github.com/devgeniem/acf-codifier
 Description: A helper class to make defining ACF field groups and fields easier in the code.
-Version: 1.38.0
+Version: 1.41.2
 Author: Miika Arponen / Geniem Oy
 Author URI: https://geniem.fi
 License: GPL-3.0

docs/classes.md

@@ -233,6 +233,15 @@ $pseudo->add_field( $some_field )
        ->add_field( $another_field );
 ```
 
+#### Bidirectional relationships
+
+Codifier supports bidirectional relationships for the field types ACF is supporting the feature (currently PostObject, Relationship, Taxonomy and User).
+
+```php
+$field->set_bidirectional()
+      ->set_bidirectional_targets( [ 'field_name_or_key' ] );
+```
+
 ## Gutenberg
 
 Codifier has a feature to register Gutenberg blocks using ACF's register block feature internally. It works in a very similar fashion than the basic field creation in Codifier as well.

plugin.php

@@ -114,6 +114,15 @@ class Block implements GroupableInterface {
      */
     protected $styles = [];
 
+    /**
+     * An array of parent blocks for the block.
+     *
+     * @see https://developer.wordpress.org/block-editor/developers/block-api/block-registration/#parent-optional
+     *
+     * @var array|null
+     */
+    protected $parent = null;
+
     /**
      * The renderer for this block.
      *
@@ -335,7 +344,7 @@ public function remove_post_type( string $post_type ) : self {
     }
 
     /**
-     * Setter for the post_ ypes.
+     * Setter for the post_types.
      *
      * @param array $post_types The post types to set.
      * @return self
@@ -449,6 +458,27 @@ public function get_styles() : array {
         return $this->styles;
     }
 
+    /**
+     * Setter for the parent of the block.
+     *
+     * @param array|null $parent Array of parent blocks or null.
+     * @return self
+     */
+    public function set_parent( ?array $parent ) : self {
+        $this->parent = $parent;
+
+        return $this;
+    }
+
+    /**
+     * Getter for the parent of the block.
+     *
+     * @return array|null
+     */
+    public function get_parent() : ?array {
+        return $this->parent;
+    }
+
     /**
      * Add a data filtering function for the block
      *
@@ -546,6 +576,7 @@ protected function register_block() {
             'align'           => $this->get_align(),
             'supports'        => $this->get_supports(),
             'styles'          => $this->get_styles(),
+            'parent'          => $this->get_parent(),
         ];
 
         if ( ! empty( $this->get_post_types() ) ) {

readme.md

@@ -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.
      *
@@ -805,7 +854,7 @@ protected static function redipress_include_search_filter( $value, $post_id, arr
 
                 if ( is_string( $redipress_value ) || is_array( $redipress_value ) || is_int( $redipress_value ) ) {
                     if ( strpos( $post_id, 'block_' ) !== false &&
-                        ! ( $post_id = \Geniem\RediPress\Index\Index::indexing() ) // phpcs:ignore
+                        ! ( $post_id = \Geniem\RediPress\Index\PostIndex::indexing() ) // phpcs:ignore
                     ) {
                         $document_uri = filter_input( INPUT_SERVER, 'DOCUMENT_URI', \FILTER_SANITIZE_STRING );
 
@@ -829,7 +878,7 @@ protected static function redipress_include_search_filter( $value, $post_id, arr
      * @param string $field_name Optional field name to RediSearch index. Defaults to field name.
      * @param float  $weight     Optional weight for the search field.
      * @param string $method     The method to use with multiple values. Defaults to "use_last".
-     *                           Possibilites: use_last, concat, concat_with_spaces, sum, custom (needs filter).
+     *                           Possibilities: use_last, concat, concat_with_spaces, sum, custom (needs filter).
      * @return self
      */
     public function redipress_add_queryable(
@@ -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 ) {
@@ -924,7 +971,7 @@ private function redipress_add_queryable_internal() {
                     $doc_id = \Geniem\RediPress\Index\PostIndex::get_document_id( get_post( $post_id ) );
                 }
                 elseif ( strpos( $post_id, 'block_' ) !== false ) {
-                    if ( ! ( $post_id = \Geniem\RediPress\Index\Index::indexing() ) ) {
+                    if ( ! ( $post_id = \Geniem\RediPress\Index\PostIndex::indexing() ) ) {
                         $document_uri = filter_input( INPUT_SERVER, 'DOCUMENT_URI', \FILTER_SANITIZE_STRING );
 
                         $post_id = basename( $document_uri );
@@ -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/Block.php

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