Merge pull request #36 from FGM/support-more-non-counters

Support more non-additive statistics. 
Add Composer support.

.gitignore

@@ -0,0 +1,2 @@
+/vendor/
+/Config/Memcache.php

Library/Data/Analysis.php

@@ -23,6 +23,14 @@
  */
 class Library_Data_Analysis
 {
+    const NON_ADDITIVE = [
+        'libevent',
+        'pid',
+        'pointer_size',
+        'time',
+        'uptime',
+        'version',
+    ];
 
     /**
      * Merge two arrays of stats from Command_XX::stats()
@@ -43,10 +51,10 @@ public static function merge($array, $stats)
 
         # Merging Stats
         foreach ($stats as $key => $value) {
-            if (isset($array[$key]) && ($key != 'version') && ($key != 'uptime')) {
-                $array[$key] += $value;
-            } else {
+            if (! isset($array[$key]) || in_array($key, static::NON_ADDITIVE)) {
                 $array[$key] = $value;
+            } else {
+                $array[$key] += $value;
             }
         }
         return $array;
@@ -71,7 +79,7 @@ public static function diff($array, $stats)
 
         # Diff for each key
         foreach ($stats as $key => $value) {
-            if (isset($array[$key])) {
+            if (isset($array[$key]) && ! in_array($key, static::NON_ADDITIVE)) {
                 $stats[$key] = $value - $array[$key];
             }
         }
@@ -316,4 +324,4 @@ public static function hitResize($value)
         }
         return sprintf('%.0f%s', $value, $unit);
     }
-}
+}

composer.json

@@ -0,0 +1,13 @@
+{
+    "name": "elijaa/phpmemcacheadmin",
+    "description": "Graphic stand-alone administration for memcached",
+    "type": "library",
+    "license": "Apache-2.0",
+    "authors": [
+        {
+            "name": "Cyrille Mahieux",
+            "email": "[email protected]"
+        }
+    ],
+    "require": {}
+}