Skip to content

Commit

Permalink
Merge branch '5.4'
Browse files Browse the repository at this point in the history 
* 5.4:
  [AdminBundle] Fix symfony 3.4 translator incompatibility
  [MediaBundle] Replace incorrect mobile icons
  [MediaBundle] Fix incompatibility with liip/imagine-bundle 2.2+
  • Loading branch information
@acrobat
acrobat committed Mar 17, 2020
2 parents 97fd6f5 + b78a542 commit 7e08655
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 13 deletions.
11 changes: 9 additions & 2 deletions src/Kunstmaan/AdminBundle/Helper/VersionCheck/VersionChecker.php
View file
Expand Up @@ -7,6 +7,7 @@
use GuzzleHttp\Client;
use Kunstmaan\AdminBundle\Helper\VersionCheck\Exception\ParseException;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;

/**
Expand Down Expand Up @@ -45,7 +46,7 @@ class VersionChecker
private $client;

/**
* @var TranslatorInterface
* @var TranslatorInterface|LegacyTranslatorInterface
*/
private $translator;

Expand All @@ -55,10 +56,16 @@ class VersionChecker
* @param ContainerInterface $container
* @param Cache $cache
*/
public function __construct(ContainerInterface $container, Cache $cache, TranslatorInterface $translator)
public function __construct(ContainerInterface $container, Cache $cache, $translator)
{
$this->container = $container;
$this->cache = $cache;

// NEXT_MAJOR Add "Symfony\Contracts\Translation\TranslatorInterface" typehint when sf <4.4 support is removed.
if (!$translator instanceof TranslatorInterface && !$translator instanceof LegacyTranslatorInterface) {
throw new \InvalidArgumentException(sprintf('The "$translator" parameter should be instance of "%s" or "%s"', Symfony\Contracts\Translation\TranslatorInterface::class, LegacyTranslatorInterface::class));
}

$this->translator = $translator;

$this->webserviceUrl = $this->container->getParameter('version_checker.url');
Expand Down
8 changes: 7 additions & 1 deletion src/Kunstmaan/AdminBundle/Tests/unit/Helper/VersionCheck/VersionCheckTest.php
View file
Expand Up @@ -15,6 +15,7 @@
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpKernel\Kernel;
use Symfony\Component\Translation\Translator;
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;

class VersionCheckTest extends TestCase
Expand All @@ -32,7 +33,12 @@ public function setUp()

/* @var Cache $cache */
$this->cache = $this->createMock(Cache::class);
$this->translator = $this->createMock(TranslatorInterface::class);

if (\interface_exists(TranslatorInterface::class)) {
$this->translator = $this->createMock(TranslatorInterface::class);
} else {
$this->translator = $this->createMock(LegacyTranslatorInterface::class);
}
}

/**
Expand Down
25 changes: 21 additions & 4 deletions src/Kunstmaan/MediaBundle/Helper/Imagine/WebPathResolver.php
View file
Expand Up @@ -38,15 +38,21 @@ protected function getFileUrl($path, $filter)
return parent::getFileUrl($path, $filter);
}

protected function getFilePath($path, $filter)
{
$filterConf = $this->filterConfig->get($filter);
$path = $this->changeFileExtension($path, $filterConf['format']);
$fullPath = $this->getFullPath($path, $filter);

return $this->webRoot.'/'.$fullPath;
}

/**
* {@inheritdoc}
*/
public function resolve($path, $filter)
{
return sprintf('%s/%s',
$this->getBaseUrl(),
$this->getFileUrl($path, $filter)
);
return sprintf('%s/%s', $this->getBaseUrl(), $this->getFileUrl($path, $filter));
}

/**
Expand All @@ -66,4 +72,15 @@ private function changeFileExtension($path, $format)

return $path;
}

/**
* Copy from \Liip\ImagineBundle\Imagine\Cache\Resolver\WebPathResolver::getFullPath
*/
private function getFullPath($path, $filter)
{
// crude way of sanitizing URL scheme ("protocol") part
$path = str_replace('://', '---', $path);

return $this->cachePrefix.'/'.$filter.'/'.ltrim($path, '/');
}
}
4 changes: 2 additions & 2 deletions src/Kunstmaan/MediaBundle/Resources/views/Chooser/chooserShowFolder.html.twig
View file
Expand Up @@ -143,11 +143,11 @@
</div>
<button class="btn btn-default btn--raise-on-hover" data-target="#addsub-modal" data-toggle="modal" type="button">
<span class="large-screen">{{ 'media.folder.addsub.action' |trans }}</span>
<span class="small-screen">{{ 'media.folder.addsub.action_short' |trans }} <i class="fa fa-folder-o btn__icon-folder"></i></span>
<span class="small-screen">{{ 'media.folder.addsub.action_short' |trans }} <i class="fa fa-plus-circle btn__icon-folder"></i></span>
</button>
<button class="btn btn-default btn--raise-on-hover" data-target="#delete-modal" data-toggle="modal" type="button">
<span class="large-screen">{{ 'media.folder.delete.action' |trans }}</span>
<span class="small-screen">{{ 'media.folder.delete.action_short' |trans }} <i class="fa fa-folder-o btn__icon-folder"></i></span>
<span class="small-screen">{{ 'media.folder.delete.action_short' |trans }} <i class="fa fa-minus-circle btn__icon-folder"></i></span>
</button>
{% endblock %}
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/Kunstmaan/MediaBundle/Resources/views/Folder/show.html.twig
View file
Expand Up @@ -94,19 +94,19 @@
</div>
<button class="btn btn-default btn--raise-on-hover" data-target="#addsub-modal" data-toggle="modal" type="button">
<span class="large-screen">{{ 'media.folder.addsub.action' |trans }}</span>
<span class="small-screen">{{ 'media.folder.addsub.action_short' |trans }} <i class="fa fa-folder btn__icon-folder"></i></span>
<span class="small-screen">{{ 'media.folder.addsub.action_short' |trans }} <i class="fa fa-plus-circle btn__icon-folder"></i></span>
</button>
<button class="btn btn-default btn--raise-on-hover" data-target="#delete-modal" data-toggle="modal" type="button">
<span class="large-screen">{{ 'media.folder.delete.action' |trans }}</span>
<span class="small-screen">{{ 'media.folder.delete.action_short' |trans }} <i class="fa fa-folder btn__icon-folder"></i></span>
<span class="small-screen">{{ 'media.folder.delete.action_short' |trans }} <i class="fa fa-minus-circle btn__icon-folder"></i></span>
</button>
<button class="btn btn-default btn--raise-on-hover" data-target="#empty-modal" data-toggle="modal" type="button">
<span class="large-screen">{{ 'media.folder.empty.action' |trans }}</span>
<span class="small-screen">{{ 'media.folder.empty.action_short' |trans }} <i class="fa fa-folder btn__icon-folder"></i></span>
<span class="small-screen">{{ 'media.folder.empty.action_short' |trans }} <i class="fa fa-trash btn__icon-folder"></i></span>
</button>
<button class="btn btn-default btn--raise-on-hover" data-target="#bulk-move-modal" data-toggle="modal" type="button">
<span class="large-screen">{{ 'media.folder.bulk_move.action' |trans }}</span>
<span class="small-screen">{{ 'media.folder.bulk_move.action_short' |trans }} <i class="fa fa-folder btn__icon-folder"></i></span>
<span class="small-screen">{{ 'media.folder.bulk_move.action_short' |trans }} <i class="fa fa-arrow-circle-right btn__icon-folder"></i></span>
</button>
{% endblock %}
</div>
Expand Down

0 comments on commit 7e08655

Please sign in to comment.