Skip to content

Commit c2fd29f

Browse files
westonruterwestonruter
committed
Undebug
1 parent fd0c402 commit c2fd29f

File tree

4 files changed

+7
-72
lines changed

4 files changed

+7
-72
lines changed

‎.github/workflows/phpunit-tests.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
secrets: inherit
7070
if: ${{ startsWith( github.repository, 'WordPress/' ) && ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) }}
7171
strategy:
72-
fail-fast: true
72+
fail-fast: false
7373
matrix:
7474
event: ['${{ github.event_name }}']
7575
os: [ ubuntu-24.04 ]
@@ -205,7 +205,7 @@ jobs:
205205
secrets: inherit
206206
if: ${{ startsWith( github.repository, 'WordPress/' ) && ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) }}
207207
strategy:
208-
fail-fast: true
208+
fail-fast: false
209209
matrix:
210210
event: ['${{ github.event_name }}']
211211
os: [ ubuntu-24.04 ]
@@ -428,7 +428,7 @@ jobs:
428428
secrets: inherit
429429
if: ${{ startsWith( github.repository, 'WordPress/' ) && ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) }}
430430
strategy:
431-
fail-fast: true
431+
fail-fast: false
432432
matrix:
433433
event: ['${{ github.event_name }}']
434434
os: [ ubuntu-24.04 ]
@@ -495,7 +495,7 @@ jobs:
495495
secrets: inherit
496496
if: ${{ startsWith( github.repository, 'WordPress/' ) && ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) }}
497497
strategy:
498-
fail-fast: true
498+
fail-fast: false
499499
matrix:
500500
php: [ '7.2', '7.4', '8.0', '8.4' ]
501501
db-type: [ 'mysql' ]
@@ -524,7 +524,7 @@ jobs:
524524
secrets: inherit
525525
if: ${{ ! startsWith( github.repository, 'WordPress/' ) && github.event_name == 'pull_request' }}
526526
strategy:
527-
fail-fast: true
527+
fail-fast: false
528528
matrix:
529529
php: [ '7.2', '8.4' ]
530530
db-version: [ '8.4', '11.8' ]

