8000 Removed deprecated stuff from the Config component by dosten · Pull Request #14927 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Removed deprecated stuff from the Config component #14927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 18, 2015
Merged

Removed deprecated stuff from the Config component #14927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Removed deprecated stuff from the Config component
  • Loading branch information
@dosten
dosten committed Jun 18, 2015
commit 07a17903d6598aa6d2c0487a38c495809794fde0
13 changes: 0 additions & 13 deletions src/Symfony/Component/Config/ConfigCache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,6 @@ public function __construct($file, $debug)
$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.
*
Expand Down
11 changes: 1 addition & 10 deletions src/Symfony/Component/Config/Loader/FileLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,7 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe
$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);
Expand Down
0