Changeset 42343 for trunk/src/wp-admin/includes/taxonomy.php

Timestamp:

11/30/2017 11:09:33 PM (9 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

• trunk/src/wp-admin/includes/taxonomy.php (modified) (14 diffs)

trunk/src/wp-admin/includes/taxonomy.php

@@ -23 +23 @@
  */
 function category_exists( $cat_name, $parent = null ) {
-        $id = term_exists($cat_name, 'category', $parent);
-        if ( is_array($id) )
+        $id = term_exists( $cat_name, 'category', $parent );
+        if ( is_array( $id ) ) {
                 $id = $id['term_id'];
+        }
         return $id;
 }
@@ -53 +54 @@
  */
 function wp_create_category( $cat_name, $parent = 0 ) {
-        if ( $id = category_exists($cat_name, $parent) )
+        if ( $id = category_exists( $cat_name, $parent ) ) {
                 return $id;
-
-        return wp_insert_category( array('cat_name' => $cat_name, 'category_parent' => $parent) );
+        }
+
+        return wp_insert_category(
+                array(
+                        'cat_name'        => $cat_name,
+                        'category_parent' => $parent,
+                )
+        );
 }
 
@@ -69 +76 @@
  */
 function wp_create_categories( $categories, $post_id = '' ) {
-        $cat_ids = array ();
+        $cat_ids = array();
         foreach ( $categories as $category ) {
                 if ( $id = category_exists( $category ) ) {
@@ -78 +85 @@
         }
 
-        if ( $post_id )
-                wp_set_post_categories($post_id, $cat_ids);
+        if ( $post_id ) {
+                wp_set_post_categories( $post_id, $cat_ids );
+        }
 
         return $cat_ids;
@@ -107 +115 @@
  */
 function wp_insert_category( $catarr, $wp_error = false ) {
-        $cat_defaults = array( 'cat_ID' => 0, 'taxonomy' => 'category', 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => '' );
-        $catarr = wp_parse_args( $catarr, $cat_defaults );
+        $cat_defaults = array(
+                'cat_ID'               => 0,
+                'taxonomy'             => 'category',
+                'cat_name'             => '',
+                'category_description' => '',
+                'category_nicename'    => '',
+                'category_parent'      => '',
+        );
+        $catarr       = wp_parse_args( $catarr, $cat_defaults );
 
         if ( trim( $catarr['cat_name'] ) == '' ) {
@@ -121 +136 @@
 
         // Are we updating or creating?
-        $update = ! empty ( $catarr['cat_ID'] );
-
-        $name = $catarr['cat_name'];
+        $update = ! empty( $catarr['cat_ID'] );
+
+        $name        = $catarr['cat_name'];
         $description = $catarr['category_description'];
-        $slug = $catarr['category_nicename'];
-        $parent = (int) $catarr['category_parent'];
+        $slug        = $catarr['category_nicename'];
+        $parent      = (int) $catarr['category_parent'];
         if ( $parent < 0 ) {
                 $parent = 0;
@@ -137 +152 @@
         }
 
-        $args = compact('name', 'slug', 'parent', 'description');
+        $args = compact( 'name', 'slug', 'parent', 'description' );
 
         if ( $update ) {
@@ -166 +181 @@
  * @return int|bool The ID number of the new or updated Category on success. Zero or FALSE on failure.
  */
-function wp_update_category($catarr) {
+function wp_update_category( $catarr ) {
         $cat_ID = (int) $catarr['cat_ID'];
 
-        if ( isset($catarr['category_parent']) && ($cat_ID == $catarr['category_parent']) )
+        if ( isset( $catarr['category_parent'] ) && ( $cat_ID == $catarr['category_parent'] ) ) {
                 return false;
+        }
 
         // First, get all of the original fields
@@ -177 +193 @@
 
         // Escape data pulled from DB.
-        $category = wp_slash($category);
+        $category = wp_slash( $category );
 
         // Merge old and new fields with new fields overwriting old ones.
-        $catarr = array_merge($category, $catarr);
-
-        return wp_insert_category($catarr);
+        $catarr = array_merge( $category, $catarr );
+
+        return wp_insert_category( $catarr );
 }
 
@@ -197 +213 @@
  * @return mixed
  */
-function tag_exists($tag_name) {
-        return term_exists($tag_name, 'post_tag');
+function tag_exists( $tag_name ) {
+        return term_exists( $tag_name, 'post_tag' );
 }
 
@@ -209 +225 @@
  * @return array|WP_Error
  */
-function wp_create_tag($tag_name) {
-        return wp_create_term( $tag_name, 'post_tag');
+function wp_create_tag( $tag_name ) {
+        return wp_create_term( $tag_name, 'post_tag' );
 }
 
@@ -223 +239 @@
  */
 function get_tags_to_edit( $post_id, $taxonomy = 'post_tag' ) {
-        return get_terms_to_edit( $post_id, $taxonomy);
+        return get_terms_to_edit( $post_id, $taxonomy );
 }
 
@@ -237 +253 @@
 function get_terms_to_edit( $post_id, $taxonomy = 'post_tag' ) {
         $post_id = (int) $post_id;
-        if ( !$post_id )
+        if ( ! $post_id ) {
                 return false;
+        }
 
         $terms = get_object_term_cache( $post_id, $taxonomy );
@@ -283 +300 @@
  * @return array|WP_Error
  */
-function wp_create_term($tag_name, $taxonomy = 'post_tag') {
-        if ( $id = term_exists($tag_name, $taxonomy) )
+function wp_create_term( $tag_name, $taxonomy = 'post_tag' ) {
+        if ( $id = term_exists( $tag_name, $taxonomy ) ) {
                 return $id;
-
-        return wp_insert_term($tag_name, $taxonomy);
-}
+        }
+
+        return wp_insert_term( $tag_name, $taxonomy );
+}