Changeset 37648

Timestamp:

06/06/2016 09:50:29 PM (9 years ago)

Author:

ocean90

Message:

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.

Location:

trunk

Files:

• src/wp-includes/class-wp-widget.php (modified) (3 diffs)
• tests/phpunit/tests/widgets.php (modified) (7 diffs)

trunk/src/wp-includes/class-wp-widget.php

@@ -17 +17 @@
  * @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 {
 
     /**
@@ -98 +97 @@
      * @since 2.8.0
      * @access public
-     * @abstract
      *
      * @param array $args     Display arguments including 'before_title', 'after_title',
@@ -104 +102 @@
      * @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.');
+    }
 
     /**

trunk/tests/phpunit/tests/widgets.php

@@ -337 +337 @@
      */
     function test_wp_widget_form() {
-        $widget = new WP_Widget_Mock( 'foo', 'Foo' );
+        $widget = new WP_Widget( 'foo', 'Foo' );
         ob_start();
         $retval = $widget->form( array() );
@@ -351 +351 @@
         $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 );
@@ -369 +369 @@
             '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'] );
@@ -380 +380 @@
      */
     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 ) );
@@ -431 +431 @@
      */
     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 ) );
@@ -504 +504 @@
         global $wp_customize;
 
-        $widget = new WP_Widget_Mock( 'foo', 'Foo' );
+        $widget = new WP_Widget( 'foo', 'Foo' );
 
         $this->assertEmpty( $wp_customize );
@@ -680 +680 @@
 
 }
-
-/**
- * Mock of WP_Widget.
- *
- * @since 4.6.0
- */
-class WP_Widget_Mock extends WP_Widget {
-    public function widget( $args, $instance ) {
-        return;
-    }
-};