diff --git a/lib/Alchemy/Phrasea/Border/Attribute/Story.php b/lib/Alchemy/Phrasea/Border/Attribute/Story.php index a34df36c60..d9210fd18b 100644 --- a/lib/Alchemy/Phrasea/Border/Attribute/Story.php +++ b/lib/Alchemy/Phrasea/Border/Attribute/Story.php @@ -69,7 +69,7 @@ class Story implements AttributeInterface */ public function asString() { - return $this->story->get_serialize_key(); + return $this->story->getId(); } /** diff --git a/lib/Alchemy/Phrasea/Border/Manager.php b/lib/Alchemy/Phrasea/Border/Manager.php index bb364d1d7e..39e0514ee1 100644 --- a/lib/Alchemy/Phrasea/Border/Manager.php +++ b/lib/Alchemy/Phrasea/Border/Manager.php @@ -277,7 +277,7 @@ class Manager $file->addAttribute( new MetadataAttr( new Metadata( - new TfRecordid(), new MonoValue($element->get_record_id()) + new TfRecordid(), new MonoValue($element->getRecordId()) ) ) ); diff --git a/lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php b/lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php index e4e989c9e2..238ffa4236 100644 --- a/lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php +++ b/lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php @@ -59,7 +59,7 @@ class BuildMissingSubdefs extends Command $subdefGenerator->generateSubdefs($record, $wanted_subdefs); 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 ++; } } diff --git a/lib/Alchemy/Phrasea/Command/RecordAdd.php b/lib/Alchemy/Phrasea/Command/RecordAdd.php index e40514ac4c..47192053af 100644 --- a/lib/Alchemy/Phrasea/Command/RecordAdd.php +++ b/lib/Alchemy/Phrasea/Command/RecordAdd.php @@ -61,7 +61,7 @@ class RecordAdd extends Command if (!$input->getOption('yes')) { do { $continue = strtolower($dialog->ask($output, sprintf("Will add record %s (%s) on collection %s\nContinue ? (y/N)", $file, $media->getType(), $collection->get_label($this->container['locale'])), 'N')); - } while ( ! in_array($continue, ['y', 'n'])); + } while (!in_array($continue, ['y', 'n'])); if (strtolower($continue) !== 'y') { $output->writeln('Aborted !'); @@ -112,7 +112,10 @@ class RecordAdd extends Command if ($elementCreated instanceof \record_adapter) { $output->writeln( sprintf( - "Record id %d 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 %d 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) { diff --git a/lib/Alchemy/Phrasea/Command/Upgrade/Step35.php b/lib/Alchemy/Phrasea/Command/Upgrade/Step35.php index 911585335f..d3219effe6 100644 --- a/lib/Alchemy/Phrasea/Command/Upgrade/Step35.php +++ b/lib/Alchemy/Phrasea/Command/Upgrade/Step35.php @@ -80,13 +80,13 @@ class Step35 implements DatasUpgraderInterface try { $this->updateMetadatas($record, $row['xml']); } 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 { $record->set_binary_status($row['status']); } 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); } @@ -131,7 +131,7 @@ class Step35 implements DatasUpgraderInterface */ protected function updateMetadatas(\record_adapter $record, $xml) { - $metas = $record->get_databox()->get_meta_structure(); + $metas = $record->getDatabox()->get_meta_structure(); $datas = $metadatas = []; diff --git a/lib/Alchemy/Phrasea/Controller/AbstractDelivery.php b/lib/Alchemy/Phrasea/Controller/AbstractDelivery.php index e550c21912..edce950bd1 100644 --- a/lib/Alchemy/Phrasea/Controller/AbstractDelivery.php +++ b/lib/Alchemy/Phrasea/Controller/AbstractDelivery.php @@ -62,7 +62,7 @@ abstract class AbstractDelivery private function logView(\record_adapter $record, Request $request) { try { - $logger = $this->getDataboxLogger($record->get_databox()); + $logger = $this->getDataboxLogger($record->getDatabox()); $log_id = $logger->get_id(); $record->log_view( $log_id, diff --git a/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php b/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php index de751a1e0b..b1cf6f3341 100644 --- a/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php +++ b/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php @@ -2182,7 +2182,7 @@ class V1Controller extends Controller $story->removeChild($record); } - return $record->get_serialize_key(); + return $record->getId(); } 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)); - return $record->get_serialize_key(); + return $record->getId(); } public function getCurrentUserAction(Request $request) diff --git a/lib/Alchemy/Phrasea/Controller/DatafileController.php b/lib/Alchemy/Phrasea/Controller/DatafileController.php index 764a30e263..15fb91a3ae 100644 --- a/lib/Alchemy/Phrasea/Controller/DatafileController.php +++ b/lib/Alchemy/Phrasea/Controller/DatafileController.php @@ -66,7 +66,7 @@ class DatafileController extends AbstractDelivery $stamp = false; $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) { $subdef_class = null; diff --git a/lib/Alchemy/Phrasea/Controller/PermalinkController.php b/lib/Alchemy/Phrasea/Controller/PermalinkController.php index 04aed5ec2c..6850439985 100644 --- a/lib/Alchemy/Phrasea/Controller/PermalinkController.php +++ b/lib/Alchemy/Phrasea/Controller/PermalinkController.php @@ -122,7 +122,7 @@ class PermalinkController extends AbstractDelivery $watermark = $stamp = false; 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) { /** @var BasketElementRepository $repository */ @@ -138,7 +138,7 @@ class PermalinkController extends AbstractDelivery 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()) { default: case 'none': @@ -169,8 +169,8 @@ class PermalinkController extends AbstractDelivery $response = $this->deliverContent($request, $record, $subdef, $watermark, $stamp); $response->headers->set('Link', $this->app->url("permalinks_caption", [ - 'sbas_id' => $record->get_sbas_id(), - 'record_id' => $record->get_record_id(), + 'sbas_id' => $record->getDataboxId(), + 'record_id' => $record->getRecordId(), 'token' => $token, ])); diff --git a/lib/Alchemy/Phrasea/Controller/Prod/EditController.php b/lib/Alchemy/Phrasea/Controller/Prod/EditController.php index d935211685..10b59e1754 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/EditController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/EditController.php @@ -146,15 +146,15 @@ class EditController extends Controller foreach ($records as $record) { $indice = $record->getNumber(); $elements[$indice] = [ - 'bid' => $record->get_base_id(), - 'rid' => $record->get_record_id(), + 'bid' => $record->getBaseId(), + 'rid' => $record->getRecordId(), 'sselcont_id' => null, '_selected' => false, 'fields' => $databox_fields, ]; $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) { $tmp_val = substr(strrev($record->get_status()), $n, 1); $elements[$indice]['statbits'][$n]['value'] = ($tmp_val == '1') ? '1' : '0'; @@ -209,7 +209,7 @@ class EditController extends Controller ['record' => $record] ); - $elements[$indice]['type'] = $record->get_type(); + $elements[$indice]['type'] = $record->getType(); } } @@ -287,7 +287,7 @@ class EditController extends Controller try { $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) { if (!in_array($name, ['thumbnail', 'preview'])) { @@ -300,7 +300,7 @@ class EditController extends Controller $media = $this->app->getMediaFromUri($value->getRealPath()); $this->getSubDefinitionSubstituer()->substitute($reg_record, $name, $media); $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, \Session_Logger::EVENT_SUBSTITUTE, $name == 'document' ? 'HD' : $name, @@ -325,7 +325,7 @@ class EditController extends Controller continue; } - $key = $record->get_serialize_key(); + $key = $record->getId(); if (!array_key_exists($key, $elements)) { continue; @@ -364,8 +364,8 @@ class EditController extends Controller $record ->write_metas() - ->get_collection() - ->reset_stamp($record->get_record_id()); + ->getCollection() + ->reset_stamp($record->getRecordId()); if ($statbits != '') { $this->getDataboxLogger($databox) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/FeedController.php b/lib/Alchemy/Phrasea/Controller/Prod/FeedController.php index 084c317aee..6c51b0fe5c 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/FeedController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/FeedController.php @@ -81,8 +81,8 @@ class FeedController extends Controller foreach ($publishing as $record) { $item = new FeedItem(); $item->setEntry($entry) - ->setRecordId($record->get_record_id()) - ->setSbasId($record->get_sbas_id()); + ->setRecordId($record->getRecordId()) + ->setSbasId($record->getDataboxId()); $entry->addItem($item); $manager->persist($item); } diff --git a/lib/Alchemy/Phrasea/Controller/Prod/LazaretController.php b/lib/Alchemy/Phrasea/Controller/Prod/LazaretController.php index d3a663dcc4..626df230c7 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/LazaretController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/LazaretController.php @@ -203,7 +203,7 @@ class LazaretController extends Controller //Check if the chosen record is eligible to the substitution foreach ($lazaretFile->getRecordsToSubstitute($this->app) as $record) { - if ($record->get_record_id() !== (int) $recordId) { + if ($record->getRecordId() !== (int) $recordId) { continue; } @@ -227,7 +227,7 @@ class LazaretController extends Controller $record = $lazaretFile->getCollection($this->app)->get_databox()->get_record($recordId); $this->getSubDefinitionSubstituer() ->substitute($record, 'document', $media); - $this->getDataboxLogger($record->get_databox())->log( + $this->getDataboxLogger($record->getDatabox())->log( $record, \Session_Logger::EVENT_SUBSTITUTE, 'HD', diff --git a/lib/Alchemy/Phrasea/Controller/Prod/MoveCollectionController.php b/lib/Alchemy/Phrasea/Controller/Prod/MoveCollectionController.php index 74c8378e84..e880861049 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/MoveCollectionController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/MoveCollectionController.php @@ -71,7 +71,7 @@ class MoveCollectionController extends Controller if ($request->request->get("chg_coll_son") == "1") { /** @var \record_adapter $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()); } } diff --git a/lib/Alchemy/Phrasea/Controller/Prod/PrinterController.php b/lib/Alchemy/Phrasea/Controller/Prod/PrinterController.php index 968e6b23b9..d2bc03b190 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/PrinterController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/PrinterController.php @@ -34,7 +34,7 @@ class PrinterController extends Controller $layout = $request->request->get('lay'); 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); diff --git a/lib/Alchemy/Phrasea/Controller/Prod/PropertyController.php b/lib/Alchemy/Phrasea/Controller/Prod/PropertyController.php index f368b24046..c6997a1325 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/PropertyController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/PropertyController.php @@ -87,17 +87,17 @@ class PropertyController extends Controller foreach ($records as $record) { //perform logic - $sbasId = $record->get_databox()->get_sbas_id(); + $sbasId = $record->getDataboxId(); if (!isset($recordsType[$sbasId])) { $recordsType[$sbasId] = []; } - if (!isset($recordsType[$sbasId][$record->get_type()])) { - $recordsType[$sbasId][$record->get_type()] = []; + if (!isset($recordsType[$sbasId][$record->getType()])) { + $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', [ @@ -120,18 +120,18 @@ class PropertyController extends Controller $postStatus = (array) $request->request->get('status'); foreach ($records as $record) { - $sbasId = $record->get_databox()->get_sbas_id(); + $sbasId = $record->getDataboxId(); //update record 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 if (isset($applyStatusToChildren[$sbasId]) && $record->isStory()) { - foreach ($record->get_children() as $child) { + foreach ($record->getChildren() as $child) { 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) { try { - $recordType = !empty($forceType) ? $forceType : (isset($typeLst[$record->get_serialize_key()]) ? $typeLst[$record->get_serialize_key()] : null); - $mimeType = isset($mimeLst[$record->get_serialize_key()]) ? $mimeLst[$record->get_serialize_key()] : null; + $recordType = !empty($forceType) ? $forceType : (isset($typeLst[$record->getId()]) ? $typeLst[$record->getId()] : null); + $mimeType = isset($mimeLst[$record->getId()]) ? $mimeLst[$record->getId()] : null; if ($recordType) { - $record->set_type($recordType); - $updated[$record->get_serialize_key()]['record_type'] = $recordType; + $record->setType($recordType); + $updated[$record->getId()]['record_type'] = $recordType; } if ($mimeType) { - $record->set_mime($mimeType); - $updated[$record->get_serialize_key()]['mime_type'] = $mimeType; + $record->setMimeType($mimeType); + $updated[$record->getId()]['mime_type'] = $mimeType; } } catch (\Exception $e) { @@ -185,7 +185,7 @@ class PropertyController extends Controller */ 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])) { $postStatus = $postStatus[$sbasId]; diff --git a/lib/Alchemy/Phrasea/Controller/Prod/PushController.php b/lib/Alchemy/Phrasea/Controller/Prod/PushController.php index e666350fa8..90abd15573 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/PushController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/PushController.php @@ -124,7 +124,7 @@ class PushController extends Controller ); } - $this->getDataboxLogger($element->get_databox())->log( + $this->getDataboxLogger($element->getDatabox())->log( $element, \Session_Logger::EVENT_VALIDATE, $user_receiver->getId(), @@ -322,7 +322,7 @@ class PushController extends Controller $manager->merge($basketElement); $manager->persist($validationData); - $this->getDataboxLogger($basketElement->getRecord($this->app)->get_databox())->log( + $this->getDataboxLogger($basketElement->getRecord($this->app)->getDatabox())->log( $basketElement->getRecord($this->app), \Session_Logger::EVENT_PUSH, $participantUser->getId(), diff --git a/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php b/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php index cc8f86c7e9..a9c967e815 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php @@ -106,8 +106,8 @@ class RecordController extends Controller ]), "pos" => $record->getNumber(), "title" => str_replace(array('[[em]]', '[[/em]]'), array('', ''), $record->get_title($query, $searchEngine)), - "collection_name" => $record->get_collection()->get_name(), - "collection_logo" => $record->get_collection()->getLogo($record->get_base_id(), $this->app), + "collection_name" => $record->getCollection()->get_name(), + "collection_logo" => $record->getCollection()->getLogo($record->getBaseId(), $this->app), ]); } @@ -135,7 +135,7 @@ class RecordController extends Controller foreach ($basketElements as $element) { $manager->remove($element); - $deleted[] = $element->getRecord($this->app)->get_serialize_key(); + $deleted[] = $element->getRecord($this->app)->getId(); } $attachedStories = $StoryWZRepository->findByRecord($this->app, $record); @@ -144,7 +144,7 @@ class RecordController extends Controller $manager->remove($attachedStory); } - $deleted[] = $record->get_serialize_key(); + $deleted[] = $record->getId(); $record->delete(); } catch (\Exception $e) { @@ -186,7 +186,7 @@ class RecordController extends Controller $renewed = []; 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); diff --git a/lib/Alchemy/Phrasea/Controller/Prod/StoryController.php b/lib/Alchemy/Phrasea/Controller/Prod/StoryController.php index e8efc59e47..39ffb95bf9 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/StoryController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/StoryController.php @@ -84,8 +84,8 @@ class StoryController extends Controller 'message' => $this->app->trans('Story created'), 'WorkZone' => $storyWZ->getId(), 'story' => [ - 'sbas_id' => $story->get_sbas_id(), - 'record_id' => $story->get_record_id(), + 'sbas_id' => $story->getDataboxId(), + 'record_id' => $story->getRecordId(), ], ]; @@ -109,7 +109,7 @@ class StoryController extends Controller { $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'); } @@ -145,7 +145,7 @@ class StoryController extends Controller $story = new \record_adapter($this->app, $sbas_id, $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'); } @@ -188,17 +188,17 @@ class StoryController extends Controller 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')); } $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) { $params = [ ':ord' => $ord, - ':parent_id' => $story->get_record_id(), + ':parent_id' => $story->getRecordId(), ':children_id' => $record_id ]; $stmt->execute($params); diff --git a/lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php b/lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php index 5c46afe518..8dc57a8cb8 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php @@ -202,7 +202,7 @@ class ToolsController extends Controller $record->insertTechnicalDatas($this->getMediaVorus()); $this->getMetadataSetter()->replaceMetadata($this->getMetadataReader() ->read($media), $record); - $this->getDataboxLogger($record->get_databox()) + $this->getDataboxLogger($record->getDatabox()) ->log($record, \Session_Logger::EVENT_SUBSTITUTE, 'HD', '' ); if ((int) $request->request->get('ccfilename') === 1) { @@ -259,7 +259,7 @@ class ToolsController extends Controller $media = $this->app->getMediaFromUri($tempoFile); $this->getSubDefinitionSubstituer()->substitute($record, 'thumbnail', $media); - $this->getDataboxLogger($record->get_databox()) + $this->getDataboxLogger($record->getDatabox()) ->log($record, \Session_Logger::EVENT_SUBSTITUTE, 'thumbnail', ''); unlink($tempoFile); @@ -415,7 +415,7 @@ class ToolsController extends Controller { $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); file_put_contents($fileName, $dataUri->getData()); @@ -423,7 +423,7 @@ class ToolsController extends Controller $media = $this->app->getMediaFromUri($fileName); $this->getSubDefinitionSubstituer()->substitute($record, $subDefName, $media); - $this->getDataboxLogger($record->get_databox()) + $this->getDataboxLogger($record->getDatabox()) ->log($record, \Session_Logger::EVENT_SUBSTITUTE, $subDefName, ''); unset($media); diff --git a/lib/Alchemy/Phrasea/Controller/Prod/UploadController.php b/lib/Alchemy/Phrasea/Controller/Prod/UploadController.php index 1c04bfd251..d800aacdb9 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/UploadController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/UploadController.php @@ -178,7 +178,7 @@ class UploadController extends Controller } if ($elementCreated instanceof \record_adapter) { - $id = $elementCreated->get_serialize_key(); + $id = $elementCreated->getId(); $element = 'record'; $message = $this->app->trans('The record was successfully created'); @@ -194,7 +194,7 @@ class UploadController extends Controller $media = $this->app->getMediaFromUri($fileName); $this->getSubDefinitionSubstituer()->substitute($elementCreated, 'thumbnail', $media); - $this->getDataboxLogger($elementCreated->get_databox()) + $this->getDataboxLogger($elementCreated->getDatabox()) ->log($elementCreated, \Session_Logger::EVENT_SUBSTITUTE, 'thumbnail', ''); unset($media); diff --git a/lib/Alchemy/Phrasea/Controller/Prod/WorkzoneController.php b/lib/Alchemy/Phrasea/Controller/Prod/WorkzoneController.php index 696c47b3d1..98b87bd732 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/WorkzoneController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/WorkzoneController.php @@ -100,7 +100,7 @@ class WorkzoneController extends Controller 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'); } diff --git a/lib/Alchemy/Phrasea/Controller/RecordsRequest.php b/lib/Alchemy/Phrasea/Controller/RecordsRequest.php index 1e255c41b2..5d0c93b9de 100644 --- a/lib/Alchemy/Phrasea/Controller/RecordsRequest.php +++ b/lib/Alchemy/Phrasea/Controller/RecordsRequest.php @@ -104,7 +104,7 @@ class RecordsRequest extends ArrayCollection /** @var \record_adapter $record */ foreach ($this as $record) { 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() { if ($this->isSingleStory()) { - return $this->singleStory()->get_serialize_key(); + return $this->singleStory()->getId(); } $basrec = []; @@ -211,7 +211,7 @@ class RecordsRequest extends ArrayCollection $app['acl.basket']->hasAccess($basket, $app->getAuthenticatedUser()); 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')) { $repository = $app['repo.story-wz']; @@ -230,7 +230,7 @@ class RecordsRequest extends ArrayCollection } try { $record = new \record_adapter($app, (int) $basrec[0], (int) $basrec[1]); - $received[$record->get_serialize_key()] = $record; + $received[$record->getId()] = $record; unset($record); } catch (NotFoundHttpException $e) { continue; diff --git a/lib/Alchemy/Phrasea/Controller/Report/InformationController.php b/lib/Alchemy/Phrasea/Controller/Report/InformationController.php index 4b9bf720f1..6868292743 100644 --- a/lib/Alchemy/Phrasea/Controller/Report/InformationController.php +++ b/lib/Alchemy/Phrasea/Controller/Report/InformationController.php @@ -325,8 +325,8 @@ class InformationController extends Controller /** @var \record_adapter $record */ $reportArray = $what->buildTabUserWhat( - $record->get_base_id(), - $record->get_record_id(), + $record->getBaseId(), + $record->getRecordId(), $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->setOrder('ddate', 'DESC'); diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/BridgeSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/BridgeSubscriber.php index 1e39bf68d7..0de92461df 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/BridgeSubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/BridgeSubscriber.php @@ -26,8 +26,8 @@ class BridgeSubscriber extends AbstractNotificationSubscriber 'usr_id' => $user->getId(), 'reason' => $event->getReason(), 'account_id' => $account->get_id(), - 'sbas_id' => $event->getElement()->get_record()->get_sbas_id(), - 'record_id' => $event->getElement()->get_record()->get_record_id(), + 'sbas_id' => $event->getElement()->get_record()->getDataboxId(), + 'record_id' => $event->getElement()->get_record()->getRecordId(), ]; $datas = json_encode($params); diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php b/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php index 1b00e8a779..936a5aba87 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php @@ -191,7 +191,7 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn $thumbnail_sd = $content->getRecord($app)->get_thumbnail(); $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'])) { return $this; diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterAbstract.php b/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterAbstract.php index 948dd3021d..4024a9157f 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterAbstract.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterAbstract.php @@ -52,7 +52,7 @@ abstract class FeedFormatterAbstract $thumbnail_sd = $content->getRecord($app)->get_thumbnail(); $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'])) { return $this; diff --git a/lib/Alchemy/Phrasea/Helper/Record/Helper.php b/lib/Alchemy/Phrasea/Helper/Record/Helper.php index 5e04bab6d1..853e5d0f3b 100644 --- a/lib/Alchemy/Phrasea/Helper/Record/Helper.php +++ b/lib/Alchemy/Phrasea/Helper/Record/Helper.php @@ -284,7 +284,7 @@ class Helper extends \Alchemy\Phrasea\Helper\Helper public function get_serialize_list() { if ($this->is_single_grouping()) { - return $this->get_grouping_head()->get_serialize_key(); + return $this->get_grouping_head()->getId(); } else { return $this->selection->serialize_list(); } diff --git a/lib/Alchemy/Phrasea/Metadata/PhraseanetMetadataSetter.php b/lib/Alchemy/Phrasea/Metadata/PhraseanetMetadataSetter.php index 637ba6c776..30c7580752 100644 --- a/lib/Alchemy/Phrasea/Metadata/PhraseanetMetadataSetter.php +++ b/lib/Alchemy/Phrasea/Metadata/PhraseanetMetadataSetter.php @@ -20,7 +20,7 @@ class PhraseanetMetadataSetter $metadatas = []; $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) { $tagname = $databoxField->get_tag()->getTagname(); diff --git a/lib/Alchemy/Phrasea/Model/Entities/Basket.php b/lib/Alchemy/Phrasea/Model/Entities/Basket.php index ae7e087a27..c25b074634 100644 --- a/lib/Alchemy/Phrasea/Model/Entities/Basket.php +++ b/lib/Alchemy/Phrasea/Model/Entities/Basket.php @@ -460,8 +460,8 @@ class Basket foreach ($this->getElements() as $basket_element) { $bask_record = $basket_element->getRecord($app); - if ($bask_record->get_record_id() == $record->get_record_id() - && $bask_record->get_sbas_id() == $record->get_sbas_id()) { + if ($bask_record->getRecordId() == $record->getRecordId() + && $bask_record->getDataboxId() == $record->getDataboxId()) { return true; } } diff --git a/lib/Alchemy/Phrasea/Model/Entities/BasketElement.php b/lib/Alchemy/Phrasea/Model/Entities/BasketElement.php index 45c5598696..80af7802fc 100644 --- a/lib/Alchemy/Phrasea/Model/Entities/BasketElement.php +++ b/lib/Alchemy/Phrasea/Model/Entities/BasketElement.php @@ -138,8 +138,8 @@ class BasketElement public function setRecord(\record_adapter $record) { - $this->setRecordId($record->get_record_id()); - $this->setSbasId($record->get_sbas_id()); + $this->setRecordId($record->getRecordId()); + $this->setSbasId($record->getDataboxId()); } /** diff --git a/lib/Alchemy/Phrasea/Model/Entities/StoryWZ.php b/lib/Alchemy/Phrasea/Model/Entities/StoryWZ.php index c7fdd93a3a..8761a77865 100644 --- a/lib/Alchemy/Phrasea/Model/Entities/StoryWZ.php +++ b/lib/Alchemy/Phrasea/Model/Entities/StoryWZ.php @@ -116,8 +116,8 @@ class StoryWZ public function setRecord(\record_adapter $record) { - $this->setRecordId($record->get_record_id()); - $this->setSbasId($record->get_sbas_id()); + $this->setRecordId($record->getRecordId()); + $this->setSbasId($record->getDataboxId()); } /** * @param User $user diff --git a/lib/Alchemy/Phrasea/Model/Manipulator/LazaretManipulator.php b/lib/Alchemy/Phrasea/Model/Manipulator/LazaretManipulator.php index ec6604c00b..98dac9ad8b 100644 --- a/lib/Alchemy/Phrasea/Model/Manipulator/LazaretManipulator.php +++ b/lib/Alchemy/Phrasea/Model/Manipulator/LazaretManipulator.php @@ -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); - $fields = $metaFields->toMetadataArray($record->get_databox()->get_meta_structure()); + $fields = $metaFields->toMetadataArray($record->getDatabox()->get_meta_structure()); $record->set_metadatas($fields); } diff --git a/lib/Alchemy/Phrasea/Model/Repositories/BasketElementRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/BasketElementRepository.php index b38e6366e1..677242c359 100644 --- a/lib/Alchemy/Phrasea/Model/Repositories/BasketElementRepository.php +++ b/lib/Alchemy/Phrasea/Model/Repositories/BasketElementRepository.php @@ -73,8 +73,8 @@ class BasketElementRepository extends EntityRepository AND e.sbas_id = :sbas_id'; $params = [ - 'sbas_id' => $record->get_sbas_id(), - 'record_id' => $record->get_record_id() + 'sbas_id' => $record->getDataboxId(), + 'record_id' => $record->getRecordId() ]; $query = $this->_em->createQuery($dql); @@ -121,8 +121,8 @@ class BasketElementRepository extends EntityRepository AND e.sbas_id = :sbas_id'; $params = [ - 'sbas_id' => $record->get_sbas_id(), - 'record_id' => $record->get_record_id(), + 'sbas_id' => $record->getDataboxId(), + 'record_id' => $record->getRecordId(), 'usr_id' => $user->getId() ]; @@ -144,8 +144,8 @@ class BasketElementRepository extends EntityRepository AND e.sbas_id = :sbas_id'; $params = [ - 'sbas_id' => $record->get_sbas_id(), - 'record_id' => $record->get_record_id(), + 'sbas_id' => $record->getDataboxId(), + 'record_id' => $record->getRecordId(), 'usr_id' => $user->getId() ]; diff --git a/lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php index 7f02a63ba2..6304f3eaa6 100644 --- a/lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php +++ b/lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php @@ -196,7 +196,7 @@ class BasketRepository extends EntityRepository AND b.user = :usr_id'; $params = [ - 'record_id' => $record->get_record_id(), + 'record_id' => $record->getRecordId(), 'usr_id' => $user->getId() ]; diff --git a/lib/Alchemy/Phrasea/Model/Repositories/StoryWZRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/StoryWZRepository.php index 9b6f3f1605..d973d9ccdf 100644 --- a/lib/Alchemy/Phrasea/Model/Repositories/StoryWZRepository.php +++ b/lib/Alchemy/Phrasea/Model/Repositories/StoryWZRepository.php @@ -99,8 +99,8 @@ class StoryWZRepository extends EntityRepository { $story = $this->findOneBy([ 'user' => $user->getId(), - 'sbas_id' => $Story->get_sbas_id(), - 'record_id' => $Story->get_record_id(), + 'sbas_id' => $Story->getDataboxId(), + 'record_id' => $Story->getRecordId(), ]); if ($story) { @@ -129,8 +129,8 @@ class StoryWZRepository extends EntityRepository $query = $this->_em->createQuery($dql); $query->setParameters([ - 'sbas_id' => $Story->get_sbas_id(), - 'record_id' => $Story->get_record_id(), + 'sbas_id' => $Story->getDataboxId(), + 'record_id' => $Story->getRecordId(), ]); /** @var StoryWZ[] $stories */ diff --git a/lib/Alchemy/Phrasea/Model/Serializer/CaptionSerializer.php b/lib/Alchemy/Phrasea/Model/Serializer/CaptionSerializer.php index 10af2018cf..64b65e358f 100644 --- a/lib/Alchemy/Phrasea/Model/Serializer/CaptionSerializer.php +++ b/lib/Alchemy/Phrasea/Model/Serializer/CaptionSerializer.php @@ -77,7 +77,7 @@ class CaptionSerializer extends AbstractSerializer $dom_doc->standalone = true; $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); $description = $dom_doc->createElement('description'); $record->appendChild($description); diff --git a/lib/Alchemy/Phrasea/Out/Module/PDF.php b/lib/Alchemy/Phrasea/Out/Module/PDF.php index 8fe925d8b3..bdbd809655 100644 --- a/lib/Alchemy/Phrasea/Out/Module/PDF.php +++ b/lib/Alchemy/Phrasea/Out/Module/PDF.php @@ -166,7 +166,7 @@ class PDF $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) { $fimg = \recordutils_image::watermark($this->app, $subdef); } @@ -258,7 +258,7 @@ class PDF $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->SetFillColor(220, 220, 220); $this->pdf->SetLeftMargin($lmargin); @@ -339,10 +339,10 @@ class PDF $RIGHT_TEXT = ""; $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)) { - $databox = $rec->get_databox(); + $databox = $rec->getDatabox(); $str = $databox->get_sxml_structure(); $vn = (string) ($str->pdfPrintLogo); 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 = ""; if (false !== $str = simplexml_load_string($collection->get_prefs())) { @@ -358,9 +358,9 @@ class PDF } 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") { - $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(); @@ -438,7 +438,7 @@ class PDF $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) $f = \recordutils_image::watermark($this->app, $subdef); diff --git a/lib/Alchemy/Phrasea/TaskManager/Job/ArchiveJob.php b/lib/Alchemy/Phrasea/TaskManager/Job/ArchiveJob.php index 8372a6f3b1..fca5db752b 100644 --- a/lib/Alchemy/Phrasea/TaskManager/Job/ArchiveJob.php +++ b/lib/Alchemy/Phrasea/TaskManager/Job/ArchiveJob.php @@ -875,7 +875,7 @@ class ArchiveJob extends AbstractJob $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)); diff --git a/lib/Alchemy/Phrasea/TaskManager/Job/FtpJob.php b/lib/Alchemy/Phrasea/TaskManager/Job/FtpJob.php index a5eabfc08f..332e501a86 100644 --- a/lib/Alchemy/Phrasea/TaskManager/Job/FtpJob.php +++ b/lib/Alchemy/Phrasea/TaskManager/Job/FtpJob.php @@ -412,7 +412,7 @@ class FtpJob extends AbstractJob private function logexport(Application $app, \record_adapter $record, $obj, $ftpLog) { foreach ($obj as $oneObj) { - $app['phraseanet.logger']($record->get_databox()) + $app['phraseanet.logger']($record->getDatabox()) ->log($record, \Session_Logger::EVENT_EXPORTFTP, $ftpLog, ''); } diff --git a/lib/Alchemy/Phrasea/TaskManager/Job/RecordMoverJob.php b/lib/Alchemy/Phrasea/TaskManager/Job/RecordMoverJob.php index 8ac3f3064a..8581546bde 100644 --- a/lib/Alchemy/Phrasea/TaskManager/Job/RecordMoverJob.php +++ b/lib/Alchemy/Phrasea/TaskManager/Job/RecordMoverJob.php @@ -111,13 +111,13 @@ class RecordMoverJob extends AbstractJob foreach ($rec->get_children() as $child) { $child->delete(); 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(); 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; } diff --git a/lib/classes/Bridge/Api/Dailymotion.php b/lib/classes/Bridge/Api/Dailymotion.php index b265bd0d55..acc2fae8ff 100644 --- a/lib/classes/Bridge/Api/Dailymotion.php +++ b/lib/classes/Bridge/Api/Dailymotion.php @@ -466,7 +466,7 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I public function acceptable_records() { 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 = []) { - switch ($record->get_type()) { + switch ($record->getType()) { case self::ELEMENT_TYPE_VIDEO : $url_file = $this->_api->sendFile($record->get_hd_file()->getRealPath(), $this->oauth_token); $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); $check = function ($field) use (&$errors, $datas, $record) { - $key = $record->get_serialize_key(); + $key = $record->getId(); $required = ! ! $field["required"]; $name = $field["name"]; $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) { - $key = $record->get_serialize_key(); + $key = $record->getId(); $datas = [ 'title' => $request->get('title_' . $key), 'description' => $request->get('description_' . $key), diff --git a/lib/classes/Bridge/Api/Flickr.php b/lib/classes/Bridge/Api/Flickr.php index 2ebacb59de..bfb74ee5c9 100644 --- a/lib/classes/Bridge/Api/Flickr.php +++ b/lib/classes/Bridge/Api/Flickr.php @@ -502,7 +502,7 @@ class Bridge_Api_Flickr extends Bridge_Api_Abstract implements Bridge_Api_Interf $privacy = $this->get_default_privacy(); $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) { case self::ELEMENT_TYPE_PHOTO : 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() { 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); $check = function ($field) use (&$errors, $datas, $record) { - $key = $record->get_serialize_key(); + $key = $record->getId(); $name = $field['name']; $length = (int) $field['length']; $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) { - $key = $record->get_serialize_key(); + $key = $record->getId(); $datas = [ 'title' => $request->get('title_' . $key), 'description' => $request->get('description_' . $key), diff --git a/lib/classes/Bridge/Api/Youtube.php b/lib/classes/Bridge/Api/Youtube.php index 763225b326..fd298b6daf 100644 --- a/lib/classes/Bridge/Api/Youtube.php +++ b/lib/classes/Bridge/Api/Youtube.php @@ -418,7 +418,7 @@ class Bridge_Api_Youtube extends Bridge_Api_Abstract implements Bridge_Api_Inter public function acceptable_records() { 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 = []) { - switch ($record->get_type()) { + switch ($record->getType()) { case 'video': $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); $check = function ($field) use (&$errors, $datas, $record) { - $key = $record->get_serialize_key(); + $key = $record->getId(); $name = $field['name']; $length = (int) $field['length']; $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) { - $key = $record->get_serialize_key(); + $key = $record->getId(); $datas = [ 'title' => $request->get('title_' . $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) { $errors = []; - $key = $record->get_serialize_key(); + $key = $record->getId(); //Record must rely on real file if ( ! $record->get_hd_file() instanceof SplFileInfo) { $errors["file_size_" . $key] = $this->translator->trans("Le record n'a pas de fichier physique"); diff --git a/lib/classes/Bridge/Element.php b/lib/classes/Bridge/Element.php index 84f0184446..4283e7f9eb 100644 --- a/lib/classes/Bridge/Element.php +++ b/lib/classes/Bridge/Element.php @@ -448,13 +448,13 @@ class Bridge_Element ,:datas , :status, NOW(), NOW())'; $params = [ - ':account_id' => $account->get_id() - , ':sbas_id' => $record->get_sbas_id() - , ':record_id' => $record->get_record_id() - , ':status' => $status - , ':title' => $title - , ':type' => $type - , ':datas' => serialize($datas) + ':account_id' => $account->get_id(), + ':sbas_id' => $record->getDataboxId(), + ':record_id' => $record->getRecordId(), + ':status' => $status, + ':title' => $title, + ':type' => $type, + ':datas' => serialize($datas), ]; $stmt = $app->getApplicationBox()->get_connection()->prepare($sql); diff --git a/lib/classes/Session/Logger.php b/lib/classes/Session/Logger.php index 02f838492a..9ab980b192 100644 --- a/lib/classes/Session/Logger.php +++ b/lib/classes/Session/Logger.php @@ -73,11 +73,11 @@ class Session_Logger $stmt = $this->databox->get_connection()->prepare($sql); $params = [ - ':log_id' => $this->get_id() - , ':record_id' => $record->get_record_id() - , ':action' => $action - , ':final' => $final - , ':comm' => $comment + ':log_id' => $this->get_id(), + ':record_id' => $record->getRecordId(), + ':action' => $action, + ':final' => $final, + ':comm' => $comment, ]; $stmt->execute($params); diff --git a/lib/classes/caption/Field/Value.php b/lib/classes/caption/Field/Value.php index d216de6f78..81e9f67dc3 100644 --- a/lib/classes/caption/Field/Value.php +++ b/lib/classes/caption/Field/Value.php @@ -325,7 +325,7 @@ class caption_Field_Value implements cache_cacheableInterface . ' VALUES (null, :record_id, :field, :value, :VocabType, :VocabId)'; $params = [ - ':record_id' => $record->get_record_id(), + ':record_id' => $record->getRecordId(), ':field' => $databox_field->get_id(), ':value' => $value, ':VocabType' => $vocabulary ? $vocabulary->getType() : null, diff --git a/lib/classes/caption/field.php b/lib/classes/caption/field.php index ecd4ac9bf2..d15508d53a 100644 --- a/lib/classes/caption/field.php +++ b/lib/classes/caption/field.php @@ -381,7 +381,7 @@ class caption_field implements cache_cacheableInterface */ 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 : ''); } /** diff --git a/lib/classes/caption/record.php b/lib/classes/caption/record.php index 740e21ee2b..1c6431792c 100644 --- a/lib/classes/caption/record.php +++ b/lib/classes/caption/record.php @@ -281,7 +281,7 @@ class caption_record implements caption_interface, cache_cacheableInterface */ public function get_cache_key($option = null) { - return 'caption_' . $this->record->get_serialize_key() . ($option ? '_' . $option : ''); + return 'caption_' . $this->record->getId() . ($option ? '_' . $option : ''); } /** diff --git a/lib/classes/media/subdef.php b/lib/classes/media/subdef.php index a47c3d9075..9e5f3a5f82 100644 --- a/lib/classes/media/subdef.php +++ b/lib/classes/media/subdef.php @@ -710,7 +710,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface 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 : ''); } diff --git a/lib/classes/module/console/systemExport.php b/lib/classes/module/console/systemExport.php index 272124fb75..f6763d52b5 100644 --- a/lib/classes/module/console/systemExport.php +++ b/lib/classes/module/console/systemExport.php @@ -252,9 +252,9 @@ class module_console_systemExport extends Command $dest_file = new \SplFileInfo($outfile); touch( - $dest_file->getPathname() - , $record->get_creation_date()->format('U') - , $record->get_modification_date()->format('U') + $dest_file->getPathname(), + $record->getCreated()->format('U'), + $record->getUpdated()->format('U') ); switch (strtolower($caption)) { diff --git a/lib/classes/module/report/nav.php b/lib/classes/module/report/nav.php index 25e42f3eed..09ad769ff9 100644 --- a/lib/classes/module/report/nav.php +++ b/lib/classes/module/report/nav.php @@ -516,7 +516,7 @@ class module_report_nav extends module_report 'photo' => "" - , 'record_id' => $record->get_record_id() + , 'record_id' => $record->getRecordId() , 'date' => $this->app['date-formatter']->getPrettyString($document->get_creation_date()) , 'type' => $document->get_mime() , 'titre' => $record->get_title() diff --git a/lib/classes/patch/320alpha4b.php b/lib/classes/patch/320alpha4b.php index a0e649bb87..fa1bd4184f 100644 --- a/lib/classes/patch/320alpha4b.php +++ b/lib/classes/patch/320alpha4b.php @@ -133,8 +133,8 @@ class patch_320alpha4b extends patchAbstract $item = new FeedItem(); $item->setEntry($entry); $entry->addItem($item); - $item->setRecordId($record->get_record_id()); - $item->setSbasId($record->get_sbas_id()); + $item->setRecordId($record->getRecordId()); + $item->setSbasId($record->getDataboxId()); $app['orm.em']->persist($item); } catch (NotFoundHttpException $e) { diff --git a/lib/classes/record/adapter.php b/lib/classes/record/adapter.php index 0e981c8631..ad0d6fbaf3 100644 --- a/lib/classes/record/adapter.php +++ b/lib/classes/record/adapter.php @@ -370,8 +370,19 @@ class record_adapter implements RecordInterface, cache_cacheableInterface * Return record collection * * @return \collection + * @deprecated use {@link self::getCollection} instead. */ 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); } @@ -460,7 +471,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface */ 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; } @@ -904,6 +915,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface /** * @return string + * @deprecated use {@link self::getId} instead. */ public function get_serialize_key() { @@ -1694,7 +1706,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface 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) diff --git a/lib/classes/record/exportElement.php b/lib/classes/record/exportElement.php index 62ac7ab0a8..1faac611e0 100644 --- a/lib/classes/record/exportElement.php +++ b/lib/classes/record/exportElement.php @@ -83,13 +83,13 @@ class record_exportElement extends record_adapter $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 */ $subdefs = []; 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; break; } @@ -101,10 +101,10 @@ class record_exportElement extends record_adapter '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; } - 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; } 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']; - $masters = $query->on_base_ids([$this->get_base_id()]) + $masters = $query->on_base_ids([$this->getBaseId()]) ->who_have_right(['order_master']) ->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; $downloadable['document'] = false; if (isset($sd['document']) && is_file($sd['document']->getRealPath())) { 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 --; if ($this->remain_hd >= 0) { $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 ($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 --; if ($this->remain_hd >= 0) $downloadable[$name] = [ diff --git a/lib/classes/record/preview.php b/lib/classes/record/preview.php index 805b9ba120..bd53ffc255 100644 --- a/lib/classes/record/preview.php +++ b/lib/classes/record/preview.php @@ -126,9 +126,9 @@ class record_preview extends record_adapter } else { $children = $this->container->get_children(); foreach ($children as $child) { - $sbas_id = $child->get_sbas_id(); + $sbas_id = $child->getDataboxId(); $this->original_item = $child; - $record_id = $child->get_record_id(); + $record_id = $child->getRecordId(); if ($child->getNumber() == $pos) break; } @@ -152,8 +152,8 @@ class record_preview extends record_adapter $i ++; if ($first) { $this->original_item = $element; - $sbas_id = $element->getRecord($this->app)->get_sbas_id(); - $record_id = $element->getRecord($this->app)->get_record_id(); + $sbas_id = $element->getRecord($this->app)->getDataboxId(); + $record_id = $element->getRecord($this->app)->getRecordId(); $this->name = $Basket->getName(); $number = $element->getOrd(); } @@ -161,8 +161,8 @@ class record_preview extends record_adapter if ($element->getOrd() == $pos) { $this->original_item = $element; - $sbas_id = $element->getRecord($this->app)->get_sbas_id(); - $record_id = $element->getRecord($this->app)->get_record_id(); + $sbas_id = $element->getRecord($this->app)->getDataboxId(); + $record_id = $element->getRecord($this->app)->getRecordId(); $this->name = $Basket->getName(); $number = $element->getOrd(); } @@ -272,7 +272,7 @@ class record_preview extends record_adapter return $this->title; } - $this->title = collection::getLogo($this->get_base_id(), $this->app) . ' '; + $this->title = collection::getLogo($this->getBaseId(), $this->app) . ' '; switch ($this->env) { @@ -323,16 +323,16 @@ class record_preview extends record_adapter $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(); $sql = 'SELECT d . * , l.user, l.usrid as usr_id, l.site FROM log_docs d, log l WHERE d.log_id = l.id AND d.record_id = :record_id '; - $params = [':record_id' => $this->get_record_id()]; + $params = [':record_id' => $this->getRecordId()]; if (! $report) { $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 ($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 { $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( - $this->get_base_id(), 'canreport'); + $this->getBaseId(), 'canreport'); if ( ! $report && ! $this->app['conf']->get(['registry', 'webservices', 'google-charts-enabled'])) { $this->view_popularity = false; @@ -429,12 +429,12 @@ class record_preview extends record_adapter AND site_id = :site 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(); $stmt = $connsbas->prepare($sql); $stmt->execute( [ - ':record_id' => $this->get_record_id(), + ':record_id' => $this->getRecordId(), ':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( - $this->get_base_id(), 'canreport'); + $this->getBaseId(), 'canreport'); if ( ! $report && ! $this->app['conf']->get(['registry', 'webservices', 'google-charts-enabled'])) { $this->refferer_popularity = false; @@ -498,7 +498,7 @@ class record_preview extends record_adapter return $this->refferer_popularity; } - $databox = $this->app->findDataboxById($this->get_sbas_id()); + $databox = $this->app->findDataboxById($this->getDataboxId()); $connsbas = $databox->get_connection(); $sql = 'SELECT count( id ) AS views, referrer @@ -508,7 +508,7 @@ class record_preview extends record_adapter GROUP BY referrer ORDER BY referrer ASC'; $stmt = $connsbas->prepare($sql); - $stmt->execute([':record_id' => $this->get_record_id()]); + $stmt->execute([':record_id' => $this->getRecordId()]); $rs = $stmt->fetchAll(PDO::FETCH_ASSOC); $stmt->closeCursor(); @@ -562,7 +562,7 @@ class record_preview extends record_adapter 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; if ( ! $report && ! $this->app['conf']->get(['registry', 'webservices', 'google-charts-enabled'])) { @@ -592,12 +592,12 @@ class record_preview extends record_adapter AND site= :site 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(); $stmt = $connsbas->prepare($sql); $stmt->execute( [ - ':record_id' => $this->get_record_id(), + ':record_id' => $this->getRecordId(), ':site' => $this->app['conf']->get(['main', 'key']) ] ); diff --git a/lib/classes/recordutils/image.php b/lib/classes/recordutils/image.php index 1c0fa411e9..a7fee96aeb 100644 --- a/lib/classes/recordutils/image.php +++ b/lib/classes/recordutils/image.php @@ -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) { return $subdef->getRealPath(); @@ -71,7 +71,7 @@ class recordutils_image $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(); } @@ -172,7 +172,7 @@ class recordutils_image @unlink($pathOut); // no cache possible when date changes break; case 'RECORD_ID': - $varval = $subdef->get_record()->get_record_id(); + $varval = $subdef->get_record()->getRecordId(); break; } $n->parentNode->replaceChild($domprefs->createTextNode($varval), $n); @@ -381,7 +381,7 @@ class recordutils_image $palette = new RGB(); } - $base_id = $subdef->get_record()->get_base_id(); + $base_id = $subdef->get_record()->getBaseId(); if ($subdef->get_name() !== 'preview') { 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); } else { - $collname = $subdef->get_record()->get_collection()->get_name(); + $collname = $subdef->get_record()->getCollection()->get_name(); $draw = $in_image->draw(); $black = $palette->color("000000"); $white = $palette->color("FFFFFF"); diff --git a/lib/classes/set/abstract.php b/lib/classes/set/abstract.php index d724199676..499332df36 100644 --- a/lib/classes/set/abstract.php +++ b/lib/classes/set/abstract.php @@ -121,7 +121,7 @@ abstract class set_abstract implements IteratorAggregate */ public function add_element(\record_adapter $record) { - $this->elements[$record->get_serialize_key()] = $record; + $this->elements[$record->getId()] = $record; return $this; } @@ -132,7 +132,7 @@ abstract class set_abstract implements IteratorAggregate */ public function remove_element(\record_adapter $record) { - $key = $record->get_serialize_key(); + $key = $record->getId(); if (isset($this->elements[$key])) unset($this->elements[$key]); @@ -146,7 +146,7 @@ abstract class set_abstract implements IteratorAggregate { $basrec = []; foreach ($this->elements as $record) { - $basrec[] = $record->get_serialize_key(); + $basrec[] = $record->getId(); } return implode(';', $basrec); diff --git a/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php b/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php index cbae2afcff..749dce7a5d 100644 --- a/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php +++ b/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php @@ -255,8 +255,8 @@ class OverviewTest extends \PhraseanetAuthenticatedWebTestCase self::$DI['app']['subdef.substituer']->substitute($story, $name, $media); $path = self::$DI['app']['url_generator']->generate('datafile', [ - 'sbas_id' => $story->get_sbas_id(), - 'record_id' => $story->get_record_id(), + 'sbas_id' => $story->getDataboxId(), + 'record_id' => $story->getRecordId(), 'subdef' => $name, ]); @@ -334,13 +334,13 @@ class OverviewTest extends \PhraseanetAuthenticatedWebTestCase // Ensure permalink is created \media_Permalink_Adapter::getPermalink( self::$DI['app'], - $record->get_databox(), + $record->getDatabox(), $record->get_subdef('preview') ); $path = self::$DI['app']['url_generator']->generate('permalinks_permaview', [ - 'sbas_id' => $record->get_sbas_id(), - 'record_id' => $record->get_record_id(), + 'sbas_id' => $record->getDataboxId(), + 'record_id' => $record->getRecordId(), 'subdef' => 'preview', ]); diff --git a/tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php b/tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php index e893004740..1556d918d1 100644 --- a/tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php +++ b/tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php @@ -218,7 +218,7 @@ class ManagerTest extends \PhraseanetAuthenticatedWebTestCase $found = false; 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; } } diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php index e8cb3530da..aabf8beab2 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php @@ -60,8 +60,8 @@ class ApiJsonTest extends ApiTestCase $record = \record_adapter::createFromFile($file, $app); $story['story_records'] = array(array( - 'databox_id' => $record->get_sbas_id(), - 'record_id' => $record->get_record_id() + 'databox_id' => $record->getDataboxId(), + 'record_id' => $record->getRecordId() )); $client = $this->getClient(); @@ -96,7 +96,7 @@ class ApiJsonTest extends ApiTestCase $this->setToken($this->userAccessToken); $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( self::$DI['app'], @@ -106,8 +106,8 @@ class ApiJsonTest extends ApiTestCase $record = \record_adapter::createFromFile($file, self::$DI['app']); $records = array( - 'databox_id' => $record->get_sbas_id(), - 'record_id' => $record->get_record_id() + 'databox_id' => $record->getDataboxId(), + 'record_id' => $record->getRecordId() ); self::$DI['client']->request( @@ -569,7 +569,7 @@ class ApiJsonTest extends ApiTestCase $record_1 = $this->getRecord1(); $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']); $client->request('GET', $route, $this->getParameters(), [], ['HTTP_Accept' => $this->getAcceptMimeType()]); $content = $this->unserialize($client->getResponse()->getContent()); @@ -1032,7 +1032,7 @@ class ApiJsonTest extends ApiTestCase /** @var \record_adapter $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']); /** @var Client $client */ @@ -1119,7 +1119,7 @@ class ApiJsonTest extends ApiTestCase /** @var \record_adapter $story */ $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']); /** @var Client $client */ @@ -1296,7 +1296,7 @@ class ApiJsonTest extends ApiTestCase /** * 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->evaluateMeta200($content); @@ -1319,11 +1319,11 @@ class ApiJsonTest extends ApiTestCase $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; - foreach ($record->get_databox()->get_collections() as $collection) { - if ($collection->get_base_id() != $record->get_base_id()) { + foreach ($record->getDatabox()->get_collections() as $collection) { + if ($collection->get_base_id() != $record->getBaseId()) { $base_id = $collection->get_base_id(); break; } diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php b/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php index ea90eefb66..63ece34f27 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php @@ -694,7 +694,7 @@ abstract class ApiTestCase extends \PhraseanetWebTestCase protected function evaluateRecordsStatusResponse(\record_adapter $record, $content) { - $statusStructure = $record->get_databox()->getStatusStructure(); + $statusStructure = $record->getDatabox()->getStatusStructure(); $r_status = strrev($record->get_status()); $this->assertArrayHasKey('status', $content['response']); @@ -714,7 +714,7 @@ abstract class ApiTestCase extends \PhraseanetWebTestCase 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 { $values = $record->get_caption()->get_field($field->get_name())->get_values(); $value = array_pop($values); diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/ExportTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/ExportTest.php index 9782a41dc1..c8085f437b 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/ExportTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/ExportTest.php @@ -143,7 +143,7 @@ class ExportTest extends \PhraseanetAuthenticatedWebTestCase //inserted rows from this function are deleted in tearDownAfterClass $this->getClient()->request('POST', '/prod/export/ftp/', [ - 'lst' => $this->getRecord1()->get_serialize_key(), + 'lst' => $this->getRecord1()->getId(), 'user_dest' => $user->getId(), 'address' => 'local.phrasea.test', 'login' => $user->getEmail(), @@ -169,7 +169,7 @@ class ExportTest extends \PhraseanetAuthenticatedWebTestCase $this->mockNotificationDeliverer('Alchemy\Phrasea\Notification\Mail\MailRecordsExport'); $this->getClient()->request('POST', '/prod/export/mail/', [ - 'lst' => $this->getRecord1()->get_serialize_key(), + 'lst' => $this->getRecord1()->getId(), 'destmail' => 'user@example.com', 'obj' => ['preview'], ]); diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php index 38d0d6f05f..82c916e197 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php @@ -142,7 +142,7 @@ class LazaretTest extends \PhraseanetAuthenticatedWebTestCase //Provide some valid test values $lazaretAttribute->expects($this->exactly(4)) ->method('getValue') - ->will($this->onConsecutiveCalls('metadataValue', $story->get_serialize_key(), '00001111', 'metafieldValue')); + ->will($this->onConsecutiveCalls('metadataValue', $story->getId(), '00001111', 'metafieldValue')); //Add the 5 attribute $lazaretFile->addAttribute($lazaretAttribute); diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/OrderTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/OrderTest.php index a4737f6e2e..efbf7835a6 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/OrderTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/OrderTest.php @@ -34,7 +34,7 @@ class OrderTest extends \PhraseanetAuthenticatedWebTestCase }); $client = $this->getClient(); $client->request('POST', '/prod/order/', [ - 'lst' => $this->getRecord1()->get_serialize_key(), + 'lst' => $this->getRecord1()->getId(), 'deadline' => '+10 minutes' ]); @@ -62,7 +62,7 @@ class OrderTest extends \PhraseanetAuthenticatedWebTestCase }); $this->XMLHTTPRequest('POST', '/prod/order/', [ - 'lst' => $this->getRecord1()->get_serialize_key(), + 'lst' => $this->getRecord1()->getId(), 'deadline' => '+10 minutes' ]); @@ -83,7 +83,7 @@ class OrderTest extends \PhraseanetAuthenticatedWebTestCase public function testDisplayOrders() { $this->XMLHTTPRequest('POST', '/prod/order/', [ - 'lst' => $this->getRecord1()->get_serialize_key(), + 'lst' => $this->getRecord1()->getId(), 'deadline' => '+10 minutes' ]); $client = $this->getClient(); diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/PropertyTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/PropertyTest.php index 6cc15e8318..1e6ea9b1a3 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/PropertyTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/PropertyTest.php @@ -93,12 +93,12 @@ class PropertyTest extends \PhraseanetAuthenticatedWebTestCase self::$DI['app']['acl'] = $aclProvider; self::$DI['client']->request('POST', '/prod/records/property/status/', [ - 'apply_to_children' => [$story->get_sbas_id() => true], + 'apply_to_children' => [$story->getDataboxId() => true], 'status' => [ - $record->get_sbas_id() => [6 => true, 8 => true, 11 => true] + $record->getDataboxId() => [6 => true, 8 => true, 11 => true] ], 'lst' => implode(';', [ - $record->get_serialize_key(),$story->get_serialize_key() + $record->getId(),$story->getId() ]) ]); $response = self::$DI['client']->getResponse(); @@ -107,8 +107,8 @@ class PropertyTest extends \PhraseanetAuthenticatedWebTestCase $this->assertTrue($datas['success']); $this->assertArrayHasKey('updated', $datas); - $record = new \record_adapter(self::$DI['app'], $record->get_sbas_id(), $record->get_record_id()); - $story = new \record_adapter(self::$DI['app'], $story->get_sbas_id(), $story->get_record_id()); + $record = new \record_adapter(self::$DI['app'], $record->getDataboxId(), $record->getRecordId()); + $story = new \record_adapter(self::$DI['app'], $story->getDataboxId(), $story->getRecordId()); $recordStatus = strrev($record->get_status()); $storyStatus = strrev($story->get_status()); @@ -146,11 +146,11 @@ class PropertyTest extends \PhraseanetAuthenticatedWebTestCase self::$DI['client']->request('POST', '/prod/records/property/type/', [ 'lst' => implode(';', [ - $record->get_serialize_key(), $record2->get_serialize_key() + $record->getId(), $record2->getId() ]), 'types' => [ - $record->get_serialize_key() => 'document', - $record2->get_serialize_key() => 'flash', + $record->getId() => 'document', + $record2->getId() => 'flash', ] ]); $response = self::$DI['client']->getResponse(); @@ -159,11 +159,11 @@ class PropertyTest extends \PhraseanetAuthenticatedWebTestCase $this->assertTrue($datas['success']); $this->assertArrayHasKey('updated', $datas); - $record = new \record_adapter(self::$DI['app'], $record->get_sbas_id(), $record->get_record_id()); - $record2 = new \record_adapter(self::$DI['app'], $record2->get_sbas_id(), $record2->get_record_id()); + $record = new \record_adapter(self::$DI['app'], $record->getDataboxId(), $record->getRecordId()); + $record2 = new \record_adapter(self::$DI['app'], $record2->getDataboxId(), $record2->getRecordId()); - $this->assertEquals('document', $record->get_type()); - $this->assertEquals('flash', $record2->get_type()); + $this->assertEquals('document', $record->getType()); + $this->assertEquals('flash', $record2->getType()); $record->delete(); $record2->delete(); diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/RecordsTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/RecordsTest.php index 898e0049f0..6b6edc4a61 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/RecordsTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/RecordsTest.php @@ -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']); $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(); $datas = (array) json_decode($response->getContent()); - $this->assertContains($record->get_serialize_key(), $datas); + $this->assertContains($record->getId(), $datas); 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'); } 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']); $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(); $datas = (array) json_decode($response->getContent()); $this->assertTrue(count($datas) > 0); diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php index 182cffc9a5..c2612d6e9d 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php @@ -100,7 +100,7 @@ class StoryTest extends \PhraseanetAuthenticatedWebTestCase { $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 = [ 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']); - $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 = [ self::$DI['record_1']->get_serialize_key(), @@ -162,11 +162,11 @@ class StoryTest extends \PhraseanetAuthenticatedWebTestCase foreach ($records as $record) { /* @var $record \record_adapter */ $route = sprintf( - "/prod/story/%s/%s/delete/%s/%s/" - , $story->get_sbas_id() - , $story->get_record_id() - , $record->get_sbas_id() - , $record->get_record_id() + "/prod/story/%s/%s/delete/%s/%s/", + $story->getDataboxId(), + $story->getRecordId(), + $record->getDataboxId(), + $record->getRecordId() ); if (($n % 2) === 0) { diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Report/InformationsTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Report/InformationsTest.php index 73bc5a7701..4f6456d31e 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Report/InformationsTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Report/InformationsTest.php @@ -269,8 +269,8 @@ class InformationsTest extends \PhraseanetAuthenticatedWebTestCase 'dmax' => $this->dmax->format('Y-m-d H:i:s'), 'sbasid' => $this->getCollection()->get_sbas_id(), 'collection' => $this->getCollection()->get_coll_id(), - 'sbasid' => $this->getRecord1()->get_sbas_id(), - 'rid' => $this->getRecord1()->get_record_id(), + 'sbasid' => $this->getRecord1()->getDataboxId(), + 'rid' => $this->getRecord1()->getRecordId(), ]); $response = $this->client->getResponse(); @@ -285,8 +285,8 @@ class InformationsTest extends \PhraseanetAuthenticatedWebTestCase 'dmax' => $this->dmax->format('Y-m-d H:i:s'), 'sbasid' => $this->getCollection()->get_sbas_id(), 'collection' => $this->getCollection()->get_coll_id(), - 'sbasid' => $this->getRecord1()->get_sbas_id(), - 'rid' => $this->getRecord1()->get_record_id(), + 'sbasid' => $this->getRecord1()->getDataboxId(), + 'rid' => $this->getRecord1()->getRecordId(), 'from' => 'TOOL' ]); @@ -302,8 +302,8 @@ class InformationsTest extends \PhraseanetAuthenticatedWebTestCase 'dmax' => $this->dmax->format('Y-m-d H:i:s'), 'sbasid' => $this->getCollection()->get_sbas_id(), 'collection' => $this->getCollection()->get_coll_id(), - 'sbasid' => $this->getRecord1()->get_sbas_id(), - 'rid' => $this->getRecord1()->get_record_id(), + 'sbasid' => $this->getRecord1()->getDataboxId(), + 'rid' => $this->getRecord1()->getRecordId(), 'from' => 'DASH' ]); @@ -319,8 +319,8 @@ class InformationsTest extends \PhraseanetAuthenticatedWebTestCase 'dmax' => $this->dmax->format('Y-m-d H:i:s'), 'sbasid' => $this->getCollection()->get_sbas_id(), 'collection' => $this->getCollection()->get_coll_id(), - 'sbasid' => $this->getRecord1()->get_sbas_id(), - 'rid' => $this->getRecord1()->get_record_id(), + 'sbasid' => $this->getRecord1()->getDataboxId(), + 'rid' => $this->getRecord1()->getRecordId(), 'user' => $this->getUser()->getId() ]); diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php index c1d78612c2..9ae0c68a2a 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php @@ -388,7 +388,7 @@ class RSSFeedTest extends \PhraseanetWebTestCase $this->assertEquals($ressource->get_mime(), $value); break; case "medium": - $this->assertEquals(strtolower($record->get_type()), $value); + $this->assertEquals(strtolower($record->getType()), $value); break; case "isDefault": !$is_thumbnail ? $this->assertEquals("true", $value) : $this->assertEquals("false", $value); diff --git a/tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineAbstractTest.php b/tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineAbstractTest.php index e5f24b7aa2..6b42702d77 100644 --- a/tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineAbstractTest.php +++ b/tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineAbstractTest.php @@ -137,7 +137,7 @@ abstract class SearchEngineAbstractTest extends \PhraseanetAuthenticatedTestCase { $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) { continue; } @@ -239,7 +239,7 @@ abstract class SearchEngineAbstractTest extends \PhraseanetAuthenticatedTestCase $toupdate = []; $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) { continue; diff --git a/tests/classes/Bridge/ElementTest.php b/tests/classes/Bridge/ElementTest.php index 84644a8143..bb8fef2032 100644 --- a/tests/classes/Bridge/ElementTest.php +++ b/tests/classes/Bridge/ElementTest.php @@ -70,8 +70,8 @@ class Bridge_ElementTest extends \PhraseanetTestCase public function testGet_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_record_id(), $this->object->get_record()->get_record_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()->getRecordId()); } public function testGet_dist_id() diff --git a/tests/classes/PhraseanetAuthenticatedWebTestCase.php b/tests/classes/PhraseanetAuthenticatedWebTestCase.php index 5da9dc0055..3c50f8ea6b 100644 --- a/tests/classes/PhraseanetAuthenticatedWebTestCase.php +++ b/tests/classes/PhraseanetAuthenticatedWebTestCase.php @@ -202,8 +202,8 @@ abstract class PhraseanetAuthenticatedWebTestCase extends \PhraseanetAuthenticat $app = $this->getApplication(); $elasticsearchRecord = new ElasticsearchRecord(); - $elasticsearchRecord->setDataboxId($record->get_sbas_id()); - $elasticsearchRecord->setRecordId($record->get_record_id()); + $elasticsearchRecord->setDataboxId($record->getDataboxId()); + $elasticsearchRecord->setRecordId($record->getRecordId()); $result = new SearchEngineResult( new SearchEngineOptions(), diff --git a/tests/classes/PhraseanetTestCase.php b/tests/classes/PhraseanetTestCase.php index 9ae1b83c01..0002f49213 100644 --- a/tests/classes/PhraseanetTestCase.php +++ b/tests/classes/PhraseanetTestCase.php @@ -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']); $record = record_adapter::createFromFile($file, self::$DI['app']); 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]; }); @@ -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']); $record = record_adapter::createFromFile($file, self::$DI['app']); 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]; }); diff --git a/tests/classes/databox/fieldTest.php b/tests/classes/databox/fieldTest.php index 77976fb2f1..80fe123a8d 100644 --- a/tests/classes/databox/fieldTest.php +++ b/tests/classes/databox/fieldTest.php @@ -23,7 +23,7 @@ class databox_fieldTest extends \PhraseanetTestCase /** @var record_adapter $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_multi = 'Field Test Multi'; diff --git a/tests/classes/media/subdefTest.php b/tests/classes/media/subdefTest.php index c489f103a8..14f8262025 100644 --- a/tests/classes/media/subdefTest.php +++ b/tests/classes/media/subdefTest.php @@ -80,10 +80,10 @@ class media_subdefTest extends \PhraseanetTestCase */ public function testGet_record() { - $this->assertEquals(self::$recordonbleu->get_record_id(), self::$objectNotPresent->get_record()->get_record_id()); - $this->assertEquals(self::$recordonbleu->get_record_id(), self::$objectPresent->get_record()->get_record_id()); - $this->assertEquals(self::$recordonbleu->get_sbas_id(), self::$objectNotPresent->get_record()->get_sbas_id()); - $this->assertEquals(self::$recordonbleu->get_sbas_id(), self::$objectPresent->get_record()->get_sbas_id()); + $this->assertEquals(self::$recordonbleu->getRecordId(), self::$objectNotPresent->get_record()->getRecordId()); + $this->assertEquals(self::$recordonbleu->getRecordId(), self::$objectPresent->get_record()->getRecordId()); + $this->assertEquals(self::$recordonbleu->getDataboxId(), self::$objectNotPresent->get_record()->getDataboxId()); + $this->assertEquals(self::$recordonbleu->getDataboxId(), self::$objectPresent->get_record()->getDataboxId()); } /** @@ -111,8 +111,8 @@ class media_subdefTest extends \PhraseanetTestCase */ public function testGet_record_id() { - $this->assertEquals(self::$recordonbleu->get_record_id(), self::$objectNotPresent->get_record()->get_record_id()); - $this->assertEquals(self::$recordonbleu->get_record_id(), self::$objectPresent->get_record()->get_record_id()); + $this->assertEquals(self::$recordonbleu->getRecordId(), self::$objectNotPresent->get_record()->getRecordId()); + $this->assertEquals(self::$recordonbleu->getRecordId(), self::$objectPresent->get_record()->getRecordId()); } /** @@ -140,8 +140,8 @@ class media_subdefTest extends \PhraseanetTestCase */ public function testGet_sbas_id() { - $this->assertEquals(self::$recordonbleu->get_sbas_id(), self::$objectNotPresent->get_record()->get_sbas_id()); - $this->assertEquals(self::$recordonbleu->get_sbas_id(), self::$objectPresent->get_record()->get_sbas_id()); + $this->assertEquals(self::$recordonbleu->getDataboxId(), self::$objectNotPresent->get_record()->getDataboxId()); + $this->assertEquals(self::$recordonbleu->getDataboxId(), self::$objectPresent->get_record()->getDataboxId()); } /** diff --git a/tests/classes/record/adapterTest.php b/tests/classes/record/adapterTest.php index 9728cb7da0..a87cfc9111 100644 --- a/tests/classes/record/adapterTest.php +++ b/tests/classes/record/adapterTest.php @@ -21,7 +21,7 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase // Reset thumbtitle in order to have consistent tests (testGet_title) 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(); } self::$thumbtitled = true; @@ -86,7 +86,7 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase $this->getClient()->request( 'POST', $app['url_generator']->generate('prod_order_new'), [ - 'lst' => $this->getRecord1()->get_serialize_key(), + 'lst' => $this->getRecord1()->getId(), 'deadline' => '+10 minutes' ]); @@ -137,16 +137,16 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase { $record_1 = $this->getRecord1(); try { - $record_1->set_type('jambon'); + $record_1->setType('jambon'); $this->fail(); } catch (Exception $e) { } - $old_type = $record_1->get_type(); - $record_1->set_type('video'); - $this->assertEquals('video', $record_1->get_type()); - $record_1->set_type($old_type); - $this->assertEquals($old_type, $record_1->get_type()); + $old_type = $record_1->getType(); + $record_1->setType('video'); + $this->assertEquals('video', $record_1->getType()); + $record_1->setType($old_type); + $this->assertEquals($old_type, $record_1->getType()); } public function testIs_grouping() @@ -158,17 +158,17 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase public function testGet_base_id() { $record_1 = $this->getRecord1(); - $this->assertTrue(is_int($record_1->get_base_id())); - $this->assertEquals($this->getCollection()->get_base_id(), $record_1->get_base_id()); + $this->assertTrue(is_int($record_1->getBaseId())); + $this->assertEquals($this->getCollection()->get_base_id(), $record_1->getBaseId()); $record_story_1 = $this->getRecordStory1(); - $this->assertTrue(is_int($record_story_1->get_base_id())); - $this->assertEquals($this->getCollection()->get_base_id(), $record_story_1->get_base_id()); + $this->assertTrue(is_int($record_story_1->getBaseId())); + $this->assertEquals($this->getCollection()->get_base_id(), $record_story_1->getBaseId()); } public function testGet_record_id() { - $this->assertTrue(is_int($this->getRecord1()->get_record_id())); - $this->assertTrue(is_int($this->getRecordStory1()->get_record_id())); + $this->assertTrue(is_int($this->getRecord1()->getRecordId())); + $this->assertTrue(is_int($this->getRecordStory1()->getRecordId())); } public function testGet_thumbnail() @@ -187,7 +187,7 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase 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() @@ -208,26 +208,26 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase public function testGet_sha256() { $record_1 = $this->getRecord1(); - $this->assertNotNull($record_1->get_sha256()); - $this->assertRegExp('/[a-zA-Z0-9]{32}/', $record_1->get_sha256()); - $this->assertNull($this->getRecordStory1()->get_sha256()); + $this->assertNotNull($record_1->getSha256()); + $this->assertRegExp('/[a-zA-Z0-9]{32}/', $record_1->getSha256()); + $this->assertNull($this->getRecordStory1()->getSha256()); } public function testGet_mime() { - $this->assertRegExp('/image\/\w+/', $this->getRecord1()->get_mime()); + $this->assertRegExp('/image\/\w+/', $this->getRecord1()->getMimeType()); } public function testSetMimeType() { $record_1 = $this->getRecord1(); - $oldMime = $record_1->get_mime(); - $record_1->set_mime('foo/bar'); - $this->assertEquals('foo/bar', $record_1->get_mime()); + $oldMime = $record_1->getMimeType(); + $record_1->setMimeType('foo/bar'); + $this->assertEquals('foo/bar', $record_1->getMimeType()); - $record_1->set_mime($oldMime); - $this->assertEquals($oldMime, $record_1->get_mime()); + $record_1->setMimeType($oldMime); + $this->assertEquals($oldMime, $record_1->getMimeType()); } public function testGet_status() @@ -307,12 +307,12 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase public function testGet_serialize_key() { $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() { - $this->assertTrue(is_int($this->getRecord1()->get_sbas_id())); + $this->assertTrue(is_int($this->getRecord1()->getDataboxId())); } public function testSet_metadatas() @@ -431,15 +431,15 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase FROM record WHERE jeton & ' . JETON_MAKE_SUBDEF . ' > 0 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); $stmt->closeCursor(); if ( ! $row) $this->fail(); - if ($row['record_id'] != $record_1->get_record_id()) + if ($row['record_id'] != $record_1->getRecordId()) $this->fail(); } @@ -450,15 +450,15 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase $sql = 'SELECT record_id, coll_id, jeton FROM record WHERE (jeton & ' . JETON_WRITE_META . ' > 0) 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); $stmt->closeCursor(); if ( ! $row) $this->fail(); - if ($row['record_id'] != $record_1->get_record_id()) + if ($row['record_id'] != $record_1->getRecordId()) $this->fail(); } @@ -482,26 +482,26 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase public function testGet_record_by_sha() { $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)); foreach ($tmp_records as $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( $record_1->getDatabox(), - $record_1->get_sha256(), - $record_1->get_record_id() + $record_1->getSha256(), + $record_1->getRecordId() ); $this->assertTrue(is_array($tmp_records)); $this->assertTrue(count($tmp_records) === 1); foreach ($tmp_records as $tmp_record) { $this->assertInstanceOf('record_adapter', $tmp_record); - $this->assertEquals($record_1->get_sha256(), $tmp_record->get_sha256()); - $this->assertEquals($record_1->get_record_id(), $tmp_record->get_record_id()); + $this->assertEquals($record_1->getSha256(), $tmp_record->getSha256()); + $this->assertEquals($record_1->getRecordId(), $tmp_record->getRecordId()); } } @@ -518,8 +518,8 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase $found = $sselcont_id = false; $record_1 = $this->getRecord1(); - $sbas_id = $record_1->get_sbas_id(); - $record_id = $record_1->get_record_id(); + $sbas_id = $record_1->getDataboxId(); + $record_id = $record_1->getRecordId(); foreach ($record_1->get_container_baskets($app['orm.em'], self::$DI['user']) as $c_basket) { if ($c_basket->getId() == $basket->getId()) { @@ -538,7 +538,7 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase public function testSetStatus() { $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'); $this->assertSame('00000000000000001001001001010101', $record->get_status()); } diff --git a/tests/classes/recordutils/imageTest.php b/tests/classes/recordutils/imageTest.php index 2ab653e927..e27503f3a0 100644 --- a/tests/classes/recordutils/imageTest.php +++ b/tests/classes/recordutils/imageTest.php @@ -17,7 +17,7 @@ class recordutils_imageTest extends \PhraseanetTestCase $app->getApplicationBox()->write_collection_pic( $app['media-alchemyst'], $app['filesystem'], - $record_1->get_collection(), + $record_1->getCollection(), null, \collection::PIC_WM ); @@ -36,7 +36,7 @@ class recordutils_imageTest extends \PhraseanetTestCase $app->getApplicationBox()->write_collection_pic( $app['media-alchemyst'], $app['filesystem'], - $record_1->get_collection(), + $record_1->getCollection(), new SymfoFile(__DIR__ . '/../../files/logocoll.gif'), \collection::PIC_WM ); @@ -82,13 +82,13 @@ class recordutils_imageTest extends \PhraseanetTestCase { /** @var record_adapter $record_1 */ $record_1 = self::$DI['record_1']; - $this->addStampConf($record_1->get_collection()); + $this->addStampConf($record_1->getCollection()); $app = $this->getApplication(); $app->getApplicationBox()->write_collection_pic( $app['media-alchemyst'], $app['filesystem'], - $record_1->get_collection(), + $record_1->getCollection(), null, \collection::PIC_STAMP ); @@ -103,13 +103,13 @@ class recordutils_imageTest extends \PhraseanetTestCase { /** @var record_adapter $record_1 */ $record_1 = self::$DI['record_1']; - $this->addStampConf($record_1->get_collection()); + $this->addStampConf($record_1->getCollection()); $app = $this->getApplication(); $app->getApplicationBox()->write_collection_pic( $app['media-alchemyst'], $app['filesystem'], - $record_1->get_collection(), + $record_1->getCollection(), new SymfoFile(__DIR__ . '/../../files/logocoll.gif'), \collection::PIC_STAMP );