diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php index ab5c95a7d8b8..4462bdd00af0 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php @@ -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); } @@ -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); } } @@ -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; + } } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.txt index 45523dcb68ed..2a643d33fefd 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.txt @@ -5,10 +5,10 @@ "tag1" tag ---------- - * definition_2 + • definition_2 "tag2" tag ---------- - * definition_2 + • definition_2 diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/win/builder_1_tags.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/win/builder_1_tags.txt new file mode 100644 index 000000000000..45523dcb68ed --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/win/builder_1_tags.txt @@ -0,0 +1,14 @@ + +Symfony Container Public and Private Tags +========================================= + +"tag1" tag +---------- + + * definition_2 + +"tag2" tag +---------- + + * definition_2 + diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php index 311d0675b552..7d76e1068026 100644 --- a/src/Symfony/Component/Console/Style/SymfonyStyle.php +++ b/src/Symfony/Component/Console/Style/SymfonyStyle.php @@ -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); diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_5.txt b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_5.txt index be4a2db60579..f41dce77708e 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_5.txt +++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_5.txt @@ -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 diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_6.txt b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_6.txt index 5f2d33c148a9..6e4c0d162612 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_6.txt +++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_6.txt @@ -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 diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/win/output_5.txt b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/win/output_5.txt new file mode 100644 index 000000000000..be4a2db60579 --- /dev/null +++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/win/output_5.txt @@ -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 + diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/win/output_6.txt b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/win/output_6.txt new file mode 100644 index 000000000000..5f2d33c148a9 --- /dev/null +++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/win/output_6.txt @@ -0,0 +1,6 @@ + + * Lorem ipsum dolor sit amet + * consectetur adipiscing elit + + [OK] Lorem ipsum dolor sit amet + diff --git a/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php b/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php index 865bb33f7932..93157da7e64f 100644 --- a/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php +++ b/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php @@ -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() diff --git a/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php index c29e3fe2fc5e..74174edce0c2 100644 --- a/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php +++ b/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php @@ -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; } } diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.txt index 9b3338ec7bd3..3cc34e55bdba 100644 --- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.txt +++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.txt @@ -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 diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt index 3a0a452fd45c..0a732ac76103 100644 --- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt +++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt @@ -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 diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/win/defaults_1.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/win/defaults_1.txt new file mode 100644 index 000000000000..9b3338ec7bd3 --- /dev/null +++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/win/defaults_1.txt @@ -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 + diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/win/resolved_form_type_1.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/win/resolved_form_type_1.txt new file mode 100644 index 000000000000..3a0a452fd45c --- /dev/null +++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/win/resolved_form_type_1.txt @@ -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 +