Changeset 42343 for trunk/src/wp-includes/class-wp-roles.php

Timestamp:

11/30/2017 11:09:33 PM (8 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-includes/class-wp-roles.php (modified) (8 diffs)

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

@@ -16 +16 @@
  *
  *     array (
- *          'rolename' => array (
- *              'name' => 'rolename',
- *              'capabilities' => array()
- *          )
+ *          'rolename' => array (
+ *              'name' => 'rolename',
+ *              'capabilities' => array()
+ *          )
  *     )
  *
@@ -158 +158 @@
         }
 
-        $this->roles[$role] = array(
-            'name' => $display_name,
-            'capabilities' => $capabilities
-            );
-        if ( $this->use_db )
+        $this->roles[ $role ] = array(
+            'name'         => $display_name,
+            'capabilities' => $capabilities,
+        );
+        if ( $this->use_db ) {
             update_option( $this->role_key, $this->roles );
-        $this->role_objects[$role] = new WP_Role( $role, $capabilities );
-        $this->role_names[$role] = $display_name;
-        return $this->role_objects[$role];
+        }
+        $this->role_objects[ $role ] = new WP_Role( $role, $capabilities );
+        $this->role_names[ $role ]   = $display_name;
+        return $this->role_objects[ $role ];
     }
 
@@ -177 +178 @@
      */
     public function remove_role( $role ) {
-        if ( ! isset( $this->role_objects[$role] ) )
-            return;
-
-        unset( $this->role_objects[$role] );
-        unset( $this->role_names[$role] );
-        unset( $this->roles[$role] );
-
-        if ( $this->use_db )
+        if ( ! isset( $this->role_objects[ $role ] ) ) {
+            return;
+        }
+
+        unset( $this->role_objects[ $role ] );
+        unset( $this->role_names[ $role ] );
+        unset( $this->roles[ $role ] );
+
+        if ( $this->use_db ) {
             update_option( $this->role_key, $this->roles );
-
-        if ( get_option( 'default_role' ) == $role )
+        }
+
+        if ( get_option( 'default_role' ) == $role ) {
             update_option( 'default_role', 'subscriber' );
+        }
     }
 
@@ -201 +205 @@
      */
     public function add_cap( $role, $cap, $grant = true ) {
-        if ( ! isset( $this->roles[$role] ) )
-            return;
-
-        $this->roles[$role]['capabilities'][$cap] = $grant;
-        if ( $this->use_db )
+        if ( ! isset( $this->roles[ $role ] ) ) {
+            return;
+        }
+
+        $this->roles[ $role ]['capabilities'][ $cap ] = $grant;
+        if ( $this->use_db ) {
             update_option( $this->role_key, $this->roles );
+        }
     }
 
@@ -218 +224 @@
      */
     public function remove_cap( $role, $cap ) {
-        if ( ! isset( $this->roles[$role] ) )
-            return;
-
-        unset( $this->roles[$role]['capabilities'][$cap] );
-        if ( $this->use_db )
+        if ( ! isset( $this->roles[ $role ] ) ) {
+            return;
+        }
+
+        unset( $this->roles[ $role ]['capabilities'][ $cap ] );
+        if ( $this->use_db ) {
             update_option( $this->role_key, $this->roles );
+        }
     }
 
@@ -235 +243 @@
      */
     public function get_role( $role ) {
-        if ( isset( $this->role_objects[$role] ) )
-            return $this->role_objects[$role];
-        else
+        if ( isset( $this->role_objects[ $role ] ) ) {
+            return $this->role_objects[ $role ];
+        } else {
             return null;
+        }
     }
 
@@ -261 +270 @@
      */
     public function is_role( $role ) {
-        return isset( $this->role_names[$role] );
+        return isset( $this->role_names[ $role ] );
     }
 
@@ -275 +284 @@
 
         $this->role_objects = array();
-        $this->role_names =  array();
+        $this->role_names   = array();
         foreach ( array_keys( $this->roles ) as $role ) {
             $this->role_objects[ $role ] = new WP_Role( $role, $this->roles[ $role ]['capabilities'] );
-            $this->role_names[ $role ] = $this->roles[ $role ]['name'];
+            $this->role_names[ $role ]   = $this->roles[ $role ]['name'];
         }