Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[Console] Use UTF-8 bullet for listing #26698

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Mar 30, 2018
Merged

[Console] Use UTF-8 bullet for listing #26698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions 18 src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ private function getDescriptionTestData(array $objects)
{
$data = array();
foreach ($objects as $name => $object) {
$description = file_get_contents(sprintf('%s/../../Fixtures/Descriptor/%s.%s', __DIR__, $name, $this->getFormat()));
$description = file_get_contents($this->getFixtureFilename($name));
$data[] = array($object, $description);
}

Expand All @@ -223,7 +223,7 @@ private function getContainerBuilderDescriptionTestData(array $objects)
$data = array();
foreach ($objects as $name => $object) {
foreach ($variations as $suffix => $options) {
$description = file_get_contents(sprintf('%s/../../Fixtures/Descriptor/%s_%s.%s', __DIR__, $name, $suffix, $this->getFormat()));
$description = file_get_contents($this->getFixtureFilename($name.'_'.$suffix));
$data[] = array($object, $description, $options);
}
}
Expand All @@ -241,11 +241,23 @@ private function getEventDispatcherDescriptionTestData(array $objects)
$data = array();
foreach ($objects as $name => $object) {
foreach ($variations as $suffix => $options) {
$description = file_get_contents(sprintf('%s/../../Fixtures/Descriptor/%s_%s.%s', __DIR__, $name, $suffix, $this->getFormat()));
$description = file_get_contents($this->getFixtureFilename($name.'_'.$suffix));
$data[] = array($object, $description, $options);
}
}

return $data;
}

private function getFixtureFilename($name)
{
$format = $this->getFormat();
$baseDir = __DIR__.'/../../Fixtures/Descriptor';
$file = $baseDir.'/'.$name.'.'.$format;
if ('\\' === DIRECTORY_SEPARATOR && is_file($winFile = $baseDir.'/win/'.$name.'.'.$format)) {
return $winFile;
}

return $file;
}
}
4 changes: 2 additions & 2 deletions 4 src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"tag1" tag
----------

* definition_2
• definition_2

"tag2" tag
----------

* definition_2
• definition_2

14 changes: 14 additions & 0 deletions 14 src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/win/builder_1_tags.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

Symfony Container Public and Private Tags
=========================================

"tag1" tag
----------

* definition_2

"tag2" tag
----------

* definition_2

2 changes: 1 addition & 1 deletion 2 src/Symfony/Component/Console/Style/SymfonyStyle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public function listing(array $elements)
{
$this->autoPrependText();
$elements = array_map(function ($element) {
return sprintf(' * %s', $element);
return sprintf(' %s %s', '\\' === DIRECTORY_SEPARATOR ? '*' : '•', $element);
}, $elements);

$this->writeln($elements);
Expand Down
8 changes: 4 additions & 4 deletions 8 src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_5.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Lorem ipsum dolor sit amet
* Lorem ipsum dolor sit amet
* consectetur adipiscing elit
• Lorem ipsum dolor sit amet
• consectetur adipiscing elit

Lorem ipsum dolor sit amet
* Lorem ipsum dolor sit amet
* consectetur adipiscing elit
• Lorem ipsum dolor sit amet
• consectetur adipiscing elit

Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet
Expand Down
4 changes: 2 additions & 2 deletions 4 src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_6.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

* Lorem ipsum dolor sit amet
* consectetur adipiscing elit
• Lorem ipsum dolor sit amet
• consectetur adipiscing elit

[OK] Lorem ipsum dolor sit amet

18 changes: 18 additions & 0 deletions 18 src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/win/output_5.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
Lorem ipsum dolor sit amet
* Lorem ipsum dolor sit amet
* consectetur adipiscing elit

Lorem ipsum dolor sit amet
* Lorem ipsum dolor sit amet
* consectetur adipiscing elit

Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet
consectetur adipiscing elit

Lorem ipsum dolor sit amet

// Lorem ipsum dolor sit amet
//
// consectetur adipiscing elit

6 changes: 6 additions & 0 deletions 6 src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/win/output_6.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

* Lorem ipsum dolor sit amet
* consectetur adipiscing elit

[OK] Lorem ipsum dolor sit amet

10 changes: 9 additions & 1 deletion 10 src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,15 @@ public function inputCommandToOutputFilesProvider()
{
$baseDir = __DIR__.'/../Fixtures/Style/SymfonyStyle';

return array_map(null, glob($baseDir.'/command/command_*.php'), glob($baseDir.'/output/output_*.txt'));
return array_map(function ($cmd) use ($baseDir) {
$basename = 'output_'.substr(basename($cmd, '.php'), 8).'.txt';
$output = $baseDir.'/output/'.$basename;
if ('\\' === \DIRECTORY_SEPARATOR && is_file($outputWin = $baseDir.'/output/win/'.$basename)) {
return array($cmd, $outputWin);
}

return array($cmd, $output);
}, glob($baseDir.'/command/command_*.php'));
}

public function testGetErrorStyle()
Expand Down
9 changes: 8 additions & 1 deletion 9 src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,14 @@ private function getExpectedDescription($name)

private function getFixtureFilename($name)
{
return sprintf('%s/../../Fixtures/Descriptor/%s.%s', __DIR__, $name, $this->getFormat());
$format = $this->getFormat();
$baseDir = __DIR__.'/../../Fixtures/Descriptor';
$file = $baseDir.'/'.$name.'.'.$format;
if ('\\' === DIRECTORY_SEPARATOR && is_file($winFile = $baseDir.'/win/'.$name.'.'.$format)) {
return $winFile;
}

return $file;
}
}

