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

Use short array syntax

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-11-18 14:40:20 +01:00
parent 1cde667730
commit 98fee5038b
59 changed files with 223 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Alchemy/Phrasea/Core/Configuration/PropertyAccess.php
View File

@@ -145,7 +145,7 @@ class PropertyAccess
$conf[$prop] = $value;
} else {
if (! array_key_exists($prop, $conf)) {
$conf[$prop] = array();
$conf[$prop] = [];
}
$this->doSet($conf[$prop], $props, $value);
}
@@ -165,7 +165,7 @@ class PropertyAccess
return $conf[$prop] = $value;
}
if (!array_key_exists($prop, $conf)) {
$conf[$prop] = array();
$conf[$prop] = [];
}
return $this->doMerge($conf[$prop], $props, $value);
@@ -193,7 +193,7 @@ class PropertyAccess
private function arrayize($value)
{
if (!is_array($value)) {
return array($value);
return [$value];
}
return $value;

4
lib/classes/patch/320alpha1a.php
View File

@@ -17,7 +17,7 @@ class patch_320alpha1a implements patchInterface
private $release = '3.2.0-alpha.1';
/** @var Array */
private $concern = array(base::DATA_BOX);
private $concern = [base::DATA_BOX];
/**
* {@inheritdoc}
@@ -32,7 +32,7 @@ class patch_320alpha1a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

4
lib/classes/patch/320alpha1b.php
View File

@@ -17,7 +17,7 @@ class patch_320alpha1b implements patchInterface
private $release = '3.2.0-alpha.1';
/** @var Array */
private $concern = array(base::APPLICATION_BOX);
private $concern = [base::APPLICATION_BOX];
/**
* {@inheritdoc}
@@ -40,7 +40,7 @@ class patch_320alpha1b implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

10
lib/classes/patch/320alpha2a.php
View File

@@ -17,7 +17,7 @@ class patch_320alpha2a implements patchInterface
private $release = '3.2.0-alpha.2';
/** @var array */
private $concern = array(base::APPLICATION_BOX);
private $concern = [base::APPLICATION_BOX];
/**
* {@inheritdoc}
@@ -40,7 +40,7 @@ class patch_320alpha2a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**
@@ -66,7 +66,7 @@ class patch_320alpha2a implements patchInterface
$stmt = $appbox->get_connection()->prepare($sql);
foreach ($rs as $row) {
$nonce = random::generatePassword(16);
$params = array(':usr_id' => $row['usr_id'], ':nonce' => $nonce);
$params = [':usr_id' => $row['usr_id'], ':nonce' => $nonce];
$stmt->execute($params);
}
$stmt->closeCursor();
@@ -83,10 +83,10 @@ class patch_320alpha2a implements patchInterface
if (strpos($row['class'], 'task_period_') !== false)
continue;
$params = array(
$params = [
':task_id' => $row['task_id']
, ':class' => str_replace('task_', 'task_period_', $row['class'])
);
];
$stmt->execute($params);
}

4
lib/classes/patch/320alpha3a.php
View File

@@ -17,7 +17,7 @@ class patch_320alpha3a implements patchInterface
private $release = '3.2.0-alpha.3';
/** @var array */
private $concern = array(base::APPLICATION_BOX);
private $concern = [base::APPLICATION_BOX];
/**
* {@inheritdoc}
@@ -40,7 +40,7 @@ class patch_320alpha3a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

8
lib/classes/patch/320alpha4a.php
View File

@@ -17,7 +17,7 @@ class patch_320alpha4a implements patchInterface
private $release = '3.2.0-alpha.4';
/** @var array */
private $concern = array(base::DATA_BOX);
private $concern = [base::DATA_BOX];
/**
* {@inheritdoc}
@@ -40,7 +40,7 @@ class patch_320alpha4a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**
@@ -71,7 +71,7 @@ class patch_320alpha4a implements patchInterface
$stmt->execute();
$stmt->closeCursor();
$phrasea_maps = array(
$phrasea_maps = [
'pdftext' => 'Phraseanet:pdftext'
, 'tf-archivedate' => 'Phraseanet:tf-archivedate'
, 'tf-atime' => 'Phraseanet:tf-atime'
@@ -90,7 +90,7 @@ class patch_320alpha4a implements patchInterface
, 'tf-recordid' => 'Phraseanet:tf-recordid'
, 'tf-size' => 'Phraseanet:tf-size'
, 'tf-width' => 'Phraseanet:tf-width'
);
];
$sxe = $databox->get_sxml_structure();
$dom_struct = $databox->get_dom_structure();

12
lib/classes/patch/320alpha4b.php
View File

@@ -24,7 +24,7 @@ class patch_320alpha4b implements patchInterface
private $release = '3.2.0-alpha.4';
/** @var array */
private $concern = array(base::APPLICATION_BOX);
private $concern = [base::APPLICATION_BOX];
/**
* {@inheritdoc}
@@ -39,7 +39,7 @@ class patch_320alpha4b implements patchInterface
*/
public function getDoctrineMigrations()
{
return array('feed');
return ['feed'];
}
/**
@@ -63,7 +63,7 @@ class patch_320alpha4b implements patchInterface
*/
public function apply(base $appbox, Application $app)
{
$feeds = array();
$feeds = [];
try {
$sql = 'ALTER TABLE `ssel` ADD `migrated` INT NOT NULL DEFAULT "0"';
@@ -119,7 +119,7 @@ class patch_320alpha4b implements patchInterface
$sql = 'SELECT sselcont_id, ssel_id, base_id, record_id
FROM sselcont WHERE ssel_id = :ssel_id ORDER BY ord ASC';
$stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute(array(':ssel_id' => $row['ssel_id']));
$stmt->execute([':ssel_id' => $row['ssel_id']]);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
@@ -142,7 +142,7 @@ class patch_320alpha4b implements patchInterface
$sql = 'UPDATE ssel SET deleted = "1", migrated="1"
WHERE ssel_id = :ssel_id';
$stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute(array(':ssel_id' => $row['ssel_id']));
$stmt->execute([':ssel_id' => $row['ssel_id']]);
$stmt->closeCursor();
$app['EM']->persist($feed);
$n++;
@@ -170,7 +170,7 @@ class patch_320alpha4b implements patchInterface
return;
}
protected static $feeds = array();
protected static $feeds = [];
protected function get_feed(appbox $appbox, User_Adapter $user, $pub_restrict, $homelink, Application $app)
{

8
lib/classes/patch/320alpha5a.php
View File

@@ -17,7 +17,7 @@ class patch_320alpha5a implements patchInterface
private $release = '3.2.0-alpha.5';
/** @var array */
private $concern = array(base::APPLICATION_BOX);
private $concern = [base::APPLICATION_BOX];
/**
* {@inheritdoc}
@@ -40,7 +40,7 @@ class patch_320alpha5a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**
@@ -67,10 +67,10 @@ class patch_320alpha5a implements patchInterface
$stmt = $appbox->get_connection()->prepare($sql);
foreach ($rs as $row) {
$params = array(
$params = [
':base_id' => $row['base_id'],
':usr_id' => $row['usr_id']
);
];
$stmt->execute($params);
}

4
lib/classes/patch/320alpha6a.php
View File

@@ -18,7 +18,7 @@ class patch_320alpha6a implements patchInterface
private $release = '3.2.0-alpha.6';
/** @var array */
private $concern = array(base::DATA_BOX);
private $concern = [base::DATA_BOX];
/**
* {@inheritdoc}
@@ -41,7 +41,7 @@ class patch_320alpha6a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

4
lib/classes/patch/320alpha8a.php
View File

@@ -18,7 +18,7 @@ class patch_320alpha8a implements patchInterface
private $release = '3.2.0-alpha.8';
/** @var array */
private $concern = array(base::APPLICATION_BOX);
private $concern = [base::APPLICATION_BOX];
/**
* {@inheritdoc}
@@ -41,7 +41,7 @@ class patch_320alpha8a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

26
lib/classes/patch/360alpha1a.php
View File

@@ -20,7 +20,7 @@ class patch_360alpha1a implements patchInterface
private $release = '3.6.0-alpha.1';
/** @var array */
private $concern = array(base::APPLICATION_BOX);
private $concern = [base::APPLICATION_BOX];
/**
* {@inheritdoc}
@@ -51,7 +51,7 @@ class patch_360alpha1a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array('workzone', 'session');
return ['workzone', 'session'];
}
/**
@@ -59,7 +59,7 @@ class patch_360alpha1a implements patchInterface
*/
public function apply(base $appbox, Application $app)
{
$tables = array('StoryWZ', 'ValidationDatas', 'ValidationParticipants', 'ValidationSessions', 'BasketElements', 'Baskets');
$tables = ['StoryWZ', 'ValidationDatas', 'ValidationParticipants', 'ValidationSessions', 'BasketElements', 'Baskets'];
foreach ($tables as $table) {
$sql = 'DELETE FROM ' . $table;
@@ -68,7 +68,7 @@ class patch_360alpha1a implements patchInterface
$stmt->closeCursor();
}
$stories = array();
$stories = [];
$sql = 'SELECT sbas_id, rid as record_id, usr_id
FROM ssel
@@ -79,7 +79,7 @@ class patch_360alpha1a implements patchInterface
$rs_s = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
$current = array();
$current = [];
foreach ($rs_s as $row_story) {
$serial = $row_story['sbas_id'] . '_' . $row_story['usr_id'] . '_' . $row_story['record_id'];
@@ -98,11 +98,11 @@ class patch_360alpha1a implements patchInterface
$stmt = $appbox->get_connection()->prepare($sql);
foreach ($stories as $row) {
$params = array(
$params = [
':usr_id' => $row['usr_id'],
':sbas_id' => $row['sbas_id'],
':record_id' => $row['record_id']
);
];
$stmt->execute($params);
}
@@ -137,7 +137,7 @@ class patch_360alpha1a implements patchInterface
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
$sselcont_ids = array();
$sselcont_ids = [];
foreach ($rs as $row) {
$sql = 'SELECT c.sselcont_id, c.record_id, b.sbas_id
@@ -146,11 +146,11 @@ class patch_360alpha1a implements patchInterface
AND c.ssel_id = :ssel_id AND s.ssel_id = c.ssel_id';
$stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute(array(':ssel_id' => $row['ssel_id']));
$stmt->execute([':ssel_id' => $row['ssel_id']]);
$rs_be = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
$current = array();
$current = [];
foreach ($rs_be as $row_sselcont) {
$serial = $row_sselcont['sbas_id'] . '_' . $row_sselcont['record_id'];
@@ -167,7 +167,7 @@ class patch_360alpha1a implements patchInterface
$stmt = $appbox->get_connection()->prepare($sql);
foreach ($sselcont_ids as $sselcont_id) {
$stmt->execute(array(':sselcont_id' => $sselcont_id));
$stmt->execute([':sselcont_id' => $sselcont_id]);
}
$stmt->closeCursor();
@@ -236,11 +236,11 @@ class patch_360alpha1a implements patchInterface
)';
$stmt = $appbox->get_connection()->prepare($sql);
foreach ($rs as $row) {
$params = array(
$params = [
':participant_id' => $row['participant_id'],
':basket_id' => $row['basket_id'],
':usr_id' => $row['usr_id'],
);
];
$stmt->execute($params);
}

4
lib/classes/patch/360alpha1b.php
View File

@@ -18,7 +18,7 @@ class patch_360alpha1b implements patchInterface
private $release = '3.6.0-alpha.1';
/** @var array */
private $concern = array(base::DATA_BOX);
private $concern = [base::DATA_BOX];
/**
* {@inheritdoc}
@@ -41,7 +41,7 @@ class patch_360alpha1b implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

4
lib/classes/patch/360alpha2a.php
View File

@@ -18,7 +18,7 @@ class patch_360alpha2a implements patchInterface
private $release = '3.6.0-alpha.2';
/** @var array */
private $concern = array(base::APPLICATION_BOX);
private $concern = [base::APPLICATION_BOX];
/**
* {@inheritdoc}
@@ -41,7 +41,7 @@ class patch_360alpha2a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

12
lib/classes/patch/360alpha2b.php
View File

@@ -18,7 +18,7 @@ class patch_360alpha2b implements patchInterface
private $release = '3.6.0-alpha.2';
/** @var array */
private $concern = array(base::DATA_BOX);
private $concern = [base::DATA_BOX];
/**
* {@inheritdoc}
@@ -33,7 +33,7 @@ class patch_360alpha2b implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**
@@ -121,7 +121,7 @@ class patch_360alpha2b implements patchInterface
VALUES (null, :record_id, :meta_struct_id, :value)';
$stmt = $databox->get_connection()->prepare($sql);
$databox_fields = array();
$databox_fields = [];
foreach ($rs as $row) {
$meta_struct_id = $row['meta_struct_id'];
@@ -133,11 +133,11 @@ class patch_360alpha2b implements patchInterface
$values = \caption_field::get_multi_values($row['value'], $databox_fields[$meta_struct_id]->get_separator());
foreach ($values as $value) {
$params = array(
$params = [
':record_id' => $row['record_id'],
':meta_struct_id' => $row['meta_struct_id'],
':value' => $value,
);
];
$stmt->execute($params);
}
}
@@ -148,7 +148,7 @@ class patch_360alpha2b implements patchInterface
$stmt = $databox->get_connection()->prepare($sql);
foreach ($rs as $row) {
$params = array(':id' => $row['id']);
$params = [':id' => $row['id']];
$stmt->execute($params);
}

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

@@ -19,7 +19,7 @@ class patch_361alpha1a implements patchInterface
private $release = '3.6.1-alpha.1';
/** @var array */
private $concern = array(base::APPLICATION_BOX);
private $concern = [base::APPLICATION_BOX];
/**
* {@inheritdoc}
@@ -50,7 +50,7 @@ class patch_361alpha1a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array('workzone');
return ['workzone'];
}
/**
@@ -79,7 +79,7 @@ class patch_361alpha1a implements patchInterface
$sql = 'SELECT record_id FROM record WHERE record_id = :record_id';
$stmt = $connbas->prepare($sql);
$stmt->execute(array(':record_id' => $row['record_id']));
$stmt->execute([':record_id' => $row['record_id']]);
$rowCount = $stmt->rowCount();
$stmt->closeCursor();

6
lib/classes/patch/370alpha1a.php
View File

@@ -18,7 +18,7 @@ class patch_370alpha1a implements patchInterface
private $release = '3.7.0-alpha.1';
/** @var array */
private $concern = array(base::DATA_BOX);
private $concern = [base::DATA_BOX];
/**
* {@inheritdoc}
@@ -33,7 +33,7 @@ class patch_370alpha1a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**
@@ -86,7 +86,7 @@ class patch_370alpha1a implements patchInterface
$sql = 'UPDATE pref SET value = :structure WHERE prop = "structure"';
$stmt = $conn->prepare($sql);
$stmt->execute(array(':structure' => $DOMDocument->saveXML()));
$stmt->execute([':structure' => $DOMDocument->saveXML()]);
$stmt->closeCursor();
return true;

4
lib/classes/patch/370alpha3a.php
View File

@@ -18,7 +18,7 @@ class patch_370alpha3a implements patchInterface
private $release = '3.7.0-alpha.3';
/** @var array */
private $concern = array(base::APPLICATION_BOX);
private $concern = [base::APPLICATION_BOX];
/**
*
@@ -42,7 +42,7 @@ class patch_370alpha3a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

12
lib/classes/patch/370alpha4a.php
View File

@@ -17,7 +17,7 @@ class patch_370alpha4a implements patchInterface
private $release = '3.7.0-alpha.4';
/** @var array */
private $concern = array(base::DATA_BOX);
private $concern = [base::DATA_BOX];
/**
* {@inheritdoc}
@@ -48,7 +48,7 @@ class patch_370alpha4a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**
@@ -62,7 +62,7 @@ class patch_370alpha4a implements patchInterface
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
$update = array();
$update = [];
$tagDirname = new \Alchemy\Phrasea\Metadata\Tag\TfDirname();
$tagBasename = new \Alchemy\Phrasea\Metadata\Tag\TfBasename();
@@ -70,10 +70,10 @@ class patch_370alpha4a implements patchInterface
foreach ($rs as $row) {
if (strpos(strtolower($row['src']), 'tf-parentdir') !== false) {
$update[] = array('id' => $row['id'], 'src' => $tagDirname->getTagname());
$update[] = ['id' => $row['id'], 'src' => $tagDirname->getTagname()];
}
if (strpos(strtolower($row['src']), 'tf-filename') !== false) {
$update[] = array('id' => $row['id'], 'src' => $tagBasename->getTagname());
$update[] = ['id' => $row['id'], 'src' => $tagBasename->getTagname()];
}
}
@@ -81,7 +81,7 @@ class patch_370alpha4a implements patchInterface
$stmt = $databox->get_connection()->prepare($sql);
foreach ($update as $row) {
$stmt->execute(array(':src' => $row['src'], ':id' => $row['id']));
$stmt->execute([':src' => $row['src'], ':id' => $row['id']]);
}
$stmt->closeCursor();

12
lib/classes/patch/370alpha5a.php
View File

@@ -17,7 +17,7 @@ class patch_370alpha5a implements patchInterface
private $release = '3.7.0-alpha.5';
/** @var array */
private $concern = array(base::DATA_BOX);
private $concern = [base::DATA_BOX];
/**
* {@inheritdoc}
@@ -48,7 +48,7 @@ class patch_370alpha5a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**
@@ -63,20 +63,20 @@ class patch_370alpha5a implements patchInterface
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
$update = array();
$update = [];
foreach ($rs as $row) {
$src = str_replace(
array('/rdf:RDF/rdf:Description/PHRASEANET:', '/rdf:RDF/rdf:Description/'), array('Phraseanet:', ''), $row['src']
['/rdf:RDF/rdf:Description/PHRASEANET:', '/rdf:RDF/rdf:Description/'], ['Phraseanet:', ''], $row['src']
);
$update[] = array('id' => $row['id'], 'src' => $src);
$update[] = ['id' => $row['id'], 'src' => $src];
}
$sql = 'UPDATE metadatas_structure SET src = :src WHERE id = :id';
$stmt = $databox->get_connection()->prepare($sql);
foreach ($update as $row) {
$stmt->execute(array(':src' => $row['src'], ':id' => $row['id']));
$stmt->execute([':src' => $row['src'], ':id' => $row['id']]);
}
$stmt->closeCursor();

44
lib/classes/patch/370alpha6a.php
View File

@@ -17,7 +17,7 @@ class patch_370alpha6a implements patchInterface
private $release = '3.7.0-alpha.6';
/** @var array */
private $concern = array(base::DATA_BOX);
private $concern = [base::DATA_BOX];
/**
* {@inheritdoc}
@@ -48,7 +48,7 @@ class patch_370alpha6a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**
@@ -81,7 +81,7 @@ class patch_370alpha6a implements patchInterface
$this->addScreenDeviceOption($subdefgroups, $subdef, $groupname);
if (in_array($name, array('preview', 'thumbnail'))) {
if (in_array($name, ['preview', 'thumbnail'])) {
if ($name == 'thumbnail' || $subdef->getSubdefType()->getType() != \Alchemy\Phrasea\Media\Subdef\Subdef::TYPE_VIDEO) {
$this->addMobileSubdefImage($subdefgroups, $subdef, $groupname);
@@ -105,7 +105,7 @@ class patch_370alpha6a implements patchInterface
{
$optionsSubdef = $subdef->getOptions();
$options = array();
$options = [];
foreach ($optionsSubdef as $optname => $option) {
$options[$optname] = $option->getValue();
@@ -114,19 +114,19 @@ class patch_370alpha6a implements patchInterface
$options['path'] = $subdef->get_path();
$options['mediatype'] = $subdef->getSubdefType()->getType();
$options['meta'] = $subdef->meta_writeable() ? 'yes' : 'no';
$options['devices'] = array(databox_subdef::DEVICE_SCREEN);
$options['devices'] = [databox_subdef::DEVICE_SCREEN];
$root->set_subdef($groupname, $subdef->get_name(), $subdef->get_class(), $subdef->is_downloadable(), $options, array());
$root->set_subdef($groupname, $subdef->get_name(), $subdef->get_class(), $subdef->is_downloadable(), $options, []);
}
protected function addMobileSubdefVideo($root, $baseSubdef, $groupname)
{
$newSubdefOptionsWebM = $newSubdefOptionsOgg = $newSubdefOptionsX264 = array(
$newSubdefOptionsWebM = $newSubdefOptionsOgg = $newSubdefOptionsX264 = [
'path' => $baseSubdef->get_path(),
'mediatype' => \Alchemy\Phrasea\Media\Subdef\Subdef::TYPE_VIDEO
);
];
$options = array(
$options = [
'path' => $baseSubdef->get_path(),
'mediatype' => \Alchemy\Phrasea\Media\Subdef\Subdef::TYPE_VIDEO,
'bitrate' => '300',
@@ -134,8 +134,8 @@ class patch_370alpha6a implements patchInterface
'GOPsize' => '25',
'size' => '480',
'fps' => '15',
'devices' => array(databox_subdef::DEVICE_HANDHELD),
);
'devices' => [databox_subdef::DEVICE_HANDHELD],
];
foreach ($options as $name => $value) {
$newSubdefOptionsWebM[$name] = $value;
@@ -152,14 +152,14 @@ class patch_370alpha6a implements patchInterface
$newSubdefOptionsX264['acodec'] = 'libvo_aacenc';
$newSubdefOptionsX264['vcodec'] = 'libx264';
$root->set_subdef($groupname, $baseSubdef->get_name() . '_mobile_webM', $baseSubdef->get_class(), false, $newSubdefOptionsWebM, array());
$root->set_subdef($groupname, $baseSubdef->get_name() . '_mobile_OGG', $baseSubdef->get_class(), false, $newSubdefOptionsOgg, array());
$root->set_subdef($groupname, $baseSubdef->get_name() . '_mobile_X264', $baseSubdef->get_class(), false, $newSubdefOptionsX264, array());
$root->set_subdef($groupname, $baseSubdef->get_name() . '_mobile_webM', $baseSubdef->get_class(), false, $newSubdefOptionsWebM, []);
$root->set_subdef($groupname, $baseSubdef->get_name() . '_mobile_OGG', $baseSubdef->get_class(), false, $newSubdefOptionsOgg, []);
$root->set_subdef($groupname, $baseSubdef->get_name() . '_mobile_X264', $baseSubdef->get_class(), false, $newSubdefOptionsX264, []);
}
protected function addMobileSubdefImage($root, $baseSubdef, $groupname)
{
$optionMobile = array();
$optionMobile = [];
$optionMobile['size'] = $baseSubdef->get_name() == 'thumbnail' ? '150' : '480';
$optionMobile['resolution'] = '72';
@@ -169,18 +169,18 @@ class patch_370alpha6a implements patchInterface
$optionMobile['mediatype'] = \Alchemy\Phrasea\Media\Subdef\Subdef::TYPE_IMAGE;
$optionMobile['meta'] = 'no';
$optionMobile['devices'] = array(databox_subdef::DEVICE_HANDHELD);
$optionMobile['devices'] = [databox_subdef::DEVICE_HANDHELD];
$root->set_subdef($groupname, $baseSubdef->get_name() . '_mobile', $baseSubdef->get_class(), false, $optionMobile, array());
$root->set_subdef($groupname, $baseSubdef->get_name() . '_mobile', $baseSubdef->get_class(), false, $optionMobile, []);
}
protected function addHtml5Video($root, $baseSubdef, $groupname)
{
$newSubdefOptionsWebM = $newSubdefOptionsOgg = array(
$newSubdefOptionsWebM = $newSubdefOptionsOgg = [
'path' => $baseSubdef->get_path(),
'mediatype' => \Alchemy\Phrasea\Media\Subdef\Subdef::TYPE_VIDEO,
'devices' => array(\databox_subdef::DEVICE_SCREEN)
);
'devices' => [\databox_subdef::DEVICE_SCREEN]
];
foreach ($baseSubdef->getOptions() as $optionname => $option) {
$newSubdefOptionsWebM[$optionname] = $option->getValue();
@@ -193,7 +193,7 @@ class patch_370alpha6a implements patchInterface
$newSubdefOptionsOgg['vcodec'] = 'libtheora';
$newSubdefOptionsOgg['acodec'] = 'libvorbis';
$root->set_subdef($groupname, $baseSubdef->get_name() . '_webM', $baseSubdef->get_class(), false, $newSubdefOptionsWebM, array());
$root->set_subdef($groupname, $baseSubdef->get_name() . '_OGG', $baseSubdef->get_class(), false, $newSubdefOptionsOgg, array());
$root->set_subdef($groupname, $baseSubdef->get_name() . '_webM', $baseSubdef->get_class(), false, $newSubdefOptionsWebM, []);
$root->set_subdef($groupname, $baseSubdef->get_name() . '_OGG', $baseSubdef->get_class(), false, $newSubdefOptionsOgg, []);
}
}

4
lib/classes/patch/370alpha7a.php
View File

@@ -21,7 +21,7 @@ class patch_370alpha7a implements patchInterface
private $release = '3.7.0-alpha.7';
/** @var array */
private $concern = array(base::APPLICATION_BOX);
private $concern = [base::APPLICATION_BOX];
/**
* {@inheritdoc}
@@ -52,7 +52,7 @@ class patch_370alpha7a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array('lazaret');
return ['lazaret'];
}
/**

14
lib/classes/patch/370alpha8a.php
View File

@@ -18,7 +18,7 @@ class patch_370alpha8a implements patchInterface
private $release = '3.7.0-alpha.8';
/** @var array */
private $concern = array(base::APPLICATION_BOX);
private $concern = [base::APPLICATION_BOX];
/**
* {@inheritdoc}
@@ -46,7 +46,7 @@ class patch_370alpha8a implements patchInterface
public function getDoctrineMigrations()
{
return array('task');
return ['task'];
}
/**
@@ -60,7 +60,7 @@ class patch_370alpha8a implements patchInterface
*/
public function apply(base $appbox, Application $app)
{
$ttasks = array();
$ttasks = [];
$conn = $appbox->get_connection();
$sql = 'SELECT task_id, active, name, class, settings FROM task2 WHERE class=\'task_period_workflow01\'';
if (($stmt = $conn->prepare($sql)) !== FALSE) {
@@ -69,11 +69,11 @@ class patch_370alpha8a implements patchInterface
$stmt->closeCursor();
}
$tdom = array(); // key = period
$taskstodel = array();
$tdom = []; // key = period
$taskstodel = [];
foreach ($ttasks as $task) {
$active = true;
$warning = array();
$warning = [];
/*
* migrating task 'workflow01'
@@ -90,7 +90,7 @@ class patch_370alpha8a implements patchInterface
$ts->appendChild($dom->createElement('period'))->appendChild($dom->createTextNode(60 * $period));
$ts->appendChild($dom->createElement('logsql'))->appendChild($dom->createTextNode('1'));
$tasks = $ts->appendChild($dom->createElement('tasks'));
$tdom['_' . $period] = array('dom' => $dom, 'tasks' => $tasks);
$tdom['_' . $period] = ['dom' => $dom, 'tasks' => $tasks];
} else {
$dom = &$tdom['_' . $period]['dom'];
$tasks = &$tdom['_' . $period]['tasks'];

4
lib/classes/patch/370alpha9a.php
View File

@@ -17,7 +17,7 @@ class patch_370alpha9a implements patchInterface
private $release = '3.7.0-alpha.9';
/** @var array */
private $concern = array(base::APPLICATION_BOX);
private $concern = [base::APPLICATION_BOX];
/**
* {@inheritdoc}
@@ -40,7 +40,7 @@ class patch_370alpha9a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

4
lib/classes/patch/3715alpha1a.php
View File

@@ -20,7 +20,7 @@ class patch_3715alpha1a implements patchInterface
private $release = '3.7.15-alpha1';
/** @var array */
private $concern = array(base::APPLICATION_BOX);
private $concern = [base::APPLICATION_BOX];
/**
* {@inheritdoc}
@@ -43,7 +43,7 @@ class patch_3715alpha1a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

4
lib/classes/patch/371alpha1a.php
View File

@@ -17,7 +17,7 @@ class patch_371alpha1a implements patchInterface
private $release = '3.7.1-alpha1';
/** @var array */
private $concern = array(base::DATA_BOX);
private $concern = [base::DATA_BOX];
/**
* {@inheritdoc}
@@ -48,7 +48,7 @@ class patch_371alpha1a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

22
lib/classes/patch/373alpha1a.php
View File

@@ -17,7 +17,7 @@ class patch_373alpha1a implements patchInterface
private $release = '3.7.3-alpha.1';
/** @var array */
private $concern = array(base::APPLICATION_BOX);
private $concern = [base::APPLICATION_BOX];
/**
* {@inheritdoc}
@@ -40,7 +40,7 @@ class patch_373alpha1a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**
@@ -59,7 +59,7 @@ class patch_373alpha1a implements patchInterface
$sql = 'SELECT * FROM registry WHERE `key` = :key';
$stmt = $app['phraseanet.appbox']->get_connection()->prepare($sql);
$Regbinaries = array(
$Regbinaries = [
'GV_cli',
'GV_swf_extract',
'GV_pdf2swf',
@@ -69,9 +69,9 @@ class patch_373alpha1a implements patchInterface
'GV_ffprobe',
'GV_mp4box',
'GV_pdftotext',
);
];
$mapping = array(
$mapping = [
'GV_cli' => 'php_binary',
'GV_swf_extract' => 'swf_extract_binary',
'GV_pdf2swf' => 'pdf2swf_binary',
@@ -81,12 +81,12 @@ class patch_373alpha1a implements patchInterface
'GV_ffprobe' => 'ffprobe_binary',
'GV_mp4box' => 'mp4box_binary',
'GV_pdftotext' => 'pdftotext_binary',
);
];
$binaries = array('ghostscript_binary' => null);
$binaries = ['ghostscript_binary' => null];
foreach ($Regbinaries as $name) {
$stmt->execute(array(':key' => $name));
$stmt->execute([':key' => $name]);
$row = $stmt->fetch(\PDO::FETCH_ASSOC);
$value = is_executable($row['value']) ? $row['value'] : null;
@@ -102,14 +102,14 @@ class patch_373alpha1a implements patchInterface
$stmt = $app['phraseanet.appbox']->get_connection()->prepare($sql);
foreach ($Regbinaries as $name) {
$stmt->execute(array(':key' => $name));
$stmt->execute([':key' => $name]);
}
$stmt->closeCursor();
$sql = 'SELECT value FROM registry WHERE `key` = :key';
$stmt = $app['phraseanet.appbox']->get_connection()->prepare($sql);
$stmt->execute(array(':key'=>'GV_sit'));
$stmt->execute([':key'=>'GV_sit']);
$row = $stmt->fetch(\PDO::FETCH_ASSOC);
$stmt->closeCursor();
@@ -119,7 +119,7 @@ class patch_373alpha1a implements patchInterface
$sql = 'DELETE FROM registry WHERE `key` = :key';
$stmt = $app['phraseanet.appbox']->get_connection()->prepare($sql);
$stmt->execute(array(':key'=>'GV_sit'));
$stmt->execute([':key'=>'GV_sit']);
$stmt->closeCursor();
return true;

4
lib/classes/patch/379alpha1a.php
View File

@@ -17,7 +17,7 @@ class patch_379alpha1a implements patchInterface
private $release = '3.7.9-alpha1';
/** @var array */
private $concern = array(base::DATA_BOX);
private $concern = [base::DATA_BOX];
/**
* {@inheritdoc}
@@ -40,7 +40,7 @@ class patch_379alpha1a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

2
lib/classes/patch/380alpha10a.php
View File

@@ -32,7 +32,7 @@ class patch_380alpha10a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

2
lib/classes/patch/380alpha11a.php
View File

@@ -50,7 +50,7 @@ class patch_380alpha11a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array('session');
return ['session'];
}
/**

2
lib/classes/patch/380alpha13a.php
View File

@@ -32,7 +32,7 @@ class patch_380alpha13a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

2
lib/classes/patch/380alpha14a.php
View File

@@ -40,7 +40,7 @@ class patch_380alpha14a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

2
lib/classes/patch/380alpha15a.php
View File

@@ -32,7 +32,7 @@ class patch_380alpha15a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**
* {@inheritdoc}

2
lib/classes/patch/380alpha16a.php
View File

@@ -32,7 +32,7 @@ class patch_380alpha16a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

2
lib/classes/patch/380alpha17a.php
View File

@@ -32,7 +32,7 @@ class patch_380alpha17a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

2
lib/classes/patch/380alpha18a.php
View File

@@ -33,7 +33,7 @@ class patch_380alpha18a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

4
lib/classes/patch/380alpha2a.php
View File

@@ -18,7 +18,7 @@ class patch_380alpha2a implements patchInterface
private $release = '3.8.0-alpha.2';
/** @var array */
private $concern = array(base::APPLICATION_BOX);
private $concern = [base::APPLICATION_BOX];
/**
* {@inheritdoc}
@@ -41,7 +41,7 @@ class patch_380alpha2a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

4
lib/classes/patch/380alpha2b.php
View File

@@ -18,7 +18,7 @@ class patch_380alpha2b implements patchInterface
private $release = '3.8.0-alpha.2';
/** @var array */
private $concern = array(base::APPLICATION_BOX);
private $concern = [base::APPLICATION_BOX];
/**
* {@inheritdoc}
@@ -41,7 +41,7 @@ class patch_380alpha2b implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

4
lib/classes/patch/380alpha3a.php
View File

@@ -17,7 +17,7 @@ class patch_380alpha3a implements patchInterface
private $release = '3.8.0-alpha.3';
/** @var array */
private $concern = array(base::DATA_BOX);
private $concern = [base::DATA_BOX];
/**
* {@inheritdoc}
@@ -40,7 +40,7 @@ class patch_380alpha3a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

4
lib/classes/patch/380alpha3b.php
View File

@@ -17,7 +17,7 @@ class patch_380alpha3b implements patchInterface
private $release = '3.8.0-alpha.3';
/** @var array */
private $concern = array(base::APPLICATION_BOX);
private $concern = [base::APPLICATION_BOX];
/**
* {@inheritdoc}
@@ -48,7 +48,7 @@ class patch_380alpha3b implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

2
lib/classes/patch/380alpha4a.php
View File

@@ -49,7 +49,7 @@ class patch_380alpha4a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array('auth-failure');
return ['auth-failure'];
}

2
lib/classes/patch/380alpha6a.php
View File

@@ -48,7 +48,7 @@ class patch_380alpha6a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

2
lib/classes/patch/380alpha8a.php
View File

@@ -48,7 +48,7 @@ class patch_380alpha8a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

2
lib/classes/patch/380alpha9a.php
View File

@@ -48,7 +48,7 @@ class patch_380alpha9a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

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

@@ -40,7 +40,7 @@ class patch_381alpha1a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

2
lib/classes/patch/381alpha1b.php
View File

@@ -40,7 +40,7 @@ class patch_381alpha1b implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

2
lib/classes/patch/381alpha2a.php
View File

@@ -40,7 +40,7 @@ class patch_381alpha2a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

2
lib/classes/patch/381alpha3a.php
View File

@@ -32,7 +32,7 @@ class patch_381alpha3a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

2
lib/classes/patch/381alpha4a.php
View File

@@ -32,7 +32,7 @@ class patch_381alpha4a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return [];
}
/**

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

@@ -49,7 +49,7 @@ class patch_390alpha1a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array('ftp-credential');
return ['ftp-credential'];
}
/**

2
lib/classes/patch/390alpha1b.php
View File

@@ -51,7 +51,7 @@ class patch_390alpha1b implements patchInterface
*/
public function getDoctrineMigrations()
{
return array('order');
return ['order'];
}
/**

2
lib/classes/patch/390alpha2a.php
View File

@@ -51,7 +51,7 @@ class patch_390alpha2a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array('user');
return ['user'];
}
/**

2
lib/classes/patch/390alpha3a.php
View File

@@ -49,7 +49,7 @@ class patch_390alpha3a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array('user-query');
return ['user-query'];
}
/**

2
lib/classes/patch/390alpha4a.php
View File

@@ -49,7 +49,7 @@ class patch_390alpha4a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array('user-setting');
return ['user-setting'];
}
/**

2
lib/classes/patch/390alpha5a.php
View File

@@ -49,7 +49,7 @@ class patch_390alpha5a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array('user-notif-setting');
return ['user-notif-setting'];
}
/**

2
lib/classes/patch/390alpha6a.php
View File

@@ -51,7 +51,7 @@ class patch_390alpha6a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array('ftp-export');
return ['ftp-export'];
}
/**

2
lib/classes/patch/390alpha7a.php
View File

@@ -55,7 +55,7 @@ class patch_390alpha7a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array('feed', 'aggregate-token');
return ['feed', 'aggregate-token'];
}
/**

2
lib/classes/patch/390alpha8a.php
View File

@@ -49,7 +49,7 @@ class patch_390alpha8a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array('task');
return ['task'];
}
/**

8
tests/Alchemy/Tests/Phrasea/Core/CLIProvider/DoctrineMigrationServiceProviderTest.php
View File

@@ -6,12 +6,12 @@ class DoctrineMigrationServiceProviderTest extends ServiceProviderTestCase
{
public function provideServiceDescription()
{
return array(
array(
return [
[
'Alchemy\Phrasea\Core\CLIProvider\DoctrineMigrationServiceProvider',
'doctrine-migration.configuration',
'Doctrine\DBAL\Migrations\Configuration\YamlConfiguration'
)
);
]
];
}
}

120
tests/Alchemy/Tests/Phrasea/Core/Configuration/PropertyAccessTest.php
View File

@@ -60,87 +60,87 @@ class PropertyAccessTest extends \PHPUnit_Framework_TestCase
public function provideMergeData()
{
$conf = array(
'key1' => array('subkey1' => 'value1'),
);
$conf = [
'key1' => ['subkey1' => 'value1'],
];
return array(
array($conf, 'key1', array('subkey2' => 'valuetest'), array('subkey1' => 'value1', 'subkey2' => 'valuetest'), array('key1' => array('subkey1' => 'value1', 'subkey2' => 'valuetest'))),
array($conf, 'key1', array('subkey1' => 'valuetest'), array('subkey1' => 'valuetest'), array('key1' => array('subkey1' => 'valuetest'))),
array($conf, 'key2', array('subkey1' => 'valuetest'), array('subkey1' => 'valuetest'), array('key1' => array('subkey1' => 'value1'), 'key2' => array('subkey1' => 'valuetest'))),
array($conf, array('key1', 'subkey2'), array('subkey3' => 'valuetest'), array('subkey3' => 'valuetest'), array('key1' => array('subkey1' => 'value1', 'subkey2' => array('subkey3' => 'valuetest')))),
);
return [
[$conf, 'key1', ['subkey2' => 'valuetest'], ['subkey1' => 'value1', 'subkey2' => 'valuetest'], ['key1' => ['subkey1' => 'value1', 'subkey2' => 'valuetest']]],
[$conf, 'key1', ['subkey1' => 'valuetest'], ['subkey1' => 'valuetest'], ['key1' => ['subkey1' => 'valuetest']]],
[$conf, 'key2', ['subkey1' => 'valuetest'], ['subkey1' => 'valuetest'], ['key1' => ['subkey1' => 'value1'], 'key2' => ['subkey1' => 'valuetest']]],
[$conf, ['key1', 'subkey2'], ['subkey3' => 'valuetest'], ['subkey3' => 'valuetest'], ['key1' => ['subkey1' => 'value1', 'subkey2' => ['subkey3' => 'valuetest']]]],
];
}
public function provideGetData()
{
$conf = array(
'key1' => array('subkey1' => 'value1'),
'key2' => array('subkey1' => 'value1', 'subkey2' => array('subkey3' => 'value3')),
);
$conf = [
'key1' => ['subkey1' => 'value1'],
'key2' => ['subkey1' => 'value1', 'subkey2' => ['subkey3' => 'value3']],
];
return array(
array($conf, 'key1', array('subkey1' => 'value1'), null),
array($conf, 'key1', array('subkey1' => 'value1'), 'ladada'),
array($conf, 'key2', array('subkey1' => 'value1', 'subkey2' => array('subkey3' => 'value3')), null),
array($conf, 'key2', array('subkey1' => 'value1', 'subkey2' => array('subkey3' => 'value3')), 'ladada'),
array($conf, array('key2', 'subkey1'), 'value1', null),
array($conf, array('key2', 'subkey1'), 'value1', 'ladada'),
array($conf, array('key2', 'subkey2', 'subkey3'), 'value3', null),
array($conf, array('key2', 'subkey2', 'subkey3'), 'value3', 'ladada'),
array($conf, array('key2', 'subkey2', 'subkey4'), null, null),
array($conf, array('key2', 'subkey2', 'subkey4'), 'ladada', 'ladada'),
array($conf, array('key', 'subkey', 'subkey'), null, null),
array($conf, array('key', 'subkey', 'subkey'), 'ladada', 'ladada'),
array($conf, 'key3', null, null),
array($conf, 'key3', 'ladada', 'ladada'),
);
return [
[$conf, 'key1', ['subkey1' => 'value1'], null],
[$conf, 'key1', ['subkey1' => 'value1'], 'ladada'],
[$conf, 'key2', ['subkey1' => 'value1', 'subkey2' => ['subkey3' => 'value3']], null],
[$conf, 'key2', ['subkey1' => 'value1', 'subkey2' => ['subkey3' => 'value3']], 'ladada'],
[$conf, ['key2', 'subkey1'], 'value1', null],
[$conf, ['key2', 'subkey1'], 'value1', 'ladada'],
[$conf, ['key2', 'subkey2', 'subkey3'], 'value3', null],
[$conf, ['key2', 'subkey2', 'subkey3'], 'value3', 'ladada'],
[$conf, ['key2', 'subkey2', 'subkey4'], null, null],
[$conf, ['key2', 'subkey2', 'subkey4'], 'ladada', 'ladada'],
[$conf, ['key', 'subkey', 'subkey'], null, null],
[$conf, ['key', 'subkey', 'subkey'], 'ladada', 'ladada'],
[$conf, 'key3', null, null],
[$conf, 'key3', 'ladada', 'ladada'],
];
}
public function provideHasData()
{
$conf = array(
'key1' => array('subkey1' => 'value1'),
'key2' => array('subkey1' => 'value1', 'subkey2' => array('subkey3' => 'value3')),
);
$conf = [
'key1' => ['subkey1' => 'value1'],
'key2' => ['subkey1' => 'value1', 'subkey2' => ['subkey3' => 'value3']],
];
return array(
array($conf, 'key1', true),
array($conf, 'key2', true),
array($conf, array('key2', 'subkey1'), true),
array($conf, array('key2', 'subkey2', 'subkey3'), true),
array($conf, array('key2', 'subkey2', 'subkey4'), false),
array($conf, array('key', 'subkey', 'subkey'), false),
array($conf, 'key3', false),
);
return [
[$conf, 'key1', true],
[$conf, 'key2', true],
[$conf, ['key2', 'subkey1'], true],
[$conf, ['key2', 'subkey2', 'subkey3'], true],
[$conf, ['key2', 'subkey2', 'subkey4'], false],
[$conf, ['key', 'subkey', 'subkey'], false],
[$conf, 'key3', false],
];
}
public function provideSetData()
{
$conf = array(
'key1' => array('subkey1' => 'value1'),
);
$conf = [
'key1' => ['subkey1' => 'value1'],
];
return array(
array($conf, 'key1', 'valuetest', array('key1' => 'valuetest')),
array($conf, 'key2', 'valuetest', array('key1' => array('subkey1' => 'value1'), 'key2' => 'valuetest')),
array($conf, array('key2', 'subkey1'), 'valuetest', array('key1' => array('subkey1' => 'value1'), 'key2' => array('subkey1' => 'valuetest'))),
array($conf, array('key1', 'subkey2'), 'valuetest', array('key1' => array('subkey1' => 'value1', 'subkey2' => 'valuetest'))),
);
return [
[$conf, 'key1', 'valuetest', ['key1' => 'valuetest']],
[$conf, 'key2', 'valuetest', ['key1' => ['subkey1' => 'value1'], 'key2' => 'valuetest']],
[$conf, ['key2', 'subkey1'], 'valuetest', ['key1' => ['subkey1' => 'value1'], 'key2' => ['subkey1' => 'valuetest']]],
[$conf, ['key1', 'subkey2'], 'valuetest', ['key1' => ['subkey1' => 'value1', 'subkey2' => 'valuetest']]],
];
}
public function provideRemoveData()
{
$conf = array(
'key1' => array('subkey1' => 'value1'),
);
$conf = [
'key1' => ['subkey1' => 'value1'],
];
return array(
array($conf, 'key1', array('subkey1' => 'value1'), array()),
array($conf, array('key1', 'subkey1'), 'value1', array('key1' => array())),
array($conf, array('key1', 'subkey2'), null, $conf),
array($conf, 'key2', null, $conf),
);
return [
[$conf, 'key1', ['subkey1' => 'value1'], []],
[$conf, ['key1', 'subkey1'], 'value1', ['key1' => []]],
[$conf, ['key1', 'subkey2'], null, $conf],
[$conf, 'key2', null, $conf],
];
}
}