Ticket #33440: 35470.patch

wp-includes/class-wp-widget.php

@@ -168 +168 @@
          * @param array  $control_options
          */
         public function WP_Widget( $id_base, $name, $widget_options = array(), $control_options = array() ) {
-                _deprecated_constructor( 'WP_Widget', '4.3.0' );
+                _deprecated_constructor( 'WP_Widget', '4.3.0', get_class( $this ) );
                 WP_Widget::__construct( $id_base, $name, $widget_options, $control_options );
         }
 

wp-includes/functions.php

@@ -3628 +3628 @@
  * This function is to be used in every PHP4 style constructor method that is deprecated.
  *
  * @since 4.3.0
+ * @since 4.5.0 Parent Class.
+ *
  * @access private
  *
  * @param string $class   The class containing the deprecated constructor.
  * @param string $version The version of WordPress that deprecated the function.
+ * @param string $parent_class The parent class.
  */
-function _deprecated_constructor( $class, $version ) {
+function _deprecated_constructor( $class, $version, $parent_class = '' ) {
 
         /**
          * Fires when a deprecated constructor is called.
          *
          * @since 4.3.0
+         * @since 4.5.0 Add param `$parent_class`
          *
          * @param string $class   The class containing the deprecated constructor.
          * @param string $version The version of WordPress that deprecated the function.
+         * @param string $parent_class The parent class.
          */
-        do_action( 'deprecated_constructor_run', $class, $version );
+        do_action( 'deprecated_constructor_run', $class, $version, $parent_class );
 
         /**
          * Filter whether to trigger an error for deprecated functions.
@@ -3656 +3661 @@
          */
         if ( WP_DEBUG && apply_filters( 'deprecated_constructor_trigger_error', true ) ) {
                 if ( function_exists( '__' ) ) {
-                        trigger_error( sprintf( __( 'The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ), $class, $version, '<pre>__construct()</pre>' ) );
-                } else {
-                        trigger_error( sprintf( 'The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $class, $version, '<pre>__construct()</pre>' ) );
+                        if ( ! empty( $parent_class ) ) {
+                                trigger_error( sprintf( __( 'The called constructor method for %1$s in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.' ),
+                                                $class, $parent_class, $version, '<pre>__construct()</pre>' ) );
+                        } else {
+                                trigger_error( sprintf( __( 'The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ),
+                                                $class, $version, '<pre>__construct()</pre>' ) );
+                        }
+                } else {
+                        if ( ! empty( $parent_class ) ) {
+                                trigger_error( sprintf( 'The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.',
+                                                $class, $version, '<pre>__construct()</pre>' ) );
+                        } else {
+                                trigger_error( sprintf( 'The called constructor method for %1$s in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.',
+                                                $class, $parent_class, $version, '<pre>__construct()</pre>' ) );
+                        }
                 }
         }