Skip to content

Forms: Remove classic Admin initialization and migrate functionality #46254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CGastrell merged 16 commits into from
Dec 11, 2025
Merged

Forms: Remove classic Admin initialization and migrate functionality #46254

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2efd4ca
Forms: Depreacte Classic Admin
enejb Jul 30, 2025
75423ad
changelog
enejb Jul 30, 2025
2cd7387
move gdrive export to plugin class
CGastrell Sep 4, 2025
d0b67b2
We don't need to move this method.
enejb Sep 4, 2025
a9e2ff7
Deprecate the method.
enejb Sep 4, 2025
b1bc9b9
Fixes for phan
enejb Sep 4, 2025
c777be5
Update phan baseline
enejb Sep 5, 2025
d61b1fc
Code clean up
enejb Sep 5, 2025
4f6e184
add tests and phan baseline to allow deprecated function call
CGastrell Sep 9, 2025
11296d4
add tests for export_to_gdrive delegation
CGastrell Sep 9, 2025
c2eb35d
Apply suggestion from @Copilot
enejb Sep 10, 2025
91eeaa9
reinstate csv column array building even on empty values
CGastrell Sep 10, 2025
3cdf870
fix after rebase
CGastrell Dec 10, 2025
dc9401f
update phan baseline
CGastrell Dec 10, 2025
88d3d32
esc values going into the sheet, fix json encode flag requirement
CGastrell Dec 10, 2025
de0af73
try a different approach for the test for validating gdrive nonce, ph…
CGastrell Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixes for phan
  • Loading branch information
@enejb @CGastrell
enejb authored and CGastrell committed Dec 10, 2025
commit b1bc9b980ac732cfe2a5282500339ce8c5ccb18c
7 changes: 5 additions & 2 deletions projects/packages/forms/src/contact-form/class-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
/**
* Class Admin
*
* @deprecated $$next-version$$
*
* Singleton for Grunion admin area support.
*
* This class will be removed in a future version.
*/
class Admin {
/**
Expand All @@ -39,9 +39,12 @@ class Admin {
/**
* Instantiates this singleton class
*
* @deprecated $$next-version$$
*
* @return Admin The Admin class instance.
*/
public static function init() {
_deprecated_function( __METHOD__, 'package-$$next-version$$' );
static $instance = false;

if ( ! $instance ) {
Expand Down
6 changes: 5 additions & 1 deletion projects/packages/forms/src/contact-form/class-contact-form-plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3701,7 +3701,11 @@ public function export_to_gdrive() {
* Put all the fields in `$current_row` array.
*/
foreach ( $fields as $single_field_name ) {
$current_row[] = $export_data[ $single_field_name ][ $i ];
if ( isset( $export_data[ $single_field_name ][ $i ] ) ) {
$current_row[] = $export_data[ $single_field_name ][ $i ];
} else {
$current_row[] = '';
}
}

$sheet_data[] = $current_row;
Expand Down
1 change: 0 additions & 1 deletion projects/packages/forms/src/contact-form/class-editor-view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ public static function add_hooks( $screen ) {
* Admin header.
*/
public static function admin_head() {
remove_action( 'media_buttons', array( Admin::init(), 'grunion_media_button' ), 999 );
add_action( 'media_buttons', array( __CLASS__, 'grunion_media_button' ), 999 );
}

Expand Down