hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 15:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deprecated get_uuid in favor of getUuid

Browse Source
This commit is contained in:
Benoît Burnichon
2015-07-13 18:08:04 +02:00
parent 38ae7bc2ac
commit 2107cd28df
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Alchemy/Phrasea/Controller/Api/V1Controller.php
View File

@@ -1147,7 +1147,7 @@ class V1Controller extends Controller
'thumbnail' => $this->listEmbeddableMedia($request, $record, $record->get_thumbnail()), 'thumbnail' => $this->listEmbeddableMedia($request, $record, $record->get_thumbnail()),
'technical_informations' => $technicalInformation, 'technical_informations' => $technicalInformation,
'phrasea_type' => $record->get_type(), 'phrasea_type' => $record->get_type(),
'uuid' => $record->get_uuid(), 'uuid' => $record->getUuid(),
]; ];
if ($request->attributes->get('_extended', false)) { if ($request->attributes->get('_extended', false)) {
@@ -1219,7 +1219,7 @@ class V1Controller extends Controller
'created_on' => $story->getCreated()->format(DATE_ATOM), 'created_on' => $story->getCreated()->format(DATE_ATOM),
'collection_id' => \phrasea::collFromBas($this->app, $story->get_base_id()), 'collection_id' => \phrasea::collFromBas($this->app, $story->get_base_id()),
'thumbnail' => $this->listEmbeddableMedia($request, $story, $story->get_thumbnail()), 'thumbnail' => $this->listEmbeddableMedia($request, $story, $story->get_thumbnail()),
'uuid' => $story->get_uuid(), 'uuid' => $story->getUuid(),
'metadatas' => [ 'metadatas' => [
'@entity@' => self::OBJECT_TYPE_STORY_METADATA_BAG, '@entity@' => self::OBJECT_TYPE_STORY_METADATA_BAG,
'dc:contributor' => $format($caption, \databox_Field_DCESAbstract::Contributor), 'dc:contributor' => $format($caption, \databox_Field_DCESAbstract::Contributor),

2
lib/Alchemy/Phrasea/Model/Serializer/ESRecordSerializer.php
View File

@@ -70,7 +70,7 @@ class ESRecordSerializer extends AbstractSerializer
'technical_informations' => $technicalInformation, 'technical_informations' => $technicalInformation,
'phrasea_type' => $record->get_type(), 'phrasea_type' => $record->get_type(),
'type' => $record->is_grouping() ? 'story' : 'record', 'type' => $record->is_grouping() ? 'story' : 'record',
'uuid' => $record->get_uuid(), 'uuid' => $record->getUuid(),
'caption' => $caption, 'caption' => $caption,
'status' => $status, 'status' => $status,
'caption-business' => $business, 'caption-business' => $business,

8
lib/Alchemy/Phrasea/TaskManager/Job/WriteMetadataJob.php
View File

@@ -108,23 +108,23 @@ class WriteMetadataJob extends AbstractJob
$metadata = new Metadata\MetadataBag(); $metadata = new Metadata\MetadataBag();
if ($record->get_uuid()) { if ($record->getUuid()) {
$metadata->add( $metadata->add(
new Metadata\Metadata( new Metadata\Metadata(
new Tag\XMPExif\ImageUniqueID(), new Tag\XMPExif\ImageUniqueID(),
new Value\Mono($record->get_uuid()) new Value\Mono($record->getUuid())
) )
); );
$metadata->add( $metadata->add(
new Metadata\Metadata( new Metadata\Metadata(
new Tag\ExifIFD\ImageUniqueID(), new Tag\ExifIFD\ImageUniqueID(),
new Value\Mono($record->get_uuid()) new Value\Mono($record->getUuid())
) )
); );
$metadata->add( $metadata->add(
new Metadata\Metadata( new Metadata\Metadata(
new Tag\IPTC\UniqueDocumentID(), new Tag\IPTC\UniqueDocumentID(),
new Value\Mono($record->get_uuid()) new Value\Mono($record->getUuid())
) )
); );
} }

12
lib/classes/record/adapter.php
View File

@@ -127,8 +127,14 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
/** /**
* @return string * @return string
* @deprecated use {@link getUuid} instead.
*/ */
public function get_uuid() public function get_uuid()
{
return $this->getUuid();
}
public function getUuid()
{ {
return $this->uuid; return $this->uuid;
} }
@@ -1828,12 +1834,6 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
return $this->get_type(); return $this->get_type();
} }
/** {@inheritdoc} */
public function getUuid()
{
return $this->get_uuid();
}
/** {@inheritdoc} */ /** {@inheritdoc} */
public function getId() public function getId()
{ {

2
tests/classes/record/adapterTest.php
View File

@@ -107,7 +107,7 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase
public function testGet_uuid() public function testGet_uuid()
{ {
$this->assertTrue(Uuid::isValid($this->getRecord1()->get_uuid())); $this->assertTrue(Uuid::isValid($this->getRecord1()->getUuid()));
} }
public function testGetUpdated() public function testGetUpdated()