Refactoring to latest phpbench

dantleech · dantleech · commit c677b09384bc · 2015-08-11T09:07:15.000+02:00
diff --git a/benchmarks/BaseBench.php b/benchmarks/BaseBench.php
@@ -3,10 +3,10 @@
 namespace PHPCR\Benchmark;
 
 use PHPCR\NodeInterface;
-use PhpBench\Benchmark;
+use PhpBench\BenchmarkInterface;
 use PHPCR\ImportUUIDBehaviorInterface;
 
-abstract class BaseBench implements Benchmark
+abstract class BaseBench implements BenchmarkInterface
 {
     const ROOT_NAME = 'bench';
     const ROOT_PATH = '/bench';
diff --git a/benchmarks/InsertBench.php b/benchmarks/InsertBench.php
@@ -8,12 +8,10 @@
 
 /**
  * @group insert
- * @processIsolation iteration
  */
 class InsertBench extends BaseBench
 {
     /**
-     * @description Insert nodes
      * @paramProvider provideNbNodes
      * @beforeMethod beforeResetWorkspace
      * @iterations 2
diff --git a/benchmarks/QueryBench.php b/benchmarks/QueryBench.php
@@ -7,7 +7,6 @@
 
 /**
  * @group query
- * @processIsolation iteration
  */
 class QueryBench extends BaseBench
 {
@@ -17,7 +16,6 @@ public function setUp()
     }
 
     /**
-     * @description No iterations
      * @paramProvider provideQueries
      * @iterations 5
      * @group query_single_prop
@@ -29,7 +27,6 @@ public function benchQuery(Iteration $iteration)
     }
 
     /**
-     * @description Retrive nodes for each row
      * @paramProvider provideQueries
      * @iterations 5
      * @group query_single_prop
@@ -45,7 +42,6 @@ public function benchQueryWithNodes(Iteration $iteration)
     }
 
     /**
-     * @description Iterate over rows and retrieve properties
      * @paramProvider provideQueries
      * @iterations 5
      * @group query_single_prop
@@ -61,7 +57,6 @@ public function benchQueryIterate(Iteration $iteration)
     }
 
     /**
-     * @description Run a select query with variable amount of properties
      * @paramProvider provideProperties
      * @iterations 5
      * @group query_variable_props
diff --git a/benchmarks/TraversalBench.php b/benchmarks/TraversalBench.php
@@ -4,9 +4,6 @@
 
 use PHPCR\NodeInterface;
 
-/**
- * @processIsolation iteration
- */
 class TraversalBench extends BaseBench
 {
     public function setUp()
@@ -15,7 +12,6 @@ public function setUp()
     }
 
     /**
-     * @description Full traversal
      * @group traversal_full
      * @iterations 3
      */
@@ -25,7 +21,6 @@ public function benchFullTraversal()
     }
 
     /**
-     * @description Full traversal and read all properties
      * @group traversal_full
      * @iterations 3
      */
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
     ],
     "minimum-stability": "dev",
     "require": {
-        "phpbench/phpbench": "~0.3.0"
+        "phpbench/phpbench": "dev-master"
     },
     "autoload": {
         "psr-4": {
diff --git a/config/bootstrap.php b/config/bootstrap.php
@@ -22,10 +22,3 @@
 }
 
 require_once($cwd . '/tests/bootstrap.php');
-
-$config = new PhpBench\Configuration();
-$config->setPath(__DIR__ . '/../benchmarks');
-
-require_once('report.php');
-
-return $config;
diff --git a/config/phpbench.json b/config/phpbench.json
@@ -0,0 +1,11 @@
+{
+    "bootstrap": "./bootstrap.php",
+    "path": "../benchmarks",
+    "reports": "{
+        "insert": {
+            "extends": "aggregate",
+            "title": "Inserting Nodes",
+            "description": "Insert nodes into the repository as children of a single parent"
+        }
+    }
+}
