Merge pull request #218 from localheinz/fix/template

Fix: Adjust template variable names
ergebnis · Oct 25, 2017 · 0e016a4 · 0e016a4
2 parents bb0684d + 18866d3
commit 0e016a4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/Console/GenerateCommand.php b/src/Console/GenerateCommand.php
@@ -93,7 +93,7 @@ protected function configure()
                 't',
                 Input\InputOption::VALUE_REQUIRED,
                 'The template to use for rendering a pull request',
-                '- %title% (#%number%), by @%author%'
+                '- %pullrequest.title% (#%pullrequest.number%), by @%pullrequest.author.login%'
             );
     }
 
@@ -184,14 +184,16 @@ protected function execute(Input\InputInterface $input, Output\OutputInterface $
             \array_walk($pullRequests, function (Resource\PullRequestInterface $pullRequest) use ($output, $template) {
                 $message = \str_replace(
                     [
-                        '%title%',
-                        '%number%',
-                        '%author%',
+                        '%pullrequest.title%',
+                        '%pullrequest.number%',
+                        '%pullrequest.author.login%',
+                        '%pullrequest.author.htmlUrl%',
                     ],
                     [
                         $pullRequest->title(),
                         $pullRequest->number(),
                         $pullRequest->author()->login(),
+                        $pullRequest->author()->htmlUrl(),
                     ],
                     $template
                 );

diff --git a/test/Unit/Console/GenerateCommandTest.php b/test/Unit/Console/GenerateCommandTest.php
@@ -401,7 +401,7 @@ public function testExecuteRendersPullRequestsWithTemplate()
 
         $pullRequests = $this->pullRequests($count);
 
-        $template = '- %title% (#%number%)';
+        $template = '- %pullrequest.title% (#pullrequest.%number%), submitted by [%pullrequest.author.login%](%pullrequest.author.htmlUrl%)';
 
         $expectedMessages = [
             \sprintf(
@@ -414,12 +414,16 @@ public function testExecuteRendersPullRequestsWithTemplate()
         \array_walk($pullRequests, function (Resource\PullRequestInterface $pullRequest) use (&$expectedMessages, $template) {
             $expectedMessages[] = \str_replace(
                 [
-                    '%title%',
-                    '%number%',
+                    '%pullrequest.title%',
+                    '%pullrequest.number%',
+                    '%pullrequest.author.login%',
+                    '%pullrequest.author.htmlUrl%',
                 ],
                 [
                     $pullRequest->title(),
                     $pullRequest->number(),
+                    $pullRequest->author()->login(),
+                    $pullRequest->author()->htmlUrl(),
                 ],
                 $template
             );

diff --git a/test/Util/DataProvider.php b/test/Util/DataProvider.php
@@ -60,7 +60,7 @@ public function providerGenerateCommandOption(): \Generator
                 't',
                 true,
                 'The template to use for rendering a pull request',
-                '- %title% (#%number%), by @%author%',
+                '- %pullrequest.title% (#%pullrequest.number%), by @%pullrequest.author.login%',
             ],
         ];
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,7 +60,7 @@ public function providerGenerateCommandOption(): \Generator @@
                     't',
                     true,
                     'The template to use for rendering a pull request',
-                    '- %title% (#%number%), by @%author%',
+                    '- %pullrequest.title% (#%pullrequest.number%), by @%pullrequest.author.login%',
                 ],
             ];
@@ Expand Down @@