From ba2c37c2163edd7bcc6de753e18eba302ffdda75 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Thu, 31 Jan 2019 17:51:04 +0200
Subject: [PATCH] Removed apc and xcache support, made apc alias of apcu

---
 CHANGELOG.md                     |  3 +--
 system/src/Grav/Common/Cache.php | 11 -----------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index af394c91c..ef71c377b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
     * Added index file support for Flex Objects
 1. [](#improved)
     * Improved error detection for broken Flex Objects
+    * Removed apc and xcache support, made apc alias of apcu
 
 # v1.6.0-rc.1
 ## 01/30/2019
@@ -12,14 +13,12 @@
 1. [](#improved)
     * Improved `$page->forms()` call, added `$page->addForms()`
     * Made `FormFlashFile` more robust against deleted files
-    * Removed apc and xcache support, made apc alias of apcu
     * Updated languages from crowdin
 1. [](#bugfix)
     * Fixed a bug in `FormFlashFile::moveTo()` not deleting the old file
     * Fixed `FlexMediaTrait::getMedia()` trying to include uploaded but already moved media
     * Fixed `ImageMedium` constructor warning when file does not exist
     * Fixed bad host header in PSR-7 (if using 'php -S localhost:8000 system/router.php')
-    * Fixed Getters::count() method not returning anything
     * Fixed non-namespaced exceptions in scheduler
     
 # v1.6.0-beta.8
diff --git a/system/src/Grav/Common/Cache.php b/system/src/Grav/Common/Cache.php
index 1f4ed705d..d868cf5cf 100644
--- a/system/src/Grav/Common/Cache.php
+++ b/system/src/Grav/Common/Cache.php
@@ -212,12 +212,8 @@ class Cache extends Getters
         if (!$setting || $setting === 'auto') {
             if (extension_loaded('apcu')) {
                 $driver_name = 'apcu';
-            } elseif (extension_loaded('apc')) {
-                $driver_name = 'apc';
             } elseif (extension_loaded('wincache')) {
                 $driver_name = 'wincache';
-            } elseif (extension_loaded('xcache')) {
-                $driver_name = 'xcache';
             }
         } else {
             $driver_name = $setting;
@@ -227,9 +223,6 @@ class Cache extends Getters
 
         switch ($driver_name) {
             case 'apc':
-                $driver = new DoctrineCache\ApcCache();
-                break;
-
             case 'apcu':
                 $driver = new DoctrineCache\ApcuCache();
                 break;
@@ -238,10 +231,6 @@ class Cache extends Getters
                 $driver = new DoctrineCache\WinCacheCache();
                 break;
 
-            case 'xcache':
-                $driver = new DoctrineCache\XcacheCache();
-                break;
-
             case 'memcache':
                 $memcache = new \Memcache();
                 $memcache->connect($this->config->get('system.cache.memcache.server', 'localhost'),