‎src/wp-includes/class-wp-block.php‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -628,9 +628,6 @@ public function render( $options = array() ) {
628628
*/
629629
if ( ( ! empty( $this->block_type->style_handles ) ) ) {
630630
foreach ( $this->block_type->style_handles as $style_handle ) {
631-
if ( ! empty( $GLOBALS['debug_on_demand_block_style'] ) ) {
632-
error_log( __FILE__ . ':' . __LINE__ . ' enqueue: ' . json_encode( $style_handle ) );
633-
}
634631
wp_enqueue_style( $style_handle );
635632
}
636633
}
@@ -678,9 +675,6 @@ public function render( $options = array() ) {
678675
$after_styles_queue = wp_styles()->queue;
679676
$after_scripts_queue = wp_scripts()->queue;
680677
$after_script_modules_queue = wp_script_modules()->get_queue();
681-
if ( ! empty( $GLOBALS['debug_on_demand_block_style'] ) ) {
682-
error_log( __FILE__ . ':' . __LINE__ . ' $after_styles_queue: ' . json_encode( $after_styles_queue ) );
683-
}
684678

685679
/*
686680
* As a very special case, a dynamic block may in fact include a call to wp_head() (and thus wp_enqueue_scripts()),
@@ -712,9 +706,6 @@ public function render( $options = array() ) {
712706
) {
713707
foreach ( array_diff( $after_styles_queue, $before_styles_queue ) as $handle ) {
714708
wp_dequeue_style( $handle );
715-
if ( ! empty( $GLOBALS['debug_on_demand_block_style'] ) ) {
716-
error_log( __FILE__ . ':' . __LINE__ . ' wp_dequeue_style: ' . json_encode( $handle ) );
717-
}
718709
}
719710
foreach ( array_diff( $after_scripts_queue, $before_scripts_queue ) as $handle ) {
720711
wp_dequeue_script( $handle );

‎src/wp-includes/script-loader.php‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3660,8 +3660,6 @@ function wp_hoist_late_printed_styles() {
36603660
$printed_block_styles = '';
36613661
$printed_late_styles = '';
36623662
$capture_late_styles = static function () use ( &$printed_block_styles, &$printed_late_styles ) {
3663-
error_log( __FILE__ . ':' . __LINE__ . ' wp_styles()->queue: ' . json_encode( wp_styles()->queue ) );
3664-
36653663
// Gather the styles related to on-demand block enqueues.
36663664
$all_block_style_handles = array();
36673665
foreach ( WP_Block_Type_Registry::get_instance()->get_all_registered() as $block_type ) {
@@ -3684,14 +3682,11 @@ function wp_hoist_late_printed_styles() {
36843682
* to preserve the CSS cascade. The logic in this `if` statement is derived from `wp_print_styles()`.
36853683
*/
36863684
$enqueued_block_styles = array_values( array_intersect( $all_block_style_handles, wp_styles()->queue ) );
3687-
error_log( __FILE__ . ':' . __LINE__ . ' $enqueued_block_styles: ' . json_encode( $enqueued_block_styles ) );
3688-
error_log( __FILE__ . ':' . __LINE__ . ' wp_styles()->done: ' . json_encode( wp_styles()->done ) );
36893685
if ( count( $enqueued_block_styles ) > 0 ) {
36903686
ob_start();
36913687
wp_styles()->do_items( $enqueued_block_styles );
36923688
$printed_block_styles = ob_get_clean();
36933689
}
3694-
error_log( __FILE__ . ':' . __LINE__ . ' wp_styles()->done: ' . json_encode( wp_styles()->done ) );
36953690

36963691
/*
36973692
* Print all remaining styles not related to blocks. This contains a subset of the logic from
@@ -3701,7 +3696,6 @@ function wp_hoist_late_printed_styles() {
37013696
ob_start();
37023697
wp_styles()->do_footer_items();
37033698
$printed_late_styles = ob_get_clean();
3704-
error_log( __FILE__ . ':' . __LINE__ . ' wp_styles()->done: ' . json_encode( wp_styles()->done ) );
37053699
};
37063700

37073701
/*

‎tests/phpunit/tests/template.php‎

Lines changed: 2 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1645,9 +1645,6 @@ function (): void {
16451645
* @dataProvider data_wp_hoist_late_printed_styles
16461646
*/
16471647
public function test_wp_hoist_late_printed_styles( ?Closure $set_up, int $inline_size_limit, array $expected_styles ): void {
1648-
$GLOBALS['debug_on_demand_block_style'] = true; // TODO: Remove.
1649-
error_log( "\n##BEGIN DEBUG ####################################\n" );
1650-
16511648
switch_theme( 'default' );
16521649
global $wp_styles;
16531650
$wp_styles = null;
@@ -1677,47 +1674,10 @@ static function () {
16771674
register_core_block_style_handles();
16781675
$this->assertTrue( WP_Block_Type_Registry::get_instance()->is_registered( 'core/separator' ), 'Expected the core/separator block to be registered.' );
16791676

1680-
// Ensure
1677+
// Ensure stylesheet files exist on the filesystem since a build may not have been done.
16811678
$this->ensure_style_asset_file_created( 'wp-block-library', 'css/dist/block-library/style.css' );
1682-
// $handle = 'wp-block-library';
1683-
// $this->assertTrue( wp_style_is( $handle, 'registered' ), 'Expected the wp-block-library style to be registered.' );
1684-
// $dependency = wp_styles()->query( $handle );
1685-
// $relative_path = 'css/dist/block-library/style.css';
1686-
// error_log( __FILE__ . ':' . __LINE__ . ' $dependency->src === ' . $dependency->src );
1687-
// $dependency->src = includes_url( $relative_path );
1688-
// $path = ABSPATH . WPINC . '/blocks/separator/style.css';
1689-
// if ( ! file_exists( $path ) ) {
1690-
// mkdir( dirname( $path ), 0777, true );
1691-
// error_log( __FILE__ . ':' . __LINE__ . ' FILE DOES NOT EXIST: ' . $path );
1692-
// file_put_contents( $path, '/* The separator CSS */' );
1693-
// } else {
1694-
// error_log( __FILE__ . ':' . __LINE__ . ' FILE DOES EXIST: ' . $path );
1695-
// }
1696-
// wp_style_add_data( $handle, 'path', $path );
1697-
16981679
if ( wp_should_load_separate_core_block_assets() ) {
16991680
$this->ensure_style_asset_file_created( 'wp-block-separator', 'blocks/separator/style.css' );
1700-
1701-
// $handle = 'wp-block-separator';
1702-
// $this->assertTrue( wp_style_is( $handle, 'registered' ), 'Expected the wp-block-separator style to be registered.' );
1703-
// $dependency = wp_styles()->query( $handle );
1704-
// error_log( __FILE__ . ':' . __LINE__ . ' $dependency->src === ' . $dependency->src );
1705-
// $relative_path = 'blocks/separator/style.css';
1706-
// $dependency->src = includes_url( $relative_path );
1707-
// $path = ABSPATH . WPINC . '/' . $relative_path;
1708-
// if ( ! file_exists( $path ) ) {
1709-
// mkdir( dirname( $path ), 0777, true );
1710-
// error_log( __FILE__ . ':' . __LINE__ . ' FILE DOES NOT EXIST: ' . $path );
1711-
// file_put_contents( $path, '/* The separator CSS */' );
1712-
// } else {
1713-
// error_log( __FILE__ . ':' . __LINE__ . ' FILE DOES EXIST: ' . $path );
1714-
// }
1715-
// wp_style_add_data( $handle, 'path', $path );
1716-
1717-
$handle = 'wp-block-separator';
1718-
$done = wp_styles()->done;
1719-
error_log( __FILE__ . ':' . __LINE__ . ": wp_print_styles($handle): " . get_echo( 'wp_print_styles', array( $handle ) ) );
1720-
wp_styles()->done = $done;
17211681
}
17221682

17231683
$this->assertFalse( wp_is_block_theme(), 'Test is not relevant to block themes (only classic themes).' );
@@ -1754,9 +1714,6 @@ static function () {
17541714
'the_content',
17551715
'<!-- wp:separator --><hr class="wp-block-separator has-alpha-channel-opacity"/><!-- /wp:separator -->'
17561716
);
1757-
if ( ! empty( $GLOBALS['debug_on_demand_block_style'] ) ) {
1758-
error_log( __FILE__ . ':' . __LINE__ . ' wp_styles()->queue: ' . json_encode( wp_styles()->queue ) );
1759-
}
17601717

17611718
// Simulate footer scripts.
17621719
$footer_output = get_echo( 'wp_footer' );
@@ -1802,9 +1759,6 @@ static function () {
18021759
$found_subset_styles,
18031760
'Expected the same styles. Snapshot: ' . self::get_array_snapshot_export( $found_styles )
18041761
);
1805-
1806-
unset( $GLOBALS['debug_on_demand_block_style'] ); // TODO: Remove.
1807-
error_log( "\n##END DEBUG ####################################\n" ); // TODO: Remove.
18081762
}
18091763

18101764
/**
@@ -1820,19 +1774,15 @@ static function () {
18201774
*/
18211775
private function ensure_style_asset_file_created( string $handle, string $relative_path ) {
18221776
$this->assertTrue( wp_style_is( $handle, 'registered' ), 'Expected the wp-block-separator style to be registered.' );
1823-
$dependency = wp_styles()->query( $handle );
1824-
error_log( __FILE__ . ':' . __LINE__ . ' $dependency->src === ' . $dependency->src );
1777+
$dependency = wp_styles()->query( $handle );
18251778
$dependency->src = includes_url( $relative_path );
18261779
$path = ABSPATH . WPINC . '/' . $relative_path;
18271780
if ( ! file_exists( $path ) ) {
18281781
$dir = dirname( $path );
18291782
if ( ! file_exists( $dir ) ) {
18301783
mkdir( $dir, 0777, true );
18311784
}
1832-
error_log( __FILE__ . ':' . __LINE__ . ' FILE DOES NOT EXIST: ' . $path );
18331785
file_put_contents( $path, "/* CSS for $handle */" );
1834-
} else {
1835-
error_log( __FILE__ . ':' . __LINE__ . ' FILE DOES EXIST: ' . $path );
18361786
}
18371787
wp_style_add_data( $handle, 'path', $path );
18381788
}

0 commit comments

Comments
 (0)