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

Hotfix/6278 #6927

Closed
wants to merge 7 commits into from
Closed

Hotfix/6278 #6927

wants to merge 7 commits into from

Conversation

MadCat34
Copy link
Contributor

Fix for #6278

@@ -175,6 +175,37 @@ public function testConstructionWithOptions($input, $expected)
$this->assertEquals($expected, $validator->isValid($input));
}

public static function jcbValues()
Copy link
Contributor

Choose a reason for hiding this comment

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

static is not required here, and will probably cause an issue/notice in the future.

@Ocramius Ocramius added this to the 2.3.4 milestone Nov 26, 2014
@Ocramius Ocramius self-assigned this Nov 26, 2014
@MadCat34
Copy link
Contributor Author

@macnibblet @Ocramius Ok, i have removed the 'static' keyword :)

@Ocramius
Copy link
Member

@MadCat34 the cache failure is unrelated, and it's mainly because of a risky test.

@MadCat34
Copy link
Contributor Author

@Ocramius Yes, i know it was unrelated :-)

Ocramius added a commit that referenced this pull request Nov 27, 2014
Ocramius added a commit that referenced this pull request Nov 27, 2014
@Ocramius Ocramius closed this in d56ef55 Nov 27, 2014
Ocramius added a commit that referenced this pull request Nov 27, 2014
…nges-update' into develop

Close #6927
Close #6278
Forward port #6927
Forward port #6278
@Ocramius
Copy link
Member

@MadCat34 I had to manually cherry-pick the commits as there is an unwanted merge in your pull request, but it's merged: thanks!

master: d56ef55
develop: 56deda7

@MadCat34
Copy link
Contributor Author

@Ocramius Ok. I'll be careful next time :-)

And i'll add docblock too :-)

Thanks

@MadCat34 MadCat34 deleted the hotfix/6278 branch November 27, 2014 20:14
@Ocramius
Copy link
Member

@MadCat34 no problem at all: rebases are always messy and complicated ;-)

gianarb pushed a commit to zendframework/zend-validator that referenced this pull request May 15, 2015
…dding missing `@group` docblock referencing the pull request that introduced the test
gianarb pushed a commit to zendframework/zend-validator that referenced this pull request May 15, 2015
gianarb pushed a commit to zendframework/zend-validator that referenced this pull request May 15, 2015
…dding missing docblock parameters, minor cs fixes
gianarb pushed a commit to zendframework/zend-validator that referenced this pull request May 15, 2015
gianarb pushed a commit to zendframework/zend-validator that referenced this pull request May 15, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants