This repository has been archived by the owner on Jan 8, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
hotfix custom barcode adapter wasn't being set to options. #6576
Merged
weierophinney
merged 2 commits into
zendframework:master
from
fabiocarneiro:hotfix-custom-barcode-validator
Aug 20, 2014
Merged
hotfix custom barcode adapter wasn't being set to options. #6576
weierophinney
merged 2 commits into
zendframework:master
from
fabiocarneiro:hotfix-custom-barcode-validator
Aug 20, 2014
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
none of the errors reported by travis, including the php-cs-fixer one, were caused by my changes, they were failing before my changes and in lines i didn't touch. The testcase will prove it was broken b4. |
throw new Exception\InvalidArgumentException( | ||
"Adapter $adapter does not implement Zend\\Validate\\Barcode\\AdapterInterface" | ||
sprintf("Adapter %s does not implement Zend\\Validator\\Barcode\\AdapterInterface", get_class($adapter)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be checking if $adapter
is an object before calling get_class
. The common pattern we use is:
(is_object($adapter) ? get_class($adapter) : gettype($adapter)
|
||
public function testSetCustomAdapter() | ||
{ | ||
$barcode = new Barcode([ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can't use short array syntax as we still support 5.3. I'll fix this on merge, though.
weierophinney
added a commit
that referenced
this pull request
Aug 20, 2014
…idator hotfix custom barcode adapter wasn't being set to options.
weierophinney
added a commit
that referenced
this pull request
Aug 20, 2014
- as we still support 5.3.
weierophinney
added a commit
that referenced
this pull request
Aug 20, 2014
weierophinney
added a commit
that referenced
this pull request
Aug 20, 2014
Merged to master for release with 2.3.2. |
weierophinney
added a commit
to zendframework/zend-validator
that referenced
this pull request
May 15, 2015
…o/hotfix-custom-barcode-validator hotfix custom barcode adapter wasn't being set to options.
weierophinney
added a commit
to zendframework/zend-validator
that referenced
this pull request
May 15, 2015
- as we still support 5.3.
weierophinney
added a commit
to zendframework/zend-validator
that referenced
this pull request
May 15, 2015
weierophinney
added a commit
to zendframework/zend-validator
that referenced
this pull request
May 15, 2015
weierophinney
added 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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
since it was only setting the adapter to $this->options in line 11, and there was an if to check if the adapter was a string in line 3, the adapter were never going to be set to options if the param provided was an object.