From 980c7c91303e6cf0646809af293a8bb4126a5ca0 Mon Sep 17 00:00:00 2001
From: Chris Wright <daverandom@php.net>
Date: Wed, 26 Nov 2014 16:02:43 +0000
Subject: [PATCH] Add CacheFactory

---
 lib/CacheFactory.php | 23 +++++++++++++++++++++++
 lib/Client.php       | 14 +-------------
 2 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 lib/CacheFactory.php

diff --git a/lib/CacheFactory.php b/lib/CacheFactory.php
new file mode 100644
index 0000000..8aee8a0
--- /dev/null
+++ b/lib/CacheFactory.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Amp\Dns;
+
+use Amp\Dns\Cache\MemoryCache;
+use Amp\Dns\Cache\APCCache;
+
+class CacheFactory
+{
+    /**
+     * Get an instance of the best available caching back-end that does not have any dependencies
+     *
+     * @return Cache
+     */
+    public function select()
+    {
+        if (extension_loaded('apc') && ini_get("apc.enabled") && @apc_cache_info()) {
+            return new APCCache;
+        }
+
+        return new MemoryCache;
+    }
+}
diff --git a/lib/Client.php b/lib/Client.php
index 014415d..5ff4fd1 100644
--- a/lib/Client.php
+++ b/lib/Client.php
@@ -5,8 +5,6 @@ namespace Amp\Dns;
 use Amp\Reactor;
 use Amp\Failure;
 use Amp\Future;
-use Amp\Dns\Cache\MemoryCache;
-use Amp\Dns\Cache\APCCache;
 
 class Client {
     const OP_MS_REQUEST_TIMEOUT = 0b0001;
@@ -103,17 +101,7 @@ class Client {
         $this->reactor = $reactor ?: \Amp\reactor();
         $this->requestBuilder = $requestBuilder ?: new RequestBuilder;
         $this->responseInterpreter = $responseInterpreter ?: new ResponseInterpreter;
-
-        if (!$cache) {
-            if (extension_loaded('apc') && ini_get("apc.enabled") && @apc_cache_info()) {
-                $cache = new APCCache;
-            }
-            else {
-                $cache = new MemoryCache;
-            }
-        }
-
-        $this->cache = $cache;
+        $this->cache = $cache ?: (new CacheFactory)->select();
     }
 
     /**