Merge branch '4.0' into 4.1

nicolas-grekas · nicolas-grekas · commit 2b860d515f8f · 2018-07-09T15:27:18.000+02:00
* 4.0:
  [Filesystem] fix lock file mode
  [Console] fix typo in phpdoc
diff --git a/src/Symfony/Component/Console/Output/OutputInterface.php b/src/Symfony/Component/Console/Output/OutputInterface.php
@@ -33,7 +33,7 @@ interface OutputInterface
     /**
      * Writes a message to the output.
      *
-     * @param string|iterable $messages The message as an iterable of lines or a single string
+     * @param string|iterable $messages The message as an iterable of strings or a single string
      * @param bool            $newline  Whether to add a newline
      * @param int             $options  A bitmask of options (one of the OUTPUT or VERBOSITY constants), 0 is considered the same as self::OUTPUT_NORMAL | self::VERBOSITY_NORMAL
      */
@@ -42,7 +42,7 @@ public function write($messages, $newline = false, $options = 0);
     /**
      * Writes a message to the output and adds a newline at the end.
      *
-     * @param string|iterable $messages The message as an iterable of lines of a single string
+     * @param string|iterable $messages The message as an iterable of strings or a single string
      * @param int             $options  A bitmask of options (one of the OUTPUT or VERBOSITY constants), 0 is considered the same as self::OUTPUT_NORMAL | self::VERBOSITY_NORMAL
      */
     public function writeln($messages, $options = 0);
diff --git a/src/Symfony/Component/Lock/Store/FlockStore.php b/src/Symfony/Component/Lock/Store/FlockStore.php
@@ -81,7 +81,7 @@ private function lock(Key $key, $blocking)
         set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
         if (!$handle = fopen($fileName, 'r+') ?: fopen($fileName, 'r')) {
             if ($handle = fopen($fileName, 'x')) {
-                chmod($fileName, 0644);
+                chmod($fileName, 0666);
             } elseif (!$handle = fopen($fileName, 'r+') ?: fopen($fileName, 'r')) {
                 usleep(100); // Give some time for chmod() to complete
                 $handle = fopen($fileName, 'r+') ?: fopen($fileName, 'r');
