From 43c7f9b5e95cd2b330f489eab08e8f43a32285da Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Mon, 25 Apr 2016 16:50:46 +0100 Subject: [PATCH 1/3] [Routing] Fix the annotation loader taking a class constant as a beginning of a class name --- .../Routing/Loader/AnnotationFileLoader.php | 2 ++ .../Tests/Fixtures/AnnotatedClasses/FooTrait.php | 13 +++++++++++++ .../Tests/Loader/AnnotationFileLoaderTest.php | 10 ++++++++++ 3 files changed, 25 insertions(+) create mode 100644 src/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/FooTrait.php diff --git a/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php index a3a7e0e5ae50..7e424fd336c5 100644 --- a/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php +++ b/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php @@ -96,6 +96,8 @@ protected function findClass($file) $token = $tokens[$i]; if (!isset($token[1])) { + $class = false; + continue; } diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/FooTrait.php b/src/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/FooTrait.php new file mode 100644 index 000000000000..f34c6b64cf43 --- /dev/null +++ b/src/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/FooTrait.php @@ -0,0 +1,13 @@ +loader->load(__DIR__.'/../Fixtures/AnnotatedClasses/FooClass.php'); } + /** + * @requires PHP 5.4 + */ + public function testLoadTraitWithClassConstant() + { + $this->reader->expects($this->never())->method('getClassAnnotation'); + + $this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses/FooTrait.php'); + } + /** * @requires PHP 5.6 */ From 8d4f35d12cc660bb5bc6d7a3955ad3fd953913d2 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Sun, 29 May 2016 12:13:06 +0200 Subject: [PATCH 2/3] [Routing] Finish annotation loader taking a class constant as a beginning of a class name --- .../Routing/Loader/AnnotationFileLoader.php | 21 ++++++++++++++++--- .../Fixtures/AnnotatedClasses/FooTrait.php | 2 +- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php index 7e424fd336c5..b8fc03615f96 100644 --- a/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php +++ b/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php @@ -96,8 +96,6 @@ protected function findClass($file) $token = $tokens[$i]; if (!isset($token[1])) { - $class = false; - continue; } @@ -114,7 +112,24 @@ protected function findClass($file) } if (T_CLASS === $token[0]) { - $class = true; + // Skip usage of ::class constant + $isClassConstant = false; + for ($j = $i - 1; $j > 0; --$j) { + if (!isset($tokens[$j][1])) { + break; + } + + if (T_DOUBLE_COLON === $tokens[$j][0]) { + $isClassConstant = true; + break; + } elseif (!in_array($tokens[$j][0], array(T_WHITESPACE, T_DOC_COMMENT, T_COMMENT))) { + break; + } + } + + if (!$isClassConstant) { + $class = true; + } } if (T_NAMESPACE === $token[0]) { diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/FooTrait.php b/src/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/FooTrait.php index f34c6b64cf43..ee8f4b071a36 100644 --- a/src/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/FooTrait.php +++ b/src/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/FooTrait.php @@ -10,4 +10,4 @@ public function doBar() if (true) { } } -} \ No newline at end of file +} From 1c94fea42f6c3d74471597c8b81cbee4959b0934 Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Thu, 26 May 2016 10:39:15 +0200 Subject: [PATCH 3/3] [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments CS Fixes Add tests Add docblock Fix side effect on FrameworkBundle tests Remove useless '\n' from TextDescriptor since comments are block --- .../Console/Descriptor/TextDescriptor.php | 2 +- .../Tests/Fixtures/Descriptor/alias_1.txt | 4 +++- .../Tests/Fixtures/Descriptor/alias_2.txt | 4 +++- .../Component/Console/Style/SymfonyStyle.php | 12 +++++++----- .../Style/SymfonyStyle/command/command_11.php | 13 +++++++++++++ .../Style/SymfonyStyle/output/output_11.txt | 6 ++++++ .../Fixtures/Style/SymfonyStyle/output/output_5.txt | 7 +++++-- 7 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_11.php create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_11.txt diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php index dca8ffc4839e..4aa00a85dbb1 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php @@ -339,7 +339,7 @@ protected function describeContainerDefinition(Definition $definition, array $op */ protected function describeContainerAlias(Alias $alias, array $options = array()) { - $options['output']->comment(sprintf("This service is an alias for the service %s\n", (string) $alias)); + $options['output']->comment(sprintf('This service is an alias for the service %s', (string) $alias)); } /** diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_1.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_1.txt index c3b9987ec27f..91ed6790f03b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_1.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_1.txt @@ -1 +1,3 @@ -// This service is an alias for the service service_1 \ No newline at end of file + + // This service is an alias for the service service_1 + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_2.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_2.txt index b53b090b5f3c..1ebffe38ac58 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_2.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_2.txt @@ -1 +1,3 @@ -// This service is an alias for the service service_2 \ No newline at end of file + + // This service is an alias for the service service_2 + diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php index ebaa18dd536e..53a7951e016d 100644 --- a/src/Symfony/Component/Console/Style/SymfonyStyle.php +++ b/src/Symfony/Component/Console/Style/SymfonyStyle.php @@ -170,16 +170,18 @@ public function text($message) } /** - * {@inheritdoc} + * Formats a command comment. + * + * @param string|array $message */ public function comment($message) { - $this->autoPrependText(); - $messages = is_array($message) ? array_values($message) : array($message); - foreach ($messages as $message) { - $this->writeln(sprintf(' // %s', $message)); + foreach ($messages as &$message) { + $message = $this->getFormatter()->format($message); } + + $this->block($messages, null, null, ' // '); } /** diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_11.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_11.php new file mode 100644 index 000000000000..a2781ddbeafa --- /dev/null +++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_11.php @@ -0,0 +1,13 @@ +comment( + 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum' + ); +}; diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_11.txt b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_11.txt new file mode 100644 index 000000000000..9983af832aa7 --- /dev/null +++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_11.txt @@ -0,0 +1,6 @@ + + // Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna + // aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. + // Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur + // sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum + 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 738eb9e60601..be4a2db60579 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 @@ -11,5 +11,8 @@ 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 +