(stable) Promote 2020 Week 42

src/future/FutureIterator.php

@@ -194,7 +194,7 @@ final class FutureIterator
    * @task iterator
    */
   public function next() {
-    // See T13572. If we preivously resolved and returned a Future, release
+    // See T13572. If we previously resolved and returned a Future, release
     // it now. This prevents us from holding Futures indefinitely when callers
     // like FuturePool build long-lived iterators and keep adding new Futures
     // to them.

src/lint/linter/__tests__/rubocop/convention.lint-test

@@ -1,4 +1,6 @@
 def hello()
 end
 ~~~~~~~~~~
-warning:1:10:-
+warning:1:1
+warning:1:1
+warning:1:10

src/lint/linter/__tests__/rubocop/no_errors.lint-test

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 def hello
   puts 'hello world'
 end

src/lint/linter/__tests__/rubocop/warning.lint-test

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 def hello(unused)
   puts 'hi'
 end
 ~~~~~~~~~
-warning:1:11
+warning:3:11

src/utils/utf8.php

@@ -426,6 +426,8 @@ function phutil_utf8_is_cjk($string) {
  * @return list  A list of characters in the string.
  */
 function phutil_utf8v($string, $byte_limit = null) {
+  $string = phutil_string_cast($string);
+
   $res = array();
   $len = strlen($string);
 

src/workflow/ArcanistDiffWorkflow.php

@@ -2741,6 +2741,17 @@ EOTEXT
         'git push -- %s %s',
         $staging_uri,
         $ref);
+
+      if ($err) {
+        $this->writeWarn(
+          pht('STAGING FAILED'),
+          pht('Unable to push lfs changes to the staging area.'));
+
+        throw new ArcanistUsageException(
+          pht(
+            'Failed to push lfs changes to staging area. Correct the issue, '.
+            'or use --skip-staging to skip this step.'));
+      }
     }
 
     return $refs;

support/init/init-script.php

@@ -50,6 +50,12 @@ function __arcanist_init_script__() {
     // See T13296. On macOS under PHP 7.3.x, PCRE currently segfaults after
     // "fork()" if "pcre.jit" is enabled.
     'pcre.jit' => 0,
+
+    // See PHI1894. This option was introduced in PHP 7.4, and removes the
+    // "args" value from exception backtraces. We have some unit tests which
+    // inspect "args", and this option generally obscures useful debugging
+    // information without any benefit in the context of Phabricator.
+    'zend.exception_ignore_args' => 0,
   );
 
   foreach ($config_map as $config_key => $config_value) {