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

hotfix custom barcode adapter wasn't being set to options. #6576

Conversation

fabiocarneiro
Copy link
Contributor

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.

@fabiocarneiro
Copy link
Contributor Author

@weierophinney,
@Maks3w,

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))
Copy link
Member

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([
Copy link
Member

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 weierophinney added this to the 2.3.3 milestone Aug 20, 2014
@weierophinney weierophinney self-assigned this Aug 20, 2014
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
@weierophinney weierophinney merged commit b8ba6f2 into zendframework:master Aug 20, 2014
weierophinney added a commit that referenced this pull request Aug 20, 2014
@weierophinney
Copy link
Member

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
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants