Merge pull request #167 from figureone/fix-divide-by-zero

Fix divide-by-zero warning in plugin checks

Author: danielbachhuber

composer.json

@@ -29,7 +29,10 @@
             "php": "5.6"
         },
         "process-timeout": 7200,
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     },
     "extra": {
         "branch-alias": {

features/check-plugin-active-count.feature

@@ -33,3 +33,12 @@ Feature: Check whether a high number of plugins are activated
     Then STDOUT should be a table containing rows:
       | name                | status  | message                                             |
       | plugin-active-count | warning | Number of active plugins (4) exceeds threshold (3). |
+
+  Scenario: Include network-enabled plugins in active plugin count
+    Given a WP multisite installation
+    And I run `wp plugin activate --network --all`
+
+    When I run `wp doctor check plugin-active-count`
+    Then STDOUT should be a table containing rows:
+      | name                | status  | message                                                   |
+      | plugin-active-count | success | Number of active plugins (2) is less than threshold (80). |

features/check-plugin-deactivated.feature

@@ -42,3 +42,21 @@ Feature: Check whether a high percentage of plugins are deactivated
     Then STDOUT should be a table containing rows:
       | name               | status  | message                                          |
       | plugin-deactivated | warning | Greater than 60 percent of plugins are deactivated. |
+
+  Scenario: Gracefully handle no plugins installed
+    Given a WP install
+    And I run `wp plugin uninstall --all`
+
+    When I run `wp doctor check plugin-deactivated`
+    Then STDOUT should be a table containing rows:
+      | name               | status  | message                                          |
+      | plugin-deactivated | success | Less than 40 percent of plugins are deactivated. |
+
+  Scenario: Gracefully handle only network-enabled plugins installed and activated
+    Given a WP multisite installation
+    And I run `wp plugin activate --network --all`
+
+    When I run `wp doctor check plugin-deactivated`
+    Then STDOUT should be a table containing rows:
+      | name               | status  | message                                          |
+      | plugin-deactivated | success | Less than 40 percent of plugins are deactivated. |

inc/checks/class-plugin-active-count.php

@@ -21,7 +21,7 @@ public function run() {
 
 		$active = 0;
 		foreach ( self::get_plugins() as $plugin ) {
-			if ( 'active' === $plugin['status'] ) {
+			if ( 'active' === $plugin['status'] || 'active-network' === $plugin['status'] ) {
 				$active++;
 			}
 		}

inc/checks/class-plugin-deactivated.php

@@ -22,15 +22,15 @@ public function run() {
 		$active   = 0;
 		$inactive = 0;
 		foreach ( self::get_plugins() as $plugin ) {
-			if ( 'active' === $plugin['status'] ) {
+			if ( 'active' === $plugin['status'] || 'active-network' === $plugin['status'] ) {
 				$active++;
 			} elseif ( 'inactive' === $plugin['status'] ) {
 				$inactive++;
 			}
 		}
 
 		$threshold = (int) $this->threshold_percentage;
-		if ( ( $inactive / ( $inactive + $active ) ) > ( $threshold / 100 ) ) {
+		if ( $inactive + $active > 0 && ( $inactive / ( $inactive + $active ) ) > ( $threshold / 100 ) ) {
 			$this->set_status( 'warning' );
 			$this->set_message( "Greater than {$threshold} percent of plugins are deactivated." );
 		} else {