MDL-40903 cache: coding style tidyup pre-integration

cache/classes/definition.php

@@ -726,7 +726,7 @@ class cache_definition {
      *
      * Please call data_should_be_persistent instead.
      *
-     * @deprecated since 2.6
+     * @deprecated since 2.4.7
      * @return bool
      */
     public function should_be_persistent() {
@@ -734,7 +734,11 @@ class cache_definition {
     }
 
     /**
-     * Returns true if the cache loader for this definition should be persistent.
+     * Returns true if we should hold onto the data flowing through the cache.
+     *
+     * If set to true data flowing through the cache will be stored in a static variable
+     * to make subsequent requests for the data much faster.
+     *
      * @return bool
      */
     public function data_should_be_persistent() {
@@ -844,4 +848,4 @@ class cache_definition {
     protected function get_cache_identifier() {
         return cache_helper::get_site_identifier();
     }
-}
+}

cache/tests/fixtures/lib.php

@@ -243,26 +243,6 @@ class cache_phpunit_application extends cache_application {
     public function phpunit_get_store_implements() {
         return class_implements($this->get_store());
     }
-
-    /**
-     * Returns the given key directly from the persistdata cache.
-     *
-     * @param string $key
-     * @return false|mixed
-     */
-    public function phpunit_get_directly_from_persistcache($key) {
-        $key = $this->parse_key($key);
-        return $this->get_from_persist_cache($key);
-    }
-
-    /**
-     * Returns the cache loaders definition.
-     *
-     * @return cache_definition
-     */
-    public function phpunit_get_definition() {
-        return $this->get_definition();
-    }
 }
 
 /**