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

Appearance settings

Commit 4037514

Browse filesBrowse files
committed
make returned dir relative
1 parent d43f958 commit 4037514
Copy full SHA for 4037514

File tree

Expand file treeCollapse file tree

3 files changed

+11
-4
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+11
-4
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
138138
/** @var BundleInterface $bundle */
139139
foreach ($kernel->getBundles() as $bundle) {
140140
if (!method_exists($bundle, 'getPublicPath')) {
141-
@trigger_error('Not definind getPublicPath() method is deprecated since Symfony 4.4 and will not be supported in 5.0.', E_USER_DEPRECATED);
142-
$publicPath = '/Resources/public';
141+
@trigger_error('Not defining getPublicPath() method is deprecated since Symfony 4.4 and will not be supported in 5.0.', E_USER_DEPRECATED);
142+
$publicPath = 'Resources/public';
143143
} else {
144144
$publicPath = $bundle->getPublicPath();
145145
}
146-
if (!is_dir($originDir = $bundle->getPath().$publicPath)) {
146+
if (!is_dir($originDir = $bundle->getPath().DIRECTORY_SEPARATOR.$publicPath)) {
147147
continue;
148148
}
149149

‎src/Symfony/Component/HttpKernel/Bundle/Bundle.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Bundle/Bundle.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public function registerCommands(Application $application)
137137

138138
public function getPublicPath(): string
139139
{
140-
return '/Resources/public';
140+
return 'Resources/public';
141141
}
142142

143143
/**

‎src/Symfony/Component/HttpKernel/Tests/KernelTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/KernelTest.php
+7Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,13 @@ protected function getBundle($dir = null, $parent = null, $className = null, $bu
649649
->willReturn($dir)
650650
;
651651

652+
$bundle
653+
->expects($this->any())
654+
->method('getPublicPath')
655+
->willReturn('Resources/public')
656+
;
657+
658+
652659
$bundle
653660
->expects($this->any())
654661
->method('getParent')

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.