-
-
Notifications
You must be signed in to change notification settings - Fork 9.7k
[Console] application/command as text/xml/whatever decoupling #7454
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
Closed
Closed
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
da67c12
[Console] added descriptor & refactored description commands
jfsimon f239b1c
[Console] added JSON descriptors
jfsimon bebf1eb
[Console] added markdown descriptors
jfsimon 43b5e5c
[Console] added forgotten headers
jfsimon acc7414
[Console] removed unused methods (tests broken)
jfsimon 774794c
[Console] fixed tests
jfsimon 2066a9b
[Console] added XML descriptors
jfsimon 47fa194
[Console] started text derciptors
jfsimon 8b56eb1
[Console] finished text descriptors
jfsimon 27aa872
[Console] repaired tests
jfsimon 30d8807
[Console] re-introduced asText & asXml methods to avoid BC break
jfsimon 9964838
[Console] added command definition merge be fore description
jfsimon ef6d8ba
[Console] simplified description commands
jfsimon 389101a
[Console] re-introduced --xml option to avoid BC break
jfsimon 84be8de
[Console] simplified mardown descriptors
jfsimon ce5c0fd
[Console] applied comments from github
jfsimon 49a4612
[Console] applied comments from github
jfsimon 20c10a5
[Console] added provider injection to descriptors
jfsimon 9c7b358
[Console] simplified descriptors
jfsimon d3ec073
[Console] applied advices from github comments
jfsimon d70e086
[Console] removed proxy
jfsimon ce60fb7
[Console] simplified descriptor interface
jfsimon 28f082e
[Console] removed changes
jfsimon cbb8105
[Console] moved commands arguments
jfsimon 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
[Console] added provider injection to descriptors
- Loading branch information
commit 20c10a5606b0c9e3622c7af38a839d17b4fbffe4
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
---|---|---|
|
@@ -11,8 +11,7 @@ | |
|
||
namespace Symfony\Component\Console\Command; | ||
|
||
use Symfony\Component\Console\Descriptor\Text\CommandTextDescriptor; | ||
use Symfony\Component\Console\Descriptor\Xml\CommandXmlDescriptor; | ||
use Symfony\Component\Console\Descriptor\DescriptorProvider; | ||
use Symfony\Component\Console\Input\InputDefinition; | ||
use Symfony\Component\Console\Input\InputOption; | ||
use Symfony\Component\Console\Input\InputArgument; | ||
|
@@ -566,9 +565,9 @@ public function getHelper($name) | |
*/ | ||
public function asText() | ||
{ | ||
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 also requires a BC layer |
||
$descriptor = new CommandTextDescriptor(); | ||
$descriptor = new DescriptorProvider(); | ||
|
||
return $descriptor->describe($this); | ||
return $descriptor->get($this, 'txt')->describe($this); | ||
} | ||
|
||
/** | ||
|
@@ -582,7 +581,8 @@ public function asText() | |
*/ | ||
public function asXml($asDom = false) | ||
{ | ||
$descriptor = new CommandXmlDescriptor(); | ||
$provider = new DescriptorProvider(); | ||
$descriptor = $provider->get($this, 'xml'); | ||
|
||
if ($asDom) { | ||
$dom = new \DOMDocument('1.0', 'UTF-8'); | ||
|
40 changes: 40 additions & 0 deletions
40
src/Symfony/Component/Console/Descriptor/AbstractDescriptor.php
This file contains hidden or 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,40 @@ | ||
<?php | ||
|
||
namespace Symfony\Component\Console\Descriptor; | ||
|
||
/** | ||
* @author Jean-François Simon <[email protected]> | ||
*/ | ||
abstract class AbstractDescriptor implements DescriptorInterface | ||
{ | ||
/** | ||
* @var DescriptorProvider|null | ||
*/ | ||
private $descriptorProvider; | ||
|
||
/** | ||
* {@inheritdoc} | ||
*/ | ||
public function setDescriptorProvider(DescriptorProvider $descriptorProvider) | ||
{ | ||
$this->descriptorProvider = $descriptorProvider; | ||
} | ||
|
||
/** | ||
* Returns a descriptor for given object with current format. | ||
* | ||
* @param object $object | ||
* | ||
* @return DescriptorInterface | ||
* | ||
* @throws \LogicException | ||
*/ | ||
protected function getDescriptor($object) | ||
{ | ||
if (null === $this->descriptorProvider) { | ||
throw new \LogicException('You must set a descriptor provider to get a descriptor.'); | ||
} | ||
|
||
return $this->descriptorProvider->get($object, $this->getFormat()); | ||
} | ||
} |
This file contains hidden or 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 hidden or 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 hidden or 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 |
---|---|---|
|
@@ -11,12 +11,12 @@ | |
|
||
namespace Symfony\Component\Console\Descriptor\Json; | ||
|
||
use Symfony\Component\Console\Descriptor\DescriptorInterface; | ||
use Symfony\Component\Console\Descriptor\AbstractDescriptor; | ||
|
||
/** | ||
* @author Jean-François Simon <[email protected]> | ||
*/ | ||
abstract class AbstractJsonDescriptor implements DescriptorInterface | ||
abstract class AbstractJsonDescriptor extends AbstractDescriptor | ||
{ | ||
/** | ||
* @var int | ||
|
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
---|---|---|
|
@@ -11,12 +11,12 @@ | |
|
||
namespace Symfony\Component\Console\Descriptor\Markdown; | ||
|
||
use Symfony\Component\Console\Descriptor\DescriptorInterface; | ||
use Symfony\Component\Console\Descriptor\AbstractDescriptor; | ||
|
||
/** | ||
* @author Jean-François Simon <[email protected]> | ||
*/ | ||
abstract class AbstractMarkdownDescriptor implements DescriptorInterface | ||
abstract class AbstractMarkdownDescriptor extends AbstractDescriptor | ||
{ | ||
/** | ||
* {@inheritdoc} | ||
|
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
---|---|---|
|
@@ -11,12 +11,12 @@ | |
|
||
namespace Symfony\Component\Console\Descriptor\Text; | ||
|
||
use Symfony\Component\Console\Descriptor\DescriptorInterface; | ||
use Symfony\Component\Console\Descriptor\AbstractDescriptor; | ||
|
||
/** | ||
* @author Jean-François Simon <[email protected]> | ||
*/ | ||
abstract class AbstractTextDescriptor implements DescriptorInterface | ||
abstract class AbstractTextDescriptor extends AbstractDescriptor | ||
{ | ||
/** | ||
* @var boolean | ||
|
This file contains hidden or 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 hidden or 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 hidden or 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 |
---|---|---|
|
@@ -11,12 +11,12 @@ | |
|
||
namespace Symfony\Component\Console\Descriptor\Xml; | ||
|
||
use Symfony\Component\Console\Descriptor\DescriptorInterface; | ||
use Symfony\Component\Console\Descriptor\AbstractDescriptor; | ||
|
||
/** | ||
* @author Jean-François Simon <[email protected]> | ||
*/ | ||
abstract class AbstractXmlDescriptor implements DescriptorInterface | ||
abstract class AbstractXmlDescriptor extends AbstractDescriptor | ||
{ | ||
/** | ||
* {@inheritdoc} | ||
|
This file contains hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
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.
you need to provide a BC layer to avoid the BC break