Changeset 10065 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-block-validator.php

Timestamp:

07/13/2020 07:40:02 PM (4 years ago)

Author:

ryelle

Message:

Plugin Directory: Update duplicate block name check

Switches the check to flag an error if we find the block name in a different repo plugin, or a warning if the found block has the same author.

See #5303

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-block-validator.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-block-validator.php

@@ -192 +192 @@
             foreach ( $results_by_type[ $type ] as $item ) {
                 // Only get details if this is a warning or error.
-                $details = ( 'info' === $type ) ? false : self::get_detailed_help( $item->check_name );
+                $details = ( 'info' === $type ) ? false : self::get_detailed_help( $item->check_name, $item );
                 if ( $details ) {
                     $details = '<p>' . implode( '</p><p>', (array) $details ) . '</p>';
@@ -226 +226 @@
      *
      * @param string $method The name of the check method.
+     * @param array  $result The full result data.
      *
      * @return string|array More details for a given block issue. Array of strings if there should be a linebreak.
      */
-    public static function get_detailed_help( $method ) {
+    public static function get_detailed_help( $method, $result ) {
         switch ( $method ) {
             // These don't need more details.
@@ -242 +243 @@
                 return __( 'The readme.txt file must contain the tag "block" (singular) for this to be added to the block directory.', 'wporg-plugins' );
             case 'check_for_duplicate_block_name':
-                return [
+                $details = [
                     __( "Block names must be unique, otherwise it can cause problems when using the block. It is recommended to use your plugin's name as the namespace.", 'wporg-plugins' ),
-                    '<em>' . __( 'If this is a different version of your own plugin, you can ignore this warning.', 'wporg-plugins' ) . '</em>',
                 ];
+                if ( 'warning' === $result->type ) {
+                    $details[] = '<em>' . __( 'If this is a different version of your own plugin, you can ignore this warning.', 'wporg-plugins' ) . '</em>';
+                }
+                return $details;
             case 'check_for_blocks':
                 return [