Release 2.28.0

.circleci/config.yml

@@ -61,15 +61,15 @@ jobs:
           paths:
             - .
 
-  run_php_72_unit_tests:
+  run_php_74_unit_tests:
     <<: *default_job_config
     steps:
       - attach_workspace:
           at: /home/circleci
       - run:
-          name: Running PHP 7.2 unit tests
+          name: Running PHP 7.4 unit tests
           command: |
-            /home/circleci/tooling/docker-unit-tests/docker-unit-tests.sh test_72
+            /home/circleci/tooling/docker-unit-tests/docker-unit-tests.sh test_74
 
   run_php_80_unit_tests:
     <<: *default_job_config
@@ -126,7 +126,7 @@ workflows:
     jobs:
       - prepare_test_and_build_environment:
           <<: *context
-      - run_php_72_unit_tests:
+      - run_php_74_unit_tests:
           <<: *test_job_config
       - run_php_80_unit_tests:
           <<: *test_job_config
@@ -135,6 +135,6 @@ workflows:
       - build_package_release:
           <<: *context
           requires:
-            - run_php_72_unit_tests
+            - run_php_74_unit_tests
             - run_php_80_unit_tests
 #            - run_acceptance_tests

assets/js/admin-views.js

@@ -1722,6 +1722,7 @@
 
 				$.when( vcfg.server_request( 'install_product', {
 						id: $link.attr( 'data-download-id' ),
+						text_domain: $link.attr( 'data-template-text-domain' ),
 						activate: true,
 					} ) )
 					.then( on_success )

composer.json

@@ -23,7 +23,7 @@
     }
   ],
   "require": {
-    "php": ">=7.2.0",
+    "php": ">=7.4.0",
     "ext-json": "*",
     "ext-openssl": "*",
     "gravitykit/foundation": "dev-main"
@@ -94,7 +94,8 @@
       "@prefix_vendor",
       "@post_update_install",
       "composer dump-autoload -o"
-    ]
+    ],
+    "compat": "./vendor/bin/phpcs -p ./ ./gravityview.php ./tests  --standard=PHPCompatibilityWP --extensions=php --runtime-set testVersion 7.2- --ignore=vendor/*,vendor_prefixed/*,node_modules/*"
   },
   "config": {
     "platform-check": false,

composer_public.json

@@ -21,19 +21,19 @@
       "type": "package",
       "package": {
         "name": "gravitykit/foundation",
-        "version": "1.2.12",
+        "version": "1.2.17",
         "dist": {
-          "url": "https://www.dropbox.com/scl/fi/9ymdlep3stwsobdxa3fvm/foundation-1.2.12-987da1e.zip?rlkey=tt6zethqhk1f574ygoi1xdnlm&dl=1",
+          "url": "https://www.dropbox.com/scl/fi/b3p6jtt7673iij218pm11/foundation-1.2.17-0852c84.zip?rlkey=6hs3qrxzl7ucqu57dfz7cycuq&dl=1",
           "type": "zip"
         }
       }
     }
   ],
   "require": {
-    "php": ">=7.2.0",
+    "php": ">=7.4.0",
     "ext-json": "*",
     "ext-openssl": "*",
-    "gravitykit/foundation": "1.2.12"
+    "gravitykit/foundation": "1.2.17"
   },
   "require-dev": {
     "phpunit/phpunit": "^8.5",

future/_mocks.php

@@ -155,8 +155,10 @@ function ( $e ) {
  * @return null|string The value of a field in an entry.
  */
 function GravityView_API_field_value( $entry, $field_settings, $format ) {
+	$original_args = func_get_args();
+
 	if ( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) {
-		gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( func_get_args() ) ) );
+		gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( $original_args ) ) );
 		return null;
 	}
 
@@ -202,7 +204,7 @@ function GravityView_API_field_value( $entry, $field_settings, $format ) {
 
 		/** An unidentified backend. */
 		default:
-			gravityview()->log->error( 'Could not determine source for entry', array( 'data' => array( func_get_args() ) ) );
+			gravityview()->log->error( 'Could not determine source for entry', array( 'data' => array( $original_args ) ) );
 			return null;
 	endswitch;
 
@@ -235,6 +237,7 @@ function GravityView_API_field_value( $entry, $field_settings, $format ) {
  * @return string The label of a field in an entry.
  */
 function GravityView_API_field_label( $form, $field_settings, $entry, $force_show_label = false ) {
+	$original_args = func_get_args();
 
 	/** A bail condition. */
 	$bail = function ( $label, $field_settings, $entry, $force_show_label, $form ) {
@@ -280,7 +283,7 @@ function GravityView_API_field_label( $form, $field_settings, $entry, $force_sho
 	}
 
 	if ( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) {
-		gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( func_get_args() ) ) );
+		gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( $original_args ) ) );
 		return $bail( $label, $field_settings, $entry, $force_show_label, $form );
 	}
 
@@ -333,7 +336,7 @@ function GravityView_API_field_label( $form, $field_settings, $entry, $force_sho
 
 		/** An unidentified backend. */
 		default:
-			gravityview()->log->error( 'Could not determine source for entry. Using empty field.', array( 'data' => array( func_get_args() ) ) );
+			gravityview()->log->error( 'Could not determine source for entry. Using empty field.', array( 'data' => array( $original_args ) ) );
 			$field = new \GV\Field();
 			break;
 	endswitch;

future/includes/class-gv-shortcode-gvlogic.php

@@ -208,7 +208,7 @@ private function get_output( $match, $atts, $content ) {
 				break; // No more shortcodes
 			}
 
-			list( $_, $before_shortcode, $shortcode, $_, $after_shortcode ) = $matches;
+			list( $_, $before_shortcode, $shortcode, $__, $after_shortcode ) = $matches;
 
 			if ( ! $found ) { // We're still iffing.
 				$if .= $before_shortcode;

future/includes/class-gv-template-view-table.php

@@ -90,15 +90,13 @@ public static function add_columns_sort_links( $column_label, $context = null )
 
 		$class = 'gv-sort';
 
-		$sort_field_id = \GravityView_frontend::_override_sorting_id_by_field_type( $context->field->ID, $context->view->form->ID );
-
 		$sort_args = array(
 			sprintf( 'sort[%s]', $context->field->ID ),
 			'asc',
 		);
 
 		// If we are already sorting by the current field...
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
+		if ( ! empty( $sorting['key'] ) && (string) $context->field->ID === (string) $sorting['key'] ) {
 
 		    switch ( $sorting['direction'] ) {
 		        // No sort