Remove dependency of phpunit-bridge (#112)

php-cache · Nov 3, 2020 · eda2e6b · eda2e6b
1 parent 9f1ef69
commit eda2e6b
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -25,12 +25,12 @@
     "require":     {
         "php": ">=5.5.9",
         "psr/cache": "~1.0",
-        "cache/tag-interop": "^1.0",
-        "symfony/phpunit-bridge": "^5.1"
+        "cache/tag-interop": "^1.0"
     },
     "require-dev": {
         "cache/cache": "^1.0",
         "symfony/cache": "^3.4.31|^4.3.4|^5.0",
+        "symfony/phpunit-bridge": "^5.1",
         "illuminate/cache": "^5.4|^5.5|^5.6",
         "tedivm/stash": "^0.14",
         "mockery/mockery": "^1.0"

diff --git a/src/CachePoolTest.php b/src/CachePoolTest.php
@@ -14,12 +14,9 @@
 use PHPUnit\Framework\TestCase;
 use Psr\Cache\CacheItemInterface;
 use Psr\Cache\CacheItemPoolInterface;
-use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 abstract class CachePoolTest extends TestCase
 {
-    use SetUpTearDownTrait;
-
     /**
      * @type array with functionName => reason.
      */
@@ -35,12 +32,18 @@ abstract class CachePoolTest extends TestCase
      */
     abstract public function createCachePool();
 
-    private function doSetUp()
+    /**
+     * @before
+     */
+    public function setupService()
     {
         $this->cache = $this->createCachePool();
     }
 
-    private function doTearDown()
+    /**
+     * @after
+     */
+    public function tearDownService()
     {
         if ($this->cache !== null) {
             $this->cache->clear();

diff --git a/src/HierarchicalCachePoolTest.php b/src/HierarchicalCachePoolTest.php
@@ -13,15 +13,12 @@
 
 use PHPUnit\Framework\TestCase;
 use Psr\Cache\CacheItemPoolInterface;
-use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
 abstract class HierarchicalCachePoolTest extends TestCase
 {
-    use SetUpTearDownTrait;
-
     /**
      * @type array with functionName => reason.
      */
@@ -37,12 +34,18 @@ abstract class HierarchicalCachePoolTest extends TestCase
      */
     abstract public function createCachePool();
 
-    private function doSetUp()
+    /**
+     * @before
+     */
+    public function setupService()
     {
         $this->cache = $this->createCachePool();
     }
 
-    private function doTearDown()
+    /**
+     * @after
+     */
+    public function tearDownService()
     {
         if ($this->cache !== null) {
             $this->cache->clear();

diff --git a/src/SimpleCacheTest.php b/src/SimpleCacheTest.php
@@ -13,12 +13,9 @@
 
 use PHPUnit\Framework\TestCase;
 use Psr\SimpleCache\CacheInterface;
-use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 abstract class SimpleCacheTest extends TestCase
 {
-    use SetUpTearDownTrait;
-
     /**
      * @type array with functionName => reason.
      */
@@ -49,12 +46,18 @@ public function advanceTime($seconds)
         sleep($seconds);
     }
 
-    private function doSetUp()
+    /**
+     * @before
+     */
+    public function setupService()
     {
         $this->cache = $this->createSimpleCache();
     }
 
-    private function doTearDown()
+    /**
+     * @after
+     */
+    public function tearDownService()
     {
         if ($this->cache !== null) {
             $this->cache->clear();

diff --git a/src/TaggableCachePoolTest.php b/src/TaggableCachePoolTest.php
@@ -13,15 +13,12 @@
 
 use Cache\TagInterop\TaggableCacheItemPoolInterface;
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
 abstract class TaggableCachePoolTest extends TestCase
 {
-    use SetUpTearDownTrait;
-
     /**
      * @type array with functionName => reason.
      */
@@ -37,12 +34,18 @@ abstract class TaggableCachePoolTest extends TestCase
      */
     abstract public function createCachePool();
 
-    private function doSetUp()
+    /**
+     * @before
+     */
+    public function setupService()
     {
         $this->cache = $this->createCachePool();
     }
 
-    private function doTearDown()
+    /**
+     * @after
+     */
+    public function tearDownService()
     {
         if ($this->cache !== null) {
             $this->cache->clear();