Skip to content
This repository has been archived by the owner on Jan 31, 2020. It is now read-only.

Allow PHPunit 6.5+ when zend-session gets installed as dependency #108

Merged
merged 1 commit into from
Feb 22, 2018
Merged

Allow PHPunit 6.5+ when zend-session gets installed as dependency #108

merged 1 commit into from
Feb 22, 2018

Conversation

Koopzington
Copy link
Contributor

c323a94 introduced a conflict to the composer.json in order for builds to work. Unfortunately due to the nature of conflict this resulted in people not being able install phpunit >=6.5.0 when zend-session is being installed as dependency in a project.
I therefore propose to update the require-dev line for phpunit to define a version range which will still ensure that travis builds of zend-session won't install any phpunit version >=6.5.0 and simultanously allows users that require zend-session as dependency in their projects to use newer versions.

@michalbundyra
Copy link
Member

@Koopzington I can't see that issue. What version of composer are you using? Just tested on local with composer 1.6.3 and I am able to install phpunit 6.5+ with zend-session 2.8.4 (latest release).

Copy link
Member

@michalbundyra michalbundyra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Koopzington sorry, my mistake, zend-session 2.8.2 has been installed in that case.

LGTM 👍

@Ocramius Ocramius added this to the 2.8.5 milestone Feb 22, 2018
@Ocramius Ocramius self-assigned this Feb 22, 2018
@Ocramius Ocramius added the bug label Feb 22, 2018
@Ocramius Ocramius merged commit d34655a into zendframework:master Feb 22, 2018
Ocramius added a commit that referenced this pull request Feb 22, 2018
Ocramius added a commit that referenced this pull request Feb 22, 2018
…flict

Signed-off-by: Marco Pivetta <ocramius@gmail.com>
@Ocramius
Copy link
Member

Also added to develop via e7cdb22. Thanks @Koopzington!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants