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

Fixes #35 : Encrypt/Openssl Unset 'compression' Difference on __construct #36

Merged
merged 2 commits into from
May 17, 2017
Merged

Fixes #35 : Encrypt/Openssl Unset 'compression' Difference on __construct #36

merged 2 commits into from
May 17, 2017

Conversation

samsonasik
Copy link
Contributor

Fixes #35

@samsonasik samsonasik mentioned this pull request Jul 20, 2016
Closed
@samsonasik samsonasik changed the title Fixes #35 : Encrypt/Openssl Unset Difference on __construct Fixes #35 : Encrypt/Openssl Unset 'compression' Difference on __construct Jul 20, 2016
@samsonasik
Copy link
Contributor Author

ping @ezimuel

michalbundyra
michalbundyra reviewed Sep 15, 2016
View reviewed changes
test/Encrypt/OpensslTest.php
public function testPassCompressionConfigWillBeUnsetCorrectly()
{
$filter = new OpensslEncryption([
'compression' => 'bz2'
Copy link
Member

Choose a reason for hiding this comment

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

trailing comma please

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed.

michalbundyra
michalbundyra approved these changes Sep 15, 2016
View reviewed changes
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.

Fine for me. Thanks @samsonasik !

@samsonasik
Copy link
Contributor Author

ping @ezimuel @weierophinney

@samsonasik
Copy link
Contributor Author

ping @ezimuel is there a chance to merge it ?

@samsonasik
Copy link
Contributor Author

ping @ezimuel @weierophinney

@samsonasik
Copy link
Contributor Author

any other thing I can do to get it merged ? Thank you.

@weierophinney weierophinney added this to the 2.7.2 milestone May 17, 2017
@weierophinney weierophinney merged commit 4c6e669 into zendframework:master May 17, 2017
weierophinney added a commit that referenced this pull request May 17, 2017
@weierophinney
Merge pull request #36 from samsonasik/35
0596343 
Fixes #35 : Encrypt/Openssl Unset 'compression' Difference on __construct

Conflicts:
	test/Encrypt/OpensslTest.php
weierophinney added a commit that referenced this pull request May 17, 2017
@weierophinney
Added CHANGELOG for #36
f22a771
weierophinney added a commit that referenced this pull request May 17, 2017
@weierophinney
Merge branch 'hotfix/36'
e8c1aca 
Close #36
Fixes #35
weierophinney added a commit that referenced this pull request May 17, 2017
@weierophinney
Merge branch 'hotfix/36' into develop
70b8272 
Forward port #36
@weierophinney
Copy link
Member

Thanks, @samsonasik

@samsonasik samsonasik deleted the 35 branch May 17, 2017 20:36
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@froschdesign froschdesign froschdesign approved these changes

@michalbundyra michalbundyra michalbundyra approved these changes

Assignees
No one assigned
Labels
bug
Projects
None yet
Milestone
2.7.2
Development

Successfully merging this pull request may close these issues.
4 participants
@samsonasik @weierophinney @froschdesign @michalbundyra