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

Fix deprecation notice with zend-expressive-router 2.4 for config driven apps #583

Merged
merged 2 commits into from
Mar 9, 2018
Merged

Fix deprecation notice with zend-expressive-router 2.4 for config driven apps #583

merged 2 commits into from
Mar 9, 2018

Conversation

michalbundyra
Copy link
Member

michalbundyra and others added 2 commits March 9, 2018 14:03
- Updates the ApplicationConfigInjectionTrait to use
  `prepareMiddleware()` before calling `route()`; this ensures that
  `Route` instances only ever receive middleware instances.
- Provides changes to tests to ensure they work with the 2.4 version of
  the router. Primarily this means mocking the `MiddlewareInterface`
  when providing middleware to pipe or route against when we are not
  testing for that particular middleware. Additionally, it modifies the
  "assertRoute" expectations to simply ensure we _have_ middleware, but
  not the type; decorators are often in play, even in the existing 2.X
  series.
@weierophinney weierophinney merged commit e97025b into zendframework:master Mar 9, 2018
weierophinney added a commit that referenced this pull request Mar 9, 2018
weierophinney added a commit that referenced this pull request Mar 9, 2018
weierophinney added a commit that referenced this pull request Mar 9, 2018
Forward port #583

Conflicts:
	CHANGELOG.md
	src/Container/ApplicationConfigInjectionDelegator.php
	test/Container/ApplicationConfigInjectionDelegatorTest.php
	test/Container/ApplicationFactoryTest.php
	test/Middleware/DispatchMiddlewareTest.php
@michalbundyra michalbundyra deleted the hotfix/deprecation branch March 9, 2018 15:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants