Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15409631
D14230.id34365.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
4 KB
Referenced Files
None
Subscribers
None
D14230.id34365.diff
View Options
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -218,6 +218,7 @@
'PhutilKeyValueCacheProxy' => 'cache/PhutilKeyValueCacheProxy.php',
'PhutilKeyValueCacheStack' => 'cache/PhutilKeyValueCacheStack.php',
'PhutilKeyValueCacheTestCase' => 'cache/__tests__/PhutilKeyValueCacheTestCase.php',
+ 'PhutilKoreanLocale' => 'internationalization/locales/PhutilKoreanLocale.php',
'PhutilLDAPAuthAdapter' => 'auth/PhutilLDAPAuthAdapter.php',
'PhutilLanguageGuesser' => 'parser/PhutilLanguageGuesser.php',
'PhutilLanguageGuesserTestCase' => 'parser/__tests__/PhutilLanguageGuesserTestCase.php',
@@ -732,6 +733,7 @@
'PhutilKeyValueCacheProxy' => 'PhutilKeyValueCache',
'PhutilKeyValueCacheStack' => 'PhutilKeyValueCache',
'PhutilKeyValueCacheTestCase' => 'PhutilTestCase',
+ 'PhutilKoreanLocale' => 'PhutilLocale',
'PhutilLDAPAuthAdapter' => 'PhutilAuthAdapter',
'PhutilLanguageGuesser' => 'Phobject',
'PhutilLanguageGuesserTestCase' => 'PhutilTestCase',
diff --git a/src/markup/engine/__tests__/remarkup/quoted-code-block.txt b/src/markup/engine/__tests__/remarkup/quoted-code-block.txt
--- a/src/markup/engine/__tests__/remarkup/quoted-code-block.txt
+++ b/src/markup/engine/__tests__/remarkup/quoted-code-block.txt
@@ -7,8 +7,8 @@
~~~~~~~~~~
<blockquote><p>This should be a code block:</p>
-<div class="remarkup-code-block" data-code-lang="php" data-sigil="remarkup-code-block"><pre class="remarkup-code"><span class="o"><?php
-</span><span class="nv">$foo</span> <span class="k">=</span> <span class="s">'bar'</span><span class="k">;</span></pre></div></blockquote>
+<div class="remarkup-code-block" data-code-lang="php" data-sigil="remarkup-code-block"><pre class="remarkup-code"><span class="o"><?php</span>
+<span class="nv">$foo</span> <span class="k">=</span> <span class="s">'bar'</span><span class="k">;</span></pre></div></blockquote>
~~~~~~~~~~
> This should be a code block:
diff --git a/src/markup/syntax/highlighter/__tests__/PhutilXHPASTSyntaxHighlighterTestCase.php b/src/markup/syntax/highlighter/__tests__/PhutilXHPASTSyntaxHighlighterTestCase.php
--- a/src/markup/syntax/highlighter/__tests__/PhutilXHPASTSyntaxHighlighterTestCase.php
+++ b/src/markup/syntax/highlighter/__tests__/PhutilXHPASTSyntaxHighlighterTestCase.php
@@ -19,7 +19,7 @@
(string)$this->highlight($this->read('builtin-classname.source')),
pht('Builtin classnames should not be marked as linkable symbols.'));
$this->assertEqual(
- $this->read('trailing-comment.expect'),
+ rtrim($this->read('trailing-comment.expect')),
(string)$this->highlight($this->read('trailing-comment.source')),
pht('Trailing comments should not be dropped.'));
$this->assertEqual(
diff --git a/src/markup/syntax/highlighter/__tests__/xhpast/builtin-classname.expect b/src/markup/syntax/highlighter/__tests__/xhpast/builtin-classname.expect
--- a/src/markup/syntax/highlighter/__tests__/xhpast/builtin-classname.expect
+++ b/src/markup/syntax/highlighter/__tests__/xhpast/builtin-classname.expect
@@ -1,5 +1,5 @@
-<span class="o"><?php
-</span>
+<span class="o"><?php</span>
+
<span class="k">class</span> <span data-symbol-name="C" class="nc">C</span> <span class="k">{</span>
<span class="k">public</span> <span class="k">function</span> <span class="nx">f</span><span class="k">(</span><span class="k">)</span> <span class="k">{</span>
<span data-symbol-name="D" class="nc">D</span><span class="k">::</span><span data-symbol-context="D" data-symbol-name="X" class="na">X</span><span class="k">;</span>
diff --git a/src/markup/syntax/highlighter/__tests__/xhpast/multiline-token.expect b/src/markup/syntax/highlighter/__tests__/xhpast/multiline-token.expect
--- a/src/markup/syntax/highlighter/__tests__/xhpast/multiline-token.expect
+++ b/src/markup/syntax/highlighter/__tests__/xhpast/multiline-token.expect
@@ -1,5 +1,5 @@
-<span class="o"><?php
-</span>
+<span class="o"><?php</span>
+
<span class="c">/* this comment
</span><span class="c">extends across
</span><span class="c">multiple lines */</span>
diff --git a/src/markup/syntax/highlighter/__tests__/xhpast/trailing-comment.expect b/src/markup/syntax/highlighter/__tests__/xhpast/trailing-comment.expect
--- a/src/markup/syntax/highlighter/__tests__/xhpast/trailing-comment.expect
+++ b/src/markup/syntax/highlighter/__tests__/xhpast/trailing-comment.expect
@@ -1,2 +1,3 @@
-<span class="o"><?php
-</span><span class="c">// xyz</span>
\ No newline at end of file
+<span class="o"><?php</span>
+<span class="c">// xyz
+</span>
diff --git a/src/markup/syntax/highlighter/__tests__/xhpast/trailing-comment.source b/src/markup/syntax/highlighter/__tests__/xhpast/trailing-comment.source
--- a/src/markup/syntax/highlighter/__tests__/xhpast/trailing-comment.source
+++ b/src/markup/syntax/highlighter/__tests__/xhpast/trailing-comment.source
@@ -1,2 +1,2 @@
<?php
-// xyz
\ No newline at end of file
+// xyz
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Mar 20, 4:47 AM (1 d, 23 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7640777
Default Alt Text
D14230.id34365.diff (4 KB)
Attached To
Mode
D14230: Fix unit test errors in libphutil
Attached
Detach File
Event Timeline
Log In to Comment