Skip to content

Commit

Permalink
Merge pull request #1480 from liip/cs
Browse files Browse the repository at this point in the history
fix ci
  • Loading branch information
dbu committed Jul 31, 2022
2 parents 15bed48 + f47676f commit c9f0d61
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions .github/workflows/phpunit.yml
Expand Up @@ -76,6 +76,7 @@ jobs:
- name: Require Symfony version
if: matrix.symfony != '*'
run: |
composer global config --no-plugins allow-plugins.symfony/flex true
composer global require --no-interaction --no-progress symfony/flex:^1.11
composer config extra.symfony.require ${{ matrix.symfony }}
Expand Down
2 changes: 2 additions & 0 deletions Imagine/Cache/Resolver/PsrCacheResolver.php
Expand Up @@ -14,7 +14,9 @@
use Liip\ImagineBundle\Binary\BinaryInterface;
use Psr\Cache\CacheItemInterface;
use Psr\Cache\CacheItemPoolInterface;

use function str_replace;

use Symfony\Component\OptionsResolver\OptionsResolver;

final class PsrCacheResolver implements ResolverInterface
Expand Down
4 changes: 2 additions & 2 deletions Tests/DependencyInjection/LiipImagineExtensionTest.php
Expand Up @@ -313,12 +313,12 @@ private function assertParameter(string $value, string $key): void

private function assertHasDefinition(string $id): void
{
$this->assertTrue(($this->containerBuilder->hasDefinition($id) ?: $this->containerBuilder->hasAlias($id)));
$this->assertTrue($this->containerBuilder->hasDefinition($id) ?: $this->containerBuilder->hasAlias($id));
}

private function assertHasNotDefinition(string $id): void
{
$this->assertFalse(($this->containerBuilder->hasDefinition($id) || $this->containerBuilder->hasAlias($id)));
$this->assertFalse($this->containerBuilder->hasDefinition($id) || $this->containerBuilder->hasAlias($id));
}

private function assertDICConstructorArguments(Definition $definition, array $arguments): void
Expand Down
Expand Up @@ -27,7 +27,7 @@ public function testCouldBeGetFromContainerAsService(): void

$this->assertInstanceOf(
GrayscaleFilterLoader::class,
self::$kernel->getContainer()->get('liip_imagine.filter.loader.grayscale')
self::$kernel->getContainer()->get('liip_imagine.filter.loader.grayscale')
);
}
}

0 comments on commit c9f0d61

Please sign in to comment.