Merge branch '5.0'

* 5.0:
  [Filesystem] chown and chgrp should also accept int as owner and group
  [DI] Fix EnvVar not loaded when Loader requires an env var
  Fixed #34713 Move new messages to intl domain when possible
  [FrameworkBundle] Fix small typo in output comment
  chown and chgrp should also accept int as owner and group
  Revert "Fixed translations file dumper behavior"
  Fix RememberMe with null password
  [Validator] Fix plurals for sr_Latn (Serbian language written in latin script) validation messages
  Set booted flag to false when test kernel is unset
  [FrameworkBundle] remove messenger cache if not enabled
  [PhpUnitBridge][SymfonyTestsListenerTrait] Remove some unneeded code
  [HttpClient] Fix strict parsing of response status codes
  fix PHP const mapping keys using the inline notation
  [SecurityBundle] Drop duplicated code
  [FrameworkBundle] Make sure one can use fragments.hinclude_default_template
  Fix that no-cache requires positive validation with the origin, even for fresh responses
  Improve upgrading instructions for deprecated router options
  [DI] Suggest typed argument when binding fails with untyped argument

Author: nicolas-grekas

Filesystem.php

@@ -206,11 +206,13 @@ public function chmod($files, int $mode, int $umask = 0000, bool $recursive = fa
     /**
      * Change the owner of an array of files or directories.
      *
-     * @param string|iterable $files A filename, an array of files, or a \Traversable instance to change owner
+     * @param string|iterable $files     A filename, an array of files, or a \Traversable instance to change owner
+     * @param string|int      $user      A user name or number
+     * @param bool            $recursive Whether change the owner recursively or not
      *
      * @throws IOException When the change fails
      */
-    public function chown($files, string $user, bool $recursive = false)
+    public function chown($files, $user, bool $recursive = false)
     {
         foreach ($this->toIterable($files) as $file) {
             if ($recursive && is_dir($file) && !is_link($file)) {
@@ -231,11 +233,13 @@ public function chown($files, string $user, bool $recursive = false)
     /**
      * Change the group of an array of files or directories.
      *
-     * @param string|iterable $files A filename, an array of files, or a \Traversable instance to change group
+     * @param string|iterable $files     A filename, an array of files, or a \Traversable instance to change group
+     * @param string|int      $group     A group name or number
+     * @param bool            $recursive Whether change the group recursively or not
      *
      * @throws IOException When the change fails
      */
-    public function chgrp($files, string $group, bool $recursive = false)
+    public function chgrp($files, $group, bool $recursive = false)
     {
         foreach ($this->toIterable($files) as $file) {
             if ($recursive && is_dir($file) && !is_link($file)) {

Tests/FilesystemTest.php

@@ -521,7 +521,7 @@ public function testChmodChangesZeroModeOnSubdirectoriesOnRecursive()
         $this->assertFilePermissions(753, $subdirectory);
     }
 
-    public function testChown()
+    public function testChownByName()
     {
         $this->markAsSkippedIfPosixIsMissing();
 
@@ -534,7 +534,20 @@ public function testChown()
         $this->assertSame($owner, $this->getFileOwner($dir));
     }
 
-    public function testChownRecursive()
+    public function testChownById()
+    {
+        $this->markAsSkippedIfPosixIsMissing();
+
+        $dir = $this->workspace.\DIRECTORY_SEPARATOR.'dir';
+        mkdir($dir);
+
+        $ownerId = $this->getFileOwnerId($dir);
+        $this->filesystem->chown($dir, $ownerId);
+
+        $this->assertSame($ownerId, $this->getFileOwnerId($dir));
+    }
+
+    public function testChownRecursiveByName()
     {
         $this->markAsSkippedIfPosixIsMissing();
 
@@ -549,6 +562,21 @@ public function testChownRecursive()
         $this->assertSame($owner, $this->getFileOwner($file));
     }
 
+    public function testChownRecursiveById()
+    {
+        $this->markAsSkippedIfPosixIsMissing();
+
+        $dir = $this->workspace.\DIRECTORY_SEPARATOR.'dir';
+        mkdir($dir);
+        $file = $dir.\DIRECTORY_SEPARATOR.'file';
+        touch($file);
+
+        $ownerId = $this->getFileOwnerId($dir);
+        $this->filesystem->chown($dir, $ownerId, true);
+
+        $this->assertSame($ownerId, $this->getFileOwnerId($file));
+    }
+
     public function testChownSymlink()
     {
         $this->markAsSkippedIfSymlinkIsMissing();
@@ -624,7 +652,7 @@ public function testChownFail()
         $this->filesystem->chown($dir, 'user'.time().mt_rand(1000, 9999));
     }
 
-    public function testChgrp()
+    public function testChgrpByName()
     {
         $this->markAsSkippedIfPosixIsMissing();
 
@@ -637,6 +665,19 @@ public function testChgrp()
         $this->assertSame($group, $this->getFileGroup($dir));
     }
 
+    public function testChgrpById()
+    {
+        $this->markAsSkippedIfPosixIsMissing();
+
+        $dir = $this->workspace.\DIRECTORY_SEPARATOR.'dir';
+        mkdir($dir);
+
+        $groupId = $this->getFileGroupId($dir);
+        $this->filesystem->chgrp($dir, $groupId);
+
+        $this->assertSame($groupId, $this->getFileGroupId($dir));
+    }
+
     public function testChgrpRecursive()
     {
         $this->markAsSkippedIfPosixIsMissing();
@@ -652,7 +693,7 @@ public function testChgrpRecursive()
         $this->assertSame($group, $this->getFileGroup($file));
     }
 
-    public function testChgrpSymlink()
+    public function testChgrpSymlinkByName()
     {
         $this->markAsSkippedIfSymlinkIsMissing();
 
@@ -669,6 +710,23 @@ public function testChgrpSymlink()
         $this->assertSame($group, $this->getFileGroup($link));
     }
 
+    public function testChgrpSymlinkById()
+    {
+        $this->markAsSkippedIfSymlinkIsMissing();
+
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $link = $this->workspace.\DIRECTORY_SEPARATOR.'link';
+
+        touch($file);
+
+        $this->filesystem->symlink($file, $link);
+
+        $groupId = $this->getFileGroupId($link);
+        $this->filesystem->chgrp($link, $groupId);
+
+        $this->assertSame($groupId, $this->getFileGroupId($link));
+    }
+
     public function testChgrpLink()
     {
         $this->markAsSkippedIfLinkIsMissing();

Tests/FilesystemTestCase.php

@@ -105,21 +105,36 @@ protected function assertFilePermissions($expectedFilePerms, $filePath)
         );
     }
 
+    protected function getFileOwnerId($filepath)
+    {
+        $this->markAsSkippedIfPosixIsMissing();
+
+        $infos = stat($filepath);
+
+        return $infos['uid'];
+    }
+
     protected function getFileOwner($filepath)
     {
         $this->markAsSkippedIfPosixIsMissing();
 
+        return ($datas = posix_getpwuid($this->getFileOwnerId($filepath))) ? $datas['name'] : null;
+    }
+
+    protected function getFileGroupId($filepath)
+    {
+        $this->markAsSkippedIfPosixIsMissing();
+
         $infos = stat($filepath);
 
-        return ($datas = posix_getpwuid($infos['uid'])) ? $datas['name'] : null;
+        return $infos['gid'];
     }
 
     protected function getFileGroup($filepath)
     {
         $this->markAsSkippedIfPosixIsMissing();
 
-        $infos = stat($filepath);
-        if ($datas = posix_getgrgid($infos['gid'])) {
+        if ($datas = posix_getgrgid($this->getFileGroupId($filepath))) {
             return $datas['name'];
         }