Skip to content

Fixed a merge error #8962

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
Jan 2, 2018
Merged

Fixed a merge error #8962

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
5 changes: 0 additions & 5 deletions service_container/3.3-di-changes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,13 +626,8 @@ Start by updating the service ids to class names:

Services associated with global PHP classes (i.e. not using PHP namespaces)
must maintain the ``class`` parameter. For example, when using the old Twig
<<<<<<< HEAD
classes (e.g. ``Twig_Extensions_Extension_Intl`` instead of ``Twig\Extensions\IntlExtension``)
you can't redefine the service as `Twig_Extensions_Extension_Intl: ~` and
=======
classes (e.g. ``Twig_Extensions_Extension_Intl`` instead of ``Twig\Extensions\IntlExtension``),
  you can't redefine the service as ``Twig_Extensions_Extension_Intl: ~`` and
>>>>>>> upstream/3.3
you must keep the original ``class`` parameter.

But, this change will break our app! The old service ids (e.g. ``app.github_notifier``)
Expand Down