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

Replace app['phraseanet.appbox']->get_databox using trait

Browse Source
This commit is contained in:
Benoît Burnichon
2015-06-30 11:32:34 +02:00
parent 360e69ff8d
commit 6e651f3b07
75 changed files with 171 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Alchemy/Phrasea/Application/Helper/ApplicationBoxAware.php
View File

@@ -62,4 +62,25 @@ trait ApplicationBoxAware
return $this->applicationBox;
}
/**
* Find a registered Databoxes.
*
* @return \databox[]
*/
public function getDataboxes()
{
return $this->getApplicationBox()->get_databoxes();
}
/**
* Find a registered Databox by its id.
*
* @param int $id
* @return \databox
*/
public function findDataboxById($id)
{
return $this->getApplicationBox()->get_databox($id);
}
}

3
lib/Alchemy/Phrasea/Border/Attribute/MetaField.php
View File

@@ -106,8 +106,7 @@ class MetaField implements AttributeInterface
}
try {
return new static($app['phraseanet.appbox']
->get_databox($datas['sbas_id'])
return new static($app->findDataboxById($datas['sbas_id'])
->get_meta_structure()->get_element($datas['id']), $datas['value']);
} catch (NotFoundHttpException $e) {
throw new \InvalidArgumentException('Field does not exist anymore');

2
lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php
View File

@@ -37,7 +37,7 @@ class BuildMissingSubdefs extends Command
$start = microtime(true);
$n = 0;
foreach ($this->container['phraseanet.appbox']->get_databoxes() as $databox) {
foreach ($this->container->getDataboxes() as $databox) {
$sql = 'SELECT record_id FROM record WHERE parent_record_id = 0';
$stmt = $databox->get_connection()->prepare($sql);
$stmt->execute();

2
lib/Alchemy/Phrasea/Command/BuildSubdefs.php
View File

@@ -108,7 +108,7 @@ class BuildSubdefs extends Command
list($sqlCount, $stmtParams) = SQLParserUtils::expandListParameters($sqlCount, $params, $types);
$databox = $this->container['phraseanet.appbox']->get_databox($input->getArgument('databox'));
$databox = $this->container->findDataboxById($input->getArgument('databox'));
$connection = $databox->get_connection();
$stmt = $connection->prepare($sqlCount);

2
lib/Alchemy/Phrasea/Command/CreateCollection.php
View File

@@ -37,7 +37,7 @@ class CreateCollection extends Command
protected function doExecute(InputInterface $input, OutputInterface $output)
{
$databox = $this->container['phraseanet.appbox']->get_databox((int) $input->getArgument('databox_id'));
$databox = $this->container->findDataboxById((int) $input->getArgument('databox_id'));
$new_collection = \collection::create($this->container, $databox, $this->container['phraseanet.appbox'], $input->getArgument('collname'));

2
lib/Alchemy/Phrasea/Command/Developer/IniReset.php
View File

@@ -54,7 +54,7 @@ class IniReset extends Command
// get dbs
$conf = $this->container['phraseanet.configuration']->getConfig();
$dbs = array('ab' => $conf['main']['database']['dbname'], 'dbs' => array(), 'setup_dbs' => array());
foreach($this->container['phraseanet.appbox']->get_databoxes() as $databox) {
foreach($this->container->getDataboxes() as $databox) {
$dbs['dbs'][] = $databox;
}

2
lib/Alchemy/Phrasea/Command/Developer/JsFixtures.php
View File

@@ -38,7 +38,7 @@ class JsFixtures extends Command
return $app['orm.ems'][$app['db.fixture.hash.key']];
});
$sbasId = current($this->container['phraseanet.appbox']->get_databoxes())->get_sbas_id();
$sbasId = current($this->container->getDataboxes())->get_sbas_id();
$this->writeResponse($output, 'GET', '/login/', '/home/login/index.html');
$this->writeResponse($output, 'GET', '/admin/fields/'.$sbasId , '/admin/fields/index.html', true);
$this->writeResponse($output, 'GET', '/admin/task-manager/tasks', '/admin/task-manager/index.html', true);

2
lib/Alchemy/Phrasea/Command/Developer/RegenerateSqliteDb.php
View File

@@ -373,7 +373,7 @@ class RegenerateSqliteDb extends Command
{
$coll = $collection_no_acces = $collection_no_acces_by_status = null;
/** @var \databox[] $databoxes */
$databoxes = $this->container['phraseanet.appbox']->get_databoxes();
$databoxes = $this->container->getDataboxes();
foreach ($databoxes as $databox) {
foreach ($databox->get_collections() as $collection) {

4
lib/Alchemy/Phrasea/Command/RescanTechnicalDatas.php
View File

@@ -58,7 +58,7 @@ class RescanTechnicalDatas extends Command
$start = microtime(true);
$n = 0;
foreach ($this->container['phraseanet.appbox']->get_databoxes() as $databox) {
foreach ($this->container->getDataboxes() as $databox) {
$sql = 'SELECT record_id FROM record WHERE parent_record_id = 0';
$stmt = $databox->get_connection()->prepare($sql);
@@ -94,7 +94,7 @@ class RescanTechnicalDatas extends Command
{
$n = 0;
foreach ($this->container['phraseanet.appbox']->get_databoxes() as $databox) {
foreach ($this->container->getDataboxes() as $databox) {
$n += $databox->get_record_amount();
}

4
lib/Alchemy/Phrasea/Command/Upgrade/Step31.php
View File

@@ -41,7 +41,7 @@ class Step31 implements DatasUpgraderInterface
*/
public function execute(InputInterface $input, OutputInterface $output)
{
foreach ($this->app['phraseanet.appbox']->get_databoxes() as $databox) {
foreach ($this->app->getDataboxes() as $databox) {
do {
$records = $this->getNullUUIDs($databox);
@@ -60,7 +60,7 @@ class Step31 implements DatasUpgraderInterface
{
$time = 0;
foreach ($this->app['phraseanet.appbox']->get_databoxes() as $databox) {
foreach ($this->app->getDataboxes() as $databox) {
$time += $this->getDataboxTimeEstimation($databox);
}

6
lib/Alchemy/Phrasea/Command/Upgrade/Step35.php
View File

@@ -37,7 +37,7 @@ class Step35 implements DatasUpgraderInterface
*/
public function execute(InputInterface $input, OutputInterface $output)
{
foreach ($this->app['phraseanet.appbox']->get_databoxes() as $databox) {
foreach ($this->app->getDataboxes() as $databox) {
foreach ($databox->get_meta_structure()->get_elements() as $databox_field) {
if ($databox_field->is_on_error()) {
@@ -96,7 +96,7 @@ class Step35 implements DatasUpgraderInterface
} while (count($rs) > 0);
}
foreach ($this->app['phraseanet.appbox']->get_databoxes() as $databox) {
foreach ($this->app->getDataboxes() as $databox) {
$this->ensureDropMigrateColumn($databox);
}
}
@@ -108,7 +108,7 @@ class Step35 implements DatasUpgraderInterface
{
$time = 0;
foreach ($this->app['phraseanet.appbox']->get_databoxes() as $databox) {
foreach ($this->app->getDataboxes() as $databox) {
$sql = 'select record_id
FROM record';

2
lib/Alchemy/Phrasea/Controller/Admin/CollectionController.php
View File

@@ -735,7 +735,7 @@ class CollectionController extends Controller
public function getSuggestedValues($bas_id)
{
/** @var \databox $databox */
$databox = $this->app['phraseanet.appbox']->get_databox(\phrasea::sbasFromBas($this->app, $bas_id));
$databox = $this->app->findDataboxById(\phrasea::sbasFromBas($this->app, $bas_id));
$collection = \collection::get_from_base_id($this->app, $bas_id);
$structFields = $suggestedValues = $basePrefs = [];

2
lib/Alchemy/Phrasea/Core/Provider/BorderManagerServiceProvider.php
View File

@@ -57,7 +57,7 @@ class BorderManagerServiceProvider implements ServiceProviderInterface
$databoxes = [];
foreach ($checker['databoxes'] as $sbas_id) {
try {
$databoxes[] = $app['phraseanet.appbox']->get_databox($sbas_id);
$databoxes[] = $app->findDataboxById($sbas_id);
} catch (\Exception $e) {
throw new \InvalidArgumentException('Invalid databox option');
}

2
lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.php
View File

@@ -68,7 +68,7 @@ class SearchEngineServiceProvider implements ServiceProviderInterface
});
$app['search_engine.structure'] = $app->share(function ($app) {
$databoxes = $app['phraseanet.appbox']->get_databoxes();
$databoxes = $app->getDataboxes();
return Structure::createFromDataboxes($databoxes);
});

4
lib/Alchemy/Phrasea/Helper/User/Edit.php
View File

@@ -280,7 +280,7 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper
$tbits_right = [];
$sbas_id = \phrasea::sbasFromBas($this->app, $this->base_id);
$databox = $this->app['phraseanet.appbox']->get_databox($sbas_id);
$databox = $this->app->findDataboxById($sbas_id);
$statusStructure = $databox->getStatusStructure();
foreach ($statusStructure as $bit => $status) {
@@ -470,7 +470,7 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper
'datas' => $this->users_datas,
'users' => $this->users,
'users_serial' => implode(';', $this->users),
'databox' => $this->app['phraseanet.appbox']->get_databox($sbas_id),
'databox' => $this->app->findDataboxById($sbas_id),
];
}

2
lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
View File

@@ -464,7 +464,7 @@ class SearchEngineOptions
$value = array_map(function ($serialized) use ($app) {
$data = explode('_', $serialized);
return \databox_field::get_instance($app, $app['phraseanet.appbox']->get_databox($data[0]), $data[1]);
return \databox_field::get_instance($app, $app->findDataboxById($data[0]), $data[1]);
return \collection::get_from_base_id($app, $base_id);
}, $value);
break;

2
lib/Alchemy/Phrasea/Setup/ConfigurationTester.php
View File

@@ -109,7 +109,7 @@ class ConfigurationTester
$upgradable = version::lt($this->app['phraseanet.appbox']->get_version(), $this->app['phraseanet.version']->getNumber());
if (!$upgradable) {
foreach ($this->app['phraseanet.appbox']->get_databoxes() as $databox) {
foreach ($this->app->getDataboxes() as $databox) {
if (version::lt($databox->get_version(), $this->app['phraseanet.version']->getNumber())) {
$upgradable = true;
break;

2
lib/Alchemy/Phrasea/TaskManager/Job/ArchiveJob.php
View File

@@ -79,7 +79,7 @@ class ArchiveJob extends AbstractJob
throw new RuntimeException('Invalid collection base_id.');
}
$databox = $app['phraseanet.appbox']->get_databox($sbasId);
$databox = $app->findDataboxById($sbasId);
$TColls = [];
$collection = null;

10
lib/Alchemy/Phrasea/TaskManager/Job/RecordMoverJob.php
View File

@@ -75,7 +75,7 @@ class RecordMoverJob extends AbstractJob
private function processData(Application $app, $row, $logsql)
{
/** @var databox $databox */
$databox = $app['phraseanet.appbox']->get_databox($row['sbas_id']);
$databox = $app->findDataboxById($row['sbas_id']);
$rec = $databox->get_record($row['record_id']);
switch ($row['action']) {
@@ -145,7 +145,7 @@ class RecordMoverJob extends AbstractJob
try {
/** @var databox $databox */
$databox = $app['phraseanet.appbox']->get_databox($task['sbas_id']);
$databox = $app->findDataboxById($task['sbas_id']);
} catch (\Exception $e) {
$this->log('error', sprintf("can't connect sbas %s", $task['sbas_id']));
continue;
@@ -207,7 +207,7 @@ class RecordMoverJob extends AbstractJob
try {
/** @var databox $dbox */
$dbox = $app['phraseanet.appbox']->get_databox($sbas_id);
$dbox = $app->findDataboxById($sbas_id);
$ret['basename'] = $dbox->get_label($app['locale']);
$ret['basename_htmlencoded'] = htmlentities($ret['basename']);
@@ -351,7 +351,7 @@ class RecordMoverJob extends AbstractJob
private function playTest(Application $app, $sbas_id, $sql)
{
/** @var databox $databox */
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$databox = $app->findDataboxById($sbas_id);
$connbas = $databox->get_connection();
$result = ['rids' => [], 'err' => '', 'n' => null];
@@ -374,7 +374,7 @@ class RecordMoverJob extends AbstractJob
{
$err = "";
/** @var databox $databox */
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$databox = $app->findDataboxById($sbas_id);
/** @var Connection $connbas */
$connbas = $databox->get_connection();

2
lib/Alchemy/Phrasea/TaskManager/Job/SubdefsJob.php
View File

@@ -77,7 +77,7 @@ class SubdefsJob extends AbstractJob
return;
}
foreach ($app['phraseanet.appbox']->get_databoxes() as $databox) {
foreach ($app->getDataboxes() as $databox) {
if (!$this->isStarted()) {
break;
}

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

@@ -69,7 +69,7 @@ class WriteMetadataJob extends AbstractJob
// move this in service provider configuration
// $app['exiftool.writer']->setModule(Writer::MODULE_MWG, true);
foreach ($app['phraseanet.appbox']->get_databoxes() as $databox) {
foreach ($app->getDataboxes() as $databox) {
$conn = $databox->get_connection();
$metaSubdefs = [];

6
lib/classes/ACL.php
View File

@@ -254,7 +254,7 @@ class ACL implements cache_cacheableInterface
return true;
}
$databox = $this->app['phraseanet.appbox']->get_databox($record->getDataboxId());
$databox = $this->app->findDataboxById($record->getDataboxId());
try {
$subdef_class = $databox->get_subdef_structure()
->get_subdef($record->getType(), $subdef_name)
@@ -692,7 +692,7 @@ class ACL implements cache_cacheableInterface
$this->load_rights_bas();
$ret = [];
foreach ($this->app['phraseanet.appbox']->get_databoxes() as $databox) {
foreach ($this->app->getDataboxes() as $databox) {
if ($sbas_ids && !in_array($databox->get_sbas_id(), $sbas_ids)) {
continue;
}
@@ -758,7 +758,7 @@ class ACL implements cache_cacheableInterface
continue;
try {
$ret[$sbas_id] = $this->app['phraseanet.appbox']->get_databox((int) $sbas_id);
$ret[$sbas_id] = $this->app->findDataboxById((int) $sbas_id);
} catch (\Exception $e) {
}

4
lib/classes/Session/Logger.php
View File

@@ -222,9 +222,9 @@ class Session_Logger
foreach ($sbas_ids as $sbas_id) {
try {
$logger = $app['phraseanet.logger']($app['phraseanet.appbox']->get_databox($sbas_id));
$logger = $app['phraseanet.logger']($app->findDataboxById($sbas_id));
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$databox = $app->findDataboxById($sbas_id);
$connbas = $databox->get_connection();
$sql = 'SELECT appli FROM log WHERE id = :log_id';
$stmt = $connbas->prepare($sql);

2
lib/classes/User/Query.php
View File

@@ -1008,7 +1008,7 @@ class User_Query implements User_QueryInterface
private function setActiveBases()
{
foreach ($this->app['phraseanet.appbox']->get_databoxes() as $databox) {
foreach ($this->app->getDataboxes() as $databox) {
$this->active_sbas[] = $databox->get_sbas_id();
foreach ($databox->get_collections() as $collection) {
$this->active_bases[] = $collection->get_base_id();

4
lib/classes/cache/databox.php vendored
View File

@@ -29,7 +29,7 @@ class cache_databox
self::$refreshing = true;
$databox = $app['phraseanet.appbox']->get_databox((int) $sbas_id);
$databox = $app->findDataboxById((int) $sbas_id);
$date = new \DateTime('-3 seconds');
@@ -144,7 +144,7 @@ class cache_databox
*/
public static function update(Application $app, $sbas_id, $type, $value = '')
{
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$databox = $app->findDataboxById($sbas_id);
$connbas = $databox->get_connection();
$sql = 'SELECT distinct site_id as site_id

2
lib/classes/collection.php
View File

@@ -448,7 +448,7 @@ class collection implements cache_cacheableInterface
if (! $sbas_id || ! $coll_id) {
throw new Exception_Databox_CollectionNotFound(sprintf("Collection with base_id %s could not be found", $base_id));
}
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$databox = $app->findDataboxById($sbas_id);
return self::get_from_coll_id($app, $databox, $coll_id);
}

2
lib/classes/databox.php
View File

@@ -665,7 +665,7 @@ class databox extends base
$app['phraseanet.appbox']->delete_data_from_cache(appbox::CACHE_LIST_BASES);
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$databox = $app->findDataboxById($sbas_id);
$databox->delete_data_from_cache(databox::CACHE_COLLECTIONS);
$app['phraseanet.appbox']->delete_data_from_cache(appbox::CACHE_SBAS_IDS);

2
lib/classes/databox/cgu.php
View File

@@ -46,7 +46,7 @@ class databox_cgu
{
$terms = [];
foreach ($app['phraseanet.appbox']->get_databoxes() as $databox) {
foreach ($app->getDataboxes() as $databox) {
try {
$cgus = $databox->get_cgus();

2
lib/classes/databox/field.php
View File

@@ -232,7 +232,7 @@ class databox_field implements cache_cacheableInterface
public function hydrate(Application $app)
{
$this->app = $app;
$this->set_databox($this->app['phraseanet.appbox']->get_databox($this->sbas_id));
$this->set_databox($this->app->findDataboxById($this->sbas_id));
$this->loadVocabulary();
}

4
lib/classes/databox/status.php
View File

@@ -58,7 +58,7 @@ class databox_status
public static function deleteIcon(Application $app, $databox_id, $bit, $switch)
{
$databox = $app['phraseanet.appbox']->get_databox($databox_id);
$databox = $app->findDataboxById($databox_id);
$statusStructure = $app['factory.status-structure']->getStructure($databox);
@@ -88,7 +88,7 @@ class databox_status
public static function updateIcon(Application $app, $databox_id, $bit, $switch, UploadedFile $file)
{
$databox = $app['phraseanet.appbox']->get_databox($databox_id);
$databox = $app->findDataboxById($databox_id);
$statusStructure = $app['factory.status-structure']->getStructure($databox);

4
lib/classes/module/report.php
View File

@@ -836,7 +836,7 @@ class module_report
return $this->report;
}
$databox = $this->app['phraseanet.appbox']->get_databox($this->sbas_id);
$databox = $this->app->findDataboxById($this->sbas_id);
$conn = $databox->get_connection();
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
@@ -887,7 +887,7 @@ class module_report
{
$tab = [];
$databox = $app['phraseanet.appbox']->get_databox((int) $sbasid);
$databox = $app->findDataboxById((int) $sbasid);
foreach ($databox->get_meta_structure() as $databox_field) {
/* @var $databox_field \databox_field */

18
lib/classes/module/report/activity.php
View File

@@ -557,7 +557,7 @@ class module_report_activity extends module_report
// ========================== ???????????????? ===========================
public static function topTenUser(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
{
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$databox = $app->findDataboxById($sbas_id);
$conn = $databox->get_connection();
$result = [];
$result['top_ten_doc'] = [];
@@ -652,7 +652,7 @@ class module_report_activity extends module_report
//============================= Dashboard =========================
public static function activity(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
{
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$databox = $app->findDataboxById($sbas_id);
$conn = $databox->get_connection();
$res = [];
$datefilter =
@@ -708,7 +708,7 @@ class module_report_activity extends module_report
//============================= Dashboard =========================
public static function activityDay(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
{
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$databox = $app->findDataboxById($sbas_id);
$conn = $databox->get_connection();
$result = array();
$res = array();
@@ -761,7 +761,7 @@ class module_report_activity extends module_report
//============================= Dashboard =========================
public static function activityQuestion(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
{
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$databox = $app->findDataboxById($sbas_id);
$conn = $databox->get_connection();
$result = [];
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
@@ -814,7 +814,7 @@ class module_report_activity extends module_report
//============================= Dashboard =========================
public static function activiteTopQuestion(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
{
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$databox = $app->findDataboxById($sbas_id);
$conn = $databox->get_connection();
$result = [];
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
@@ -870,7 +870,7 @@ class module_report_activity extends module_report
//============================= Dashboard =========================
public static function activiteTopTenSiteView(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
{
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$databox = $app->findDataboxById($sbas_id);
$conn = $databox->get_connection();
$result = [];
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
@@ -928,7 +928,7 @@ class module_report_activity extends module_report
//============================= Dashboard =========================
public static function activiteAddedDocument(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
{
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$databox = $app->findDataboxById($sbas_id);
$conn = $databox->get_connection();
$result = [];
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax, 'log_docs.date');
@@ -977,7 +977,7 @@ class module_report_activity extends module_report
//============================= Dashboard =========================
public static function activiteEditedDocument(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
{
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$databox = $app->findDataboxById($sbas_id);
$conn = $databox->get_connection();
$result = [];
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax, 'log_docs.date');
@@ -1026,7 +1026,7 @@ class module_report_activity extends module_report
//============================= Dashboard =========================
public static function activiteAddedTopTenUser(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
{
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$databox = $app->findDataboxById($sbas_id);
$conn = $databox->get_connection();
$result = [];
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax, 'log_docs.date');

2
lib/classes/module/report/connexion.php
View File

@@ -136,7 +136,7 @@ class module_report_connexion extends module_report
public static function getNbConn(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
{
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$databox = $app->findDataboxById($sbas_id);
$conn = $databox->get_connection();
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);

4
lib/classes/module/report/download.php
View File

@@ -177,7 +177,7 @@ class module_report_download extends module_report
public static function getNbDl(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
{
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$databox = $app->findDataboxById($sbas_id);
$conn = $databox->get_connection();
$params = [':site_id' => $app['conf']->get(['main', 'key'])];
@@ -223,7 +223,7 @@ class module_report_download extends module_report
public static function getTopDl(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
{
$databox = $app['phraseanet.appbox']->get_databox((int) $sbas_id);
$databox = $app->findDataboxById((int) $sbas_id);
$conn = $databox->get_connection();
$params = [':site_id' => $app['conf']->get(['main', 'key'])];

4
lib/classes/module/report/nav.php
View File

@@ -416,7 +416,7 @@ class module_report_nav extends module_report
if ($on) {
if ( ! empty($req)) {
$stmt = $this->app['phraseanet.appbox']->get_databox($this->sbas_id)->get_connection()->prepare($req);
$stmt = $this->app->findDataboxById($this->sbas_id)->get_connection()->prepare($req);
$stmt->execute($params);
$rsu = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
@@ -531,7 +531,7 @@ class module_report_nav extends module_report
public function buildTabInfoNav($tab = false, $navigator)
{
$databox = $this->app['phraseanet.appbox']->get_databox($this->sbas_id);
$databox = $this->app->findDataboxById($this->sbas_id);
$conn = $databox->get_connection();
$this->title = $this->app->trans('report:: Information sur le navigateur %name%', ['%name%' => $navigator]);
$sqlBuilder = new module_report_sql($this->app, $this);

2
lib/classes/module/report/sql.php
View File

@@ -40,7 +40,7 @@ class module_report_sql
public function __construct(Application $app, module_report $report)
{
$this->conn = $app['phraseanet.appbox']->get_connection();
$this->connbas = $app['phraseanet.appbox']->get_databox($report->getSbasId())->get_connection();
$this->connbas = $app->findDataboxById($report->getSbasId())->get_connection();
$this->filter = new module_report_sqlfilter($app, $report);
$this->sql = '';
$this->params = [];

2
lib/classes/module/report/sqlfilter.php
View File

@@ -22,7 +22,7 @@ class module_report_sqlfilter
public function __construct(Application $app, module_report $report)
{
$this->app = $app;
$this->conn = $app['phraseanet.appbox']->get_databox($report->getSbasId())->get_connection();
$this->conn = $app->findDataboxById($report->getSbasId())->get_connection();
if (is_array($report->getTransQueryString()))
$this->cor_query = $report->getTransQueryString();

2
lib/classes/patch/361alpha1a.php
View File

@@ -69,7 +69,7 @@ class patch_361alpha1a extends patchAbstract
$sbas_id = (int) $row['sbas_id'];
try {
$connbas = $app['phraseanet.appbox']->get_databox($sbas_id)->get_connection();
$connbas = $app->findDataboxById($sbas_id)->get_connection();
$connbas->connect();
} catch (\Exception $e) {
$conn->exec('DELETE FROM ValidationDatas WHERE basket_element_id = ' . $row['id']);

6
lib/classes/phrasea.php
View File

@@ -197,7 +197,7 @@ class phrasea
try {
self::$_sbas_names = $app['phraseanet.appbox']->get_data_from_cache(self::CACHE_SBAS_NAMES);
} catch (\Exception $e) {
foreach ($app['phraseanet.appbox']->get_databoxes() as $databox) {
foreach ($app->getDataboxes() as $databox) {
self::$_sbas_names[$databox->get_sbas_id()] = $databox->get_viewname();
}
$app['phraseanet.appbox']->set_data_to_cache(self::$_sbas_names, self::CACHE_SBAS_NAMES);
@@ -213,7 +213,7 @@ class phrasea
try {
self::$_sbas_labels = $app['phraseanet.appbox']->get_data_from_cache(self::CACHE_SBAS_LABELS);
} catch (\Exception $e) {
foreach ($app['phraseanet.appbox']->get_databoxes() as $databox) {
foreach ($app->getDataboxes() as $databox) {
self::$_sbas_labels[$databox->get_sbas_id()] = [
'fr' => $databox->get_label('fr'),
'en' => $databox->get_label('en'),
@@ -238,7 +238,7 @@ class phrasea
try {
self::$_bas_labels = $app['phraseanet.appbox']->get_data_from_cache(self::CACHE_BAS_LABELS);
} catch (\Exception $e) {
foreach ($app['phraseanet.appbox']->get_databoxes() as $databox) {
foreach ($app->getDataboxes() as $databox) {
foreach ($databox->get_collections() as $collection) {
self::$_bas_labels[$collection->get_base_id()] = [
'fr' => $collection->get_label('fr'),

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

@@ -82,7 +82,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
public function __construct(Application $app, $sbas_id, $record_id, $number = null)
{
$this->app = $app;
$this->databox = $this->app['phraseanet.appbox']->get_databox((int) $sbas_id);
$this->databox = $this->app->findDataboxById((int) $sbas_id);
$this->number = (int) $number;
$this->record_id = (int) $record_id;
@@ -220,7 +220,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
throw new Exception('unrecognized document type');
}
$databox = $this->app['phraseanet.appbox']->get_databox($this->get_sbas_id());
$databox = $this->app->findDataboxById($this->get_sbas_id());
$connbas = $databox->get_connection();
$sql = 'UPDATE record SET type = :type WHERE record_id = :record_id';
@@ -1083,7 +1083,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
*/
public function rebuild_subdefs()
{
$databox = $this->app['phraseanet.appbox']->get_databox($this->get_sbas_id());
$databox = $this->app->findDataboxById($this->get_sbas_id());
$connbas = $databox->get_connection();
$sql = 'UPDATE record SET jeton=(jeton | ' . PhraseaTokens::MAKE_SUBDEF . ') WHERE record_id = :record_id';
$stmt = $connbas->prepare($sql);
@@ -1131,7 +1131,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
*/
public function write_metas()
{
$databox = $this->app['phraseanet.appbox']->get_databox($this->get_sbas_id());
$databox = $this->app->findDataboxById($this->get_sbas_id());
$connbas = $databox->get_connection();
$sql = 'UPDATE record
SET jeton = jeton | (' . (PhraseaTokens::WRITE_META_DOC | PhraseaTokens::WRITE_META_SUBDEF) . ')
@@ -1150,7 +1150,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
*/
public function set_binary_status($status)
{
$databox = $this->app['phraseanet.appbox']->get_databox($this->get_sbas_id());
$databox = $this->app->findDataboxById($this->get_sbas_id());
$connbas = $databox->get_connection();
$sql = 'UPDATE record SET status = 0b' . $status . '
@@ -1376,7 +1376,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
*/
public static function get_record_by_sha(Application $app, $sbas_id, $sha256, $record_id = null)
{
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$databox = $app->findDataboxById($sbas_id);
$conn = $databox->get_connection();
$sql = "SELECT record_id
@@ -1631,7 +1631,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
public function log_view($log_id, $referrer, $gv_sit)
{
$databox = $this->app['phraseanet.appbox']->get_databox($this->get_sbas_id());
$databox = $this->app->findDataboxById($this->get_sbas_id());
$connbas = $databox->get_connection();
$sql = 'INSERT INTO log_view (id, log_id, date, record_id, referrer, site_id)

2
lib/classes/record/exportElement.php
View File

@@ -85,7 +85,7 @@ class record_exportElement extends record_adapter
$sbas_id = phrasea::sbasFromBas($this->app, $this->base_id);
$subdefgroups = $this->app['phraseanet.appbox']->get_databox($sbas_id)->get_subdef_structure();
$subdefgroups = $this->app->findDataboxById($sbas_id)->get_subdef_structure();
$subdefs = [];

8
lib/classes/record/preview.php
View File

@@ -327,7 +327,7 @@ class record_preview extends record_adapter
$report = $this->app['acl']->get($this->app['authentication']->getUser())->has_right_on_base($this->get_base_id(), 'canreport');
$databox = $this->app['phraseanet.appbox']->get_databox($this->get_sbas_id());
$databox = $this->app->findDataboxById($this->get_sbas_id());
$connsbas = $databox->get_connection();
$sql = 'SELECT d . * , l.user, l.usrid as usr_id, l.site
@@ -431,7 +431,7 @@ class record_preview extends record_adapter
AND site_id = :site
GROUP BY datee ORDER BY datee ASC';
$databox = $this->app['phraseanet.appbox']->get_databox($this->get_sbas_id());
$databox = $this->app->findDataboxById($this->get_sbas_id());
$connsbas = $databox->get_connection();
$stmt = $connsbas->prepare($sql);
$stmt->execute(
@@ -500,7 +500,7 @@ class record_preview extends record_adapter
return $this->refferer_popularity;
}
$databox = $this->app['phraseanet.appbox']->get_databox($this->get_sbas_id());
$databox = $this->app->findDataboxById($this->get_sbas_id());
$connsbas = $databox->get_connection();
$sql = 'SELECT count( id ) AS views, referrer
@@ -594,7 +594,7 @@ class record_preview extends record_adapter
AND site= :site
GROUP BY datee ORDER BY datee ASC';
$databox = $this->app['phraseanet.appbox']->get_databox($this->get_sbas_id());
$databox = $this->app->findDataboxById($this->get_sbas_id());
$connsbas = $databox->get_connection();
$stmt = $connsbas->prepare($sql);
$stmt->execute(

2
resources/hudson/cleanupSubdefs.php
View File

@@ -4,7 +4,7 @@ require __DIR__ . '/../../lib/autoload.php';
$app = require __DIR__ . '/../../lib/Alchemy/Phrasea/Application/Root.php';
foreach ($app['phraseanet.appbox']->get_databoxes() as $databox) {
foreach ($app->getDataboxes() as $databox) {
$structure = $databox->get_subdef_structure();
foreach ($structure as $group => $subdefs) {
foreach ($subdefs as $subdef) {

6
tests/Alchemy/Tests/Phrasea/Border/Checker/AbstractCheckerTest.php
View File

@@ -55,7 +55,7 @@ class AbstractCheckerTest extends \PhraseanetTestCase
$databox = $collection = null;
$app = $this->loadApp();
foreach ($app['phraseanet.appbox']->get_databoxes() as $db) {
foreach ($app->getDataboxes() as $db) {
if (! $collection) {
foreach ($db->get_collections() as $coll) {
$collection = $coll;
@@ -105,7 +105,7 @@ class AbstractCheckerTest extends \PhraseanetTestCase
{
$othercollection = $collection = null;
$app = $this->loadApp();
$databoxes = $app['phraseanet.appbox']->get_databoxes();
$databoxes = $app->getDataboxes();
if (count($databoxes) === 0) {
$this->fail('Unable to find collections');
}
@@ -188,7 +188,7 @@ class AbstractCheckerTest extends \PhraseanetTestCase
$databox = $collection = null;
$app = $this->loadApp();
foreach ($app['phraseanet.appbox']->get_databoxes() as $db) {
foreach ($app->getDataboxes() as $db) {
if (! $databox) {
$databox = $db;
}

4
tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php
View File

@@ -68,7 +68,7 @@ class AdminCollectionTest extends \PhraseanetAuthenticatedWebTestCase
public function createOneCollection()
{
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$collection = \collection::create(self::$DI['app'], array_shift($databoxes), self::$DI['app']['phraseanet.appbox'], 'TESTTODELETE');
self::$createdCollections[] = $collection;
@@ -531,7 +531,7 @@ class AdminCollectionTest extends \PhraseanetAuthenticatedWebTestCase
$collection = $this->createOneCollection();
$databox = self::$DI['app']['phraseanet.appbox']->get_databox($collection->get_sbas_id());
$databox = self::$DI['app']->findDataboxById($collection->get_sbas_id());
$sql = '
INSERT INTO record
(coll_id, record_id, parent_record_id, moddate, credate

12
tests/Alchemy/Tests/Phrasea/Controller/Admin/DataboxTest.php
View File

@@ -67,7 +67,7 @@ class DataboxTest extends \PhraseanetAuthenticatedWebTestCase
public function createOneCollection()
{
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$collection = \collection::create(self::$DI['app'], array_shift($databoxes), self::$DI['app']['phraseanet.appbox'], 'TESTTODELETE');
self::$createdCollections[] = $collection;
@@ -199,7 +199,7 @@ class DataboxTest extends \PhraseanetAuthenticatedWebTestCase
$this->checkRedirection(self::$DI['client']->getResponse(), '/admin/databox/' . self::$DI['collection']->get_sbas_id() . '/cgus/?success=1');
$databox = self::$DI['app']['phraseanet.appbox']->get_databox(self::$DI['collection']->get_sbas_id());
$databox = self::$DI['app']->findDataboxById(self::$DI['collection']->get_sbas_id());
$cgus = $databox->get_cgus();
$this->assertEquals($cgus['fr']['value'], $cgusUpdate);
unset($databox);
@@ -459,7 +459,7 @@ class DataboxTest extends \PhraseanetAuthenticatedWebTestCase
{
$this->setAdmin(true);
$databox = self::$DI['app']['phraseanet.appbox']->get_databox(self::$DI['collection']->get_sbas_id());
$databox = self::$DI['app']->findDataboxById(self::$DI['collection']->get_sbas_id());
$databox->set_viewname('old_databox_name');
$this->assertEquals('old_databox_name', $databox->get_viewname());
@@ -475,7 +475,7 @@ class DataboxTest extends \PhraseanetAuthenticatedWebTestCase
$this->assertTrue(is_object($content));
$this->assertObjectHasAttribute('sbas_id', $content, $response->getContent());
$databox = self::$DI['app']['phraseanet.appbox']->get_databox(self::$DI['collection']->get_sbas_id());
$databox = self::$DI['app']->findDataboxById(self::$DI['collection']->get_sbas_id());
$this->assertEquals('new_databox_name', $databox->get_viewname());
}
@@ -495,7 +495,7 @@ class DataboxTest extends \PhraseanetAuthenticatedWebTestCase
$this->assertObjectHasAttribute('sbas_id', $json);
try {
self::$DI['app']['phraseanet.appbox']->get_databox((int) $json->sbas_id);
self::$DI['app']->findDataboxById((int) $json->sbas_id);
$this->fail('Databox not deleted');
} catch (NotFoundHttpException $e) {
@@ -577,7 +577,7 @@ class DataboxTest extends \PhraseanetAuthenticatedWebTestCase
$this->assertObjectHasAttribute('sbas_id', $json);
try {
self::$DI['app']['phraseanet.appbox']->get_databox((int) $json->sbas_id);
self::$DI['app']->findDataboxById((int) $json->sbas_id);
$this->fail('Databox not unmounted');
} catch (NotFoundHttpException $e) {

4
tests/Alchemy/Tests/Phrasea/Controller/Admin/DataboxesTest.php
View File

@@ -81,7 +81,7 @@ class DataboxesTest extends \PhraseanetAuthenticatedWebTestCase
$databoxId = $explode[3];
try {
$databox = self::$DI['app']['phraseanet.appbox']->get_databox($databoxId);
$databox = self::$DI['app']->findDataboxById($databoxId);
$databox->unmount_databox();
$databox->delete();
} catch (NotFoundHttpException $e) {
@@ -143,7 +143,7 @@ class DataboxesTest extends \PhraseanetAuthenticatedWebTestCase
$this->assertTrue(!!strrpos($uriRedirect, 'success=1'));
$explode = explode('/', $uriRedirect);
$databoxId = $explode[3];
$databox = self::$DI['app']['phraseanet.appbox']->get_databox($databoxId);
$databox = self::$DI['app']->findDataboxById($databoxId);
$databox->unmount_databox();
$databox->delete();

14
tests/Alchemy/Tests/Phrasea/Controller/Admin/FieldsTest.php
View File

@@ -15,7 +15,7 @@ class FieldsTest extends \PhraseanetAuthenticatedWebTestCase
{
public function testRoot()
{
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$databox = array_shift($databoxes);
self::$DI['client']->request("GET", "/admin/fields/" . $databox->get_sbas_id());
@@ -127,7 +127,7 @@ class FieldsTest extends \PhraseanetAuthenticatedWebTestCase
public function testUpdateFields()
{
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$databox = array_shift($databoxes);
$fieldObjects = [];
// create two fields
@@ -217,7 +217,7 @@ class FieldsTest extends \PhraseanetAuthenticatedWebTestCase
public function testCreateField()
{
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$databox = array_shift($databoxes);
$body = json_encode([
@@ -267,7 +267,7 @@ class FieldsTest extends \PhraseanetAuthenticatedWebTestCase
public function testListField()
{
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$databox = array_shift($databoxes);
self::$DI['client']->request("GET", sprintf("/admin/fields/%d/fields", $databox->get_sbas_id()));
@@ -286,7 +286,7 @@ class FieldsTest extends \PhraseanetAuthenticatedWebTestCase
public function testGetField()
{
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$databox = array_shift($databoxes);
$field = \databox_field::create(self::$DI['app'], $databox, 'testfield' . mt_rand(), false);
@@ -305,7 +305,7 @@ class FieldsTest extends \PhraseanetAuthenticatedWebTestCase
public function testUpdateField()
{
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$databox = array_shift($databoxes);
$field = \databox_field::create(self::$DI['app'], $databox, 'testfield' . mt_rand(), false);
@@ -325,7 +325,7 @@ class FieldsTest extends \PhraseanetAuthenticatedWebTestCase
public function testDeleteField()
{
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$databox = array_shift($databoxes);
$field = \databox_field::create(self::$DI['app'], $databox, 'testfield' . mt_rand(), false);

2
tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php
View File

@@ -19,7 +19,7 @@ class SubdefsTest extends \PhraseanetAuthenticatedWebTestCase
public function setUp()
{
parent::setUp();
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$this->databox = array_shift($databoxes);
}

4
tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
View File

@@ -333,9 +333,9 @@ class UsersTest extends \PhraseanetAuthenticatedWebTestCase
{
$user = self::$DI['app']['manipulator.user']->createUser(uniqid('user_'), "test");
self::$DI['app']['acl']->get($user)->give_access_to_sbas(array_keys(self::$DI['app']['phraseanet.appbox']->get_databoxes()));
self::$DI['app']['acl']->get($user)->give_access_to_sbas(array_keys(self::$DI['app']->getDataboxes()));
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
$rights = [
'bas_manage' => '1'

6
tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php
View File

@@ -108,7 +108,7 @@ abstract class ApiTestCase extends \PhraseanetWebTestCase
$this->assertArrayHasKey('stories', $data);
$this->assertCount(1, $data['stories']);
list($empty, $path, $databox_id, $story_id) = explode('/', current($data['stories']));
$databox = self::$DI['app']['phraseanet.appbox']->get_databox($databox_id);
$databox = self::$DI['app']->findDataboxById($databox_id);
$story = $databox->get_record($story_id);
$story->delete();
$record->delete();
@@ -632,7 +632,7 @@ abstract class ApiTestCase extends \PhraseanetWebTestCase
{
$this->setToken($this->userAccessToken);
$databox_id = self::$DI['record_1']->get_sbas_id();
$databox = self::$DI['app']['phraseanet.appbox']->get_databox($databox_id);
$databox = self::$DI['app']->findDataboxById($databox_id);
$statusStructure = $databox->getStatusStructure();
$route = '/api/v1/databoxes/' . $databox_id . '/status/';
$this->evaluateMethodNotAllowedRoute($route, ['POST', 'PUT', 'DELETE']);
@@ -681,7 +681,7 @@ abstract class ApiTestCase extends \PhraseanetWebTestCase
{
$this->setToken($this->userAccessToken);
$databox_id = self::$DI['record_1']->get_sbas_id();
$databox = self::$DI['app']['phraseanet.appbox']->get_databox($databox_id);
$databox = self::$DI['app']->findDataboxById($databox_id);
$ref_structure = $databox->get_meta_structure();
try {

4
tests/Alchemy/Tests/Phrasea/Controller/Prod/TOUTest.php
View File

@@ -45,7 +45,7 @@ class TOUTest extends \PhraseanetAuthenticatedWebTestCase
*/
public function testDenyTOU()
{
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$databox = array_shift($databoxes);
self::$DI['app']['authentication']->setUser(self::$DI['user_alt2']);
$this->XMLHTTPRequest('POST', '/prod/TOU/deny/'.$databox->get_sbas_id() .'/');
@@ -65,7 +65,7 @@ class TOUTest extends \PhraseanetAuthenticatedWebTestCase
*/
public function testDenyTOURequireAuthentication()
{
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$databox = array_shift($databoxes);
$this->logout(self::$DI['app']);
self::$DI['client']->request('POST', '/prod/TOU/deny/'. $databox->get_sbas_id() .'/');

2
tests/Alchemy/Tests/Phrasea/Controller/Root/AccountTest.php
View File

@@ -358,7 +358,7 @@ class AccountTest extends \PhraseanetAuthenticatedWebTestCase
{
$bases = $notifs = [];
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
foreach ($databox->get_collections() as $collection) {
$bases[] = $collection->get_base_id();
}

8
tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
View File

@@ -238,7 +238,7 @@ class LoginTest extends \PhraseanetAuthenticatedWebTestCase
$token = self::$DI['app']['manipulator.token']->createResetEmailToken($user, $email);
$user->setMailLocked(true);
$revokeBases = array();
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
foreach ($databox->get_collections() as $collection) {
$revokeBases[] = $collection->get_base_id();
}
@@ -1866,7 +1866,7 @@ class LoginTest extends \PhraseanetAuthenticatedWebTestCase
{
if (null === self::$termsOfUse) {
self::$termsOfUse = [];
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
self::$termsOfUse[$databox->get_sbas_id()] = $databox->get_cgus();
foreach ( self::$termsOfUse[$databox->get_sbas_id()]as $lng => $tou) {
@@ -1882,7 +1882,7 @@ class LoginTest extends \PhraseanetAuthenticatedWebTestCase
return;
}
self::$termsOfUse = [];
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
self::$termsOfUse[$databox->get_sbas_id()] = $databox->get_cgus();
foreach ( self::$termsOfUse[$databox->get_sbas_id()]as $lng => $tou) {
@@ -1896,7 +1896,7 @@ class LoginTest extends \PhraseanetAuthenticatedWebTestCase
if (null === self::$termsOfUse) {
return;
}
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
if (!isset(self::$termsOfUse[$databox->get_sbas_id()])) {
continue;
}

2
tests/Alchemy/Tests/Phrasea/Core/Configuration/AccessRestrictionTest.php
View File

@@ -43,7 +43,7 @@ class AccessRestrictionTest extends \PhraseanetTestCase
{
$app = $this->loadApp();
$databoxes = $app['phraseanet.appbox']->get_databoxes();
$databoxes = $app->getDataboxes();
$databox = current($databoxes);
$collections = $databox->get_collections();
$collection = current($collections);

2
tests/Alchemy/Tests/Phrasea/Core/Configuration/RegistrationManagerTest.php
View File

@@ -64,7 +64,7 @@ class RegistrationManagerTest extends \PhraseanetTestCase
$rs = $service->getRegistrationSummary(self::$DI['user']);
$databox = current(self::$DI['app']['phraseanet.appbox']->get_databoxes());
$databox = current(self::$DI['app']->getDataboxes());
$collection = current($databox->get_collections());
$this->assertEquals($value, count($rs[$databox->get_sbas_id()]['registrations']['by-type'][$type]));

2
tests/Alchemy/Tests/Phrasea/Model/Manipulator/ACLManipulatorTest.php
View File

@@ -16,7 +16,7 @@ class ACLManipulatorTest extends \PhraseanetTestCase
$databoxId = null;
$baseId = null;
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
$databoxId = $databox->get_sbas_id();
$acl->update_rights_to_sbas($databoxId, [

2
tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineAbstractTest.php
View File

@@ -35,7 +35,7 @@ abstract class SearchEngineAbstractTest extends \PhraseanetAuthenticatedTestCase
$field->save();
}
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
break;
}
}

2
tests/Alchemy/Tests/Phrasea/Setup/InstallerTest.php
View File

@@ -80,7 +80,7 @@ class InstallerTest extends \PhraseanetTestCase
$this->assertTrue($app['configuration.store']->isSetup());
$this->assertTrue($app['phraseanet.configuration-tester']->isUpToDate());
$databox = current($app['phraseanet.appbox']->get_databoxes());
$databox = current($app->getDataboxes());
$this->assertContains('<path>'.realpath($dataPath).'/db_setup_test/subdefs</path>', $databox->get_structure());
$conf = $app['configuration.store']->getConfig();

2
tests/Alchemy/Tests/Phrasea/TaskManager/Editor/RecordMoverEditorTest.php
View File

@@ -53,7 +53,7 @@ class RecordMoverEditorTest extends EditorTestCase
public function testFacilityWithActions($action)
{
$databox = null;
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $box) {
foreach (self::$DI['app']->getDataboxes() as $box) {
$databox = $box;
break;
}

34
tests/classes/ACLTest.php
View File

@@ -111,7 +111,7 @@ class ACLTest extends \PhraseanetTestCase
public function testGive_access_to_sbas()
{
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
$sbas_id = $databox->get_sbas_id();
$base_ids = [];
foreach ($databox->get_collections() as $collection) {
@@ -128,7 +128,7 @@ class ACLTest extends \PhraseanetTestCase
public function testRevoke_unused_sbas_rights()
{
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
$sbas_id = $databox->get_sbas_id();
$base_ids = [];
foreach ($databox->get_collections() as $collection) {
@@ -150,7 +150,7 @@ class ACLTest extends \PhraseanetTestCase
public function testSet_quotas_on_base()
{
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
foreach ($databox->get_collections() as $collection) {
$base_id = $collection->get_base_id();
$droits = 50;
@@ -174,7 +174,7 @@ class ACLTest extends \PhraseanetTestCase
$first = true;
$base_ref = null;
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
foreach ($databox->get_collections() as $collection) {
$base_id = $collection->get_base_id();
@@ -220,7 +220,7 @@ class ACLTest extends \PhraseanetTestCase
'canaddrecord' => true,
];
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
foreach ($databox->get_collections() as $collection) {
$base_id = $collection->get_base_id();
$this->object->give_access_to_base([$base_id]);
@@ -359,7 +359,7 @@ class ACLTest extends \PhraseanetTestCase
'bas_modif_th' => true,
];
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
$this->object->give_access_to_sbas([$databox->get_sbas_id()]);
$this->object->update_rights_to_sbas($databox->get_sbas_id(), $rights_false);
$this->assertFalse($this->object->has_right_on_sbas($databox->get_sbas_id(), 'bas_modify_struct'));
@@ -381,7 +381,7 @@ class ACLTest extends \PhraseanetTestCase
public function testGet_mask_and()
{
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
foreach ($databox->get_collections() as $collection) {
$base_id = $collection->get_base_id();
@@ -400,7 +400,7 @@ class ACLTest extends \PhraseanetTestCase
public function testGet_mask_xor()
{
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
foreach ($databox->get_collections() as $collection) {
$base_id = $collection->get_base_id();
@@ -422,7 +422,7 @@ class ACLTest extends \PhraseanetTestCase
{
$base_ids = [];
$n = 0;
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
foreach ($databox->get_collections() as $collection) {
$base_ids[] = $collection->get_base_id();
$n ++;
@@ -476,7 +476,7 @@ class ACLTest extends \PhraseanetTestCase
{
$base_ids = [];
$n = 0;
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
foreach ($databox->get_collections() as $collection) {
$base_ids[] = $collection->get_base_id();
$n ++;
@@ -508,7 +508,7 @@ class ACLTest extends \PhraseanetTestCase
{
$sbas_ids = [];
$n = 0;
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
$sbas_ids[] = $databox->get_sbas_id();
$n ++;
}
@@ -532,7 +532,7 @@ class ACLTest extends \PhraseanetTestCase
public function testHas_access_to_module()
{
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
$base_ids = [];
foreach ($databox->get_collections() as $collection) {
$base_id = $collection->get_base_id();
@@ -551,7 +551,7 @@ class ACLTest extends \PhraseanetTestCase
$this->assertFalse($this->object->has_access_to_module('report'));
$found = false;
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
foreach ($databox->get_collections() as $collection) {
$base_id = $collection->get_base_id();
$base_ids[] = $base_id;
@@ -566,7 +566,7 @@ class ACLTest extends \PhraseanetTestCase
$this->assertFalse($this->object->has_access_to_module('thesaurus'));
$this->assertFalse($this->object->has_access_to_module('upload'));
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
$this->object->update_rights_to_sbas($databox->get_sbas_id(), ['bas_modif_th' => true]);
$found = true;
}
@@ -575,7 +575,7 @@ class ACLTest extends \PhraseanetTestCase
$this->assertFalse($this->object->has_access_to_module('upload'));
$found = false;
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
foreach ($databox->get_collections() as $collection) {
$base_id = $collection->get_base_id();
$base_ids[] = $base_id;
@@ -596,7 +596,7 @@ class ACLTest extends \PhraseanetTestCase
$found = false;
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
foreach ($databox->get_collections() as $collection) {
$base_id = $collection->get_base_id();
@@ -629,7 +629,7 @@ class ACLTest extends \PhraseanetTestCase
$found = false;
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
foreach ($databox->get_collections() as $collection) {
$base_id = $collection->get_base_id();

4
tests/classes/PhraseanetTestCase.php
View File

@@ -487,9 +487,9 @@ abstract class PhraseanetTestCase extends WebTestCase
{
$app['acl']->get($user)->delete_data_from_cache(\ACL::CACHE_GLOBAL_RIGHTS);
$app['acl']->get($user)->delete_data_from_cache(databox::CACHE_COLLECTIONS);
$app['acl']->get($user)->give_access_to_sbas(array_keys($app['phraseanet.appbox']->get_databoxes()));
$app['acl']->get($user)->give_access_to_sbas(array_keys($app->getDataboxes()));
foreach ($app['phraseanet.appbox']->get_databoxes() as $databox) {
foreach ($app->getDataboxes() as $databox) {
$app['acl']->get($user)->delete_data_from_cache(\ACL::CACHE_RIGHTS_SBAS);
$rights = [

2
tests/classes/caption/recordTest.php
View File

@@ -165,7 +165,7 @@ class caption_recordTest extends \PhraseanetTestCase
{
$field = null;
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach (self::$DI['app']->getDataboxes() as $databox) {
foreach ($databox->get_meta_structure() as $meta) {
$meta->set_dces_element(new databox_Field_DCES_Contributor());
$field = $meta;

4
tests/classes/collectionTest.php
View File

@@ -23,7 +23,7 @@ class collectionTest extends \PhraseanetTestCase
parent::setup();
if (!self::$object) {
if (0 === count($databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes())) {
if (0 === count($databoxes = self::$DI['app']->getDataboxes())) {
$this->fail('No databox found for collection test');
}
@@ -68,7 +68,7 @@ class collectionTest extends \PhraseanetTestCase
$this->assertFalse(self::$object->is_active());
$sbas_id = self::$object->get_databox()->get_sbas_id();
$databox = self::$DI['app']['phraseanet.appbox']->get_databox($sbas_id);
$databox = self::$DI['app']->findDataboxById($sbas_id);
foreach ($databox->get_collections() as $collection) {
$this->assertTrue($collection->get_base_id() !== $base_id);

2
tests/classes/report/activityTest.php
View File

@@ -23,7 +23,7 @@ class report_activityTest extends \report_abstractReportTestCase
$this->dmax = $date->format("Y-m-d H:i:s");
$date->modify('-6 month');
$this->dmin = $date->format("Y-m-d H:i:s");
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$this->ret = [];
foreach ($databoxes as $databox) {
$colls = $databox->get_collections();

2
tests/classes/report/addTest.php
View File

@@ -18,7 +18,7 @@ class report_addTest extends \report_abstractReportTestCase
$this->dmax = $date->format("Y-m-d H:i:s");
$date->modify('-6 month');
$this->dmin = $date->format("Y-m-d H:i:s");
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$this->ret = [];
foreach ($databoxes as $databox) {
$colls = $databox->get_collections();

2
tests/classes/report/connexionReportTest.php
View File

@@ -19,7 +19,7 @@ class report_connexionReportTest extends \report_abstractReportTestCase
$this->dmax = $date->format("Y-m-d H:i:s");
$date->modify('-6 month');
$this->dmin = $date->format("Y-m-d H:i:s");
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$this->ret = [];
foreach ($databoxes as $databox) {
$colls = $databox->get_collections();

2
tests/classes/report/downloadReportTest.php
View File

@@ -18,7 +18,7 @@ class report_downloadReportTest extends \report_abstractReportTestCase
$this->dmax = $date->format("Y-m-d H:i:s");
$date->modify('-6 month');
$this->dmin = $date->format("Y-m-d H:i:s");
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$this->ret = [];
foreach ($databoxes as $databox) {
$colls = $databox->get_collections();

2
tests/classes/report/editTest.php
View File

@@ -18,7 +18,7 @@ class report_editTest extends \report_abstractReportTestCase
$this->dmax = $date->format("Y-m-d H:i:s");
$date->modify('-6 month');
$this->dmin = $date->format("Y-m-d H:i:s");
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$this->ret = [];
foreach ($databoxes as $databox) {
$colls = $databox->get_collections();

2
tests/classes/report/filterTest.php
View File

@@ -18,7 +18,7 @@ class report_filterTest extends \report_abstractReportTestCase
$this->dmax = $date->format("Y-m-d H:i:s");
$date->modify('-6 month');
$this->dmin = $date->format("Y-m-d H:i:s");
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$this->ret = [];
foreach ($databoxes as $databox) {
$colls = $databox->get_collections();

2
tests/classes/report/pushTest.php
View File

@@ -18,7 +18,7 @@ class report_pushTest extends \report_abstractReportTestCase
$this->dmax = $date->format("Y-m-d H:i:s");
$date->modify('-6 month');
$this->dmin = $date->format("Y-m-d H:i:s");
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$this->ret = [];
foreach ($databoxes as $databox) {
$colls = $databox->get_collections();

2
tests/classes/report/questionReportTest.php
View File

@@ -18,7 +18,7 @@ class report_questionReportTest extends \report_abstractReportTestCase
$this->dmax = $date->format("Y-m-d H:i:s");
$date->modify('-6 month');
$this->dmin = $date->format("Y-m-d H:i:s");
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$this->ret = [];
foreach ($databoxes as $databox) {
$colls = $databox->get_collections();

2
tests/classes/report/reportTest.php
View File

@@ -31,7 +31,7 @@ class report_reportTest extends \report_abstractReportTestCase
$this->dmax = $date->format("Y-m-d H:i:s");
$date->modify('-6 month');
$this->dmin = $date->format("Y-m-d H:i:s");
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$this->ret = [];
foreach ($databoxes as $databox) {
$colls = $databox->get_collections();

2
tests/classes/report/sentTest.php
View File

@@ -18,7 +18,7 @@ class report_sentTest extends \report_abstractReportTestCase
$this->dmax = $date->format("Y-m-d H:i:s");
$date->modify('-6 month');
$this->dmin = $date->format("Y-m-d H:i:s");
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$this->ret = [];
foreach ($databoxes as $databox) {
$colls = $databox->get_collections();

2
tests/classes/report/sqlFilterTest.php
View File

@@ -20,7 +20,7 @@ class report_sqlFilterTest extends \report_abstractReportTestCase
$dmax = $date->format("Y-m-d H:i:s");
$date->modify('-6 month');
$dmin = $date->format("Y-m-d H:i:s");
$databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
$databoxes = self::$DI['app']->getDataboxes();
$ret = [];
foreach ($databoxes as $databox) {
$colls = $databox->get_collections();