Skip to content
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.

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

[AdminBundle][AdminListBundle] Revert code changes for container access deprecation to make symfony 4 upgrade easier #2167

Merged
merged 1 commit into from
Oct 31, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 0 additions & 23 deletions src/Kunstmaan/AdminBundle/Controller/BaseSettingsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,4 @@

class BaseSettingsController extends Controller
{
/**
* {@inheritdoc}
*
* @deprecated
*/
protected function get($id)
{
@trigger_error('Getting services directly from the container is deprecated in KunstmaanAdminBundle 5.1 and will be removed in KunstmaanAdminBundle 6.0. Register your controllers as services and inject the necessary dependencies.', E_USER_DEPRECATED);

return parent::get($id);
}

/**
* {@inheritdoc}
*
* @deprecated
*/
protected function getParameter($name)
{
@trigger_error('Getting parameters directly from the container is deprecated in KunstmaanAdminBundle 5.1 and will be removed in KunstmaanAdminBundle 6.0. Register your controllers as services and inject the necessary parameters.', E_USER_DEPRECATED);

return parent::getParameter($name);
}
}
25 changes: 0 additions & 25 deletions src/Kunstmaan/AdminListBundle/Controller/AdminListController.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,6 @@
*/
abstract class AdminListController extends Controller
{
/**
* {@inheritdoc}
*
* @deprecated
*/
protected function get($id)
{
@trigger_error('Getting services directly from the container is deprecated in KunstmaanAdminListBundle 5.1 and will be removed in KunstmaanAdminListBundle 6.0. Register your controllers as services and inject the necessary dependencies.', E_USER_DEPRECATED);

return parent::get($id);
}

/**
* {@inheritdoc}
*
* @deprecated
*/
protected function getParameter($name)
{
@trigger_error('Getting parameters directly from the container is deprecated in KunstmaanAdminListBundle 5.1 and will be removed in KunstmaanAdminListBundle 6.0. Register your controllers as services and inject the necessary parameters.', E_USER_DEPRECATED);

return parent::getParameter($name);
}


/**
* You can override this method to return the correct entity manager when using multiple databases ...
*
Expand Down