Merge branch '4.1'

* 4.1:
  [HttpKernel] Fixed invalid REMOTE_ADDR in inline subrequest when configuring trusted proxy with subnet
  [FrameworkBundle] fixed guard event names for transitions
  [DI] Improve class named servics error message
  remove unnecessary instanceof in MongoDbSessionHandler
  [HttpFoundation] fixed using _method parameter with invalid type
  Renaming internal test class to help auto-completion
  [Intl] Replace svn with git in the icu data update script
  [Messenger] Fix error message on undefined message class for non-subscriber handler
  [HttpFoundation] Fix Cookie::isCleared

Author: nicolas-grekas

Resources/bin/icu.ini

@@ -25,8 +25,7 @@
 use Symfony\Component\Intl\Data\Provider\ScriptDataProvider;
 use Symfony\Component\Intl\Intl;
 use Symfony\Component\Intl\Locale;
-use Symfony\Component\Intl\Util\IcuVersion;
-use Symfony\Component\Intl\Util\SvnRepository;
+use Symfony\Component\Intl\Util\GitRepository;
 
 require_once __DIR__.'/common.php';
 require_once __DIR__.'/autoload.php';
@@ -40,7 +39,7 @@
 
 Updates the ICU data for Symfony to the latest version of ICU.
 
-If you downloaded the SVN repository before, you can pass the path to the
+If you downloaded the git repository before, you can pass the path to the
 repository source in the first optional argument.
 
 If you also built the repository before, you can pass the directory where that
@@ -64,36 +63,30 @@
     bailout('The intl extension for PHP is not installed.');
 }
 
