zendframework / zend-servicemanager

ServiceManager component from Zend Framework
BSD 3-Clause "New" or "Revised" License
188 stars 89 forks source link

Rebase develop to master With PR #242 applied #252

Closed fhein closed 6 years ago

fhein commented 6 years ago

This branch is intended to assist to apply #242 to master (automatically) and develop (this branch, automatically also).

It was created following the steps as follows:

  1. Apply #242 to current master via pull request.
  2. Rebase resulting branch to current develop.
  3. Apply and commit changes to resync it with #221, which was already merged to develop. Remove PHP 5.6-isms.
  4. Do a manual rebase to develop again to be sure (unrevealing different issues).
  5. Apply changes to make this PR congruent to all changes applied to develop meanwhile and to changes proposed with #231 and to remove remaining 5.6-isms.

This branch represents the target code of rebasing develop to (master with #242 applied).

It can be merged automatically.

I hope this makes integration of #242 more easy.

Procedure to produce a consistent deployment to master and develop would be

  1. Apply #242 to master
  2. Apply this PR to develop

Please let me know, if I can do more.