Ticket #31126: 31126.3.diff

src/wp-includes/functions.wp-scripts.php

@@ -94 +94 @@
  * @global WP_Scripts $wp_scripts The WP_Scripts object for printing scripts.
  *
  * @since 2.6.0
+ * @since 4.3.0 A return value was added.
  *
  * @param string      $handle    Name of the script. Should be unique.
  * @param string      $src       Path to the script from the WordPress root directory. Example: '/js/myscript.js'.
@@ -105 +106 @@
  *                               If set to null, no version is added. Default 'false'. Accepts 'false', 'null', or 'string'.
  * @param bool        $in_footer Optional. Whether to enqueue the script before </head> or before </body>.
  *                               Default 'false'. Accepts 'false' or 'true'.
+ * @return bool Whether the script has been registered. True on success, false on failure.
  */
 function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_footer = false ) {
         $wp_scripts = wp_scripts();
         _wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
 
-        $wp_scripts->add( $handle, $src, $deps, $ver );
+        $add_result = $wp_scripts->add( $handle, $src, $deps, $ver );
         if ( $in_footer ) {
                 $wp_scripts->add_data( $handle, 'group', 1 );
         }
+
+        return $add_result;
 }
 
 /**

src/wp-includes/functions.wp-styles.php

@@ -98 +98 @@
  * @link http://www.w3.org/TR/CSS2/media.html#media-types List of CSS media types.
  *
  * @since 2.6.0
+ * @since 4.3.0 A return value was added.
  *
  * @param string      $handle Name of the stylesheet.
  * @param string|bool $src    Path to the stylesheet from the WordPress root directory. Example: '/css/mystyle.css'.
@@ -107 +108 @@
  * @param string      $media  Optional. The media for which this stylesheet has been defined.
  *                            Default 'all'. Accepts 'all', 'aural', 'braille', 'handheld', 'projection', 'print',
  *                            'screen', 'tty', or 'tv'.
+ * @return bool Whether the style has been registered. True on success, false on failure.
  */
 function wp_register_style( $handle, $src, $deps = array(), $ver = false, $media = 'all' ) {
         _wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
 
-        wp_styles()->add( $handle, $src, $deps, $ver, $media );
+        return wp_styles()->add( $handle, $src, $deps, $ver, $media );
 }
 
 /**

tests/phpunit/tests/dependencies/scripts.php

@@ -155 +155 @@
                 // No scripts left to print
                 $this->assertEquals( '', get_echo( 'wp_print_scripts' ) );
         }
+
+    /**
+     * Testing 'wp_register_script' return boolean success/failure value.
+     *
+     * @ticket 31126
+     */
+    function test_wp_register_script() {
+        $this->assertTrue( wp_register_script( 'duplicate-handler', 'http://example.com' ) );
+        $this->assertFalse( wp_register_script( 'duplicate-handler', 'http://example.com' ) );
+    }
+
 }

tests/phpunit/tests/dependencies/styles.php

@@ -229 +229 @@
                 $this->assertEquals( $expected, get_echo( 'wp_print_styles' ) );
         }
 
+    /**
+     * Testing 'wp_register_style' return boolean success/failure value.
+     *
+     * @ticket 31126
+     */
+    function test_wp_register_style(){
+        $this->assertTrue( wp_register_style( 'duplicate-handler', 'http://example.com' ) );
+        $this->assertFalse( wp_register_style( 'duplicate-handler', 'http://example.com' ) );
+    }
+
 }