Add typehints and reduce code duplication

This commit is contained in:
Benoît Burnichon
2016-01-25 16:08:38 +01:00
parent f383ca08a4
commit 005524d572
3 changed files with 16 additions and 2 deletions

View File

@@ -11,6 +11,8 @@
namespace Alchemy\Phrasea\Media\Subdef;
use MediaAlchemyst\Specification\SpecificationInterface;
interface Subdef
{
const TYPE_IMAGE = 'image';
@@ -19,9 +21,20 @@ interface Subdef
const TYPE_AUDIO = 'audio';
const TYPE_FLEXPAPER = 'flexpaper';
/**
* One of Subdef Type const
*
* @return string
*/
public function getType();
/**
* @return string
*/
public function getDescription();
/**
* @return SpecificationInterface
*/
public function getMediaAlchemystSpec();
}

View File

@@ -16,6 +16,7 @@ use Alchemy\Phrasea\Media\Subdef\FlexPaper;
use Alchemy\Phrasea\Media\Subdef\Gif;
use Alchemy\Phrasea\Media\Subdef\Subdef as SubdefSpecs;
use Alchemy\Phrasea\Media\Type\Type as SubdefType;
use MediaAlchemyst\Specification\SpecificationInterface;
use Symfony\Component\Translation\TranslatorInterface;
class databox_subdef
@@ -268,7 +269,7 @@ class databox_subdef
/**
* Get the MediaAlchemyst specs for the current subdef
*
* @return type
* @return SpecificationInterface
*/
public function getSpecs()
{

View File

@@ -395,7 +395,7 @@ class recordutils_image
return false;
}
$pathIn = $subdef->get_path() . $subdef->get_file();
$pathIn = $subdef->getRealPath();
if (!is_file($pathIn)) {
return false;