Merge pull request #108 from Brugman/feature/also-use-constant

Also use the WP_ENV constant

Author: danielmorell

src/Defaults.php

@@ -19,7 +19,7 @@ public static function instance()
 
     public function environment()
     {
-        return getenv('WP_ENV') ?: null;
+        return \Rollbar\Wordpress\Plugin::getEnvironment();
     }
 
     public function root()

src/Plugin.php

@@ -52,6 +52,11 @@ public function configure(array $config) {
     private function initSettings() {
         Settings::init();
     }
+
+    public static function getEnvironment()
+    {
+        return ( getenv('WP_ENV') ?: ( defined( 'WP_ENV' ) ? WP_ENV : null ) );
+    }
 
     /**
      * Fetch settings provided in Admin -> Tools -> Rollbar
@@ -68,7 +73,7 @@ private function fetchSettings() {
 
         if (!isset($options['environment']) || empty($options['environment'])) {
 
-            if ($wpEnv = getenv('WP_ENV')) {
+            if ($wpEnv = $this->getEnvironment()) {
                 $options['environment'] = $wpEnv;
             }
 

src/UI.php

@@ -220,8 +220,10 @@ public static function status($settings)
 
     public static function environmentSettingNote()
     {
+        $env = \Rollbar\Wordpress\Plugin::getEnvironment();
+
         $output = 
-            '<p><code>WP_ENV</code> environment variable: <code> ' . getenv('WP_ENV') . ' </code></p>' .
+            '<p><code>WP_ENV</code> environment variable: <code>' . $env . '</code></p>' .
             '<p><small><strong>Rollbar for Wordpress honors the WP_ENV environment variable.</strong> ' .
             'If the <code>environment</code> setting is not specified here, it will take ' .
             'precendence over the default value.</strong></small></p>';