Merge branch '4.5'

Author: sebastianbergmann

composer.json

@@ -33,8 +33,7 @@
         "sebastian/comparator": "~1.1",
         "sebastian/diff": "~1.2",
         "sebastian/environment": "~1.2",
-        "sebastian/exporter": "~1.1",
-        "sebastian/recursion-context": "~1.0",
+        "sebastian/exporter": "~1.2",
         "sebastian/global-state": "~1.0",
         "sebastian/version": "~1.0",
         "ext-dom": "*",

src/Framework/TestCase.php

@@ -11,7 +11,6 @@
 use SebastianBergmann\GlobalState\Snapshot;
 use SebastianBergmann\GlobalState\Restorer;
 use SebastianBergmann\GlobalState\Blacklist;
-use SebastianBergmann\RecursionContext\Context;
 use SebastianBergmann\Exporter\Exporter;
 use Prophecy\Exception\Prediction\PredictionException;
 use Prophecy\Prophet;
@@ -1663,41 +1662,6 @@ public static function onConsecutiveCalls()
         return new PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls($args);
     }
 
-    /**
-     * @param  mixed                                      $data       The data to export as a string
-     * @param  SebastianBergmann\RecursionContext\Context $processed  Contains all objects and arrays that have previously been processed
-     * @return string
-     * @since  Method available since Release 3.2.1
-     */
-    protected function dataToString(&$data, $processed = null)
-    {
-        $result = array();
-        $exporter = new Exporter();
-
-        if (!$processed) {
-            $processed = new Context;
-        }
-
-        $processed->add($data);
-
-        foreach ($data as $key => $value) {
-            if (is_array($value)) {
-                if ($processed->contains($data[$key]) !== false) {
-                    $result[] = '*RECURSION*';
-                } else {
-                    $result[] = sprintf(
-                        'array(%s)',
-                        $this->dataToString($data[$key], $processed)
-                    );
-                }
-            } else {
-                $result[] = $exporter->shortenedExport($value);
-            }
-        }
-
-        return implode(', ', $result);
-    }
-
     /**
      * Gets the data set description of a TestCase.
      *
@@ -1716,8 +1680,10 @@ protected function getDataSetAsString($includeData = true)
                 $buffer .= sprintf(' with data set "%s"', $this->dataName);
             }
 
+            $exporter = new Exporter;
+
             if ($includeData) {
-                $buffer .= sprintf(' (%s)', $this->dataToString($this->data));
+                $buffer .= sprintf(' (%s)', $exporter->shortenedRecursiveExport($this->data));
             }
         }