minor beberlei#33 Deprecated Collector\Null, replaced by Collector\Nu…

…llCollector fix beberlei#32 (nicolas-grekas)

This PR was merged into the 2.x-dev branch.

Discussion
----------

Deprecated Collector\Null, replaced by Collector\NullCollector fix beberlei#32

Fixes beberlei#32: Deprecated: Beberlei\Metrics\Collector\Null uses a reserved class name (Null) that will break on PHP 7 and higher

Commits
-------

5579315 Deprecated Collector\Null, replaced by Collector\NullCollector

src/Beberlei/Bundle/MetricsBundle/Resources/config/metrics.xml

@@ -32,7 +32,7 @@
             <argument type="service" id="logger" />
             <tag name="monolog.logger" channel="beberlei_metrics" />
         </service>
-        <service id="beberlei_metrics.collector_proto.null" class="Beberlei\Metrics\Collector\Null" abstract="true">
+        <service id="beberlei_metrics.collector_proto.null" class="Beberlei\Metrics\Collector\NullCollector" abstract="true">
         </service>
         <service id="beberlei_metrics.collector_proto.statsd" class="Beberlei\Metrics\Collector\StatsD" abstract="true">
             <argument /> <!-- host, set by the extension -->

src/Beberlei/Bundle/MetricsBundle/Tests/DependencyInjection/BeberleiMetricsExtensionTest.php

@@ -99,7 +99,7 @@ public function testWithLogger()
         $this->assertInstanceOf('Beberlei\Metrics\Collector\Logger', $container->get('beberlei_metrics.collector.logger'));
     }
 
-    public function testWithNull()
+    public function testWithNullCollector()
     {
         $container = $this->createContainer(array(
             'collectors' => array(
@@ -109,7 +109,7 @@ public function testWithNull()
             ),
         ));
 
-        $this->assertInstanceOf('Beberlei\Metrics\Collector\Null', $container->get('beberlei_metrics.collector.null'));
+        $this->assertInstanceOf('Beberlei\Metrics\Collector\NullCollector', $container->get('beberlei_metrics.collector.null'));
     }
 
     public function testWithStatsD()

src/Beberlei/Metrics/Collector/Null.php

@@ -13,24 +13,9 @@
 
 namespace Beberlei\Metrics\Collector;
 
-class Null implements Collector
+/**
+ * @deprecated for PHP7 compatibility, use NullCollector instead.
+ */
+class Null extends NullCollector
 {
-    public function increment($variable)
-    {
-    }
-    public function decrement($variable)
-    {
-    }
-    public function timing($variable, $time)
-    {
-    }
-    public function measure($variable, $value)
-    {
-    }
-    public function gauge($variable, $value)
-    {
-    }
-    public function flush()
-    {
-    }
 }

src/Beberlei/Metrics/Collector/NullCollector.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Beberlei Metrics
+ *
+ * LICENSE
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this package in the file LICENSE.txt.
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so I can send you a copy immediately.
+ */
+
+namespace Beberlei\Metrics\Collector;
+
+class NullCollector implements Collector
+{
+    public function increment($variable)
+    {
+    }
+    public function decrement($variable)
+    {
+    }
+    public function timing($variable, $time)
+    {
+    }
+    public function measure($variable, $value)
+    {
+    }
+    public function gauge($variable, $value)
+    {
+    }
+    public function flush()
+    {
+    }
+}

src/Beberlei/Metrics/Factory.php

@@ -123,7 +123,7 @@ public static function create($type, array $options = array())
                 return new Collector\Logger($options['logger']);
 
             case 'null':
-                return new Collector\Null();
+                return new Collector\NullCollector();
 
             default:
                 throw new MetricsException(sprintf('Unknown metrics collector given (%s).', $type));

src/Beberlei/Metrics/Tests/FactoryTest.php

@@ -21,7 +21,7 @@ public function getCreateValidMetricTests()
             array('Beberlei\Metrics\Collector\Librato', 'librato', array('hostname' => 'foobar.com', 'username' => 'username', 'password' => 'password')),
             array('Beberlei\Metrics\Collector\DoctrineDBAL', 'doctrine_dbal', array('connection' => $this->getMockBuilder('Doctrine\DBAL\Connection')->disableOriginalConstructor()->getMock())),
             array('Beberlei\Metrics\Collector\Logger', 'logger', array('logger' => new NullLogger())),
-            array('Beberlei\Metrics\Collector\Null', 'null'),
+            array('Beberlei\Metrics\Collector\NullCollector', 'null'),
         );
     }