Skip to content

Commit 730a28b

Browse files
committed
Merge branch 'next-15104/fix-deprecations' into 'trunk'
NEXT-15104 - Fix remaining deprecations for 6.4.0 See merge request shopware/6/product/platform!5234
2 parents f6f7092 + e11234b commit 730a28b

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/Core/Framework/DependencyInjection/CompilerPass/FilesystemConfigMigrationCompilerPass.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public function process(ContainerBuilder $container): void
2727
$container->setParameter($configKey, '%shopware.filesystem.public.config%');
2828
}
2929

30-
/* @deprecated tag:v6.4.0 Remove using fallback from shopware.cdn.url */
3130
if (!$container->hasParameter('shopware.filesystem.public.url')) {
3231
$container->setParameter('shopware.filesystem.public.url', '%shopware.cdn.url%');
3332
}

src/Core/Framework/Test/DeprecatedTagTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ class DeprecatedTagTest extends TestCase
2828
'Recovery/vendor',
2929
'recovery/vendor',
3030
'storefront/vendor',
31+
// we cannot remove the method, because old migrations could still use it
32+
'Migration/MigrationStep.php',
33+
// example plugin
34+
'deprecation.plugin.js',
3135
];
3236

3337
private string $rootDir;

0 commit comments

Comments
 (0)