Expand Down
6 changes: 3 additions & 3 deletions 6 src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ Built-in form types (Symfony\Component\Form\Extension\Core\Type)
Service form types
------------------

* Symfony\Bridge\Doctrine\Form\Type\EntityType
• Symfony\Bridge\Doctrine\Form\Type\EntityType

Type extensions
---------------

* Symfony\Component\Form\Extension\Csrf\Type\FormTypeCsrfExtension
• Symfony\Component\Form\Extension\Csrf\Type\FormTypeCsrfExtension

Type guessers
-------------

* Symfony\Component\Form\Extension\Validator\ValidatorTypeGuesser
• Symfony\Component\Form\Extension\Validator\ValidatorTypeGuesser

4 changes: 2 additions & 2 deletions 4 src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ Symfony\Component\Form\Extension\Core\Type\ChoiceType (Block prefix: "choice")
Parent types
------------

* Symfony\Component\Form\Extension\Core\Type\FormType
• Symfony\Component\Form\Extension\Core\Type\FormType

Type extensions
---------------

* Symfony\Component\Form\Extension\Csrf\Type\FormTypeCsrfExtension
• Symfony\Component\Form\Extension\Csrf\Type\FormTypeCsrfExtension

21 changes: 21 additions & 0 deletions 21 src/Symfony/Component/Form/Tests/Fixtures/Descriptor/win/defaults_1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@

Built-in form types (Symfony\Component\Form\Extension\Core\Type)
----------------------------------------------------------------

FormType

Service form types
------------------

* Symfony\Bridge\Doctrine\Form\Type\EntityType

Type extensions
---------------

* Symfony\Component\Form\Extension\Csrf\Type\FormTypeCsrfExtension

Type guessers
-------------

* Symfony\Component\Form\Extension\Validator\ValidatorTypeGuesser

41 changes: 41 additions & 0 deletions 41 src/Symfony/Component/Form/Tests/Fixtures/Descriptor/win/resolved_form_type_1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@

Symfony\Component\Form\Extension\Core\Type\ChoiceType (Block prefix: "choice")
==============================================================================

--------------------------- -------------------- ------------------------- -----------------------
Options Overridden options Parent options Extension options
--------------------------- -------------------- ------------------------- -----------------------
choice_attr FormType FormType FormTypeCsrfExtension
choice_label -------------------- ------------------------- -----------------------
choice_loader compound action csrf_field_name
choice_name data_class attr csrf_message
choice_translation_domain empty_data auto_initialize csrf_protection
choice_value error_bubbling block_name csrf_token_id
choices by_reference csrf_token_manager
expanded data
group_by disabled
multiple help
placeholder inherit_data
preferred_choices label
label_attr
label_format
mapped
method
post_max_size_message
property_path
required
translation_domain
trim
upload_max_size_message
--------------------------- -------------------- ------------------------- -----------------------

Parent types
------------

* Symfony\Component\Form\Extension\Core\Type\FormType

Type extensions
---------------

* Symfony\Component\Form\Extension\Csrf\Type\FormTypeCsrfExtension

Morty Proxy This is a proxified and sanitized view of the page, visit original site.