Skip to content

Commit

Permalink
NGSTACK-901 CS fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
hknezevic committed Sep 10, 2024
1 parent 61b1928 commit 74463db
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use Ibexa\Contracts\Core\Variation\VariationPathGenerator;
use Liip\ImagineBundle\Imagine\Filter\FilterConfiguration;

use function is_string;
use function pathinfo;
use function preg_replace;

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

public function __construct(
VariationPathGenerator $innerVariationPathGenerator,
FilterConfiguration $filterConfiguration
FilterConfiguration $filterConfiguration,
) {
$this->innerVariationPathGenerator = $innerVariationPathGenerator;
$this->filterConfiguration = $filterConfiguration;
Expand All @@ -38,10 +39,10 @@ public function getVariationPath($originalPath, $filter): string

$info = pathinfo($originalPath);

if (!is_string($info['extension']) || strlen($info['extension']) === 0) {
if (!is_string($info['extension']) || $info['extension'] === '') {

Check failure on line 42 in bundle/Core/Imagine/VariationPathGenerator/WebpFormatVariationPathGenerator.php

View workflow job for this annotation

GitHub Actions / phpstan

Call to function is_string() with string will always evaluate to true.

Check failure on line 42 in bundle/Core/Imagine/VariationPathGenerator/WebpFormatVariationPathGenerator.php

View workflow job for this annotation

GitHub Actions / phpstan

Offset 'extension' does not exist on array{dirname?: string, basename: string, extension?: string, filename: string}.
return $variationPath . '.webp';
}

return preg_replace("/\.{$info['extension']}$/", '.webp', $variationPath);
return preg_replace("/\\.{$info['extension']}$/", '.webp', $variationPath);

Check failure on line 46 in bundle/Core/Imagine/VariationPathGenerator/WebpFormatVariationPathGenerator.php

View workflow job for this annotation

GitHub Actions / phpstan

Method Netgen\Bundle\SiteBundle\Core\Imagine\VariationPathGenerator\WebpFormatVariationPathGenerator::getVariationPath() should return string but returns string|null.
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,19 @@

namespace Netgen\Bundle\SiteBundle\DependencyInjection\Compiler;

use Netgen\Bundle\SiteBundle\Core\Imagine\VariationPathGenerator\WebpFormatVariationPathGenerator;
use Ibexa\Bundle\Core\Imagine\VariationPathGenerator\WebpFormatVariationPathGenerator as BaseWebpFormatVariationPathGenerator;
use Netgen\Bundle\SiteBundle\Core\Imagine\VariationPathGenerator\WebpFormatVariationPathGenerator;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Reference;

use function array_keys;
use function in_array;

class WebpFormatVariationPathGeneratorDecoratorPass implements CompilerPassInterface
{
/**
* Overrides default Webp image alias variation path generator decorator to comply with legacy variation URL pattern
* We do this only if we have Netgen AdminUI installed (legacy-based administration)
* We do this only if we have Netgen AdminUI installed (legacy-based administration).
*/
public function process(ContainerBuilder $container): void
{
Expand Down

0 comments on commit 74463db

Please sign in to comment.