Sort Gravity Forms options by title and display id (#135)

* Correction to readme about ConditionalLogicGroup

Author: mmatiasautio

CHANGELOG.md

@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+### Added
+- Sort Gravity Forms options by title and display the id
+
 [Unreleased]
 
 ## [1.41.5]

readme.md

@@ -118,7 +118,7 @@ ACF's conditional logic groups work very similarly to groups' location rules. Fi
 
 ```php
 $conditional_logic = new ConditionalLogicGroup();
-$conditional_logic->add_rule( 'another_field', '==', true );
+$conditional_logic->add_rule( 'another_field', '==', '1' ); // For True/False fields, the value is a string, not boolean.
 
 $text->add_conditional_logic( $conditional_logic );
 ```

src/Field/GravityForms.php

@@ -18,7 +18,7 @@ class GravityForms extends \Geniem\ACF\Field\Select {
      * @param string|null $name           Name for the field.
      * @throws \Geniem\ACF\Exception Throw error if mandatory property is not set.
      */
-    public function __construct( string $label, string $key = null, string $name = null ) {
+    public function __construct( string $label, ?string $key = null, ?string $name = null ) {
         parent::__construct( $label, $key, $name );
 
         if ( ! class_exists( '\GFFormsModel' ) ) {
@@ -42,14 +42,17 @@ protected function populate_options() {
 
         $table_name = \GFFormsModel::get_form_table_name();
 
-        $sql   = "SELECT id, title from $table_name where is_active = %d and is_trash = %d";
+        $sql   = "SELECT id, title from $table_name where is_active = %d and is_trash = %d ORDER BY title ASC";
         $query = $wpdb->prepare( $sql, 1, 0 ); // phpcs:ignore
 
         $gf_form_results = $wpdb->get_results( $query ); // phpcs:ignore
 
         if ( ! empty( $gf_form_results ) ) {
             foreach ( $gf_form_results as $gf_form ) {
-                $this->add_choice( $gf_form->title, $gf_form->id );
+
+                $display_title = $gf_form->title . ' (' . $gf_form->id . ')';
+
+                $this->add_choice( $display_title, $gf_form->id );
             }
         }
     }