Remove some deprecated methods calls

This commit is contained in:
Benoît Burnichon
2016-03-06 23:05:55 +01:00
parent ba4274eb28
commit 6cdc9d7a31
77 changed files with 322 additions and 307 deletions

View File

@@ -69,7 +69,7 @@ class Story implements AttributeInterface
*/ */
public function asString() public function asString()
{ {
return $this->story->get_serialize_key(); return $this->story->getId();
} }
/** /**

View File

@@ -277,7 +277,7 @@ class Manager
$file->addAttribute( $file->addAttribute(
new MetadataAttr( new MetadataAttr(
new Metadata( new Metadata(
new TfRecordid(), new MonoValue($element->get_record_id()) new TfRecordid(), new MonoValue($element->getRecordId())
) )
) )
); );

View File

@@ -59,7 +59,7 @@ class BuildMissingSubdefs extends Command
$subdefGenerator->generateSubdefs($record, $wanted_subdefs); $subdefGenerator->generateSubdefs($record, $wanted_subdefs);
foreach ($wanted_subdefs as $subdef) { foreach ($wanted_subdefs as $subdef) {
$this->container['monolog']->addInfo("generate " .$subdef . " for record " . $record->get_record_id()); $this->container['monolog']->addInfo("generate " .$subdef . " for record " . $record->getRecordId());
$n ++; $n ++;
} }
} }

View File

@@ -112,7 +112,10 @@ class RecordAdd extends Command
if ($elementCreated instanceof \record_adapter) { if ($elementCreated instanceof \record_adapter) {
$output->writeln( $output->writeln(
sprintf( sprintf(
"Record id <info>%d</info> on collection `%s` (databox `%s`) has been created", $elementCreated->get_record_id(), $elementCreated->get_collection()->get_label($this->container['locale']), $elementCreated->get_databox()->get_label($this->container['locale']) "Record id <info>%d</info> on collection `%s` (databox `%s`) has been created",
$elementCreated->getRecordId(),
$elementCreated->getCollection()->get_label($this->container['locale']),
$elementCreated->getDatabox()->get_label($this->container['locale'])
) )
); );
} elseif ($elementCreated instanceof LazaretFile) { } elseif ($elementCreated instanceof LazaretFile) {

View File

@@ -80,13 +80,13 @@ class Step35 implements DatasUpgraderInterface
try { try {
$this->updateMetadatas($record, $row['xml']); $this->updateMetadatas($record, $row['xml']);
} catch (\Exception $e) { } catch (\Exception $e) {
$this->app['monolog']->addError(sprintf("Error while upgrading metadatas for record %d on databox %d : %s", $record->get_record_id(), $record->get_sbas_id(), $e->getMessage())); $this->app['monolog']->addError(sprintf("Error while upgrading metadatas for record %d on databox %d : %s", $record->getRecordId(), $record->getDataboxId(), $e->getMessage()));
} }
try { try {
$record->set_binary_status($row['status']); $record->set_binary_status($row['status']);
} catch (\Exception $e) { } catch (\Exception $e) {
$this->app['monolog']->addError(sprintf("Error while upgrading status for record %d on databox %d : %s", $record->get_record_id(), $record->get_sbas_id(), $e->getMessage())); $this->app['monolog']->addError(sprintf("Error while upgrading status for record %d on databox %d : %s", $record->getRecordId(), $record->getDataboxId(), $e->getMessage()));
} }
unset($record); unset($record);
} }
@@ -131,7 +131,7 @@ class Step35 implements DatasUpgraderInterface
*/ */
protected function updateMetadatas(\record_adapter $record, $xml) protected function updateMetadatas(\record_adapter $record, $xml)
{ {
$metas = $record->get_databox()->get_meta_structure(); $metas = $record->getDatabox()->get_meta_structure();
$datas = $metadatas = []; $datas = $metadatas = [];

View File

@@ -62,7 +62,7 @@ abstract class AbstractDelivery
private function logView(\record_adapter $record, Request $request) private function logView(\record_adapter $record, Request $request)
{ {
try { try {
$logger = $this->getDataboxLogger($record->get_databox()); $logger = $this->getDataboxLogger($record->getDatabox());
$log_id = $logger->get_id(); $log_id = $logger->get_id();
$record->log_view( $record->log_view(
$log_id, $log_id,

View File

@@ -2182,7 +2182,7 @@ class V1Controller extends Controller
$story->removeChild($record); $story->removeChild($record);
} }
return $record->get_serialize_key(); return $record->getId();
} }
public function addRecordsToStoryAction(Request $request, $databox_id, $story_id) public function addRecordsToStoryAction(Request $request, $databox_id, $story_id)
@@ -2244,7 +2244,7 @@ class V1Controller extends Controller
$this->dispatch(PhraseaEvents::RECORD_EDIT, new RecordEdit($story)); $this->dispatch(PhraseaEvents::RECORD_EDIT, new RecordEdit($story));
return $record->get_serialize_key(); return $record->getId();
} }
public function getCurrentUserAction(Request $request) public function getCurrentUserAction(Request $request)

View File

@@ -66,7 +66,7 @@ class DatafileController extends AbstractDelivery
$stamp = false; $stamp = false;
$watermark = !$this->acl->get($this->authentication->getUser()) $watermark = !$this->acl->get($this->authentication->getUser())
->has_right_on_base($record->get_base_id(), 'nowatermark'); ->has_right_on_base($record->getBaseId(), 'nowatermark');
if ($watermark && !$all_access) { if ($watermark && !$all_access) {
$subdef_class = null; $subdef_class = null;

View File

@@ -122,7 +122,7 @@ class PermalinkController extends AbstractDelivery
$watermark = $stamp = false; $watermark = $stamp = false;
if ($this->authentication->isAuthenticated()) { if ($this->authentication->isAuthenticated()) {
$watermark = !$this->acl->get($this->authentication->getUser())->has_right_on_base($record->get_base_id(), 'nowatermark'); $watermark = !$this->acl->get($this->authentication->getUser())->has_right_on_base($record->getBaseId(), 'nowatermark');
if ($watermark) { if ($watermark) {
/** @var BasketElementRepository $repository */ /** @var BasketElementRepository $repository */
@@ -138,7 +138,7 @@ class PermalinkController extends AbstractDelivery
return $this->deliverContentWithCaptionLink($request, $record, $subdef, $watermark, $stamp, $token); return $this->deliverContentWithCaptionLink($request, $record, $subdef, $watermark, $stamp, $token);
} }
$collection = \collection::getByBaseId($this->app, $record->get_base_id()); $collection = \collection::getByBaseId($this->app, $record->getBaseId());
switch ($collection->get_pub_wm()) { switch ($collection->get_pub_wm()) {
default: default:
case 'none': case 'none':
@@ -169,8 +169,8 @@ class PermalinkController extends AbstractDelivery
$response = $this->deliverContent($request, $record, $subdef, $watermark, $stamp); $response = $this->deliverContent($request, $record, $subdef, $watermark, $stamp);
$response->headers->set('Link', $this->app->url("permalinks_caption", [ $response->headers->set('Link', $this->app->url("permalinks_caption", [
'sbas_id' => $record->get_sbas_id(), 'sbas_id' => $record->getDataboxId(),
'record_id' => $record->get_record_id(), 'record_id' => $record->getRecordId(),
'token' => $token, 'token' => $token,
])); ]));

View File

@@ -146,15 +146,15 @@ class EditController extends Controller
foreach ($records as $record) { foreach ($records as $record) {
$indice = $record->getNumber(); $indice = $record->getNumber();
$elements[$indice] = [ $elements[$indice] = [
'bid' => $record->get_base_id(), 'bid' => $record->getBaseId(),
'rid' => $record->get_record_id(), 'rid' => $record->getRecordId(),
'sselcont_id' => null, 'sselcont_id' => null,
'_selected' => false, '_selected' => false,
'fields' => $databox_fields, 'fields' => $databox_fields,
]; ];
$elements[$indice]['statbits'] = []; $elements[$indice]['statbits'] = [];
if ($this->getAclForUser()->has_right_on_base($record->get_base_id(), 'chgstatus')) { if ($this->getAclForUser()->has_right_on_base($record->getBaseId(), 'chgstatus')) {
foreach ($status as $n => $s) { foreach ($status as $n => $s) {
$tmp_val = substr(strrev($record->get_status()), $n, 1); $tmp_val = substr(strrev($record->get_status()), $n, 1);
$elements[$indice]['statbits'][$n]['value'] = ($tmp_val == '1') ? '1' : '0'; $elements[$indice]['statbits'][$n]['value'] = ($tmp_val == '1') ? '1' : '0';
@@ -209,7 +209,7 @@ class EditController extends Controller
['record' => $record] ['record' => $record]
); );
$elements[$indice]['type'] = $record->get_type(); $elements[$indice]['type'] = $record->getType();
} }
} }
@@ -287,7 +287,7 @@ class EditController extends Controller
try { try {
$reg_record = $records->singleStory(); $reg_record = $records->singleStory();
$newsubdef_reg = new \record_adapter($this->app, $reg_record->get_sbas_id(), $request->request->get('newrepresent')); $newsubdef_reg = new \record_adapter($this->app, $reg_record->getDataboxId(), $request->request->get('newrepresent'));
foreach ($newsubdef_reg->get_subdefs() as $name => $value) { foreach ($newsubdef_reg->get_subdefs() as $name => $value) {
if (!in_array($name, ['thumbnail', 'preview'])) { if (!in_array($name, ['thumbnail', 'preview'])) {
@@ -300,7 +300,7 @@ class EditController extends Controller
$media = $this->app->getMediaFromUri($value->getRealPath()); $media = $this->app->getMediaFromUri($value->getRealPath());
$this->getSubDefinitionSubstituer()->substitute($reg_record, $name, $media); $this->getSubDefinitionSubstituer()->substitute($reg_record, $name, $media);
$this->getDispatcher()->dispatch(PhraseaEvents::RECORD_EDIT, new RecordEdit($reg_record)); $this->getDispatcher()->dispatch(PhraseaEvents::RECORD_EDIT, new RecordEdit($reg_record));
$this->getDataboxLogger($reg_record->get_databox())->log( $this->getDataboxLogger($reg_record->getDatabox())->log(
$reg_record, $reg_record,
\Session_Logger::EVENT_SUBSTITUTE, \Session_Logger::EVENT_SUBSTITUTE,
$name == 'document' ? 'HD' : $name, $name == 'document' ? 'HD' : $name,
@@ -325,7 +325,7 @@ class EditController extends Controller
continue; continue;
} }
$key = $record->get_serialize_key(); $key = $record->getId();
if (!array_key_exists($key, $elements)) { if (!array_key_exists($key, $elements)) {
continue; continue;
@@ -364,8 +364,8 @@ class EditController extends Controller
$record $record
->write_metas() ->write_metas()
->get_collection() ->getCollection()
->reset_stamp($record->get_record_id()); ->reset_stamp($record->getRecordId());
if ($statbits != '') { if ($statbits != '') {
$this->getDataboxLogger($databox) $this->getDataboxLogger($databox)

View File

@@ -81,8 +81,8 @@ class FeedController extends Controller
foreach ($publishing as $record) { foreach ($publishing as $record) {
$item = new FeedItem(); $item = new FeedItem();
$item->setEntry($entry) $item->setEntry($entry)
->setRecordId($record->get_record_id()) ->setRecordId($record->getRecordId())
->setSbasId($record->get_sbas_id()); ->setSbasId($record->getDataboxId());
$entry->addItem($item); $entry->addItem($item);
$manager->persist($item); $manager->persist($item);
} }

View File

@@ -203,7 +203,7 @@ class LazaretController extends Controller
//Check if the chosen record is eligible to the substitution //Check if the chosen record is eligible to the substitution
foreach ($lazaretFile->getRecordsToSubstitute($this->app) as $record) { foreach ($lazaretFile->getRecordsToSubstitute($this->app) as $record) {
if ($record->get_record_id() !== (int) $recordId) { if ($record->getRecordId() !== (int) $recordId) {
continue; continue;
} }
@@ -227,7 +227,7 @@ class LazaretController extends Controller
$record = $lazaretFile->getCollection($this->app)->get_databox()->get_record($recordId); $record = $lazaretFile->getCollection($this->app)->get_databox()->get_record($recordId);
$this->getSubDefinitionSubstituer() $this->getSubDefinitionSubstituer()
->substitute($record, 'document', $media); ->substitute($record, 'document', $media);
$this->getDataboxLogger($record->get_databox())->log( $this->getDataboxLogger($record->getDatabox())->log(
$record, $record,
\Session_Logger::EVENT_SUBSTITUTE, \Session_Logger::EVENT_SUBSTITUTE,
'HD', 'HD',

View File

@@ -71,7 +71,7 @@ class MoveCollectionController extends Controller
if ($request->request->get("chg_coll_son") == "1") { if ($request->request->get("chg_coll_son") == "1") {
/** @var \record_adapter $child */ /** @var \record_adapter $child */
foreach ($record->get_children() as $child) { foreach ($record->get_children() as $child) {
if ($this->getAclForUser()->has_right_on_base($child->get_base_id(), 'candeleterecord')) { if ($this->getAclForUser()->has_right_on_base($child->getBaseId(), 'candeleterecord')) {
$child->move_to_collection($collection, $this->getApplicationBox()); $child->move_to_collection($collection, $this->getApplicationBox());
} }
} }

View File

@@ -34,7 +34,7 @@ class PrinterController extends Controller
$layout = $request->request->get('lay'); $layout = $request->request->get('lay');
foreach ($printer->get_elements() as $record) { foreach ($printer->get_elements() as $record) {
$this->getDataboxLogger($record->get_databox())->log($record, \Session_Logger::EVENT_PRINT, $layout, ''); $this->getDataboxLogger($record->getDatabox())->log($record, \Session_Logger::EVENT_PRINT, $layout, '');
} }
$PDF = new PDFExport($this->app, $printer->get_elements(), $layout); $PDF = new PDFExport($this->app, $printer->get_elements(), $layout);

View File

@@ -87,17 +87,17 @@ class PropertyController extends Controller
foreach ($records as $record) { foreach ($records as $record) {
//perform logic //perform logic
$sbasId = $record->get_databox()->get_sbas_id(); $sbasId = $record->getDataboxId();
if (!isset($recordsType[$sbasId])) { if (!isset($recordsType[$sbasId])) {
$recordsType[$sbasId] = []; $recordsType[$sbasId] = [];
} }
if (!isset($recordsType[$sbasId][$record->get_type()])) { if (!isset($recordsType[$sbasId][$record->getType()])) {
$recordsType[$sbasId][$record->get_type()] = []; $recordsType[$sbasId][$record->getType()] = [];
} }
$recordsType[$sbasId][$record->get_type()][] = $record; $recordsType[$sbasId][$record->getType()][] = $record;
} }
return new Response($this->render('prod/actions/Property/type.html.twig', [ return new Response($this->render('prod/actions/Property/type.html.twig', [
@@ -120,18 +120,18 @@ class PropertyController extends Controller
$postStatus = (array) $request->request->get('status'); $postStatus = (array) $request->request->get('status');
foreach ($records as $record) { foreach ($records as $record) {
$sbasId = $record->get_databox()->get_sbas_id(); $sbasId = $record->getDataboxId();
//update record //update record
if (null !== $updatedStatus = $this->updateRecordStatus($record, $postStatus)) { if (null !== $updatedStatus = $this->updateRecordStatus($record, $postStatus)) {
$updated[$record->get_serialize_key()] = $updatedStatus; $updated[$record->getId()] = $updatedStatus;
} }
//update children if current record is a story //update children if current record is a story
if (isset($applyStatusToChildren[$sbasId]) && $record->isStory()) { if (isset($applyStatusToChildren[$sbasId]) && $record->isStory()) {
foreach ($record->get_children() as $child) { foreach ($record->getChildren() as $child) {
if (null !== $updatedStatus = $this->updateRecordStatus($child, $postStatus)) { if (null !== $updatedStatus = $this->updateRecordStatus($child, $postStatus)) {
$updated[$record->get_serialize_key()] = $updatedStatus; $updated[$record->getId()] = $updatedStatus;
} }
} }
} }
@@ -156,17 +156,17 @@ class PropertyController extends Controller
foreach ($records as $record) { foreach ($records as $record) {
try { try {
$recordType = !empty($forceType) ? $forceType : (isset($typeLst[$record->get_serialize_key()]) ? $typeLst[$record->get_serialize_key()] : null); $recordType = !empty($forceType) ? $forceType : (isset($typeLst[$record->getId()]) ? $typeLst[$record->getId()] : null);
$mimeType = isset($mimeLst[$record->get_serialize_key()]) ? $mimeLst[$record->get_serialize_key()] : null; $mimeType = isset($mimeLst[$record->getId()]) ? $mimeLst[$record->getId()] : null;
if ($recordType) { if ($recordType) {
$record->set_type($recordType); $record->setType($recordType);
$updated[$record->get_serialize_key()]['record_type'] = $recordType; $updated[$record->getId()]['record_type'] = $recordType;
} }
if ($mimeType) { if ($mimeType) {
$record->set_mime($mimeType); $record->setMimeType($mimeType);
$updated[$record->get_serialize_key()]['mime_type'] = $mimeType; $updated[$record->getId()]['mime_type'] = $mimeType;
} }
} catch (\Exception $e) { } catch (\Exception $e) {
@@ -185,7 +185,7 @@ class PropertyController extends Controller
*/ */
private function updateRecordStatus(\record_adapter $record, array $postStatus) private function updateRecordStatus(\record_adapter $record, array $postStatus)
{ {
$sbasId = $record->get_databox()->get_sbas_id(); $sbasId = $record->getDataboxId();
if (isset($postStatus[$sbasId]) && is_array($postStatus[$sbasId])) { if (isset($postStatus[$sbasId]) && is_array($postStatus[$sbasId])) {
$postStatus = $postStatus[$sbasId]; $postStatus = $postStatus[$sbasId];

View File

@@ -124,7 +124,7 @@ class PushController extends Controller
); );
} }
$this->getDataboxLogger($element->get_databox())->log( $this->getDataboxLogger($element->getDatabox())->log(
$element, $element,
\Session_Logger::EVENT_VALIDATE, \Session_Logger::EVENT_VALIDATE,
$user_receiver->getId(), $user_receiver->getId(),
@@ -322,7 +322,7 @@ class PushController extends Controller
$manager->merge($basketElement); $manager->merge($basketElement);
$manager->persist($validationData); $manager->persist($validationData);
$this->getDataboxLogger($basketElement->getRecord($this->app)->get_databox())->log( $this->getDataboxLogger($basketElement->getRecord($this->app)->getDatabox())->log(
$basketElement->getRecord($this->app), $basketElement->getRecord($this->app),
\Session_Logger::EVENT_PUSH, \Session_Logger::EVENT_PUSH,
$participantUser->getId(), $participantUser->getId(),

View File

@@ -106,8 +106,8 @@ class RecordController extends Controller
]), ]),
"pos" => $record->getNumber(), "pos" => $record->getNumber(),
"title" => str_replace(array('[[em]]', '[[/em]]'), array('<em>', '</em>'), $record->get_title($query, $searchEngine)), "title" => str_replace(array('[[em]]', '[[/em]]'), array('<em>', '</em>'), $record->get_title($query, $searchEngine)),
"collection_name" => $record->get_collection()->get_name(), "collection_name" => $record->getCollection()->get_name(),
"collection_logo" => $record->get_collection()->getLogo($record->get_base_id(), $this->app), "collection_logo" => $record->getCollection()->getLogo($record->getBaseId(), $this->app),
]); ]);
} }
@@ -135,7 +135,7 @@ class RecordController extends Controller
foreach ($basketElements as $element) { foreach ($basketElements as $element) {
$manager->remove($element); $manager->remove($element);
$deleted[] = $element->getRecord($this->app)->get_serialize_key(); $deleted[] = $element->getRecord($this->app)->getId();
} }
$attachedStories = $StoryWZRepository->findByRecord($this->app, $record); $attachedStories = $StoryWZRepository->findByRecord($this->app, $record);
@@ -144,7 +144,7 @@ class RecordController extends Controller
$manager->remove($attachedStory); $manager->remove($attachedStory);
} }
$deleted[] = $record->get_serialize_key(); $deleted[] = $record->getId();
$record->delete(); $record->delete();
} catch (\Exception $e) { } catch (\Exception $e) {
@@ -186,7 +186,7 @@ class RecordController extends Controller
$renewed = []; $renewed = [];
foreach ($records as $record) { foreach ($records as $record) {
$renewed[$record->get_serialize_key()] = (string) $record->get_preview()->renew_url(); $renewed[$record->getId()] = (string) $record->get_preview()->renew_url();
}; };
return $this->app->json($renewed); return $this->app->json($renewed);

View File

@@ -84,8 +84,8 @@ class StoryController extends Controller
'message' => $this->app->trans('Story created'), 'message' => $this->app->trans('Story created'),
'WorkZone' => $storyWZ->getId(), 'WorkZone' => $storyWZ->getId(),
'story' => [ 'story' => [
'sbas_id' => $story->get_sbas_id(), 'sbas_id' => $story->getDataboxId(),
'record_id' => $story->get_record_id(), 'record_id' => $story->getRecordId(),
], ],
]; ];
@@ -109,7 +109,7 @@ class StoryController extends Controller
{ {
$Story = new \record_adapter($this->app, $sbas_id, $record_id); $Story = new \record_adapter($this->app, $sbas_id, $record_id);
if (!$this->getAclForUser()->has_right_on_base($Story->get_base_id(), 'canmodifrecord')) { if (!$this->getAclForUser()->has_right_on_base($Story->getBaseId(), 'canmodifrecord')) {
throw new AccessDeniedHttpException('You can not add document to this Story'); throw new AccessDeniedHttpException('You can not add document to this Story');
} }
@@ -145,7 +145,7 @@ class StoryController extends Controller
$story = new \record_adapter($this->app, $sbas_id, $record_id); $story = new \record_adapter($this->app, $sbas_id, $record_id);
$record = new \record_adapter($this->app, $child_sbas_id, $child_record_id); $record = new \record_adapter($this->app, $child_sbas_id, $child_record_id);
if (!$this->getAclForUser()->has_right_on_base($story->get_base_id(), 'canmodifrecord')) { if (!$this->getAclForUser()->has_right_on_base($story->getBaseId(), 'canmodifrecord')) {
throw new AccessDeniedHttpException('You can not add document to this Story'); throw new AccessDeniedHttpException('You can not add document to this Story');
} }
@@ -188,17 +188,17 @@ class StoryController extends Controller
throw new \Exception('This is not a story'); throw new \Exception('This is not a story');
} }
if (!$this->getAclForUser()->has_right_on_base($story->get_base_id(), 'canmodifrecord')) { if (!$this->getAclForUser()->has_right_on_base($story->getBaseId(), 'canmodifrecord')) {
throw new ControllerException($this->app->trans('You can not edit this story')); throw new ControllerException($this->app->trans('You can not edit this story'));
} }
$sql = 'UPDATE regroup SET ord = :ord WHERE rid_parent = :parent_id AND rid_child = :children_id'; $sql = 'UPDATE regroup SET ord = :ord WHERE rid_parent = :parent_id AND rid_child = :children_id';
$stmt = $story->get_databox()->get_connection()->prepare($sql); $stmt = $story->getDatabox()->get_connection()->prepare($sql);
foreach ($request->request->get('element') as $record_id => $ord) { foreach ($request->request->get('element') as $record_id => $ord) {
$params = [ $params = [
':ord' => $ord, ':ord' => $ord,
':parent_id' => $story->get_record_id(), ':parent_id' => $story->getRecordId(),
':children_id' => $record_id ':children_id' => $record_id
]; ];
$stmt->execute($params); $stmt->execute($params);

View File

@@ -202,7 +202,7 @@ class ToolsController extends Controller
$record->insertTechnicalDatas($this->getMediaVorus()); $record->insertTechnicalDatas($this->getMediaVorus());
$this->getMetadataSetter()->replaceMetadata($this->getMetadataReader() ->read($media), $record); $this->getMetadataSetter()->replaceMetadata($this->getMetadataReader() ->read($media), $record);
$this->getDataboxLogger($record->get_databox()) $this->getDataboxLogger($record->getDatabox())
->log($record, \Session_Logger::EVENT_SUBSTITUTE, 'HD', '' ); ->log($record, \Session_Logger::EVENT_SUBSTITUTE, 'HD', '' );
if ((int) $request->request->get('ccfilename') === 1) { if ((int) $request->request->get('ccfilename') === 1) {
@@ -259,7 +259,7 @@ class ToolsController extends Controller
$media = $this->app->getMediaFromUri($tempoFile); $media = $this->app->getMediaFromUri($tempoFile);
$this->getSubDefinitionSubstituer()->substitute($record, 'thumbnail', $media); $this->getSubDefinitionSubstituer()->substitute($record, 'thumbnail', $media);
$this->getDataboxLogger($record->get_databox()) $this->getDataboxLogger($record->getDatabox())
->log($record, \Session_Logger::EVENT_SUBSTITUTE, 'thumbnail', ''); ->log($record, \Session_Logger::EVENT_SUBSTITUTE, 'thumbnail', '');
unlink($tempoFile); unlink($tempoFile);
@@ -415,7 +415,7 @@ class ToolsController extends Controller
{ {
$dataUri = Parser::parse($subDefDataUri); $dataUri = Parser::parse($subDefDataUri);
$name = sprintf('extractor_thumb_%s', $record->get_serialize_key()); $name = sprintf('extractor_thumb_%s', $record->getId());
$fileName = sprintf('%s/%s.png', sys_get_temp_dir(), $name); $fileName = sprintf('%s/%s.png', sys_get_temp_dir(), $name);
file_put_contents($fileName, $dataUri->getData()); file_put_contents($fileName, $dataUri->getData());
@@ -423,7 +423,7 @@ class ToolsController extends Controller
$media = $this->app->getMediaFromUri($fileName); $media = $this->app->getMediaFromUri($fileName);
$this->getSubDefinitionSubstituer()->substitute($record, $subDefName, $media); $this->getSubDefinitionSubstituer()->substitute($record, $subDefName, $media);
$this->getDataboxLogger($record->get_databox()) $this->getDataboxLogger($record->getDatabox())
->log($record, \Session_Logger::EVENT_SUBSTITUTE, $subDefName, ''); ->log($record, \Session_Logger::EVENT_SUBSTITUTE, $subDefName, '');
unset($media); unset($media);

View File

@@ -178,7 +178,7 @@ class UploadController extends Controller
} }
if ($elementCreated instanceof \record_adapter) { if ($elementCreated instanceof \record_adapter) {
$id = $elementCreated->get_serialize_key(); $id = $elementCreated->getId();
$element = 'record'; $element = 'record';
$message = $this->app->trans('The record was successfully created'); $message = $this->app->trans('The record was successfully created');
@@ -194,7 +194,7 @@ class UploadController extends Controller
$media = $this->app->getMediaFromUri($fileName); $media = $this->app->getMediaFromUri($fileName);
$this->getSubDefinitionSubstituer()->substitute($elementCreated, 'thumbnail', $media); $this->getSubDefinitionSubstituer()->substitute($elementCreated, 'thumbnail', $media);
$this->getDataboxLogger($elementCreated->get_databox()) $this->getDataboxLogger($elementCreated->getDatabox())
->log($elementCreated, \Session_Logger::EVENT_SUBSTITUTE, 'thumbnail', ''); ->log($elementCreated, \Session_Logger::EVENT_SUBSTITUTE, 'thumbnail', '');
unset($media); unset($media);

View File

@@ -100,7 +100,7 @@ class WorkzoneController extends Controller
throw new \Exception('You can only attach stories'); throw new \Exception('You can only attach stories');
} }
if (!$acl->has_access_to_base($story->get_base_id())) { if (!$acl->has_access_to_base($story->getBaseId())) {
throw new AccessDeniedHttpException('You do not have access to this Story'); throw new AccessDeniedHttpException('You do not have access to this Story');
} }

View File

@@ -104,7 +104,7 @@ class RecordsRequest extends ArrayCollection
/** @var \record_adapter $record */ /** @var \record_adapter $record */
foreach ($this as $record) { foreach ($this as $record) {
if (! isset($this->collections[$record->getBaseId()])) { if (! isset($this->collections[$record->getBaseId()])) {
$this->collections[$record->getBaseId()] = $record->get_collection(); $this->collections[$record->getBaseId()] = $record->getCollection();
} }
} }
@@ -180,7 +180,7 @@ class RecordsRequest extends ArrayCollection
public function serializedList() public function serializedList()
{ {
if ($this->isSingleStory()) { if ($this->isSingleStory()) {
return $this->singleStory()->get_serialize_key(); return $this->singleStory()->getId();
} }
$basrec = []; $basrec = [];
@@ -211,7 +211,7 @@ class RecordsRequest extends ArrayCollection
$app['acl.basket']->hasAccess($basket, $app->getAuthenticatedUser()); $app['acl.basket']->hasAccess($basket, $app->getAuthenticatedUser());
foreach ($basket->getElements() as $basket_element) { foreach ($basket->getElements() as $basket_element) {
$received[$basket_element->getRecord($app)->get_serialize_key()] = $basket_element->getRecord($app); $received[$basket_element->getRecord($app)->getId()] = $basket_element->getRecord($app);
} }
} elseif ($request->get('story')) { } elseif ($request->get('story')) {
$repository = $app['repo.story-wz']; $repository = $app['repo.story-wz'];
@@ -230,7 +230,7 @@ class RecordsRequest extends ArrayCollection
} }
try { try {
$record = new \record_adapter($app, (int) $basrec[0], (int) $basrec[1]); $record = new \record_adapter($app, (int) $basrec[0], (int) $basrec[1]);
$received[$record->get_serialize_key()] = $record; $received[$record->getId()] = $record;
unset($record); unset($record);
} catch (NotFoundHttpException $e) { } catch (NotFoundHttpException $e) {
continue; continue;

View File

@@ -325,8 +325,8 @@ class InformationController extends Controller
/** @var \record_adapter $record */ /** @var \record_adapter $record */
$reportArray = $what->buildTabUserWhat( $reportArray = $what->buildTabUserWhat(
$record->get_base_id(), $record->getBaseId(),
$record->get_record_id(), $record->getRecordId(),
$config $config
); );
@@ -393,7 +393,7 @@ class InformationController extends Controller
} }
} }
$filter->addfilter('record_id', '=', $record->get_record_id()); $filter->addfilter('record_id', '=', $record->getRecordId());
$download->setFilter($filter->getTabFilter()); $download->setFilter($filter->getTabFilter());
$download->setOrder('ddate', 'DESC'); $download->setOrder('ddate', 'DESC');

View File

@@ -26,8 +26,8 @@ class BridgeSubscriber extends AbstractNotificationSubscriber
'usr_id' => $user->getId(), 'usr_id' => $user->getId(),
'reason' => $event->getReason(), 'reason' => $event->getReason(),
'account_id' => $account->get_id(), 'account_id' => $account->get_id(),
'sbas_id' => $event->getElement()->get_record()->get_sbas_id(), 'sbas_id' => $event->getElement()->get_record()->getDataboxId(),
'record_id' => $event->getElement()->get_record()->get_record_id(), 'record_id' => $event->getElement()->get_record()->getRecordId(),
]; ];
$datas = json_encode($params); $datas = json_encode($params);

View File

@@ -191,7 +191,7 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn
$thumbnail_sd = $content->getRecord($app)->get_thumbnail(); $thumbnail_sd = $content->getRecord($app)->get_thumbnail();
$thumbnail_permalink = $thumbnail_sd->get_permalink(); $thumbnail_permalink = $thumbnail_sd->get_permalink();
$medium = strtolower($content->getRecord($app)->get_type()); $medium = strtolower($content->getRecord($app)->getType());
if ( ! in_array($medium, ['image', 'audio', 'video'])) { if ( ! in_array($medium, ['image', 'audio', 'video'])) {
return $this; return $this;

View File

@@ -52,7 +52,7 @@ abstract class FeedFormatterAbstract
$thumbnail_sd = $content->getRecord($app)->get_thumbnail(); $thumbnail_sd = $content->getRecord($app)->get_thumbnail();
$thumbnail_permalink = $thumbnail_sd->get_permalink(); $thumbnail_permalink = $thumbnail_sd->get_permalink();
$medium = strtolower($content->getRecord($app)->get_type()); $medium = strtolower($content->getRecord($app)->getType());
if ( ! in_array($medium, ['image', 'audio', 'video'])) { if ( ! in_array($medium, ['image', 'audio', 'video'])) {
return $this; return $this;

View File

@@ -284,7 +284,7 @@ class Helper extends \Alchemy\Phrasea\Helper\Helper
public function get_serialize_list() public function get_serialize_list()
{ {
if ($this->is_single_grouping()) { if ($this->is_single_grouping()) {
return $this->get_grouping_head()->get_serialize_key(); return $this->get_grouping_head()->getId();
} else { } else {
return $this->selection->serialize_list(); return $this->selection->serialize_list();
} }

View File

@@ -20,7 +20,7 @@ class PhraseanetMetadataSetter
$metadatas = []; $metadatas = [];
$tagnameToFieldnameMapping = []; $tagnameToFieldnameMapping = [];
$arrayStructure = iterator_to_array($record->get_databox()->get_meta_structure()); $arrayStructure = iterator_to_array($record->getDatabox()->get_meta_structure());
array_walk($arrayStructure, function ($databoxField) use (&$tagnameToFieldnameMapping) { array_walk($arrayStructure, function ($databoxField) use (&$tagnameToFieldnameMapping) {
$tagname = $databoxField->get_tag()->getTagname(); $tagname = $databoxField->get_tag()->getTagname();

View File

@@ -460,8 +460,8 @@ class Basket
foreach ($this->getElements() as $basket_element) { foreach ($this->getElements() as $basket_element) {
$bask_record = $basket_element->getRecord($app); $bask_record = $basket_element->getRecord($app);
if ($bask_record->get_record_id() == $record->get_record_id() if ($bask_record->getRecordId() == $record->getRecordId()
&& $bask_record->get_sbas_id() == $record->get_sbas_id()) { && $bask_record->getDataboxId() == $record->getDataboxId()) {
return true; return true;
} }
} }

View File

@@ -138,8 +138,8 @@ class BasketElement
public function setRecord(\record_adapter $record) public function setRecord(\record_adapter $record)
{ {
$this->setRecordId($record->get_record_id()); $this->setRecordId($record->getRecordId());
$this->setSbasId($record->get_sbas_id()); $this->setSbasId($record->getDataboxId());
} }
/** /**

View File

@@ -116,8 +116,8 @@ class StoryWZ
public function setRecord(\record_adapter $record) public function setRecord(\record_adapter $record)
{ {
$this->setRecordId($record->get_record_id()); $this->setRecordId($record->getRecordId());
$this->setSbasId($record->get_sbas_id()); $this->setSbasId($record->getDataboxId());
} }
/** /**
* @param User $user * @param User $user

View File

@@ -203,10 +203,10 @@ class LazaretManipulator
} }
} }
$data = $metadataBag->toMetadataArray($record->get_databox()->get_meta_structure()); $data = $metadataBag->toMetadataArray($record->getDatabox()->get_meta_structure());
$record->set_metadatas($data); $record->set_metadatas($data);
$fields = $metaFields->toMetadataArray($record->get_databox()->get_meta_structure()); $fields = $metaFields->toMetadataArray($record->getDatabox()->get_meta_structure());
$record->set_metadatas($fields); $record->set_metadatas($fields);
} }

View File

@@ -73,8 +73,8 @@ class BasketElementRepository extends EntityRepository
AND e.sbas_id = :sbas_id'; AND e.sbas_id = :sbas_id';
$params = [ $params = [
'sbas_id' => $record->get_sbas_id(), 'sbas_id' => $record->getDataboxId(),
'record_id' => $record->get_record_id() 'record_id' => $record->getRecordId()
]; ];
$query = $this->_em->createQuery($dql); $query = $this->_em->createQuery($dql);
@@ -121,8 +121,8 @@ class BasketElementRepository extends EntityRepository
AND e.sbas_id = :sbas_id'; AND e.sbas_id = :sbas_id';
$params = [ $params = [
'sbas_id' => $record->get_sbas_id(), 'sbas_id' => $record->getDataboxId(),
'record_id' => $record->get_record_id(), 'record_id' => $record->getRecordId(),
'usr_id' => $user->getId() 'usr_id' => $user->getId()
]; ];
@@ -144,8 +144,8 @@ class BasketElementRepository extends EntityRepository
AND e.sbas_id = :sbas_id'; AND e.sbas_id = :sbas_id';
$params = [ $params = [
'sbas_id' => $record->get_sbas_id(), 'sbas_id' => $record->getDataboxId(),
'record_id' => $record->get_record_id(), 'record_id' => $record->getRecordId(),
'usr_id' => $user->getId() 'usr_id' => $user->getId()
]; ];

View File

@@ -196,7 +196,7 @@ class BasketRepository extends EntityRepository
AND b.user = :usr_id'; AND b.user = :usr_id';
$params = [ $params = [
'record_id' => $record->get_record_id(), 'record_id' => $record->getRecordId(),
'usr_id' => $user->getId() 'usr_id' => $user->getId()
]; ];

View File

@@ -99,8 +99,8 @@ class StoryWZRepository extends EntityRepository
{ {
$story = $this->findOneBy([ $story = $this->findOneBy([
'user' => $user->getId(), 'user' => $user->getId(),
'sbas_id' => $Story->get_sbas_id(), 'sbas_id' => $Story->getDataboxId(),
'record_id' => $Story->get_record_id(), 'record_id' => $Story->getRecordId(),
]); ]);
if ($story) { if ($story) {
@@ -129,8 +129,8 @@ class StoryWZRepository extends EntityRepository
$query = $this->_em->createQuery($dql); $query = $this->_em->createQuery($dql);
$query->setParameters([ $query->setParameters([
'sbas_id' => $Story->get_sbas_id(), 'sbas_id' => $Story->getDataboxId(),
'record_id' => $Story->get_record_id(), 'record_id' => $Story->getRecordId(),
]); ]);
/** @var StoryWZ[] $stories */ /** @var StoryWZ[] $stories */

View File

@@ -77,7 +77,7 @@ class CaptionSerializer extends AbstractSerializer
$dom_doc->standalone = true; $dom_doc->standalone = true;
$record = $dom_doc->createElement('record'); $record = $dom_doc->createElement('record');
$record->setAttribute('record_id', $caption->get_record()->get_record_id()); $record->setAttribute('record_id', $caption->get_record()->getRecordId());
$dom_doc->appendChild($record); $dom_doc->appendChild($record);
$description = $dom_doc->createElement('description'); $description = $dom_doc->createElement('description');
$record->appendChild($description); $record->appendChild($description);

View File

@@ -166,7 +166,7 @@ class PDF
$fimg = $subdef->getRealPath(); $fimg = $subdef->getRealPath();
if (!$this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base($rec->get_base_id(), "nowatermark") if (!$this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base($rec->getBaseId(), "nowatermark")
&& $subdef->get_type() == \media_subdef::TYPE_IMAGE) { && $subdef->get_type() == \media_subdef::TYPE_IMAGE) {
$fimg = \recordutils_image::watermark($this->app, $subdef); $fimg = \recordutils_image::watermark($this->app, $subdef);
} }
@@ -258,7 +258,7 @@ class PDF
$y = $this->pdf->GetY(); $y = $this->pdf->GetY();
$t = \phrasea::bas_labels($rec->get_base_id(), $this->app); $t = \phrasea::bas_labels($rec->getBaseId(), $this->app);
$this->pdf->SetFont(PhraseaPDF::FONT, '', 10); $this->pdf->SetFont(PhraseaPDF::FONT, '', 10);
$this->pdf->SetFillColor(220, 220, 220); $this->pdf->SetFillColor(220, 220, 220);
$this->pdf->SetLeftMargin($lmargin); $this->pdf->SetLeftMargin($lmargin);
@@ -339,10 +339,10 @@ class PDF
$RIGHT_TEXT = ""; $RIGHT_TEXT = "";
$RIGHT_IMG = NULL; $RIGHT_IMG = NULL;
$LEFT__IMG = $this->app['root.path'] . "/config/minilogos/logopdf_" . $rec->get_sbas_id() . ".jpg"; $LEFT__IMG = $this->app['root.path'] . "/config/minilogos/logopdf_" . $rec->getDataboxId() . ".jpg";
if (!is_file($LEFT__IMG)) { if (!is_file($LEFT__IMG)) {
$databox = $rec->get_databox(); $databox = $rec->getDatabox();
$str = $databox->get_sxml_structure(); $str = $databox->get_sxml_structure();
$vn = (string) ($str->pdfPrintLogo); $vn = (string) ($str->pdfPrintLogo);
if (($vn * 1) == 1) { if (($vn * 1) == 1) {
@@ -350,7 +350,7 @@ class PDF
} }
} }
$collection = \collection::getByBaseId($this->app, $rec->get_base_id()); $collection = \collection::getByBaseId($this->app, $rec->getBaseId());
$vn = ""; $vn = "";
if (false !== $str = simplexml_load_string($collection->get_prefs())) { if (false !== $str = simplexml_load_string($collection->get_prefs())) {
@@ -358,9 +358,9 @@ class PDF
} }
if ($vn == "" || $vn == "1") { if ($vn == "" || $vn == "1") {
$RIGHT_TEXT = \phrasea::bas_labels($rec->get_base_id(), $this->app); $RIGHT_TEXT = \phrasea::bas_labels($rec->getBaseId(), $this->app);
} elseif ($vn == "2") { } elseif ($vn == "2") {
$RIGHT_IMG = $this->app['root.path'] . "/config/minilogos/" . $rec->get_base_id(); $RIGHT_IMG = $this->app['root.path'] . "/config/minilogos/" . $rec->getBaseId();
} }
$xtmp = $this->pdf->GetX(); $xtmp = $this->pdf->GetX();
@@ -438,7 +438,7 @@ class PDF
$f = $subdef->getRealPath(); $f = $subdef->getRealPath();
if (!$this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base($rec->get_base_id(), "nowatermark") if (!$this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base($rec->getBaseId(), "nowatermark")
&& $subdef->get_type() == \media_subdef::TYPE_IMAGE) && $subdef->get_type() == \media_subdef::TYPE_IMAGE)
$f = \recordutils_image::watermark($this->app, $subdef); $f = \recordutils_image::watermark($this->app, $subdef);

View File

@@ -875,7 +875,7 @@ class ArchiveJob extends AbstractJob
$story = $this->createStory($app, $collection, $path . '/' . $representationFileName, $path . '/' . $captionFileName, $stat0, $stat1); $story = $this->createStory($app, $collection, $path . '/' . $representationFileName, $path . '/' . $captionFileName, $stat0, $stat1);
} }
$rid = $story->get_record_id(); $rid = $story->getRecordId();
$this->log('debug', sprintf('story %s created', $rid)); $this->log('debug', sprintf('story %s created', $rid));

View File

@@ -412,7 +412,7 @@ class FtpJob extends AbstractJob
private function logexport(Application $app, \record_adapter $record, $obj, $ftpLog) private function logexport(Application $app, \record_adapter $record, $obj, $ftpLog)
{ {
foreach ($obj as $oneObj) { foreach ($obj as $oneObj) {
$app['phraseanet.logger']($record->get_databox()) $app['phraseanet.logger']($record->getDatabox())
->log($record, \Session_Logger::EVENT_EXPORTFTP, $ftpLog, ''); ->log($record, \Session_Logger::EVENT_EXPORTFTP, $ftpLog, '');
} }

View File

@@ -111,13 +111,13 @@ class RecordMoverJob extends AbstractJob
foreach ($rec->get_children() as $child) { foreach ($rec->get_children() as $child) {
$child->delete(); $child->delete();
if ($logsql) { if ($logsql) {
$this->log('debug', sprintf("on sbas %s delete (grp child) rid %s \n", $row['sbas_id'], $child->get_record_id())); $this->log('debug', sprintf("on sbas %s delete (grp child) rid %s \n", $row['sbas_id'], $child->getRecordId()));
} }
} }
} }
$rec->delete(); $rec->delete();
if ($logsql) { if ($logsql) {
$this->log('debug', sprintf("on sbas %s delete rid %s \n", $row['sbas_id'], $rec->get_record_id())); $this->log('debug', sprintf("on sbas %s delete rid %s \n", $row['sbas_id'], $rec->getRecordId()));
} }
break; break;
} }

View File

@@ -466,7 +466,7 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I
public function acceptable_records() public function acceptable_records()
{ {
return function (record_adapter $record) { return function (record_adapter $record) {
return $record->get_type() === 'video'; return $record->getType() === 'video';
}; };
} }
@@ -562,7 +562,7 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I
*/ */
public function upload(record_adapter $record, array $options = []) public function upload(record_adapter $record, array $options = [])
{ {
switch ($record->get_type()) { switch ($record->getType()) {
case self::ELEMENT_TYPE_VIDEO : case self::ELEMENT_TYPE_VIDEO :
$url_file = $this->_api->sendFile($record->get_hd_file()->getRealPath(), $this->oauth_token); $url_file = $this->_api->sendFile($record->get_hd_file()->getRealPath(), $this->oauth_token);
$options = array_merge(['url' => $url_file], $options); $options = array_merge(['url' => $url_file], $options);
@@ -787,7 +787,7 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I
{ {
$errors = $this->check_record_constraints($record); $errors = $this->check_record_constraints($record);
$check = function ($field) use (&$errors, $datas, $record) { $check = function ($field) use (&$errors, $datas, $record) {
$key = $record->get_serialize_key(); $key = $record->getId();
$required = ! ! $field["required"]; $required = ! ! $field["required"];
$name = $field["name"]; $name = $field["name"];
$length = (int) $field["length"]; $length = (int) $field["length"];
@@ -844,7 +844,7 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I
*/ */
public function get_upload_datas(Request $request, record_adapter $record) public function get_upload_datas(Request $request, record_adapter $record)
{ {
$key = $record->get_serialize_key(); $key = $record->getId();
$datas = [ $datas = [
'title' => $request->get('title_' . $key), 'title' => $request->get('title_' . $key),
'description' => $request->get('description_' . $key), 'description' => $request->get('description_' . $key),

View File

@@ -502,7 +502,7 @@ class Bridge_Api_Flickr extends Bridge_Api_Abstract implements Bridge_Api_Interf
$privacy = $this->get_default_privacy(); $privacy = $this->get_default_privacy();
$uploader->setPerms($privacy['public'], $privacy['friends'], $privacy['family']); $uploader->setPerms($privacy['public'], $privacy['friends'], $privacy['family']);
$type = $record->get_type() == 'image' ? self::ELEMENT_TYPE_PHOTO : $record->get_type(); $type = $record->getType() == 'image' ? self::ELEMENT_TYPE_PHOTO : $record->getType();
switch ($type) { switch ($type) {
case self::ELEMENT_TYPE_PHOTO : case self::ELEMENT_TYPE_PHOTO :
return $uploader->upload($record->get_hd_file()->getRealPath(), $options['title'], $options['description'], $options['tags'], true); return $uploader->upload($record->get_hd_file()->getRealPath(), $options['title'], $options['description'], $options['tags'], true);
@@ -520,7 +520,7 @@ class Bridge_Api_Flickr extends Bridge_Api_Abstract implements Bridge_Api_Interf
public function acceptable_records() public function acceptable_records()
{ {
return function (record_adapter $record) { return function (record_adapter $record) {
return in_array($record->get_type(), ['image']); return in_array($record->getType(), ['image']);
}; };
} }
@@ -681,7 +681,7 @@ class Bridge_Api_Flickr extends Bridge_Api_Abstract implements Bridge_Api_Interf
{ {
$errors = $this->check_record_constraints($record); $errors = $this->check_record_constraints($record);
$check = function ($field) use (&$errors, $datas, $record) { $check = function ($field) use (&$errors, $datas, $record) {
$key = $record->get_serialize_key(); $key = $record->getId();
$name = $field['name']; $name = $field['name'];
$length = (int) $field['length']; $length = (int) $field['length'];
$required = ! ! $field['required']; $required = ! ! $field['required'];
@@ -749,7 +749,7 @@ class Bridge_Api_Flickr extends Bridge_Api_Abstract implements Bridge_Api_Interf
*/ */
public function get_upload_datas(Request $request, record_adapter $record) public function get_upload_datas(Request $request, record_adapter $record)
{ {
$key = $record->get_serialize_key(); $key = $record->getId();
$datas = [ $datas = [
'title' => $request->get('title_' . $key), 'title' => $request->get('title_' . $key),
'description' => $request->get('description_' . $key), 'description' => $request->get('description_' . $key),

View File

@@ -418,7 +418,7 @@ class Bridge_Api_Youtube extends Bridge_Api_Abstract implements Bridge_Api_Inter
public function acceptable_records() public function acceptable_records()
{ {
return function (record_adapter $record) { return function (record_adapter $record) {
return $record->get_type() === 'video'; return $record->getType() === 'video';
}; };
} }
@@ -638,7 +638,7 @@ class Bridge_Api_Youtube extends Bridge_Api_Abstract implements Bridge_Api_Inter
*/ */
public function upload(record_adapter $record, array $options = []) public function upload(record_adapter $record, array $options = [])
{ {
switch ($record->get_type()) { switch ($record->getType()) {
case 'video': case 'video':
$video_entry = new Zend_Gdata_YouTube_VideoEntry(); $video_entry = new Zend_Gdata_YouTube_VideoEntry();
@@ -894,7 +894,7 @@ class Bridge_Api_Youtube extends Bridge_Api_Abstract implements Bridge_Api_Inter
$errors = $this->check_record_constraints($record); $errors = $this->check_record_constraints($record);
$check = function ($field) use (&$errors, $datas, $record) { $check = function ($field) use (&$errors, $datas, $record) {
$key = $record->get_serialize_key(); $key = $record->getId();
$name = $field['name']; $name = $field['name'];
$length = (int) $field['length']; $length = (int) $field['length'];
$required = ! ! $field['required']; $required = ! ! $field['required'];
@@ -973,7 +973,7 @@ class Bridge_Api_Youtube extends Bridge_Api_Abstract implements Bridge_Api_Inter
*/ */
public function get_upload_datas(Request $request, record_adapter $record) public function get_upload_datas(Request $request, record_adapter $record)
{ {
$key = $record->get_serialize_key(); $key = $record->getId();
$datas = [ $datas = [
'title' => $request->get('title_' . $key), 'title' => $request->get('title_' . $key),
'description' => $request->get('description_' . $key), 'description' => $request->get('description_' . $key),
@@ -1004,7 +1004,7 @@ class Bridge_Api_Youtube extends Bridge_Api_Abstract implements Bridge_Api_Inter
private function check_record_constraints(record_adapter $record) private function check_record_constraints(record_adapter $record)
{ {
$errors = []; $errors = [];
$key = $record->get_serialize_key(); $key = $record->getId();
//Record must rely on real file //Record must rely on real file
if ( ! $record->get_hd_file() instanceof SplFileInfo) { if ( ! $record->get_hd_file() instanceof SplFileInfo) {
$errors["file_size_" . $key] = $this->translator->trans("Le record n'a pas de fichier physique"); $errors["file_size_" . $key] = $this->translator->trans("Le record n'a pas de fichier physique");

View File

@@ -448,13 +448,13 @@ class Bridge_Element
,:datas , :status, NOW(), NOW())'; ,:datas , :status, NOW(), NOW())';
$params = [ $params = [
':account_id' => $account->get_id() ':account_id' => $account->get_id(),
, ':sbas_id' => $record->get_sbas_id() ':sbas_id' => $record->getDataboxId(),
, ':record_id' => $record->get_record_id() ':record_id' => $record->getRecordId(),
, ':status' => $status ':status' => $status,
, ':title' => $title ':title' => $title,
, ':type' => $type ':type' => $type,
, ':datas' => serialize($datas) ':datas' => serialize($datas),
]; ];
$stmt = $app->getApplicationBox()->get_connection()->prepare($sql); $stmt = $app->getApplicationBox()->get_connection()->prepare($sql);

View File

@@ -73,11 +73,11 @@ class Session_Logger
$stmt = $this->databox->get_connection()->prepare($sql); $stmt = $this->databox->get_connection()->prepare($sql);
$params = [ $params = [
':log_id' => $this->get_id() ':log_id' => $this->get_id(),
, ':record_id' => $record->get_record_id() ':record_id' => $record->getRecordId(),
, ':action' => $action ':action' => $action,
, ':final' => $final ':final' => $final,
, ':comm' => $comment ':comm' => $comment,
]; ];
$stmt->execute($params); $stmt->execute($params);

View File

@@ -325,7 +325,7 @@ class caption_Field_Value implements cache_cacheableInterface
. ' VALUES (null, :record_id, :field, :value, :VocabType, :VocabId)'; . ' VALUES (null, :record_id, :field, :value, :VocabType, :VocabId)';
$params = [ $params = [
':record_id' => $record->get_record_id(), ':record_id' => $record->getRecordId(),
':field' => $databox_field->get_id(), ':field' => $databox_field->get_id(),
':value' => $value, ':value' => $value,
':VocabType' => $vocabulary ? $vocabulary->getType() : null, ':VocabType' => $vocabulary ? $vocabulary->getType() : null,

View File

@@ -381,7 +381,7 @@ class caption_field implements cache_cacheableInterface
*/ */
public function get_cache_key($option = null) public function get_cache_key($option = null)
{ {
return 'caption_field_' . $this->databox_field->get_id() . '_' . $this->record->get_serialize_key() . ($option ? '_' . $option : ''); return 'caption_field_' . $this->databox_field->get_id() . '_' . $this->record->getId() . ($option ? '_' . $option : '');
} }
/** /**

View File

@@ -281,7 +281,7 @@ class caption_record implements caption_interface, cache_cacheableInterface
*/ */
public function get_cache_key($option = null) public function get_cache_key($option = null)
{ {
return 'caption_' . $this->record->get_serialize_key() . ($option ? '_' . $option : ''); return 'caption_' . $this->record->getId() . ($option ? '_' . $option : '');
} }
/** /**

View File

@@ -710,7 +710,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
public function get_cache_key($option = null) public function get_cache_key($option = null)
{ {
return 'subdef_' . $this->get_record()->get_serialize_key() return 'subdef_' . $this->get_record()->getId()
. '_' . $this->name . ($option ? '_' . $option : ''); . '_' . $this->name . ($option ? '_' . $option : '');
} }

View File

@@ -252,9 +252,9 @@ class module_console_systemExport extends Command
$dest_file = new \SplFileInfo($outfile); $dest_file = new \SplFileInfo($outfile);
touch( touch(
$dest_file->getPathname() $dest_file->getPathname(),
, $record->get_creation_date()->format('U') $record->getCreated()->format('U'),
, $record->get_modification_date()->format('U') $record->getUpdated()->format('U')
); );
switch (strtolower($caption)) { switch (strtolower($caption)) {

View File

@@ -516,7 +516,7 @@ class module_report_nav extends module_report
'photo' => 'photo' =>
"<img style='width:" . $x->get_width() . "px;height:" . $x->get_height() . "px;' "<img style='width:" . $x->get_width() . "px;height:" . $x->get_height() . "px;'
src='" . (string) $x->get_url() . "'>" src='" . (string) $x->get_url() . "'>"
, 'record_id' => $record->get_record_id() , 'record_id' => $record->getRecordId()
, 'date' => $this->app['date-formatter']->getPrettyString($document->get_creation_date()) , 'date' => $this->app['date-formatter']->getPrettyString($document->get_creation_date())
, 'type' => $document->get_mime() , 'type' => $document->get_mime()
, 'titre' => $record->get_title() , 'titre' => $record->get_title()

View File

@@ -133,8 +133,8 @@ class patch_320alpha4b extends patchAbstract
$item = new FeedItem(); $item = new FeedItem();
$item->setEntry($entry); $item->setEntry($entry);
$entry->addItem($item); $entry->addItem($item);
$item->setRecordId($record->get_record_id()); $item->setRecordId($record->getRecordId());
$item->setSbasId($record->get_sbas_id()); $item->setSbasId($record->getDataboxId());
$app['orm.em']->persist($item); $app['orm.em']->persist($item);
} catch (NotFoundHttpException $e) { } catch (NotFoundHttpException $e) {

View File

@@ -370,8 +370,19 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
* Return record collection * Return record collection
* *
* @return \collection * @return \collection
* @deprecated use {@link self::getCollection} instead.
*/ */
public function get_collection() public function get_collection()
{
return $this->getCollection();
}
/**
* Return collection to which the record belongs to.
*
* @return \collection
*/
public function getCollection()
{ {
return \collection::getByCollectionId($this->app, $this->getDatabox(), $this->collection_id); return \collection::getByCollectionId($this->app, $this->getDatabox(), $this->collection_id);
} }
@@ -460,7 +471,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
*/ */
public function move_to_collection(collection $collection, appbox $appbox) public function move_to_collection(collection $collection, appbox $appbox)
{ {
if ($this->get_collection()->get_base_id() === $collection->get_base_id()) { if ($this->getCollection()->get_base_id() === $collection->get_base_id()) {
return $this; return $this;
} }
@@ -904,6 +915,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
/** /**
* @return string * @return string
* @deprecated use {@link self::getId} instead.
*/ */
public function get_serialize_key() public function get_serialize_key()
{ {
@@ -1694,7 +1706,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
public function hasChild(\record_adapter $record) public function hasChild(\record_adapter $record)
{ {
return $this->get_children()->offsetExists($record->get_serialize_key()); return $this->get_children()->offsetExists($record->getId());
} }
public function appendChild(\record_adapter $record) public function appendChild(\record_adapter $record)

View File

@@ -83,13 +83,13 @@ class record_exportElement extends record_adapter
$sd = $this->get_subdefs(); $sd = $this->get_subdefs();
$sbas_id = phrasea::sbasFromBas($this->app, $this->get_base_id()); $sbas_id = phrasea::sbasFromBas($this->app, $this->getBaseId());
/** @var databox_subdef[] $subdefs */ /** @var databox_subdef[] $subdefs */
$subdefs = []; $subdefs = [];
foreach ($this->app->findDataboxById($sbas_id)->get_subdef_structure() as $subdef_type => $subdefs_obj) { foreach ($this->app->findDataboxById($sbas_id)->get_subdef_structure() as $subdef_type => $subdefs_obj) {
if ($subdef_type == $this->get_type()) { if ($subdef_type == $this->getType()) {
$subdefs = $subdefs_obj; $subdefs = $subdefs_obj;
break; break;
} }
@@ -101,10 +101,10 @@ class record_exportElement extends record_adapter
'thumbnail' => true 'thumbnail' => true
]; ];
if ($this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base($this->get_base_id(), 'candwnldhd')) { if ($this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base($this->getBaseId(), 'candwnldhd')) {
$go_dl['document'] = true; $go_dl['document'] = true;
} }
if ($this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base($this->get_base_id(), 'candwnldpreview')) { if ($this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base($this->getBaseId(), 'candwnldpreview')) {
$go_dl['preview'] = true; $go_dl['preview'] = true;
} }
if ($this->app->getAclForUser($this->app->getAuthenticatedUser())->has_hd_grant($this)) { if ($this->app->getAclForUser($this->app->getAuthenticatedUser())->has_hd_grant($this)) {
@@ -117,18 +117,18 @@ class record_exportElement extends record_adapter
$query = $this->app['phraseanet.user-query']; $query = $this->app['phraseanet.user-query'];
$masters = $query->on_base_ids([$this->get_base_id()]) $masters = $query->on_base_ids([$this->getBaseId()])
->who_have_right(['order_master']) ->who_have_right(['order_master'])
->execute()->get_results(); ->execute()->get_results();
$go_cmd = (count($masters) > 0 && $this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base($this->get_base_id(), 'cancmd')); $go_cmd = (count($masters) > 0 && $this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base($this->getBaseId(), 'cancmd'));
$orderable['document'] = false; $orderable['document'] = false;
$downloadable['document'] = false; $downloadable['document'] = false;
if (isset($sd['document']) && is_file($sd['document']->getRealPath())) { if (isset($sd['document']) && is_file($sd['document']->getRealPath())) {
if ($go_dl['document'] === true) { if ($go_dl['document'] === true) {
if ($this->app->getAclForUser($this->app->getAuthenticatedUser())->is_restricted_download($this->get_base_id())) { if ($this->app->getAclForUser($this->app->getAuthenticatedUser())->is_restricted_download($this->getBaseId())) {
$this->remain_hd --; $this->remain_hd --;
if ($this->remain_hd >= 0) { if ($this->remain_hd >= 0) {
$localizedLabel = $this->app->trans('document original'); $localizedLabel = $this->app->trans('document original');
@@ -182,7 +182,7 @@ class record_exportElement extends record_adapter
if (isset($sd[$name]) && $sd[$name]->is_physically_present()) { if (isset($sd[$name]) && $sd[$name]->is_physically_present()) {
if ($class == 'document') { if ($class == 'document') {
if ($this->app->getAclForUser($this->app->getAuthenticatedUser())->is_restricted_download($this->get_base_id())) { if ($this->app->getAclForUser($this->app->getAuthenticatedUser())->is_restricted_download($this->getBaseId())) {
$this->remain_hd --; $this->remain_hd --;
if ($this->remain_hd >= 0) if ($this->remain_hd >= 0)
$downloadable[$name] = [ $downloadable[$name] = [

View File

@@ -126,9 +126,9 @@ class record_preview extends record_adapter
} else { } else {
$children = $this->container->get_children(); $children = $this->container->get_children();
foreach ($children as $child) { foreach ($children as $child) {
$sbas_id = $child->get_sbas_id(); $sbas_id = $child->getDataboxId();
$this->original_item = $child; $this->original_item = $child;
$record_id = $child->get_record_id(); $record_id = $child->getRecordId();
if ($child->getNumber() == $pos) if ($child->getNumber() == $pos)
break; break;
} }
@@ -152,8 +152,8 @@ class record_preview extends record_adapter
$i ++; $i ++;
if ($first) { if ($first) {
$this->original_item = $element; $this->original_item = $element;
$sbas_id = $element->getRecord($this->app)->get_sbas_id(); $sbas_id = $element->getRecord($this->app)->getDataboxId();
$record_id = $element->getRecord($this->app)->get_record_id(); $record_id = $element->getRecord($this->app)->getRecordId();
$this->name = $Basket->getName(); $this->name = $Basket->getName();
$number = $element->getOrd(); $number = $element->getOrd();
} }
@@ -161,8 +161,8 @@ class record_preview extends record_adapter
if ($element->getOrd() == $pos) { if ($element->getOrd() == $pos) {
$this->original_item = $element; $this->original_item = $element;
$sbas_id = $element->getRecord($this->app)->get_sbas_id(); $sbas_id = $element->getRecord($this->app)->getDataboxId();
$record_id = $element->getRecord($this->app)->get_record_id(); $record_id = $element->getRecord($this->app)->getRecordId();
$this->name = $Basket->getName(); $this->name = $Basket->getName();
$number = $element->getOrd(); $number = $element->getOrd();
} }
@@ -272,7 +272,7 @@ class record_preview extends record_adapter
return $this->title; return $this->title;
} }
$this->title = collection::getLogo($this->get_base_id(), $this->app) . ' '; $this->title = collection::getLogo($this->getBaseId(), $this->app) . ' ';
switch ($this->env) { switch ($this->env) {
@@ -323,16 +323,16 @@ class record_preview extends record_adapter
$tab = []; $tab = [];
$report = $this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base($this->get_base_id(), 'canreport'); $report = $this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base($this->getBaseId(), 'canreport');
$databox = $this->app->findDataboxById($this->get_sbas_id()); $databox = $this->app->findDataboxById($this->getDataboxId());
$connsbas = $databox->get_connection(); $connsbas = $databox->get_connection();
$sql = 'SELECT d . * , l.user, l.usrid as usr_id, l.site $sql = 'SELECT d . * , l.user, l.usrid as usr_id, l.site
FROM log_docs d, log l FROM log_docs d, log l
WHERE d.log_id = l.id WHERE d.log_id = l.id
AND d.record_id = :record_id '; AND d.record_id = :record_id ';
$params = [':record_id' => $this->get_record_id()]; $params = [':record_id' => $this->getRecordId()];
if (! $report) { if (! $report) {
$sql .= ' AND ((l.usrid = :usr_id AND l.site= :site) OR action="add")'; $sql .= ' AND ((l.usrid = :usr_id AND l.site= :site) OR action="add")';
@@ -374,7 +374,7 @@ class record_preview extends record_adapter
if ( ! in_array($row['final'], $tab[$hour][$site][$action][$row['usr_id']]['final'])) { if ( ! in_array($row['final'], $tab[$hour][$site][$action][$row['usr_id']]['final'])) {
if ($action == 'collection') { if ($action == 'collection') {
$tab[$hour][$site][$action][$row['usr_id']]['final'][] = phrasea::baseFromColl($this->get_sbas_id(), $row['final'], $this->app); $tab[$hour][$site][$action][$row['usr_id']]['final'][] = phrasea::baseFromColl($this->getDataboxId(), $row['final'], $this->app);
} else { } else {
$tab[$hour][$site][$action][$row['usr_id']]['final'][] = $row['final']; $tab[$hour][$site][$action][$row['usr_id']]['final'][] = $row['final'];
} }
@@ -400,7 +400,7 @@ class record_preview extends record_adapter
} }
$report = $this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base( $report = $this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base(
$this->get_base_id(), 'canreport'); $this->getBaseId(), 'canreport');
if ( ! $report && ! $this->app['conf']->get(['registry', 'webservices', 'google-charts-enabled'])) { if ( ! $report && ! $this->app['conf']->get(['registry', 'webservices', 'google-charts-enabled'])) {
$this->view_popularity = false; $this->view_popularity = false;
@@ -429,12 +429,12 @@ class record_preview extends record_adapter
AND site_id = :site AND site_id = :site
GROUP BY datee ORDER BY datee ASC'; GROUP BY datee ORDER BY datee ASC';
$databox = $this->app->findDataboxById($this->get_sbas_id()); $databox = $this->app->findDataboxById($this->getDataboxId());
$connsbas = $databox->get_connection(); $connsbas = $databox->get_connection();
$stmt = $connsbas->prepare($sql); $stmt = $connsbas->prepare($sql);
$stmt->execute( $stmt->execute(
[ [
':record_id' => $this->get_record_id(), ':record_id' => $this->getRecordId(),
':site' => $this->app['conf']->get(['main', 'key']) ':site' => $this->app['conf']->get(['main', 'key'])
] ]
); );
@@ -490,7 +490,7 @@ class record_preview extends record_adapter
} }
$report = $this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base( $report = $this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base(
$this->get_base_id(), 'canreport'); $this->getBaseId(), 'canreport');
if ( ! $report && ! $this->app['conf']->get(['registry', 'webservices', 'google-charts-enabled'])) { if ( ! $report && ! $this->app['conf']->get(['registry', 'webservices', 'google-charts-enabled'])) {
$this->refferer_popularity = false; $this->refferer_popularity = false;
@@ -498,7 +498,7 @@ class record_preview extends record_adapter
return $this->refferer_popularity; return $this->refferer_popularity;
} }
$databox = $this->app->findDataboxById($this->get_sbas_id()); $databox = $this->app->findDataboxById($this->getDataboxId());
$connsbas = $databox->get_connection(); $connsbas = $databox->get_connection();
$sql = 'SELECT count( id ) AS views, referrer $sql = 'SELECT count( id ) AS views, referrer
@@ -508,7 +508,7 @@ class record_preview extends record_adapter
GROUP BY referrer ORDER BY referrer ASC'; GROUP BY referrer ORDER BY referrer ASC';
$stmt = $connsbas->prepare($sql); $stmt = $connsbas->prepare($sql);
$stmt->execute([':record_id' => $this->get_record_id()]); $stmt->execute([':record_id' => $this->getRecordId()]);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC); $rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor(); $stmt->closeCursor();
@@ -562,7 +562,7 @@ class record_preview extends record_adapter
return $this->download_popularity; return $this->download_popularity;
} }
$report = $this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base($this->get_base_id(), 'canreport'); $report = $this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base($this->getBaseId(), 'canreport');
$ret = false; $ret = false;
if ( ! $report && ! $this->app['conf']->get(['registry', 'webservices', 'google-charts-enabled'])) { if ( ! $report && ! $this->app['conf']->get(['registry', 'webservices', 'google-charts-enabled'])) {
@@ -592,12 +592,12 @@ class record_preview extends record_adapter
AND site= :site AND site= :site
GROUP BY datee ORDER BY datee ASC'; GROUP BY datee ORDER BY datee ASC';
$databox = $this->app->findDataboxById($this->get_sbas_id()); $databox = $this->app->findDataboxById($this->getDataboxId());
$connsbas = $databox->get_connection(); $connsbas = $databox->get_connection();
$stmt = $connsbas->prepare($sql); $stmt = $connsbas->prepare($sql);
$stmt->execute( $stmt->execute(
[ [
':record_id' => $this->get_record_id(), ':record_id' => $this->getRecordId(),
':site' => $this->app['conf']->get(['main', 'key']) ':site' => $this->app['conf']->get(['main', 'key'])
] ]
); );

View File

@@ -49,7 +49,7 @@ class recordutils_image
} }
}; };
$base_id = $subdef->get_record()->get_base_id(); $base_id = $subdef->get_record()->getBaseId();
if ($subdef->get_type() !== \media_subdef::TYPE_IMAGE) { if ($subdef->get_type() !== \media_subdef::TYPE_IMAGE) {
return $subdef->getRealPath(); return $subdef->getRealPath();
@@ -71,7 +71,7 @@ class recordutils_image
$domprefs = new DOMDocument(); $domprefs = new DOMDocument();
if (false === $domprefs->loadXML($subdef->get_record()->get_collection()->get_prefs())) { if (false === $domprefs->loadXML($subdef->get_record()->getCollection()->get_prefs())) {
return $subdef->getRealPath(); return $subdef->getRealPath();
} }
@@ -172,7 +172,7 @@ class recordutils_image
@unlink($pathOut); // no cache possible when date changes @unlink($pathOut); // no cache possible when date changes
break; break;
case 'RECORD_ID': case 'RECORD_ID':
$varval = $subdef->get_record()->get_record_id(); $varval = $subdef->get_record()->getRecordId();
break; break;
} }
$n->parentNode->replaceChild($domprefs->createTextNode($varval), $n); $n->parentNode->replaceChild($domprefs->createTextNode($varval), $n);
@@ -381,7 +381,7 @@ class recordutils_image
$palette = new RGB(); $palette = new RGB();
} }
$base_id = $subdef->get_record()->get_base_id(); $base_id = $subdef->get_record()->getBaseId();
if ($subdef->get_name() !== 'preview') { if ($subdef->get_name() !== 'preview') {
return $subdef->getRealPath(); return $subdef->getRealPath();
@@ -429,7 +429,7 @@ class recordutils_image
$in_image->paste($wm_image, new Point(($in_w - $wm_size->getWidth()) >> 1, ($in_h - $wm_size->getHeight()) >> 1))->save($pathOut); $in_image->paste($wm_image, new Point(($in_w - $wm_size->getWidth()) >> 1, ($in_h - $wm_size->getHeight()) >> 1))->save($pathOut);
} else { } else {
$collname = $subdef->get_record()->get_collection()->get_name(); $collname = $subdef->get_record()->getCollection()->get_name();
$draw = $in_image->draw(); $draw = $in_image->draw();
$black = $palette->color("000000"); $black = $palette->color("000000");
$white = $palette->color("FFFFFF"); $white = $palette->color("FFFFFF");

View File

@@ -121,7 +121,7 @@ abstract class set_abstract implements IteratorAggregate
*/ */
public function add_element(\record_adapter $record) public function add_element(\record_adapter $record)
{ {
$this->elements[$record->get_serialize_key()] = $record; $this->elements[$record->getId()] = $record;
return $this; return $this;
} }
@@ -132,7 +132,7 @@ abstract class set_abstract implements IteratorAggregate
*/ */
public function remove_element(\record_adapter $record) public function remove_element(\record_adapter $record)
{ {
$key = $record->get_serialize_key(); $key = $record->getId();
if (isset($this->elements[$key])) if (isset($this->elements[$key]))
unset($this->elements[$key]); unset($this->elements[$key]);
@@ -146,7 +146,7 @@ abstract class set_abstract implements IteratorAggregate
{ {
$basrec = []; $basrec = [];
foreach ($this->elements as $record) { foreach ($this->elements as $record) {
$basrec[] = $record->get_serialize_key(); $basrec[] = $record->getId();
} }
return implode(';', $basrec); return implode(';', $basrec);

View File

@@ -255,8 +255,8 @@ class OverviewTest extends \PhraseanetAuthenticatedWebTestCase
self::$DI['app']['subdef.substituer']->substitute($story, $name, $media); self::$DI['app']['subdef.substituer']->substitute($story, $name, $media);
$path = self::$DI['app']['url_generator']->generate('datafile', [ $path = self::$DI['app']['url_generator']->generate('datafile', [
'sbas_id' => $story->get_sbas_id(), 'sbas_id' => $story->getDataboxId(),
'record_id' => $story->get_record_id(), 'record_id' => $story->getRecordId(),
'subdef' => $name, 'subdef' => $name,
]); ]);
@@ -334,13 +334,13 @@ class OverviewTest extends \PhraseanetAuthenticatedWebTestCase
// Ensure permalink is created // Ensure permalink is created
\media_Permalink_Adapter::getPermalink( \media_Permalink_Adapter::getPermalink(
self::$DI['app'], self::$DI['app'],
$record->get_databox(), $record->getDatabox(),
$record->get_subdef('preview') $record->get_subdef('preview')
); );
$path = self::$DI['app']['url_generator']->generate('permalinks_permaview', [ $path = self::$DI['app']['url_generator']->generate('permalinks_permaview', [
'sbas_id' => $record->get_sbas_id(), 'sbas_id' => $record->getDataboxId(),
'record_id' => $record->get_record_id(), 'record_id' => $record->getRecordId(),
'subdef' => 'preview', 'subdef' => 'preview',
]); ]);

View File

@@ -218,7 +218,7 @@ class ManagerTest extends \PhraseanetAuthenticatedWebTestCase
$found = false; $found = false;
foreach ($record->get_grouping_parents()->get_elements() as $parent_story) { foreach ($record->get_grouping_parents()->get_elements() as $parent_story) {
if ($parent_story->get_serialize_key() === $story->get_serialize_key()) { if ($parent_story->get_serialize_key() === $story->getId()) {
$found = true; $found = true;
} }
} }

View File

@@ -60,8 +60,8 @@ class ApiJsonTest extends ApiTestCase
$record = \record_adapter::createFromFile($file, $app); $record = \record_adapter::createFromFile($file, $app);
$story['story_records'] = array(array( $story['story_records'] = array(array(
'databox_id' => $record->get_sbas_id(), 'databox_id' => $record->getDataboxId(),
'record_id' => $record->get_record_id() 'record_id' => $record->getRecordId()
)); ));
$client = $this->getClient(); $client = $this->getClient();
@@ -96,7 +96,7 @@ class ApiJsonTest extends ApiTestCase
$this->setToken($this->userAccessToken); $this->setToken($this->userAccessToken);
$story = \record_adapter::createStory(self::$DI['app'], self::$DI['collection']); $story = \record_adapter::createStory(self::$DI['app'], self::$DI['collection']);
$route = sprintf('/api/v1/stories/%s/%s/addrecords', $story->get_sbas_id(), $story->get_record_id()); $route = sprintf('/api/v1/stories/%s/%s/addrecords', $story->getDataboxId(), $story->getRecordId());
$file = new File( $file = new File(
self::$DI['app'], self::$DI['app'],
@@ -106,8 +106,8 @@ class ApiJsonTest extends ApiTestCase
$record = \record_adapter::createFromFile($file, self::$DI['app']); $record = \record_adapter::createFromFile($file, self::$DI['app']);
$records = array( $records = array(
'databox_id' => $record->get_sbas_id(), 'databox_id' => $record->getDataboxId(),
'record_id' => $record->get_record_id() 'record_id' => $record->getRecordId()
); );
self::$DI['client']->request( self::$DI['client']->request(
@@ -569,7 +569,7 @@ class ApiJsonTest extends ApiTestCase
$record_1 = $this->getRecord1(); $record_1 = $this->getRecord1();
$client = $this->getClient(); $client = $this->getClient();
$route = '/api/v1/records/' . $record_1->get_sbas_id() . '/' . $record_1->get_record_id() . '/'; $route = '/api/v1/records/' . $record_1->getDataboxId() . '/' . $record_1->getRecordId() . '/';
$this->evaluateMethodNotAllowedRoute($route, ['POST', 'PUT', 'DELETE']); $this->evaluateMethodNotAllowedRoute($route, ['POST', 'PUT', 'DELETE']);
$client->request('GET', $route, $this->getParameters(), [], ['HTTP_Accept' => $this->getAcceptMimeType()]); $client->request('GET', $route, $this->getParameters(), [], ['HTTP_Accept' => $this->getAcceptMimeType()]);
$content = $this->unserialize($client->getResponse()->getContent()); $content = $this->unserialize($client->getResponse()->getContent());
@@ -1032,7 +1032,7 @@ class ApiJsonTest extends ApiTestCase
/** @var \record_adapter $record_1 */ /** @var \record_adapter $record_1 */
$record_1 = self::$DI['record_1']; $record_1 = self::$DI['record_1'];
$route = '/api/v1/records/' . $record_1->get_sbas_id() . '/' . $record_1->get_record_id() . '/embed/'; $route = '/api/v1/records/' . $record_1->getDataboxId() . '/' . $record_1->getRecordId() . '/embed/';
$this->evaluateMethodNotAllowedRoute($route, ['POST', 'PUT', 'DELETE']); $this->evaluateMethodNotAllowedRoute($route, ['POST', 'PUT', 'DELETE']);
/** @var Client $client */ /** @var Client $client */
@@ -1119,7 +1119,7 @@ class ApiJsonTest extends ApiTestCase
/** @var \record_adapter $story */ /** @var \record_adapter $story */
$story = self::$DI['record_story_1']; $story = self::$DI['record_story_1'];
$route = '/api/v1/stories/' . $story->get_sbas_id() . '/' . $story->get_record_id() . '/embed/'; $route = '/api/v1/stories/' . $story->getDataboxId() . '/' . $story->getRecordId() . '/embed/';
$this->evaluateMethodNotAllowedRoute($route, ['POST', 'PUT', 'DELETE']); $this->evaluateMethodNotAllowedRoute($route, ['POST', 'PUT', 'DELETE']);
/** @var Client $client */ /** @var Client $client */
@@ -1296,7 +1296,7 @@ class ApiJsonTest extends ApiTestCase
/** /**
* Get fresh record_1 * Get fresh record_1
*/ */
$testRecord = new \record_adapter(self::$DI['app'], $testRecord->get_sbas_id(), $testRecord->get_record_id()); $testRecord = new \record_adapter(self::$DI['app'], $testRecord->getDataboxId(), $testRecord->getRecordId());
$this->evaluateResponse200(self::$DI['client']->getResponse()); $this->evaluateResponse200(self::$DI['client']->getResponse());
$this->evaluateMeta200($content); $this->evaluateMeta200($content);
@@ -1319,11 +1319,11 @@ class ApiJsonTest extends ApiTestCase
$this->setToken($this->userAccessToken); $this->setToken($this->userAccessToken);
$route = '/api/v1/records/' . $record->get_sbas_id() . '/' . $record->get_record_id() . '/setcollection/'; $route = '/api/v1/records/' . $record->getDataboxId() . '/' . $record->getRecordId() . '/setcollection/';
$base_id = false; $base_id = false;
foreach ($record->get_databox()->get_collections() as $collection) { foreach ($record->getDatabox()->get_collections() as $collection) {
if ($collection->get_base_id() != $record->get_base_id()) { if ($collection->get_base_id() != $record->getBaseId()) {
$base_id = $collection->get_base_id(); $base_id = $collection->get_base_id();
break; break;
} }

View File

@@ -694,7 +694,7 @@ abstract class ApiTestCase extends \PhraseanetWebTestCase
protected function evaluateRecordsStatusResponse(\record_adapter $record, $content) protected function evaluateRecordsStatusResponse(\record_adapter $record, $content)
{ {
$statusStructure = $record->get_databox()->getStatusStructure(); $statusStructure = $record->getDatabox()->getStatusStructure();
$r_status = strrev($record->get_status()); $r_status = strrev($record->get_status());
$this->assertArrayHasKey('status', $content['response']); $this->assertArrayHasKey('status', $content['response']);
@@ -714,7 +714,7 @@ abstract class ApiTestCase extends \PhraseanetWebTestCase
protected function injectMetadatas(\record_adapter $record) protected function injectMetadatas(\record_adapter $record)
{ {
foreach ($record->get_databox()->get_meta_structure()->get_elements() as $field) { foreach ($record->getDatabox()->get_meta_structure()->get_elements() as $field) {
try { try {
$values = $record->get_caption()->get_field($field->get_name())->get_values(); $values = $record->get_caption()->get_field($field->get_name())->get_values();
$value = array_pop($values); $value = array_pop($values);

View File

@@ -143,7 +143,7 @@ class ExportTest extends \PhraseanetAuthenticatedWebTestCase
//inserted rows from this function are deleted in tearDownAfterClass //inserted rows from this function are deleted in tearDownAfterClass
$this->getClient()->request('POST', '/prod/export/ftp/', [ $this->getClient()->request('POST', '/prod/export/ftp/', [
'lst' => $this->getRecord1()->get_serialize_key(), 'lst' => $this->getRecord1()->getId(),
'user_dest' => $user->getId(), 'user_dest' => $user->getId(),
'address' => 'local.phrasea.test', 'address' => 'local.phrasea.test',
'login' => $user->getEmail(), 'login' => $user->getEmail(),
@@ -169,7 +169,7 @@ class ExportTest extends \PhraseanetAuthenticatedWebTestCase
$this->mockNotificationDeliverer('Alchemy\Phrasea\Notification\Mail\MailRecordsExport'); $this->mockNotificationDeliverer('Alchemy\Phrasea\Notification\Mail\MailRecordsExport');
$this->getClient()->request('POST', '/prod/export/mail/', [ $this->getClient()->request('POST', '/prod/export/mail/', [
'lst' => $this->getRecord1()->get_serialize_key(), 'lst' => $this->getRecord1()->getId(),
'destmail' => 'user@example.com', 'destmail' => 'user@example.com',
'obj' => ['preview'], 'obj' => ['preview'],
]); ]);

View File

@@ -142,7 +142,7 @@ class LazaretTest extends \PhraseanetAuthenticatedWebTestCase
//Provide some valid test values //Provide some valid test values
$lazaretAttribute->expects($this->exactly(4)) $lazaretAttribute->expects($this->exactly(4))
->method('getValue') ->method('getValue')
->will($this->onConsecutiveCalls('metadataValue', $story->get_serialize_key(), '00001111', 'metafieldValue')); ->will($this->onConsecutiveCalls('metadataValue', $story->getId(), '00001111', 'metafieldValue'));
//Add the 5 attribute //Add the 5 attribute
$lazaretFile->addAttribute($lazaretAttribute); $lazaretFile->addAttribute($lazaretAttribute);

View File

@@ -34,7 +34,7 @@ class OrderTest extends \PhraseanetAuthenticatedWebTestCase
}); });
$client = $this->getClient(); $client = $this->getClient();
$client->request('POST', '/prod/order/', [ $client->request('POST', '/prod/order/', [
'lst' => $this->getRecord1()->get_serialize_key(), 'lst' => $this->getRecord1()->getId(),
'deadline' => '+10 minutes' 'deadline' => '+10 minutes'
]); ]);
@@ -62,7 +62,7 @@ class OrderTest extends \PhraseanetAuthenticatedWebTestCase
}); });
$this->XMLHTTPRequest('POST', '/prod/order/', [ $this->XMLHTTPRequest('POST', '/prod/order/', [
'lst' => $this->getRecord1()->get_serialize_key(), 'lst' => $this->getRecord1()->getId(),
'deadline' => '+10 minutes' 'deadline' => '+10 minutes'
]); ]);
@@ -83,7 +83,7 @@ class OrderTest extends \PhraseanetAuthenticatedWebTestCase
public function testDisplayOrders() public function testDisplayOrders()
{ {
$this->XMLHTTPRequest('POST', '/prod/order/', [ $this->XMLHTTPRequest('POST', '/prod/order/', [
'lst' => $this->getRecord1()->get_serialize_key(), 'lst' => $this->getRecord1()->getId(),
'deadline' => '+10 minutes' 'deadline' => '+10 minutes'
]); ]);
$client = $this->getClient(); $client = $this->getClient();

View File

@@ -93,12 +93,12 @@ class PropertyTest extends \PhraseanetAuthenticatedWebTestCase
self::$DI['app']['acl'] = $aclProvider; self::$DI['app']['acl'] = $aclProvider;
self::$DI['client']->request('POST', '/prod/records/property/status/', [ self::$DI['client']->request('POST', '/prod/records/property/status/', [
'apply_to_children' => [$story->get_sbas_id() => true], 'apply_to_children' => [$story->getDataboxId() => true],
'status' => [ 'status' => [
$record->get_sbas_id() => [6 => true, 8 => true, 11 => true] $record->getDataboxId() => [6 => true, 8 => true, 11 => true]
], ],
'lst' => implode(';', [ 'lst' => implode(';', [
$record->get_serialize_key(),$story->get_serialize_key() $record->getId(),$story->getId()
]) ])
]); ]);
$response = self::$DI['client']->getResponse(); $response = self::$DI['client']->getResponse();
@@ -107,8 +107,8 @@ class PropertyTest extends \PhraseanetAuthenticatedWebTestCase
$this->assertTrue($datas['success']); $this->assertTrue($datas['success']);
$this->assertArrayHasKey('updated', $datas); $this->assertArrayHasKey('updated', $datas);
$record = new \record_adapter(self::$DI['app'], $record->get_sbas_id(), $record->get_record_id()); $record = new \record_adapter(self::$DI['app'], $record->getDataboxId(), $record->getRecordId());
$story = new \record_adapter(self::$DI['app'], $story->get_sbas_id(), $story->get_record_id()); $story = new \record_adapter(self::$DI['app'], $story->getDataboxId(), $story->getRecordId());
$recordStatus = strrev($record->get_status()); $recordStatus = strrev($record->get_status());
$storyStatus = strrev($story->get_status()); $storyStatus = strrev($story->get_status());
@@ -146,11 +146,11 @@ class PropertyTest extends \PhraseanetAuthenticatedWebTestCase
self::$DI['client']->request('POST', '/prod/records/property/type/', [ self::$DI['client']->request('POST', '/prod/records/property/type/', [
'lst' => implode(';', [ 'lst' => implode(';', [
$record->get_serialize_key(), $record2->get_serialize_key() $record->getId(), $record2->getId()
]), ]),
'types' => [ 'types' => [
$record->get_serialize_key() => 'document', $record->getId() => 'document',
$record2->get_serialize_key() => 'flash', $record2->getId() => 'flash',
] ]
]); ]);
$response = self::$DI['client']->getResponse(); $response = self::$DI['client']->getResponse();
@@ -159,11 +159,11 @@ class PropertyTest extends \PhraseanetAuthenticatedWebTestCase
$this->assertTrue($datas['success']); $this->assertTrue($datas['success']);
$this->assertArrayHasKey('updated', $datas); $this->assertArrayHasKey('updated', $datas);
$record = new \record_adapter(self::$DI['app'], $record->get_sbas_id(), $record->get_record_id()); $record = new \record_adapter(self::$DI['app'], $record->getDataboxId(), $record->getRecordId());
$record2 = new \record_adapter(self::$DI['app'], $record2->get_sbas_id(), $record2->get_record_id()); $record2 = new \record_adapter(self::$DI['app'], $record2->getDataboxId(), $record2->getRecordId());
$this->assertEquals('document', $record->get_type()); $this->assertEquals('document', $record->getType());
$this->assertEquals('flash', $record2->get_type()); $this->assertEquals('flash', $record2->getType());
$record->delete(); $record->delete();
$record2->delete(); $record2->delete();

View File

@@ -36,12 +36,12 @@ class RecordsTest extends \PhraseanetAuthenticatedWebTestCase
{ {
$file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../../files/cestlafete.jpg'), self::$DI['collection']); $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../../files/cestlafete.jpg'), self::$DI['collection']);
$record = \record_adapter::createFromFile($file, self::$DI['app']); $record = \record_adapter::createFromFile($file, self::$DI['app']);
$this->XMLHTTPRequest('POST', '/prod/records/delete/', ['lst' => $record->get_serialize_key()]); $this->XMLHTTPRequest('POST', '/prod/records/delete/', ['lst' => $record->getId()]);
$response = self::$DI['client']->getResponse(); $response = self::$DI['client']->getResponse();
$datas = (array) json_decode($response->getContent()); $datas = (array) json_decode($response->getContent());
$this->assertContains($record->get_serialize_key(), $datas); $this->assertContains($record->getId(), $datas);
try { try {
new \record_adapter(self::$DI['app'], $record->get_sbas_id(), $record->get_record_id()); new \record_adapter(self::$DI['app'], $record->getDataboxId(), $record->getRecordId());
$this->fail('Record not deleted'); $this->fail('Record not deleted');
} catch (\Exception $e) { } catch (\Exception $e) {
@@ -56,7 +56,7 @@ class RecordsTest extends \PhraseanetAuthenticatedWebTestCase
{ {
$file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../../files/cestlafete.jpg'), self::$DI['collection']); $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../../files/cestlafete.jpg'), self::$DI['collection']);
$record = \record_adapter::createFromFile($file, self::$DI['app']); $record = \record_adapter::createFromFile($file, self::$DI['app']);
$this->XMLHTTPRequest('POST', '/prod/records/renew-url/', ['lst' => $record->get_serialize_key()]); $this->XMLHTTPRequest('POST', '/prod/records/renew-url/', ['lst' => $record->getId()]);
$response = self::$DI['client']->getResponse(); $response = self::$DI['client']->getResponse();
$datas = (array) json_decode($response->getContent()); $datas = (array) json_decode($response->getContent());
$this->assertTrue(count($datas) > 0); $this->assertTrue(count($datas) > 0);

View File

@@ -100,7 +100,7 @@ class StoryTest extends \PhraseanetAuthenticatedWebTestCase
{ {
$story = \record_adapter::createStory(self::$DI['app'], self::$DI['collection']); $story = \record_adapter::createStory(self::$DI['app'], self::$DI['collection']);
$route = sprintf("/prod/story/%s/%s/addElements/", $story->get_sbas_id(), $story->get_record_id()); $route = sprintf("/prod/story/%s/%s/addElements/", $story->getDataboxId(), $story->getRecordId());
$records = [ $records = [
self::$DI['record_1']->get_serialize_key(), self::$DI['record_1']->get_serialize_key(),
@@ -123,7 +123,7 @@ class StoryTest extends \PhraseanetAuthenticatedWebTestCase
{ {
$story = \record_adapter::createStory(self::$DI['app'], self::$DI['collection']); $story = \record_adapter::createStory(self::$DI['app'], self::$DI['collection']);
$route = sprintf("/prod/story/%s/%s/addElements/", $story->get_sbas_id(), $story->get_record_id()); $route = sprintf("/prod/story/%s/%s/addElements/", $story->getDataboxId(), $story->getRecordId());
$records = [ $records = [
self::$DI['record_1']->get_serialize_key(), self::$DI['record_1']->get_serialize_key(),
@@ -162,11 +162,11 @@ class StoryTest extends \PhraseanetAuthenticatedWebTestCase
foreach ($records as $record) { foreach ($records as $record) {
/* @var $record \record_adapter */ /* @var $record \record_adapter */
$route = sprintf( $route = sprintf(
"/prod/story/%s/%s/delete/%s/%s/" "/prod/story/%s/%s/delete/%s/%s/",
, $story->get_sbas_id() $story->getDataboxId(),
, $story->get_record_id() $story->getRecordId(),
, $record->get_sbas_id() $record->getDataboxId(),
, $record->get_record_id() $record->getRecordId()
); );
if (($n % 2) === 0) { if (($n % 2) === 0) {

View File

@@ -269,8 +269,8 @@ class InformationsTest extends \PhraseanetAuthenticatedWebTestCase
'dmax' => $this->dmax->format('Y-m-d H:i:s'), 'dmax' => $this->dmax->format('Y-m-d H:i:s'),
'sbasid' => $this->getCollection()->get_sbas_id(), 'sbasid' => $this->getCollection()->get_sbas_id(),
'collection' => $this->getCollection()->get_coll_id(), 'collection' => $this->getCollection()->get_coll_id(),
'sbasid' => $this->getRecord1()->get_sbas_id(), 'sbasid' => $this->getRecord1()->getDataboxId(),
'rid' => $this->getRecord1()->get_record_id(), 'rid' => $this->getRecord1()->getRecordId(),
]); ]);
$response = $this->client->getResponse(); $response = $this->client->getResponse();
@@ -285,8 +285,8 @@ class InformationsTest extends \PhraseanetAuthenticatedWebTestCase
'dmax' => $this->dmax->format('Y-m-d H:i:s'), 'dmax' => $this->dmax->format('Y-m-d H:i:s'),
'sbasid' => $this->getCollection()->get_sbas_id(), 'sbasid' => $this->getCollection()->get_sbas_id(),
'collection' => $this->getCollection()->get_coll_id(), 'collection' => $this->getCollection()->get_coll_id(),
'sbasid' => $this->getRecord1()->get_sbas_id(), 'sbasid' => $this->getRecord1()->getDataboxId(),
'rid' => $this->getRecord1()->get_record_id(), 'rid' => $this->getRecord1()->getRecordId(),
'from' => 'TOOL' 'from' => 'TOOL'
]); ]);
@@ -302,8 +302,8 @@ class InformationsTest extends \PhraseanetAuthenticatedWebTestCase
'dmax' => $this->dmax->format('Y-m-d H:i:s'), 'dmax' => $this->dmax->format('Y-m-d H:i:s'),
'sbasid' => $this->getCollection()->get_sbas_id(), 'sbasid' => $this->getCollection()->get_sbas_id(),
'collection' => $this->getCollection()->get_coll_id(), 'collection' => $this->getCollection()->get_coll_id(),
'sbasid' => $this->getRecord1()->get_sbas_id(), 'sbasid' => $this->getRecord1()->getDataboxId(),
'rid' => $this->getRecord1()->get_record_id(), 'rid' => $this->getRecord1()->getRecordId(),
'from' => 'DASH' 'from' => 'DASH'
]); ]);
@@ -319,8 +319,8 @@ class InformationsTest extends \PhraseanetAuthenticatedWebTestCase
'dmax' => $this->dmax->format('Y-m-d H:i:s'), 'dmax' => $this->dmax->format('Y-m-d H:i:s'),
'sbasid' => $this->getCollection()->get_sbas_id(), 'sbasid' => $this->getCollection()->get_sbas_id(),
'collection' => $this->getCollection()->get_coll_id(), 'collection' => $this->getCollection()->get_coll_id(),
'sbasid' => $this->getRecord1()->get_sbas_id(), 'sbasid' => $this->getRecord1()->getDataboxId(),
'rid' => $this->getRecord1()->get_record_id(), 'rid' => $this->getRecord1()->getRecordId(),
'user' => $this->getUser()->getId() 'user' => $this->getUser()->getId()
]); ]);

View File

@@ -388,7 +388,7 @@ class RSSFeedTest extends \PhraseanetWebTestCase
$this->assertEquals($ressource->get_mime(), $value); $this->assertEquals($ressource->get_mime(), $value);
break; break;
case "medium": case "medium":
$this->assertEquals(strtolower($record->get_type()), $value); $this->assertEquals(strtolower($record->getType()), $value);
break; break;
case "isDefault": case "isDefault":
!$is_thumbnail ? $this->assertEquals("true", $value) : $this->assertEquals("false", $value); !$is_thumbnail ? $this->assertEquals("true", $value) : $this->assertEquals("false", $value);

View File

@@ -137,7 +137,7 @@ abstract class SearchEngineAbstractTest extends \PhraseanetAuthenticatedTestCase
{ {
$date_field = null; $date_field = null;
foreach ($record->get_databox()->get_meta_structure() as $databox_field) { foreach ($record->getDatabox()->get_meta_structure() as $databox_field) {
if ($databox_field->get_type() != \databox_field::TYPE_DATE) { if ($databox_field->get_type() != \databox_field::TYPE_DATE) {
continue; continue;
} }
@@ -239,7 +239,7 @@ abstract class SearchEngineAbstractTest extends \PhraseanetAuthenticatedTestCase
$toupdate = []; $toupdate = [];
$field = null; $field = null;
foreach ($record->get_databox()->get_meta_structure()->get_elements() as $field) { foreach ($record->getDatabox()->get_meta_structure()->get_elements() as $field) {
if ($indexable !== $field->is_indexable() || $field->isBusiness() !== $business) { if ($indexable !== $field->is_indexable() || $field->isBusiness() !== $business) {
continue; continue;

View File

@@ -70,8 +70,8 @@ class Bridge_ElementTest extends \PhraseanetTestCase
public function testGet_record() public function testGet_record()
{ {
$this->assertInstanceOf('record_adapter', $this->object->get_record()); $this->assertInstanceOf('record_adapter', $this->object->get_record());
$this->assertEquals(self::$DI['record_1']->get_sbas_id(), $this->object->get_record()->get_sbas_id()); $this->assertEquals(self::$DI['record_1']->get_sbas_id(), $this->object->get_record()->getDataboxId());
$this->assertEquals(self::$DI['record_1']->get_record_id(), $this->object->get_record()->get_record_id()); $this->assertEquals(self::$DI['record_1']->get_record_id(), $this->object->get_record()->getRecordId());
} }
public function testGet_dist_id() public function testGet_dist_id()

View File

@@ -202,8 +202,8 @@ abstract class PhraseanetAuthenticatedWebTestCase extends \PhraseanetAuthenticat
$app = $this->getApplication(); $app = $this->getApplication();
$elasticsearchRecord = new ElasticsearchRecord(); $elasticsearchRecord = new ElasticsearchRecord();
$elasticsearchRecord->setDataboxId($record->get_sbas_id()); $elasticsearchRecord->setDataboxId($record->getDataboxId());
$elasticsearchRecord->setRecordId($record->get_record_id()); $elasticsearchRecord->setRecordId($record->getRecordId());
$result = new SearchEngineResult( $result = new SearchEngineResult(
new SearchEngineOptions(), new SearchEngineOptions(),

View File

@@ -234,7 +234,7 @@ abstract class PhraseanetTestCase extends WebTestCase
$file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../files/cestlafete.jpg'), self::$DI['collection_no_access']); $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../files/cestlafete.jpg'), self::$DI['collection_no_access']);
$record = record_adapter::createFromFile($file, self::$DI['app']); $record = record_adapter::createFromFile($file, self::$DI['app']);
self::$DI['app']['subdef.generator']->generateSubdefs($record); self::$DI['app']['subdef.generator']->generateSubdefs($record);
self::$fixtureIds['records'][$id] = $record->get_record_id(); self::$fixtureIds['records'][$id] = $record->getRecordId();
return self::$fixtureIds['records'][$id]; return self::$fixtureIds['records'][$id];
}); });
@@ -250,7 +250,7 @@ abstract class PhraseanetTestCase extends WebTestCase
$file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../files/cestlafete.jpg'), self::$DI['collection_no_access_by_status']); $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../files/cestlafete.jpg'), self::$DI['collection_no_access_by_status']);
$record = record_adapter::createFromFile($file, self::$DI['app']); $record = record_adapter::createFromFile($file, self::$DI['app']);
self::$DI['app']['subdef.generator']->generateSubdefs($record); self::$DI['app']['subdef.generator']->generateSubdefs($record);
self::$fixtureIds['records'][$id] = $record->get_record_id(); self::$fixtureIds['records'][$id] = $record->getRecordId();
return self::$fixtureIds['records'][$id]; return self::$fixtureIds['records'][$id];
}); });

View File

@@ -23,7 +23,7 @@ class databox_fieldTest extends \PhraseanetTestCase
/** @var record_adapter $record_1 */ /** @var record_adapter $record_1 */
$record_1 = self::$DI['record_1']; $record_1 = self::$DI['record_1'];
$this->databox = $record_1->get_databox(); $this->databox = $record_1->getDatabox();
$this->name_mono = 'Field Test Mono'; $this->name_mono = 'Field Test Mono';
$this->name_multi = 'Field Test Multi'; $this->name_multi = 'Field Test Multi';

View File

@@ -80,10 +80,10 @@ class media_subdefTest extends \PhraseanetTestCase
*/ */
public function testGet_record() public function testGet_record()
{ {
$this->assertEquals(self::$recordonbleu->get_record_id(), self::$objectNotPresent->get_record()->get_record_id()); $this->assertEquals(self::$recordonbleu->getRecordId(), self::$objectNotPresent->get_record()->getRecordId());
$this->assertEquals(self::$recordonbleu->get_record_id(), self::$objectPresent->get_record()->get_record_id()); $this->assertEquals(self::$recordonbleu->getRecordId(), self::$objectPresent->get_record()->getRecordId());
$this->assertEquals(self::$recordonbleu->get_sbas_id(), self::$objectNotPresent->get_record()->get_sbas_id()); $this->assertEquals(self::$recordonbleu->getDataboxId(), self::$objectNotPresent->get_record()->getDataboxId());
$this->assertEquals(self::$recordonbleu->get_sbas_id(), self::$objectPresent->get_record()->get_sbas_id()); $this->assertEquals(self::$recordonbleu->getDataboxId(), self::$objectPresent->get_record()->getDataboxId());
} }
/** /**
@@ -111,8 +111,8 @@ class media_subdefTest extends \PhraseanetTestCase
*/ */
public function testGet_record_id() public function testGet_record_id()
{ {
$this->assertEquals(self::$recordonbleu->get_record_id(), self::$objectNotPresent->get_record()->get_record_id()); $this->assertEquals(self::$recordonbleu->getRecordId(), self::$objectNotPresent->get_record()->getRecordId());
$this->assertEquals(self::$recordonbleu->get_record_id(), self::$objectPresent->get_record()->get_record_id()); $this->assertEquals(self::$recordonbleu->getRecordId(), self::$objectPresent->get_record()->getRecordId());
} }
/** /**
@@ -140,8 +140,8 @@ class media_subdefTest extends \PhraseanetTestCase
*/ */
public function testGet_sbas_id() public function testGet_sbas_id()
{ {
$this->assertEquals(self::$recordonbleu->get_sbas_id(), self::$objectNotPresent->get_record()->get_sbas_id()); $this->assertEquals(self::$recordonbleu->getDataboxId(), self::$objectNotPresent->get_record()->getDataboxId());
$this->assertEquals(self::$recordonbleu->get_sbas_id(), self::$objectPresent->get_record()->get_sbas_id()); $this->assertEquals(self::$recordonbleu->getDataboxId(), self::$objectPresent->get_record()->getDataboxId());
} }
/** /**

View File

@@ -21,7 +21,7 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase
// Reset thumbtitle in order to have consistent tests (testGet_title) // Reset thumbtitle in order to have consistent tests (testGet_title)
if (!self::$thumbtitled) { if (!self::$thumbtitled) {
foreach ($this->getRecord1()->get_databox()->get_meta_structure() as $databox_field) { foreach ($this->getRecord1()->getDatabox()->get_meta_structure() as $databox_field) {
$databox_field->set_thumbtitle(false)->save(); $databox_field->set_thumbtitle(false)->save();
} }
self::$thumbtitled = true; self::$thumbtitled = true;
@@ -86,7 +86,7 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase
$this->getClient()->request( $this->getClient()->request(
'POST', $app['url_generator']->generate('prod_order_new'), [ 'POST', $app['url_generator']->generate('prod_order_new'), [
'lst' => $this->getRecord1()->get_serialize_key(), 'lst' => $this->getRecord1()->getId(),
'deadline' => '+10 minutes' 'deadline' => '+10 minutes'
]); ]);
@@ -137,16 +137,16 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase
{ {
$record_1 = $this->getRecord1(); $record_1 = $this->getRecord1();
try { try {
$record_1->set_type('jambon'); $record_1->setType('jambon');
$this->fail(); $this->fail();
} catch (Exception $e) { } catch (Exception $e) {
} }
$old_type = $record_1->get_type(); $old_type = $record_1->getType();
$record_1->set_type('video'); $record_1->setType('video');
$this->assertEquals('video', $record_1->get_type()); $this->assertEquals('video', $record_1->getType());
$record_1->set_type($old_type); $record_1->setType($old_type);
$this->assertEquals($old_type, $record_1->get_type()); $this->assertEquals($old_type, $record_1->getType());
} }
public function testIs_grouping() public function testIs_grouping()
@@ -158,17 +158,17 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase
public function testGet_base_id() public function testGet_base_id()
{ {
$record_1 = $this->getRecord1(); $record_1 = $this->getRecord1();
$this->assertTrue(is_int($record_1->get_base_id())); $this->assertTrue(is_int($record_1->getBaseId()));
$this->assertEquals($this->getCollection()->get_base_id(), $record_1->get_base_id()); $this->assertEquals($this->getCollection()->get_base_id(), $record_1->getBaseId());
$record_story_1 = $this->getRecordStory1(); $record_story_1 = $this->getRecordStory1();
$this->assertTrue(is_int($record_story_1->get_base_id())); $this->assertTrue(is_int($record_story_1->getBaseId()));
$this->assertEquals($this->getCollection()->get_base_id(), $record_story_1->get_base_id()); $this->assertEquals($this->getCollection()->get_base_id(), $record_story_1->getBaseId());
} }
public function testGet_record_id() public function testGet_record_id()
{ {
$this->assertTrue(is_int($this->getRecord1()->get_record_id())); $this->assertTrue(is_int($this->getRecord1()->getRecordId()));
$this->assertTrue(is_int($this->getRecordStory1()->get_record_id())); $this->assertTrue(is_int($this->getRecordStory1()->getRecordId()));
} }
public function testGet_thumbnail() public function testGet_thumbnail()
@@ -187,7 +187,7 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase
public function testGet_type() public function testGet_type()
{ {
$this->assertTrue(in_array($this->getRecord1()->get_type(), ['video', 'audio', 'image', 'document', 'flash', 'unknown'])); $this->assertTrue(in_array($this->getRecord1()->getType(), ['video', 'audio', 'image', 'document', 'flash', 'unknown']));
} }
public function testGet_formatted_duration() public function testGet_formatted_duration()
@@ -208,26 +208,26 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase
public function testGet_sha256() public function testGet_sha256()
{ {
$record_1 = $this->getRecord1(); $record_1 = $this->getRecord1();
$this->assertNotNull($record_1->get_sha256()); $this->assertNotNull($record_1->getSha256());
$this->assertRegExp('/[a-zA-Z0-9]{32}/', $record_1->get_sha256()); $this->assertRegExp('/[a-zA-Z0-9]{32}/', $record_1->getSha256());
$this->assertNull($this->getRecordStory1()->get_sha256()); $this->assertNull($this->getRecordStory1()->getSha256());
} }
public function testGet_mime() public function testGet_mime()
{ {
$this->assertRegExp('/image\/\w+/', $this->getRecord1()->get_mime()); $this->assertRegExp('/image\/\w+/', $this->getRecord1()->getMimeType());
} }
public function testSetMimeType() public function testSetMimeType()
{ {
$record_1 = $this->getRecord1(); $record_1 = $this->getRecord1();
$oldMime = $record_1->get_mime(); $oldMime = $record_1->getMimeType();
$record_1->set_mime('foo/bar'); $record_1->setMimeType('foo/bar');
$this->assertEquals('foo/bar', $record_1->get_mime()); $this->assertEquals('foo/bar', $record_1->getMimeType());
$record_1->set_mime($oldMime); $record_1->setMimeType($oldMime);
$this->assertEquals($oldMime, $record_1->get_mime()); $this->assertEquals($oldMime, $record_1->getMimeType());
} }
public function testGet_status() public function testGet_status()
@@ -307,12 +307,12 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase
public function testGet_serialize_key() public function testGet_serialize_key()
{ {
$record_1 = $this->getRecord1(); $record_1 = $this->getRecord1();
$this->assertTrue($record_1->get_serialize_key() == $record_1->get_sbas_id() . '_' . $record_1->get_record_id()); $this->assertTrue($record_1->getId() == $record_1->getDataboxId() . '_' . $record_1->getRecordId());
} }
public function testGet_sbas_id() public function testGet_sbas_id()
{ {
$this->assertTrue(is_int($this->getRecord1()->get_sbas_id())); $this->assertTrue(is_int($this->getRecord1()->getDataboxId()));
} }
public function testSet_metadatas() public function testSet_metadatas()
@@ -431,15 +431,15 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase
FROM record FROM record
WHERE jeton & ' . JETON_MAKE_SUBDEF . ' > 0 WHERE jeton & ' . JETON_MAKE_SUBDEF . ' > 0
AND record_id = :record_id'; AND record_id = :record_id';
$stmt = $record_1->get_databox()->get_connection()->prepare($sql); $stmt = $record_1->getDatabox()->get_connection()->prepare($sql);
$stmt->execute([':record_id' => $record_1->get_record_id()]); $stmt->execute([':record_id' => $record_1->getRecordId()]);
$row = $stmt->fetch(PDO::FETCH_ASSOC); $row = $stmt->fetch(PDO::FETCH_ASSOC);
$stmt->closeCursor(); $stmt->closeCursor();
if ( ! $row) if ( ! $row)
$this->fail(); $this->fail();
if ($row['record_id'] != $record_1->get_record_id()) if ($row['record_id'] != $record_1->getRecordId())
$this->fail(); $this->fail();
} }
@@ -450,15 +450,15 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase
$sql = 'SELECT record_id, coll_id, jeton $sql = 'SELECT record_id, coll_id, jeton
FROM record WHERE (jeton & ' . JETON_WRITE_META . ' > 0) FROM record WHERE (jeton & ' . JETON_WRITE_META . ' > 0)
AND record_id = :record_id'; AND record_id = :record_id';
$stmt = $record_1->get_databox()->get_connection()->prepare($sql); $stmt = $record_1->getDatabox()->get_connection()->prepare($sql);
$stmt->execute([':record_id' => $record_1->get_record_id()]); $stmt->execute([':record_id' => $record_1->getRecordId()]);
$row = $stmt->fetch(PDO::FETCH_ASSOC); $row = $stmt->fetch(PDO::FETCH_ASSOC);
$stmt->closeCursor(); $stmt->closeCursor();
if ( ! $row) if ( ! $row)
$this->fail(); $this->fail();
if ($row['record_id'] != $record_1->get_record_id()) if ($row['record_id'] != $record_1->getRecordId())
$this->fail(); $this->fail();
} }
@@ -482,26 +482,26 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase
public function testGet_record_by_sha() public function testGet_record_by_sha()
{ {
$record_1 = $this->getRecord1(); $record_1 = $this->getRecord1();
$tmp_records = record_adapter::get_record_by_sha($record_1->getDatabox(), $record_1->get_sha256()); $tmp_records = record_adapter::get_record_by_sha($record_1->getDatabox(), $record_1->getSha256());
$this->assertTrue(is_array($tmp_records)); $this->assertTrue(is_array($tmp_records));
foreach ($tmp_records as $tmp_record) { foreach ($tmp_records as $tmp_record) {
$this->assertInstanceOf('record_adapter', $tmp_record); $this->assertInstanceOf('record_adapter', $tmp_record);
$this->assertEquals($record_1->get_sha256(), $tmp_record->get_sha256()); $this->assertEquals($record_1->getSha256(), $tmp_record->getSha256());
} }
$tmp_records = record_adapter::get_record_by_sha( $tmp_records = record_adapter::get_record_by_sha(
$record_1->getDatabox(), $record_1->getDatabox(),
$record_1->get_sha256(), $record_1->getSha256(),
$record_1->get_record_id() $record_1->getRecordId()
); );
$this->assertTrue(is_array($tmp_records)); $this->assertTrue(is_array($tmp_records));
$this->assertTrue(count($tmp_records) === 1); $this->assertTrue(count($tmp_records) === 1);
foreach ($tmp_records as $tmp_record) { foreach ($tmp_records as $tmp_record) {
$this->assertInstanceOf('record_adapter', $tmp_record); $this->assertInstanceOf('record_adapter', $tmp_record);
$this->assertEquals($record_1->get_sha256(), $tmp_record->get_sha256()); $this->assertEquals($record_1->getSha256(), $tmp_record->getSha256());
$this->assertEquals($record_1->get_record_id(), $tmp_record->get_record_id()); $this->assertEquals($record_1->getRecordId(), $tmp_record->getRecordId());
} }
} }
@@ -518,8 +518,8 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase
$found = $sselcont_id = false; $found = $sselcont_id = false;
$record_1 = $this->getRecord1(); $record_1 = $this->getRecord1();
$sbas_id = $record_1->get_sbas_id(); $sbas_id = $record_1->getDataboxId();
$record_id = $record_1->get_record_id(); $record_id = $record_1->getRecordId();
foreach ($record_1->get_container_baskets($app['orm.em'], self::$DI['user']) as $c_basket) { foreach ($record_1->get_container_baskets($app['orm.em'], self::$DI['user']) as $c_basket) {
if ($c_basket->getId() == $basket->getId()) { if ($c_basket->getId() == $basket->getId()) {
@@ -538,7 +538,7 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase
public function testSetStatus() public function testSetStatus()
{ {
$record_1 = $this->getRecord1(); $record_1 = $this->getRecord1();
$record = new \record_adapter($this->getApplication(), $record_1->get_sbas_id(), $record_1->get_record_id()); $record = new \record_adapter($this->getApplication(), $record_1->getDataboxId(), $record_1->getRecordId());
$record->set_binary_status('1001001001010101'); $record->set_binary_status('1001001001010101');
$this->assertSame('00000000000000001001001001010101', $record->get_status()); $this->assertSame('00000000000000001001001001010101', $record->get_status());
} }

View File

@@ -17,7 +17,7 @@ class recordutils_imageTest extends \PhraseanetTestCase
$app->getApplicationBox()->write_collection_pic( $app->getApplicationBox()->write_collection_pic(
$app['media-alchemyst'], $app['media-alchemyst'],
$app['filesystem'], $app['filesystem'],
$record_1->get_collection(), $record_1->getCollection(),
null, null,
\collection::PIC_WM \collection::PIC_WM
); );
@@ -36,7 +36,7 @@ class recordutils_imageTest extends \PhraseanetTestCase
$app->getApplicationBox()->write_collection_pic( $app->getApplicationBox()->write_collection_pic(
$app['media-alchemyst'], $app['media-alchemyst'],
$app['filesystem'], $app['filesystem'],
$record_1->get_collection(), $record_1->getCollection(),
new SymfoFile(__DIR__ . '/../../files/logocoll.gif'), new SymfoFile(__DIR__ . '/../../files/logocoll.gif'),
\collection::PIC_WM \collection::PIC_WM
); );
@@ -82,13 +82,13 @@ class recordutils_imageTest extends \PhraseanetTestCase
{ {
/** @var record_adapter $record_1 */ /** @var record_adapter $record_1 */
$record_1 = self::$DI['record_1']; $record_1 = self::$DI['record_1'];
$this->addStampConf($record_1->get_collection()); $this->addStampConf($record_1->getCollection());
$app = $this->getApplication(); $app = $this->getApplication();
$app->getApplicationBox()->write_collection_pic( $app->getApplicationBox()->write_collection_pic(
$app['media-alchemyst'], $app['media-alchemyst'],
$app['filesystem'], $app['filesystem'],
$record_1->get_collection(), $record_1->getCollection(),
null, null,
\collection::PIC_STAMP \collection::PIC_STAMP
); );
@@ -103,13 +103,13 @@ class recordutils_imageTest extends \PhraseanetTestCase
{ {
/** @var record_adapter $record_1 */ /** @var record_adapter $record_1 */
$record_1 = self::$DI['record_1']; $record_1 = self::$DI['record_1'];
$this->addStampConf($record_1->get_collection()); $this->addStampConf($record_1->getCollection());
$app = $this->getApplication(); $app = $this->getApplication();
$app->getApplicationBox()->write_collection_pic( $app->getApplicationBox()->write_collection_pic(
$app['media-alchemyst'], $app['media-alchemyst'],
$app['filesystem'], $app['filesystem'],
$record_1->get_collection(), $record_1->getCollection(),
new SymfoFile(__DIR__ . '/../../files/logocoll.gif'), new SymfoFile(__DIR__ . '/../../files/logocoll.gif'),
\collection::PIC_STAMP \collection::PIC_STAMP
); );