bug #32012 Add statement to fileLink to ignore href code when no fileLink. (bmxmale)

fabpot · fabpot · commit 9865988ac2cd · 2019-06-13T18:41:02.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- Add statement to fileLink to ignore href code when no fileLink. | Q | A | ------------- | --- | Branch? | 4.3  | Bug fix? | yes | New feature? | no  | BC breaks? | no  | Deprecations? |no  | Tests pass? | yes  | Fixed tickets | #...  | License | MIT | Doc PR | symfony/symfony-docs#...   This fix add statement to `\Symfony\Bundle\FrameworkBundle\Console\Descriptor\TextDescriptor::formatControllerLink` to fix display bug. **Before** ![image](https://user-images.githubusercontent.com/23213308/59355771-ed8a1000-8d27-11e9-998f-fa2fc34edd62.png) **After** ![image](https://user-images.githubusercontent.com/23213308/59355785-f2e75a80-8d27-11e9-953b-7523e0c9ad35.png) Commits ------- b9eab42 Add statement to fileLink to ignore href code when no fileLink.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -557,8 +557,11 @@ private function formatControllerLink($controller, string $anchorText): string
         }
 
         $fileLink = $this->fileLinkFormatter->format($r->getFileName(), $r->getStartLine());
+        if ($fileLink) {
+            return sprintf('<href=%s>%s</>', $fileLink, $anchorText);
+        }
 
-        return sprintf('<href=%s>%s</>', $fileLink, $anchorText);
+        return $anchorText;
     }
 
     private function formatCallable($callable): string

Original file line number	Diff line number	Diff line change
`@@ -557,8 +557,11 @@ private function formatControllerLink($controller, string $anchorText): string`
`557`	`557`	`}`
`558`	`558`
`559`	`559`	`$fileLink = $this->fileLinkFormatter->format($r->getFileName(), $r->getStartLine());`
	`560`	`+ if ($fileLink) {`
	`561`	`+ return sprintf('<href=%s>%s</>', $fileLink, $anchorText);`
	`562`	`+ }`
`560`	`563`
`561`		`- return sprintf('<href=%s>%s</>', $fileLink, $anchorText);`
	`564`	`+ return $anchorText;`
`562`	`565`	`}`
`563`	`566`
`564`	`567`	`private function formatCallable($callable): string`