Skip to content

Commit c2dfddf

Browse files
committed
Merge pull request #673 from sebastianblum/master
Removed UrlGenerator deprecations from symfony 2.8
2 parents 471a261 + 361ac2e commit c2dfddf

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Imagine/Cache/CacheManager.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use Liip\ImagineBundle\Imagine\Cache\Resolver\ResolverInterface;
77
use Liip\ImagineBundle\Imagine\Filter\FilterConfiguration;
88
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
9+
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
910
use Symfony\Component\Routing\RouterInterface;
1011
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
1112
use Liip\ImagineBundle\ImagineEvents;
@@ -164,12 +165,12 @@ public function generateUrl($path, $filter, array $runtimeConfig = array())
164165
);
165166

166167
if (empty($runtimeConfig)) {
167-
$filterUrl = $this->router->generate('liip_imagine_filter', $params, true);
168+
$filterUrl = $this->router->generate('liip_imagine_filter', $params, UrlGeneratorInterface::ABSOLUTE_URL);
168169
} else {
169170
$params['filters'] = $runtimeConfig;
170171
$params['hash'] = $this->signer->sign($path, $runtimeConfig);
171172

172-
$filterUrl = $this->router->generate('liip_imagine_filter_runtime', $params, true);
173+
$filterUrl = $this->router->generate('liip_imagine_filter_runtime', $params, UrlGeneratorInterface::ABSOLUTE_URL);
173174
}
174175

175176
return $filterUrl;

Tests/Imagine/Cache/CacheManagerTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Liip\ImagineBundle\Imagine\Cache\Signer;
99
use Liip\ImagineBundle\ImagineEvents;
1010
use Liip\ImagineBundle\Events\CacheResolveEvent;
11+
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
1112

1213
/**
1314
* @covers Liip\ImagineBundle\Imagine\Cache\CacheManager
@@ -290,7 +291,7 @@ public function testGenerateUrl()
290291
'path' => $path,
291292
'filter' => 'thumbnail',
292293
),
293-
true
294+
UrlGeneratorInterface::ABSOLUTE_URL
294295
)
295296
->will($this->returnValue($expectedUrl))
296297
;

0 commit comments

Comments
 (0)