Merge pull request #99 from nunomaduro/master

Moves default implementation of snapshot directory/id to concerns directory

Author: freekmurze

src/Concerns/SnapshotDirectoryAware.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Spatie\Snapshots\Concerns;
+
+use ReflectionClass;
+
+trait SnapshotDirectoryAware
+{
+    /*
+     * Determines the directory where snapshots are stored. By default a
+     * `__snapshots__` directory is created at the same level as the test
+     * class.
+     */
+    protected function getSnapshotDirectory(): string
+    {
+        return dirname((new ReflectionClass($this))->getFileName()).
+            DIRECTORY_SEPARATOR.
+            '__snapshots__';
+    }
+}

src/Concerns/SnapshotIdAware.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Spatie\Snapshots\Concerns;
+
+use ReflectionClass;
+
+trait SnapshotIdAware
+{
+    /*
+     * Determines the snapshot's id. By default, the test case's class and
+     * method names are used.
+     */
+    protected function getSnapshotId(): string
+    {
+        return (new ReflectionClass($this))->getShortName().'__'.
+            $this->getName().'__'.
+            $this->snapshotIncrementor;
+    }
+}

src/MatchesSnapshots.php

@@ -3,8 +3,9 @@
 namespace Spatie\Snapshots;
 
 use PHPUnit\Framework\ExpectationFailedException;
-use ReflectionClass;
 use ReflectionObject;
+use Spatie\Snapshots\Concerns\SnapshotDirectoryAware;
+use Spatie\Snapshots\Concerns\SnapshotIdAware;
 use Spatie\Snapshots\Drivers\HtmlDriver;
 use Spatie\Snapshots\Drivers\JsonDriver;
 use Spatie\Snapshots\Drivers\ObjectDriver;
@@ -14,6 +15,8 @@
 
 trait MatchesSnapshots
 {
+    use SnapshotDirectoryAware, SnapshotIdAware;
+
     protected int $snapshotIncrementor = 0;
 
     protected array $snapshotChanges = [];
@@ -105,29 +108,6 @@ public function assertMatchesYamlSnapshot($actual): void
         $this->assertMatchesSnapshot($actual, new YamlDriver());
     }
 
-    /*
-     * Determines the snapshot's id. By default, the test case's class and
-     * method names are used.
-     */
-    protected function getSnapshotId(): string
-    {
-        return (new ReflectionClass($this))->getShortName().'__'.
-            $this->getName().'__'.
-            $this->snapshotIncrementor;
-    }
-
-    /*
-     * Determines the directory where snapshots are stored. By default a
-     * `__snapshots__` directory is created at the same level as the test
-     * class.
-     */
-    protected function getSnapshotDirectory(): string
-    {
-        return dirname((new ReflectionClass($this))->getFileName()).
-            DIRECTORY_SEPARATOR.
-            '__snapshots__';
-    }
-
     /*
      * Determines the directory where file snapshots are stored. By default a
      * `__snapshots__/files` directory is created at the same level as the