Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc48ee0b

Browse files
committed
Merge branch '3.4' into 4.1
* 3.4: [Finder] fixed root directory access for ftp/sftp wrapper [FWBundle] Throw if PropertyInfo is enabled, but the component isn't installed
2 parentsb1f462f +636eb9e commitc48ee0b

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
useSymfony\Component\PropertyAccess\PropertyAccessor;
7070
useSymfony\Component\PropertyInfo\PropertyAccessExtractorInterface;
7171
useSymfony\Component\PropertyInfo\PropertyDescriptionExtractorInterface;
72+
useSymfony\Component\PropertyInfo\PropertyInfoExtractorInterface;
7273
useSymfony\Component\PropertyInfo\PropertyListExtractorInterface;
7374
useSymfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
7475
useSymfony\Component\Routing\Loader\AnnotationDirectoryLoader;
@@ -263,7 +264,7 @@ public function load(array $configs, ContainerBuilder $container)
263264
}
264265

265266
if ($this->isConfigEnabled($container,$config['property_info'])) {
266-
$this->registerPropertyInfoConfiguration($config['property_info'],$container,$loader);
267+
$this->registerPropertyInfoConfiguration($container,$loader);
267268
}
268269

269270
if ($this->isConfigEnabled($container,$config['lock'])) {
@@ -1352,8 +1353,12 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
13521353
}
13531354
}
13541355

1355-
privatefunctionregisterPropertyInfoConfiguration(array$config,ContainerBuilder$container,XmlFileLoader$loader)
1356+
privatefunctionregisterPropertyInfoConfiguration(ContainerBuilder$container,XmlFileLoader$loader)
13561357
{
1358+
if (!interface_exists(PropertyInfoExtractorInterface::class)) {
1359+
thrownewLogicException('PropertyInfo support cannot be enabled as the PropertyInfo component is not installed. Try running "composer require symfony/property-info".');
1360+
}
1361+
13571362
$loader->load('property_info.xml');
13581363

13591364
if (interface_exists('phpDocumentor\Reflection\DocBlockFactoryInterface')) {

‎src/Symfony/Component/Finder/Finder.php‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,12 +727,20 @@ private function searchInDirectory(string $dir): \Iterator
727727
/**
728728
* Normalizes given directory names by removing trailing slashes.
729729
*
730+
* Excluding: (s)ftp:// wrapper
731+
*
730732
* @param string $dir
731733
*
732734
* @return string
733735
*/
734736
privatefunctionnormalizeDir($dir)
735737
{
736-
returnrtrim($dir,'/'.\DIRECTORY_SEPARATOR);
738+
$dir =rtrim($dir,'/'.\DIRECTORY_SEPARATOR);
739+
740+
if (preg_match('#^s?ftp://#',$dir)) {
741+
$dir .='/';
742+
}
743+
744+
return$dir;
737745
}
738746
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp