sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Widgets: Revert [37425] and [37427]. 

The change can cause fatal errors under certain conditions, like when the subclass has a different function signature for `widget()` or doesn't even implement the method.

See #35981.

git-svn-id: https://develop.svn.wordpress.org/trunk@37648 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dominik Schilling (ocean90) 2016-06-06 21:50:29 +00:00
parent 8d40956f7a
commit 30b1f09c21
2 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wp-includes/class-wp-widget.php
View File

@ -16,9 +16,8 @@
*
* @since 2.8.0
* @since 4.4.0 Moved to its own file from wp-includes/widgets.php
* @abstract
*/
abstract class WP_Widget {
class WP_Widget {
/**
* Root ID for all widgets of this type.
@ -97,13 +96,14 @@ abstract class WP_Widget {
*
* @since 2.8.0
* @access public
* @abstract
*
* @param array $args Display arguments including 'before_title', 'after_title',
* 'before_widget', and 'after_widget'.
* @param array $instance The settings for the particular instance of the widget.
*/
abstract public function widget( $args, $instance );
public function widget( $args, $instance ) {
die('function WP_Widget::widget() must be over-ridden in a sub-class.');
}
/**
* Updates a particular instance of a widget.

23
tests/phpunit/tests/widgets.php
View File

@ -336,7 +336,7 @@ class Tests_Widgets extends WP_UnitTestCase {
* @see WP_Widget::form()
*/
function test_wp_widget_form() {
$widget = new WP_Widget_Mock( 'foo', 'Foo' );
$widget = new WP_Widget( 'foo', 'Foo' );
ob_start();
$retval = $widget->form( array() );
$output = ob_get_clean();
@ -350,7 +350,7 @@ class Tests_Widgets extends WP_UnitTestCase {
function test_wp_widget_constructor() {
$id_base = 'foo';
$name = 'Foo';
$foo_widget = new WP_Widget_Mock( $id_base, $name );
$foo_widget = new WP_Widget( $id_base, $name );
$this->assertEquals( $id_base, $foo_widget->id_base );
$this->assertEquals( $name, $foo_widget->name );
@ -368,7 +368,7 @@ class Tests_Widgets extends WP_UnitTestCase {
$control_options = array(
'id_base' => 'bar_id_base',
);
$bar_widget = new WP_Widget_Mock( $id_base, $name, $widget_options, $control_options );
$bar_widget = new WP_Widget( $id_base, $name, $widget_options, $control_options );
$this->assertEquals( $widget_options['classname'], $bar_widget->widget_options['classname'] );
$this->assertEquals( $control_options['id_base'], $bar_widget->control_options['id_base'] );
}
@ -379,7 +379,7 @@ class Tests_Widgets extends WP_UnitTestCase {
*
*/
function test_wp_widget_get_field_name( $expected, $value_to_test ) {
$widget = new WP_Widget_Mock( 'foo', 'Foo' );
$widget = new WP_Widget( 'foo', 'Foo' );
$widget->_set( 2 );
$this->assertEquals( $expected, $widget->get_field_name( $value_to_test ) );
}
@ -430,7 +430,7 @@ class Tests_Widgets extends WP_UnitTestCase {
*
*/
function test_wp_widget_get_field_id( $expected, $value_to_test ) {
$widget = new WP_Widget_Mock( 'foo', 'Foo' );
$widget = new WP_Widget( 'foo', 'Foo' );
$widget->_set( 2 );
$this->assertEquals( $expected, $widget->get_field_id( $value_to_test ) );
}
@ -503,7 +503,7 @@ class Tests_Widgets extends WP_UnitTestCase {
function test_wp_widget_is_preview() {
global $wp_customize;
$widget = new WP_Widget_Mock( 'foo', 'Foo' );
$widget = new WP_Widget( 'foo', 'Foo' );
$this->assertEmpty( $wp_customize );
$this->assertFalse( $widget->is_preview() );
@ -679,14 +679,3 @@ class Tests_Widgets extends WP_UnitTestCase {
}
}
/**
* Mock of WP_Widget.
*
* @since 4.6.0
*/
class WP_Widget_Mock extends WP_Widget {
public function widget( $args, $instance ) {
return;
}
};