Removed deprecated stuff from the Config component
This commit is contained in:
parent
80ee9cb69e
commit
07a17903d6
@ -38,19 +38,6 @@ class ConfigCache implements ConfigCacheInterface
|
||||
$this->debug = (bool) $debug;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the cache file path.
|
||||
*
|
||||
* @return string The cache file path
|
||||
* @deprecated since 2.7, to be removed in 3.0. Use getPath() instead.
|
||||
*/
|
||||
public function __toString()
|
||||
{
|
||||
@trigger_error('ConfigCache::__toString() is deprecated since version 2.7 and will be removed in 3.0. Use the getPath() method instead.', E_USER_DEPRECATED);
|
||||
|
||||
return $this->file;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the cache file path.
|
||||
*
|
||||
|
@ -83,16 +83,7 @@ abstract class FileLoader extends Loader
|
||||
$loader = $this->resolve($resource, $type);
|
||||
|
||||
if ($loader instanceof self && null !== $this->currentDir) {
|
||||
// we fallback to the current locator to keep BC
|
||||
// as some some loaders do not call the parent __construct()
|
||||
// @deprecated should be removed in 3.0
|
||||
$locator = $loader->getLocator();
|
||||
if (null === $locator) {
|
||||
@trigger_error('Not calling the parent constructor in '.get_class($loader).' which extends '.__CLASS__.' is deprecated since version 2.7 and will not be supported anymore in 3.0.', E_USER_DEPRECATED);
|
||||
$locator = $this->locator;
|
||||
}
|
||||
|
||||
$resource = $locator->locate($resource, $this->currentDir, false);
|
||||
$resource = $loader->getLocator()->locate($resource, $this->currentDir, false);
|
||||
}
|
||||
|
||||
$resources = is_array($resource) ? $resource : array($resource);
|
||||
|
Reference in New Issue
Block a user