Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Conversation

Projects
None yet
2 participants
@fabiocarneiro
Copy link
Contributor

commented Aug 14, 2014

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

This comment has been minimized.

Copy link
Contributor Author

commented Aug 14, 2014

@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))

This comment has been minimized.

Copy link
@weierophinney

weierophinney Aug 19, 2014

Member

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([

This comment has been minimized.

Copy link
@weierophinney

weierophinney Aug 20, 2014

Member

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

Merge pull request #6576 from fabiocarneiro/hotfix-custom-barcode-val…
…idator

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

weierophinney added a commit that referenced this pull request Aug 20, 2014

[#6576] do not use short array syntax
- 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

1 check failed

continuous-integration/travis-ci The Travis CI build failed
Details

weierophinney added a commit that referenced this pull request Aug 20, 2014

@weierophinney

This comment has been minimized.

Copy link
Member

commented 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

Merge pull request zendframework/zendframework#6576 from fabiocarneir…
…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 join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.