From 40cd7570e6f4da7cc60d83a3e99c72a2fb99e3f7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 1 Oct 2014 11:38:45 +0200
Subject: [ticket/11224] Revert "Merge pull request #2460 from
 Nicofuma/ticket/11224"

This reverts commit d26436944173d1fa28a1abd96bca861381246860, reversing
changes made to 75fcfb1c1d68f1632e7beae3f59699ddff8e5292.

PHPBB3-11224
---
 tests/cache/cache_memory.php | 62 --------------------------------------------
 1 file changed, 62 deletions(-)
 delete mode 100644 tests/cache/cache_memory.php

(limited to 'tests/cache/cache_memory.php')

diff --git a/tests/cache/cache_memory.php b/tests/cache/cache_memory.php
deleted file mode 100644
index c468cb4658..0000000000
--- a/tests/cache/cache_memory.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2014 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-require_once dirname(__FILE__) . '/../../phpBB/includes/acm/acm_memory.php';
-
-class phpbb_cache_memory extends acm_memory
-{
-	protected $data = array();
-
-	/**
-	* Set cache path
-	*/
-	function phpbb_cache_memory()
-	{
-	}
-
-	/**
-	* Fetch an item from the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @return mixed Cached data
-	*/
-	function _read($var)
-	{
-		return $this->data[$var];
-	}
-
-	/**
-	* Store data in the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @param mixed $data Data to store
-	* @param int $ttl Time-to-live of cached data
-	* @return bool True if the operation succeeded
-	*/
-	function _write($var, $data, $ttl = 2592000)
-	{
-		$this->data[$var] = $data;
-		return true;
-	}
-
-	/**
-	* Remove an item from the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @return bool True if the operation succeeded
-	*/
-	function _delete($var)
-	{
-		unset($this->data[$var]);
-		return true;
-	}
-}
-- 
cgit v1.2.1


From 8e638dbf6d53be3d8c5b1eda8ce44e7e4f60b75a Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Wed, 1 Oct 2014 15:00:01 +0200
Subject: [ticket/11224] Revert Revert "Merge pull request #2460 from
 ticket/11224"

This reverts commit 40cd7570e6f4da7cc60d83a3e99c72a2fb99e3f7.
---
 tests/cache/cache_memory.php | 62 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 tests/cache/cache_memory.php

(limited to 'tests/cache/cache_memory.php')

diff --git a/tests/cache/cache_memory.php b/tests/cache/cache_memory.php
new file mode 100644
index 0000000000..c468cb4658
--- /dev/null
+++ b/tests/cache/cache_memory.php
@@ -0,0 +1,62 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/acm/acm_memory.php';
+
+class phpbb_cache_memory extends acm_memory
+{
+	protected $data = array();
+
+	/**
+	* Set cache path
+	*/
+	function phpbb_cache_memory()
+	{
+	}
+
+	/**
+	* Fetch an item from the cache
+	*
+	* @access protected
+	* @param string $var Cache key
+	* @return mixed Cached data
+	*/
+	function _read($var)
+	{
+		return $this->data[$var];
+	}
+
+	/**
+	* Store data in the cache
+	*
+	* @access protected
+	* @param string $var Cache key
+	* @param mixed $data Data to store
+	* @param int $ttl Time-to-live of cached data
+	* @return bool True if the operation succeeded
+	*/
+	function _write($var, $data, $ttl = 2592000)
+	{
+		$this->data[$var] = $data;
+		return true;
+	}
+
+	/**
+	* Remove an item from the cache
+	*
+	* @access protected
+	* @param string $var Cache key
+	* @return bool True if the operation succeeded
+	*/
+	function _delete($var)
+	{
+		unset($this->data[$var]);
+		return true;
+	}
+}
-- 
cgit v1.2.1


From 5354c46e01a1efd65d4b53af12173ef4947eec9c Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Wed, 1 Oct 2014 15:13:31 +0200
Subject: [ticket/11224] Updates tests

PHPBB3-11224
---
 tests/cache/cache_memory.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'tests/cache/cache_memory.php')

diff --git a/tests/cache/cache_memory.php b/tests/cache/cache_memory.php
index c468cb4658..806edb963a 100644
--- a/tests/cache/cache_memory.php
+++ b/tests/cache/cache_memory.php
@@ -1,15 +1,17 @@
 <?php
 /**
-*
-* @package testing
-* @copyright (c) 2014 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
 
-require_once dirname(__FILE__) . '/../../phpBB/includes/acm/acm_memory.php';
-
-class phpbb_cache_memory extends acm_memory
+class phpbb_cache_memory extends \phpbb\cache\driver\memory
 {
 	protected $data = array();
 
-- 
cgit v1.2.1