This repository has been archived by the owner on Jan 31, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 16
Updated factories, reverted validatePlugin for v2-v3 compat #9
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,14 +15,14 @@ | |
"require": { | ||
"php": ">=5.5", | ||
"zendframework/zend-stdlib": "dev-develop as 2.8.0", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This can be updated to |
||
"zendframework/zend-servicemanager": "dev-develop as 2.7.0" | ||
"zendframework/zend-servicemanager": "^2.7.3 || ^3.0" | ||
}, | ||
"minimum-stability": "dev", | ||
"prefer-stable": true, | ||
"extra": { | ||
"branch-alias": { | ||
"dev-master": "2.5-dev", | ||
"dev-develop": "3.0-dev" | ||
"dev-develop": "2.6-dev" | ||
} | ||
}, | ||
"autoload-dev": { | ||
|
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
<?php | ||
/** | ||
* Zend Framework (http://framework.zend.com/) | ||
* | ||
* @link http://github.com/zendframework/zf2 for the canonical source repository | ||
* @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com) | ||
* @license http://framework.zend.com/license/new-bsd New BSD License | ||
*/ | ||
|
||
namespace ZendTest\Text\Table; | ||
|
||
use PHPUnit_Framework_TestCase as TestCase; | ||
use Zend\ServiceManager\ServiceManager; | ||
use Zend\ServiceManager\Test\CommonPluginManagerTrait; | ||
use Zend\Text\Table\Decorator\DecoratorInterface; | ||
use Zend\Text\Table\DecoratorManager; | ||
use Zend\Text\Table\Exception\InvalidDecoratorException; | ||
|
||
class DecoratorManagerTest extends TestCase | ||
{ | ||
use CommonPluginManagerTrait; | ||
|
||
protected function getPluginManager() | ||
{ | ||
return new DecoratorManager(new ServiceManager()); | ||
} | ||
|
||
protected function getV2InvalidPluginException() | ||
{ | ||
return InvalidDecoratorException::class; | ||
} | ||
|
||
protected function getInstanceOf() | ||
{ | ||
return DecoratorInterface::class; | ||
} | ||
} |
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.
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.
All references to 2.7.3 and 3.0 need to be updated to 2.7.5 and 3.0.3, respectively, as those are the versions adding the
CommonPluginManagerTrait
. I can take care of that on merge, however.