Skip to content

Commit 001af7d

Browse files
committed
NGSTACK-901 CS fixes
1 parent 61b1928 commit 001af7d

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

bundle/Core/Imagine/VariationPathGenerator/WebpFormatVariationPathGenerator.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Ibexa\Contracts\Core\Variation\VariationPathGenerator;
88
use Liip\ImagineBundle\Imagine\Filter\FilterConfiguration;
99

10+
use function array_key_exists;
1011
use function pathinfo;
1112
use function preg_replace;
1213

@@ -21,7 +22,7 @@ final class WebpFormatVariationPathGenerator implements VariationPathGenerator
2122

2223
public function __construct(
2324
VariationPathGenerator $innerVariationPathGenerator,
24-
FilterConfiguration $filterConfiguration
25+
FilterConfiguration $filterConfiguration,
2526
) {
2627
$this->innerVariationPathGenerator = $innerVariationPathGenerator;
2728
$this->filterConfiguration = $filterConfiguration;
@@ -38,10 +39,10 @@ public function getVariationPath($originalPath, $filter): string
3839

3940
$info = pathinfo($originalPath);
4041

41-
if (!is_string($info['extension']) || strlen($info['extension']) === 0) {
42+
if (!array_key_exists('extension', $info) || $info['extension'] === '') {
4243
return $variationPath . '.webp';
4344
}
4445

45-
return preg_replace("/\.{$info['extension']}$/", '.webp', $variationPath);
46+
return preg_replace("/\\.{$info['extension']}$/", '.webp', $variationPath) ?? $variationPath;
4647
}
4748
}

bundle/DependencyInjection/Compiler/WebpFormatVariationPathGeneratorDecoratorPass.php

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,27 @@
44

55
namespace Netgen\Bundle\SiteBundle\DependencyInjection\Compiler;
66

7-
use Netgen\Bundle\SiteBundle\Core\Imagine\VariationPathGenerator\WebpFormatVariationPathGenerator;
87
use Ibexa\Bundle\Core\Imagine\VariationPathGenerator\WebpFormatVariationPathGenerator as BaseWebpFormatVariationPathGenerator;
8+
use Netgen\Bundle\SiteBundle\Core\Imagine\VariationPathGenerator\WebpFormatVariationPathGenerator;
99
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
1010
use Symfony\Component\DependencyInjection\ContainerBuilder;
11-
use Symfony\Component\DependencyInjection\Reference;
11+
12+
use function array_keys;
13+
use function in_array;
14+
use function is_array;
1215

1316
class WebpFormatVariationPathGeneratorDecoratorPass implements CompilerPassInterface
1417
{
1518
/**
1619
* Overrides default Webp image alias variation path generator decorator to comply with legacy variation URL pattern
17-
* We do this only if we have Netgen AdminUI installed (legacy-based administration)
20+
* We do this only if we have Netgen AdminUI installed (legacy-based administration).
1821
*/
1922
public function process(ContainerBuilder $container): void
2023
{
24+
if (!$container->hasParameter('kernel.bundles') || !is_array($container->getParameter('kernel.bundles'))) {
25+
return;
26+
}
27+
2128
$activatedBundles = array_keys($container->getParameter('kernel.bundles'));
2229

2330
if (!in_array('NetgenAdminUIBundle', $activatedBundles, true)) {

0 commit comments

Comments
 (0)