-$filesystem = new Filesystem();
-$urls = parse_ini_file(__DIR__.'/icu.ini');
-
-echo "icu.ini parsed. Available versions:\n";
+if ($argc >= 2) {
+    $repoDir = $argv[1];
+    $git = new GitRepository($repoDir);
 
-$maxVersion = 0;
+    echo "Using the existing git repository at {$repoDir}.\n";
+} else {
+    echo "Starting git clone. This may take a while...\n";
 
-foreach ($urls as $urlVersion => $url) {
-    $maxVersion = IcuVersion::compare($maxVersion, $urlVersion, '<')
-        ? $urlVersion
-        : $maxVersion;
+    $repoDir = sys_get_temp_dir().'/icu-data';
+    $git = GitRepository::download('https://github.com/unicode-org/icu.git', $repoDir);
 
-    echo "  $urlVersion\n";
+    echo "Git clone to {$repoDir} complete.\n";
 }
 
-$shortIcuVersion = strip_minor_versions($maxVersion);
-
-if ($argc >= 2) {
-    $sourceDir = $argv[1];
-    $svn = new SvnRepository($sourceDir);
-
-    echo "Using existing SVN repository at {$sourceDir}.\n";
-} else {
-    echo "Starting SVN checkout for version $shortIcuVersion. This may take a while...\n";
+$gitTag = $git->getLastTag(function ($tag) {
+    return preg_match('#^release-[0-9]{1,}-[0-9]{1}$#', $tag);
+});
+$shortIcuVersion = strip_minor_versions(preg_replace('#release-([0-9]{1,})-([0-9]{1,})#', '$1.$2', $gitTag));
 
-    $sourceDir = sys_get_temp_dir().'/icu-data/'.$shortIcuVersion.'/source';
-    $svn = SvnRepository::download($urls[$shortIcuVersion], $sourceDir);
+echo "Checking out `{$gitTag}` for version `{$shortIcuVersion}`...\n";
+$git->checkout('tags/'.$gitTag);
 
-    echo "SVN checkout to {$sourceDir} complete.\n";
-}
+$filesystem = new Filesystem();
+$sourceDir = $repoDir.'/icu4c/source';
 
 if ($argc >= 3) {
     $buildDir = $argv[2];
@@ -265,23 +258,23 @@
 
 echo "Resource bundle compilation complete.\n";
 
-$svnInfo = <<<SVN_INFO
-SVN information
+$gitInfo = <<<GIT_INFO
+Git information
 ===============
 
-URL: {$svn->getUrl()}
-Revision: {$svn->getLastCommit()->getRevision()}
-Author: {$svn->getLastCommit()->getAuthor()}
-Date: {$svn->getLastCommit()->getDate()}
+URL: {$git->getUrl()}
+Revision: {$git->getLastCommitHash()}
+Author: {$git->getLastAuthor()}
+Date: {$git->getLastAuthoredDate()->format('c')}
 
-SVN_INFO;
+GIT_INFO;
 
 foreach ($targetDirs as $targetDir) {
-    $svnInfoFile = $targetDir.'/svn-info.txt';
+    $gitInfoFile = $targetDir.'/git-info.txt';
 
-    file_put_contents($svnInfoFile, $svnInfo);
+    file_put_contents($gitInfoFile, $gitInfo);
 
-    echo "Wrote $svnInfoFile.\n";
+    echo "Wrote $gitInfoFile.\n";
 
     $versionFile = $targetDir.'/version.txt';
 

Resources/bin/update-data.php

@@ -0,0 +1,7 @@
+Git information
+===============
+
+URL: https://github.com/unicode-org/icu.git
+Revision: 4a3ba8eee90ea1414d4f7ee36563e6c9b28fda96
+Author: Yoshito Umaoka
+Date: 2018-06-20T05:34:56+00:00

Resources/data/git-info.txt

@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Intl\Tests\Util;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Intl\Util\GitRepository;
+
+/**
+ * @group intl-data
+ */
+class GitRepositoryTest extends TestCase
+{
+    private $targetDir;
+
+    const REPO_URL = 'https://github.com/symfony/intl.git';
+
+    /**
+     * @before
+     * @after
+     */
+    protected function cleanup()
+    {
+        $this->targetDir = sys_get_temp_dir().'/GitRepositoryTest/source';
+
+        $fs = new Filesystem();
+        $fs->remove($this->targetDir);
+    }
+
+    public function testItThrowsAnExceptionIfInitialisedWithNonGitDirectory()
+    {
+        $this->expectException('Symfony\Component\Intl\Exception\RuntimeException');
+
+        @mkdir($this->targetDir, '0777', true);
+
+        new GitRepository($this->targetDir);
+    }
+
+    public function testItClonesTheRepository()
+    {
+        $git = GitRepository::download(self::REPO_URL, $this->targetDir);
+
+        $this->assertInstanceOf('Symfony\Component\Intl\Util\GitRepository', $git);
+        $this->assertDirectoryExists($this->targetDir.'/.git');
+        $this->assertSame($this->targetDir, $git->getPath());
+        $this->assertSame(self::REPO_URL, $git->getUrl());
+        $this->assertRegExp('#^[0-9a-z]{40}$#', $git->getLastCommitHash());
+        $this->assertNotEmpty($git->getLastAuthor());
+        $this->assertInstanceOf('DateTime', $git->getLastAuthoredDate());
+        $this->assertStringMatchesFormat('v%s', $git->getLastTag());
+        $this->assertStringMatchesFormat('v3%s', $git->getLastTag(function ($tag) { return 0 === strpos($tag, 'v3'); }));
+    }
+
+    public function testItCheckoutsToTheLastTag()
+    {
+        $git = GitRepository::download(self::REPO_URL, $this->targetDir);
+        $lastCommitHash = $git->getLastCommitHash();
+        $lastV3Tag = $git->getLastTag(function ($tag) { return 0 === strpos($tag, 'v3'); });
+
+        $git->checkout($lastV3Tag);
+
+        $this->assertNotEquals($lastCommitHash, $git->getLastCommitHash());
+    }
+}

Resources/data/svn-info.txt

@@ -0,0 +1,108 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Intl\Util;
+
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Intl\Exception\RuntimeException;
+
+/**
+ * @internal
+ */
+final class GitRepository
+{
+    private $path;
+
+    public function __construct(string $path)
+    {
+        $this->path = $path;
+
+        $this->getUrl();
+    }
+
+    public static function download(string $remote, string $targetDir): self
+    {
+        self::exec('which git', 'The command "git" is not installed.');
+
+        $filesystem = new Filesystem();
+
+        if (!$filesystem->exists($targetDir.'/.git')) {
+            $filesystem->remove($targetDir);
+            $filesystem->mkdir($targetDir);
+
+            self::exec(sprintf('git clone %s %s', escapeshellarg($remote), escapeshellarg($targetDir)));
+        }
+
+        return new self(realpath($targetDir));
+    }
+
+    public function getPath()
+    {
+        return $this->path;
+    }
+
+    public function getUrl()
+    {
+        return $this->getLastLine($this->execInPath('git config --get remote.origin.url'));
+    }
+
+    public function getLastCommitHash()
+    {
+        return $this->getLastLine($this->execInPath('git log -1 --format="%H"'));
+    }
+
+    public function getLastAuthor()
+    {
+        return $this->getLastLine($this->execInPath('git log -1 --format="%an"'));
+    }
+
+    public function getLastAuthoredDate()
+    {
+        return new \DateTime($this->getLastLine($this->execInPath('git log -1 --format="%ai"')));
+    }
+
+    public function getLastTag(callable $filter = null)
+    {
+        $tags = $this->execInPath('git tag -l --sort=v:refname');
+
+        if (null !== $filter) {
+            $tags = array_filter($tags, $filter);
+        }
+
+        return $this->getLastLine($tags);
+    }
+
+    public function checkout($branch)
+    {
+        $this->execInPath(sprintf('git checkout %s', escapeshellarg($branch)));
+    }
+
+    private function execInPath($command)
+    {
+        return self::exec(sprintf('cd %s && %s', escapeshellarg($this->path), $command));
+    }
+
+    private static function exec($command, $customErrorMessage = null)
+    {
+        exec(sprintf('%s 2>&1', $command), $output, $result);
+
+        if (0 !== $result) {
+            throw new RuntimeException(null !== $customErrorMessage ? $customErrorMessage : sprintf('The `%s` command failed.', $command));
+        }
+
+        return $output;
+    }
+
+    private function getLastLine(array $output)
+    {
+        return array_pop($output);
+    }
+}