Pods 2.7.16 (#5529)

Pods 2.7.16
pods-framework · Nov 13, 2019 · 7c871c0 · 7c871c0
2 parents e8d3485 + 765ad0b
commit 7c871c0
Show file tree

Hide file tree

Showing 35 changed files with 1,044 additions and 766 deletions.
diff --git a/.github/workflows/mt-code-review.yml b/.github/workflows/mt-code-review.yml
@@ -0,0 +1,17 @@
+name: MT Code Review
+on:
+  pull_request:
+    paths-ignore:
+      - 'lang/**'
+      - '**.txt'
+      - '**.md'
+      - '.editorconfig'
+      - 'CODEOWNERS'
+jobs:
+  phpcs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: moderntribe/action-tribe-phpcs@master
+        with:
+          github-bot-token: ${{ secrets.GH_BOT_TOKEN }}
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,9 @@ language: php
 
 sudo: false
 
+services:
+    - mysql
+
 php:
     - 7.1
 

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -2,230 +2,151 @@
 module.exports = function ( grunt ) {
 	'use strict';
 
-	//setup file list for copying/ not copying for SVN
-	const files_list = [
-		'classes/**',
-		'components/**',
-		'deprecated/**',
-		'includes/**',
-		'sql/**',
-		'ui/**',
-		'init.php',
-		'license.txt',
-		'readme.txt'
-	];
-
 	// load all grunt tasks in package.json matching the `grunt-*` pattern
 	require( 'load-grunt-tasks' )( grunt );
 
 	grunt.loadNpmTasks( 'grunt-exec' );
 
-	// Project configuration.
-	grunt.initConfig( {
-		pkg: grunt.file.readJSON( 'package.json' ),
-
-		clean: {
-			post_build: [
-				'build'
-			]
-		},
+	const release_branch_version = '2.7';
 
-		copy: {
-			svn_trunk: {
-				expand : true,
-				options: {
-					mode: true
-				},
-				src    : files_list,
-				dest   : 'build/<%= pkg.name %>/trunk/'
-			}
-		},
+	const config = {
+		pkg : grunt.file.readJSON( 'package.json' ),
 
-		gittag: {
-			addtag: {
-				options: {
-					tag    : '<%= pkg.version %>',
-					message: 'Pods <%= pkg.version %>',
-					force  : true
+		gittag       : {
+			addtag : {
+				options : {
+					tag : '<%= pkg.version %>', message : 'Pods <%= pkg.version %>', force : true
 				}
 			}
-		},
-
-		gitcommit: {
-			commit: {
-				options: {
-					message   : 'Pods <%= pkg.version %>',
-					noVerify  : true,
-					noStatus  : false,
-					allowEmpty: true
-				},
-				files  : {
-					src: [
+		}, gitcommit : {
+			commit : {
+				options  : {
+					message : 'Pods <%= pkg.version %>', noVerify : true, noStatus : false, allowEmpty : true
+				}, files : {
+					src : [
 						'readme.txt',
 						'init.php',
 						'package.json',
-						'Gruntfile.js',
 						'README.md'
 					]
 				}
 			}
-		},
-
-		gitpush: {
-			push: {
-				options: {
-					tags  : true,
-					remote: 'origin',
-					branch: 'master',
-					force  : true
+		}, gitpush   : {
+			push : {
+				options : {
+					tags : true, remote : 'origin', branch : 'master', force : true
 				}
 			}
-		},
-
-		replace: {
-			version_readme_txt          : {
-				src         : [ 'readme.txt' ],
-				overwrite   : true,
-				replacements: [ {
-					from: /Stable tag: (.*)/,
-					to  : "Stable tag: <%= pkg.version %>"
-				} ]
-
-			},
-			version_init_php            : {
-				src         : [ 'init.php' ],
-				overwrite   : true,
-				replacements: [ {
-					from: /Version: (.*)/,
-					to  : "Version: <%= pkg.version %>"
-				}, {
-					from: /define\( 'PODS_VERSION', '([\.\d\w\-]*)' \);/,
-					to  : "define( 'PODS_VERSION', '<%= pkg.version %>' );"
-				} ]
-			},
-			branchfix_master_readme_md  : {
-				src         : [ 'README.md' ],
-				overwrite   : true,
-				replacements: [ {
-					from: /\?branch=(release\/|)([\.\d\w\-]*)/g,
-					to  : "?branch=master"
-				}, {
-					from: /\?b=(release\/|)([\.\d\w\-]*)/g,
-					to  : "?b=master"
-				}, {
-					from: /\/blob\/(release\/|)([\.\d\w\-]*)\//g,
-					to  : "/blob/master/"
-				} ]
-
-			},
-			branchfix_master_init_php   : {
-				src         : [ 'init.php' ],
-				overwrite   : true,
-				replacements: [ {
-					from: /GitHub Branch: (release\/|)([\.\d\w\-]*)/,
-					to  : "GitHub Branch: master"
-				} ]
-			},
-			branchfix_2x_readme_md      : {
-				src         : [ 'README.md' ],
-				overwrite   : true,
-				replacements: [ {
-					from: /\?branch=(release\/|)([\.\d\w\-]*)/g,
-					to  : "?branch=2.x"
-				}, {
-					from: /\?b=(release\/|)([\.\d\w\-]*)/g,
-					to  : "?b=2.x"
-				}, {
-					from: /\/blob\/(release\/|)([\.\d\w\-]*)\//g,
-					to  : "/blob/2.x/"
-				} ]
-
-			},
-			branchfix_2x_init_php       : {
-				src         : [ 'init.php' ],
-				overwrite   : true,
-				replacements: [ {
-					from: /GitHub Branch: (release\/|)([\.\d\w\-]*)/,
-					to  : "GitHub Branch: 2.x"
-				} ]
-			},
-			branchfix_release_readme_md : {
-				src         : [ 'README.md' ],
-				overwrite   : true,
-				replacements: [ {
-					from: /\?branch=(release\/|)([\.\d\w\-]*)/g,
-					to  : "?branch=release/2.7"
-				}, {
-					from: /\?b=(release\/|)([\.\d\w\-]*)/g,
-					to  : "?b=release/2.7"
-				}, {
-					from: /\/blob\/(release\/|)([\.\d\w\-]*)\//g,
-					to  : "/blob/release/2.7/"
-				} ]
-
-			},
-			branchfix_release_init_php  : {
-				src         : [ 'init.php' ],
-				overwrite   : true,
-				replacements: [ {
-					from: /GitHub Branch: (release\/|)([\.\d\w\-]*)/,
-					to  : "GitHub Branch: release/2.7"
-				} ]
-			}
-		},
-
-		svn_checkout: {
-			make_local: {
-				repos: [
+		}, replace   : {
+			version_readme_txt             : {
+				src : ['readme.txt'], overwrite : true, replacements : [
 					{
-						path: [ 'build' ],
-						repo: 'http://plugins.svn.wordpress.org/<%= pkg.name %>'
+						from : /Stable tag: (.*)/, to : "Stable tag: <%= pkg.version %>"
+					}
+				]
+			}, version_init_php            : {
+				src : ['init.php'], overwrite : true, replacements : [
+					{
+						from : /Version: (.*)/, to : "Version: <%= pkg.version %>"
+					},
+					{
+						from : /define\( 'PODS_VERSION', '([\.\d\w\-]*)' \);/,
+						to   : "define( 'PODS_VERSION', '<%= pkg.version %>' );"
+					}
+				]
+			}, branchfix_master_readme_md  : {
+				src : ['README.md'], overwrite : true, replacements : [
+					{
+						from : /\?branch=(release\/|)([\.\d\w\-]*)/g, to : "?branch=master"
+					},
+					{
+						from : /\?b=(release\/|)([\.\d\w\-]*)/g, to : "?b=master"
+					},
+					{
+						from : /\/blob\/(release\/|)([\.\d\w\-]*)\//g, to : "/blob/master/"
+					}
+				]
+			}, branchfix_master_init_php   : {
+				src : ['init.php'], overwrite : true, replacements : [
+					{
+						from : /GitHub Branch: (release\/|)([\.\d\w\-]*)/, to : "GitHub Branch: master"
+					}
+				]
+			}, branchfix_2x_readme_md      : {
+				src : ['README.md'], overwrite : true, replacements : [
+					{
+						from : /\?branch=(release\/|)([\.\d\w\-]*)/g, to : "?branch=2.x"
+					},
+					{
+						from : /\?b=(release\/|)([\.\d\w\-]*)/g, to : "?b=2.x"
+					},
+					{
+						from : /\/blob\/(release\/|)([\.\d\w\-]*)\//g, to : "/blob/2.x/"
+					}
+				]
+			}, branchfix_2x_init_php       : {
+				src : ['init.php'], overwrite : true, replacements : [
+					{
+						from : /GitHub Branch: (release\/|)([\.\d\w\-]*)/, to : "GitHub Branch: 2.x"
+					}
+				]
+			}, branchfix_release_readme_md : {
+				src : ['README.md'], overwrite : true, replacements : [
+					{
+						from : /\?branch=(release\/|)([\.\d\w\-]*)/g, to : "?branch=release/" + release_branch_version
+					},
+					{
+						from : /\?b=(release\/|)([\.\d\w\-]*)/g, to : "?b=release/" + release_branch_version
+					},
+					{
+						from : /\/blob\/(release\/|)([\.\d\w\-]*)\//g,
+						to   : "/blob/release/" + release_branch_version + "/"
+					}
+				]
+			}, branchfix_release_init_php  : {
+				src : ['init.php'], overwrite : true, replacements : [
+					{
+						from : /GitHub Branch: (release\/|)([\.\d\w\-]*)/,
+						to   : "GitHub Branch: release/" + release_branch_version
 					}
 				]
-			}
-		},
-
-		push_svn: {
-			options: {
-				remove: true
-			},
-			main   : {
-				src : 'build/<%= pkg.name %>/trunk',
-				dest: 'http://plugins.svn.wordpress.org/<%= pkg.name %>/trunk',
-				tmp : 'build/push_svn/trunk'
-			}
-		},
-
-		svn_copy: {
-			options: {},
-			files  : {
-				// This is switched, dest = source and src = target, svn_copy code is wrong
-				// See: https://github.com/ColmMcBarron/grunt-svn-copy/issues/1
-				dest: 'http://plugins.svn.wordpress.org/<%= pkg.name %>/trunk',
-				src : 'http://plugins.svn.wordpress.org/<%= pkg.name %>/tags/<%= pkg.version %> -m "<%= pkg.name %>/<%= pkg.version %>"'
-			}
-		},
-
-		mkdir: {
-			build: {
-				options: {
-					mode  : parseInt( '0755', 8 ),
-					create: [ 'build' ]
-				}
 			}
 		}
+	};
 
-	} );
+	// Project configuration.
+	grunt.initConfig( config );
 
 	// branch related tasks
-	grunt.registerTask( 'branch_name_master', [ 'replace:branchfix_master_readme_md', 'replace:branchfix_master_init_php' ] );
-	grunt.registerTask( 'branch_name_2x', [ 'replace:branchfix_2x_readme_md', 'replace:branchfix_2x_init_php' ] );
-	grunt.registerTask( 'branch_name_release', [ 'replace:branchfix_release_readme_md', 'replace:branchfix_release_init_php' ] );
+	grunt.registerTask( 'branch_name_master', [
+		'replace:branchfix_master_readme_md',
+		'replace:branchfix_master_init_php'
+	] );
+	grunt.registerTask( 'branch_name_2x', [
+		'replace:branchfix_2x_readme_md',
+		'replace:branchfix_2x_init_php'
+	] );
+	grunt.registerTask( 'branch_name_release', [
+		'replace:branchfix_release_readme_md',
+		'replace:branchfix_release_init_php'
+	] );
 
 	// release tasks
-	grunt.registerTask( 'version_number', [ 'replace:version_readme_txt', 'replace:version_init_php' ] );
-	grunt.registerTask( 'pre_vcs', [ 'branch_name_master', 'version_number', 'clean:post_build', 'mkdir:build' ] );
-	grunt.registerTask( 'do_git', [ 'gitcommit', 'gittag', 'gitpush' ] );
-	grunt.registerTask( 'do_svn', [ 'svn_checkout', 'copy:svn_trunk', 'push_svn', 'svn_copy' ] );
-	grunt.registerTask( 'release', [ 'pre_vcs', 'do_git', 'do_svn', 'clean:post_build' ] );
+	grunt.registerTask( 'version_number', [
+		'replace:version_readme_txt',
+		'replace:version_init_php'
+	] );
+	grunt.registerTask( 'pre_vcs', [
+		'branch_name_master',
+		'version_number'
+	] );
+	grunt.registerTask( 'do_git', [
+		'gitcommit',
+		'gittag',
+		'gitpush'
+	] );
+	grunt.registerTask( 'release', [
+		'pre_vcs',
+		'do_git'
+	] );
 };
diff --git a/classes/Pods.php b/classes/Pods.php
@@ -1843,6 +1843,9 @@ public function field( $name, $single = null, $raw = false ) {
 
 							if ( $last_options ) {
 								$last_field_data = $last_options;
+							} elseif ( isset( $related_obj, $related_obj->fields, $related_obj->fields[ $field ] ) ) {
+								// Save related field data for later to be used for display formatting
+								$last_field_data = $related_obj->fields[ $field ];
 							}
 
 							break;
@@ -1870,7 +1873,6 @@ public function field( $name, $single = null, $raw = false ) {
 			$field_data = $last_field_data;
 		}
 
-		// @todo Expand this into traversed fields too.
 		if ( ! empty( $field_data ) && ( $params->display || ! $params->raw ) && ! $params->in_form && ! $params->raw_display ) {
 			if ( $params->display || ( ( $params->get_meta || $params->deprecated ) && ! in_array( $field_data['type'], $tableless_field_types, true ) ) ) {
 				$field_data['options'] = pods_v( 'options', $field_data, array(), true );