Skip to content

Commit

Permalink
Merge pull request #992 from arsthanea/feature/slugifier-interface
Browse files Browse the repository at this point in the history
[MediaBundle] use `SlugifierInterface`
  • Loading branch information
Kristof Jochmans committed Feb 10, 2016
2 parents 1519a55 + bbcdccc commit c194956
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions src/Kunstmaan/MediaBundle/Helper/File/FileHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use Symfony\Component\HttpFoundation\File\File;
use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface;
use Symfony\Component\HttpFoundation\File\UploadedFile;
use Kunstmaan\UtilitiesBundle\Helper\Slugifier;
use Kunstmaan\UtilitiesBundle\Helper\SlugifierInterface;

/**
* FileHandler
Expand Down Expand Up @@ -46,7 +46,7 @@ class FileHandler extends AbstractMediaHandler
private $blacklistedExtensions = array();

/**
* @var Slugifier
* @var SlugifierInterface
*/
private $slugifier;

Expand All @@ -62,9 +62,9 @@ public function __construct($priority, MimeTypeGuesserFactoryInterface $mimeType
}

/**
* @param Slugifier $slugifier
* @param SlugifierInterface $slugifier
*/
public function setSlugifier(Slugifier $slugifier)
public function setSlugifier(SlugifierInterface $slugifier)
{
$this->slugifier = $slugifier;
}
Expand Down Expand Up @@ -230,14 +230,13 @@ private function getFilePath(Media $media)
{
$filename = $media->getOriginalFilename();
$filename = str_replace(array('/', '\\', '%'), '', $filename);
$slugifier = new Slugifier();

if (!empty($this->blacklistedExtensions)) {
$filename = preg_replace('/\.('.join('|', $this->blacklistedExtensions).')$/', '.txt', $filename);
}

$parts = pathinfo($filename);
$filename = $slugifier->slugify($parts['filename']);
$filename = $this->slugifier->slugify($parts['filename']);
$filename .= '.'.strtolower($parts['extension']);

return sprintf(
Expand Down

0 comments on commit c194956

Please sign in to comment.