diff --git a/cache/classes/definition.php b/cache/classes/definition.php index 0e5c62e44ba..79faadee48a 100644 --- a/cache/classes/definition.php +++ b/cache/classes/definition.php @@ -246,14 +246,6 @@ class cache_definition { */ protected $datasourcefile = null; - /** - * Deprecated - this is completely unused. - * @deprecated since 2.9 - * @todo MDL-55267 This will be deleted in Moodle 3.3. - * @var string - */ - protected $datasourceaggregate = null; - /** * Set to true if the cache should hold onto items passing through it to speed up subsequent requests. * @var bool diff --git a/cache/tests/fixtures/lib.php b/cache/tests/fixtures/lib.php index c6b405b3e66..ac212542631 100644 --- a/cache/tests/fixtures/lib.php +++ b/cache/tests/fixtures/lib.php @@ -290,21 +290,6 @@ class cache_config_testing extends cache_config_writer { } } -/** - * This is a deprecated class. It has been renamed to cache_config_testing. - * - * This was deprecated in Moodle 2.9 but will be removed at the next major release - * as it is only used during testing and its highly unlikely anyone has used this. - * - * @deprecated since 2.9 - * @todo MDL-55267 This will be deleted in Moodle 3.3. - * @copyright 2014 Sam Hemelryk - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ -class cache_config_phpunittest extends cache_config_testing { - // We can't do anything here to warn the user. - // The cache can be utilised before sessions have even been started. -} /** * Dummy object for testing cacheable object interface and interaction