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

Incorporated feedback from #14 #16

Merged
merged 4 commits into from
Feb 16, 2016

Conversation

weierophinney
Copy link
Member

This patch incorporates feedback from #14, specifically:

  • Reverts the addition of zend-session to the requirements; it's not used anywhere.
  • Reverts changes to HttpTestMockAdapter; they did not serve any noticeable purpose.
  • Updates AbstractAdapter to cast the $options value to an array when scalar, ensuring it works with both v2 and v3 versions of zend-servicemanager.
  • Updated FilterPluginManager to:
    • Move the array_merge() option before the call to the parent constructor; this ensures any configuration passed at instantation takes precedence.
    • Use short array notation for the array passed to array_merge().
    • Document the constructor.
  • Updated the AbstractTest
    • Reverted the change to testAdapterShouldAllowPullingFiltersByFile; it was changing the test to follow observed behavior instead of updating the code to retain existing behavior.
    • Fixed a number of CS issues with regards to multi-line arguments.

Christophe Robert and others added 4 commits February 10, 2016 17:38
[BUG]  An alias "filerename" was requested but no service could be found  ZF2.5.3
This patch incorporates feedback from zendframework#14, specifically:

- Reverts the addition of zend-session to the requirements; it's not
  used anywhere.
- Reverts changes to `HttpTestMockAdapter`; they did not serve any
  noticeable purpose.
- Updates `AbstractAdapter` to cast the `$options` value to an array
  when scalar, ensuring it works with both v2 and v3 versions of
  zend-servicemanager.
- Updated FilterPluginManager to:
  - Move the `array_merge()` option before the call to the parent
    constructor; this ensures any configuration passed at instantation
    takes precedence.
  - Use short array notation for the array passed to `array_merge()`.
  - Document the constructor.
- Updated the `AbstractTest`
  - Reverted the change to `testAdapterShouldAllowPullingFiltersByFile`;
    it was changing the test to follow observed behavior instead of
    updating the code to retain existing behavior.
  - Fixed a number of CS issues with regards to multi-line arguments.
@weierophinney weierophinney added this to the 2.5.2 milestone Feb 16, 2016
@weierophinney weierophinney merged commit e69eb4d into zendframework:master Feb 16, 2016
weierophinney added a commit that referenced this pull request Feb 16, 2016
@weierophinney weierophinney deleted the hotfix/14 branch February 16, 2016 22:06
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant