Skip to content
Permalink
Browse files

Merge branch '3.4' into 4.3

* 3.4:
  Link the right file depending on the new version
  [Finder] Allow ssh2 stream wrapper for sftp
  [WebProfilerBundle] Require symfony/twig-bundle
  bumped Symfony version to 3.4.36
  updated VERSION for 3.4.35
  updated CHANGELOG for 3.4.35
  • Loading branch information
nicolas-grekas committed Nov 16, 2019
2 parents a90de43 + d43a20a commit 476042d0fb10c4edbcda6e8f8aa12c9a2e50de79
Showing with 3 additions and 3 deletions.
  1. +2 −2 UPGRADE-4.0.md
  2. +1 −1 src/Symfony/Component/Finder/Finder.php
@@ -26,8 +26,8 @@ file and directory structure of your application:

Then, upgrade the contents of your console script and your front controller:

* `bin/console`: https://github.com/symfony/recipes/blob/master/symfony/console/3.3/bin/console
* `public/index.php`: https://github.com/symfony/recipes/blob/master/symfony/framework-bundle/3.3/public/index.php
* `bin/console`: https://github.com/symfony/recipes/blob/master/symfony/console/4.4/bin/console
* `public/index.php`: https://github.com/symfony/recipes/blob/master/symfony/framework-bundle/4.4/public/index.php

Lastly, read the following article to add Symfony Flex to your application and
upgrade the configuration files: https://symfony.com/doc/current/setup/flex.html
@@ -803,7 +803,7 @@ private function normalizeDir($dir)
{
$dir = rtrim($dir, '/'.\DIRECTORY_SEPARATOR);
if (preg_match('#^s?ftp://#', $dir)) {
if (preg_match('#^(ssh2\.)?s?ftp://#', $dir)) {
$dir .= '/';
}

0 comments on commit 476042d

Please sign in to comment.
You can’t perform that action at this time.