Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/Controller/Admin/DataObject/DataObjectController.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,11 @@ class DataObjectController extends ElementControllerBase implements KernelContro
use UserNameTrait;

/** On active edit lock answer with editlock response */
const TASK_RESPONSE = 'response';

public const string TASK_RESPONSE = 'response';
/** On active edit lock overwrite with new user */
const TASK_OVERWRITE = 'overwrite';

public const string TASK_OVERWRITE = 'overwrite';
/** On active edit lock keep existing entry */
const TASK_KEEP = 'keep';
public const string TASK_KEEP = 'keep';

protected DataObject\Service $_objectService;

Expand Down
20 changes: 7 additions & 13 deletions src/Controller/Admin/Document/DocumentControllerBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,13 @@ abstract class DocumentControllerBase extends AdminAbstractController implements
use ElementEditLockHelperTrait;
use UserNameTrait;

const TASK_PUBLISH = 'publish';

const TASK_UNPUBLISH = 'unpublish';

const TASK_SAVE = 'save';

const TASK_VERSION = 'version';

const TASK_SCHEDULER = 'scheduler';

const TASK_AUTOSAVE = 'autosave';

const TASK_DELETE = 'delete';
public const string TASK_PUBLISH = 'publish';
public const string TASK_UNPUBLISH = 'unpublish';
public const string TASK_SAVE = 'save';
public const string TASK_VERSION = 'version';
public const string TASK_SCHEDULER = 'scheduler';
public const string TASK_AUTOSAVE = 'autosave';
public const string TASK_DELETE = 'delete';

public function __construct(protected ElementServiceInterface $elementService)
{
Expand Down
76 changes: 38 additions & 38 deletions src/Event/AdminEvents.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class AdminEvents
*
* @var string
*/
const LOGIN_REDIRECT = 'opendxp.admin.login.redirect';
public const string LOGIN_REDIRECT = 'opendxp.admin.login.redirect';

/**
* The LOGIN_LOSTPASSWORD event is triggered before the lost password email
Expand All @@ -40,7 +40,7 @@ class AdminEvents
*
* @var string
*/
const LOGIN_LOSTPASSWORD = 'opendxp.admin.login.lostpassword';
public const string LOGIN_LOSTPASSWORD = 'opendxp.admin.login.lostpassword';

/**
* The LOGIN_LOGOUT event is triggered before the user is logged out.
Expand All @@ -52,7 +52,7 @@ class AdminEvents
*
* @var string
*/
const LOGIN_LOGOUT = 'opendxp.admin.login.logout';
public const string LOGIN_LOGOUT = 'opendxp.admin.login.logout';

/**
* The LOGIN_BEFORE_RENDER event is triggered before the login view is rendered.
Expand All @@ -71,7 +71,7 @@ class AdminEvents
*
* @var string
*/
const LOGIN_BEFORE_RENDER = 'opendxp.admin.login.beforeRender';
public const string LOGIN_BEFORE_RENDER = 'opendxp.admin.login.beforeRender';

/**
* The INDEX_SETTINGS event is triggered when the settings object is built for the index page.
Expand All @@ -80,7 +80,7 @@ class AdminEvents
*
* @var string
*/
const INDEX_ACTION_SETTINGS = 'opendxp.admin.indexAction.settings';
public const string INDEX_ACTION_SETTINGS = 'opendxp.admin.indexAction.settings';

/**
* Fired before the request params are parsed. This event apply to the grid list.
Expand All @@ -93,7 +93,7 @@ class AdminEvents
*
* @var string
*/
const OBJECT_LIST_BEFORE_FILTER_PREPARE = 'opendxp.admin.object.list.beforeFilterPrepare';
public const string OBJECT_LIST_BEFORE_FILTER_PREPARE = 'opendxp.admin.object.list.beforeFilterPrepare';

/**
* Allows you to modify the object list before it is loaded. This is a global event (search list, grid list, tree list, ...).
Expand All @@ -107,7 +107,7 @@ class AdminEvents
*
* @var string
*/
const OBJECT_LIST_BEFORE_LIST_LOAD = 'opendxp.admin.object.list.beforeListLoad';
public const string OBJECT_LIST_BEFORE_LIST_LOAD = 'opendxp.admin.object.list.beforeListLoad';

/**
* Allows you to modify the object list before it is prepared for export.
Expand All @@ -121,7 +121,7 @@ class AdminEvents
*
* @var string
*/
const OBJECT_LIST_BEFORE_EXPORT_PREPARE = 'opendxp.admin.object.list.beforeExportPrepare';
public const string OBJECT_LIST_BEFORE_EXPORT_PREPARE = 'opendxp.admin.object.list.beforeExportPrepare';

/**
* Allows you to modify the object list before it is exported.
Expand All @@ -135,7 +135,7 @@ class AdminEvents
*
* @var string
*/
const OBJECT_LIST_BEFORE_EXPORT = 'opendxp.admin.object.list.beforeExport';
public const string OBJECT_LIST_BEFORE_EXPORT = 'opendxp.admin.object.list.beforeExport';

/**
* Allows you to modify the result after the list was loaded. This event apply to the grid list.
Expand All @@ -149,7 +149,7 @@ class AdminEvents
*
* @var string
*/
const OBJECT_LIST_AFTER_LIST_LOAD = 'opendxp.admin.object.list.afterListLoad';
public const string OBJECT_LIST_AFTER_LIST_LOAD = 'opendxp.admin.object.list.afterListLoad';

/**
* Allows to implement an additional condition for the object list when the search field within the grid is used.
Expand All @@ -164,7 +164,7 @@ class AdminEvents
*
* @var string
*/
const OBJECT_LIST_HANDLE_FULLTEXT_QUERY = 'opendxp.admin.object.list.handleFulltextQuery';
public const string OBJECT_LIST_HANDLE_FULLTEXT_QUERY = 'opendxp.admin.object.list.handleFulltextQuery';

/**
* Fired before the request params are parsed. This event apply to both the folder content preview list and the grid list.
Expand All @@ -177,7 +177,7 @@ class AdminEvents
*
* @var string
*/
const ASSET_LIST_BEFORE_FILTER_PREPARE = 'opendxp.admin.asset.list.beforeFilterPrepare';
public const string ASSET_LIST_BEFORE_FILTER_PREPARE = 'opendxp.admin.asset.list.beforeFilterPrepare';

/**
* Allows you to modify the asset list before it is loaded. This is a global event (folder content preview list, grid list, tree list, ...).
Expand All @@ -191,7 +191,7 @@ class AdminEvents
*
* @var string
*/
const ASSET_LIST_BEFORE_LIST_LOAD = 'opendxp.admin.asset.list.beforeListLoad';
public const string ASSET_LIST_BEFORE_LIST_LOAD = 'opendxp.admin.asset.list.beforeListLoad';

/**
* Arguments:
Expand All @@ -202,7 +202,7 @@ class AdminEvents
*
* @var string
*/
const ASSET_GET_FIELD_GRID_CONFIG = 'opendxp.admin.asset.getFieldGridConfig';
public const string ASSET_GET_FIELD_GRID_CONFIG = 'opendxp.admin.asset.getFieldGridConfig';

/**
* Allows you to modify the result after the list was loaded. This event apply to both the folder content preview list and the grid list.
Expand All @@ -216,7 +216,7 @@ class AdminEvents
*
* @var string
*/
const ASSET_LIST_AFTER_LIST_LOAD = 'opendxp.admin.asset.list.afterListLoad';
public const string ASSET_LIST_AFTER_LIST_LOAD = 'opendxp.admin.asset.list.afterListLoad';

/**
* Allows you to modify the data from the listfolder grid before it gets processed
Expand All @@ -230,7 +230,7 @@ class AdminEvents
*
* @var string
*/
const ASSET_LIST_BEFORE_UPDATE = 'opendxp.admin.asset.list.beforeUpdate';
public const string ASSET_LIST_BEFORE_UPDATE = 'opendxp.admin.asset.list.beforeUpdate';

/**
* Allows you to modify the batch update data from the listfolder grid before it gets processed
Expand All @@ -244,7 +244,7 @@ class AdminEvents
*
* @var string
*/
const ASSET_LIST_BEFORE_BATCH_UPDATE = 'opendxp.admin.asset.list.beforeBatchUpdate';
public const string ASSET_LIST_BEFORE_BATCH_UPDATE = 'opendxp.admin.asset.list.beforeBatchUpdate';

/**
* Fired before the request params are parsed. This event apply to the seo panel tree.
Expand All @@ -257,7 +257,7 @@ class AdminEvents
*
* @var string
*/
const DOCUMENT_LIST_BEFORE_FILTER_PREPARE = 'opendxp.admin.document.list.beforeFilterPrepare';
public const string DOCUMENT_LIST_BEFORE_FILTER_PREPARE = 'opendxp.admin.document.list.beforeFilterPrepare';

/**
* Allows you to modify the document list before it is loaded. This is a global event (seo panel tree, tree list, ...).
Expand All @@ -271,7 +271,7 @@ class AdminEvents
*
* @var string
*/
const DOCUMENT_LIST_BEFORE_LIST_LOAD = 'opendxp.admin.document.list.beforeListLoad';
public const string DOCUMENT_LIST_BEFORE_LIST_LOAD = 'opendxp.admin.document.list.beforeListLoad';

/**
* Allows you to modify the result after the list was loaded. This event apply to the seo panel tree.
Expand All @@ -285,7 +285,7 @@ class AdminEvents
*
* @var string
*/
const DOCUMENT_LIST_AFTER_LIST_LOAD = 'opendxp.admin.document.list.afterListLoad';
public const string DOCUMENT_LIST_AFTER_LIST_LOAD = 'opendxp.admin.document.list.afterListLoad';

/**
* Fired before the request params are parsed.
Expand All @@ -299,7 +299,7 @@ class AdminEvents
*
* @var string
*/
const ASSET_GET_PRE_SEND_DATA = 'opendxp.admin.asset.get.preSendData';
public const string ASSET_GET_PRE_SEND_DATA = 'opendxp.admin.asset.get.preSendData';

/**
* Subject: \OpenDxp\Bundle\AdminBundle\Controller\Admin\Asset\AssetController
Expand All @@ -310,7 +310,7 @@ class AdminEvents
*
* @var string
*/
const ASSET_TREE_GET_CHILDREN_BY_ID_PRE_SEND_DATA = 'opendxp.admin.asset.treeGetChildrenById.preSendData';
public const string ASSET_TREE_GET_CHILDREN_BY_ID_PRE_SEND_DATA = 'opendxp.admin.asset.treeGetChildrenById.preSendData';

/**
* Fired before the request params are parsed.
Expand All @@ -324,7 +324,7 @@ class AdminEvents
*
* @var string
*/
const DOCUMENT_GET_PRE_SEND_DATA = 'opendxp.admin.document.get.preSendData';
public const string DOCUMENT_GET_PRE_SEND_DATA = 'opendxp.admin.document.get.preSendData';

/**
* Subject: \OpenDxp\Bundle\AdminBundle\Controller\Admin\DocumentController
Expand All @@ -335,7 +335,7 @@ class AdminEvents
*
* @var string
*/
const DOCUMENT_TREE_GET_CHILDREN_BY_ID_PRE_SEND_DATA = 'opendxp.admin.document.treeGetChildrenById.preSendData';
public const string DOCUMENT_TREE_GET_CHILDREN_BY_ID_PRE_SEND_DATA = 'opendxp.admin.document.treeGetChildrenById.preSendData';

/**
* Fired before the edit lock is handled.
Expand All @@ -349,7 +349,7 @@ class AdminEvents
*
* @var string
*/
const OBJECT_GET_IS_LOCKED = 'opendxp.admin.dataobject.get.isLocked';
public const string OBJECT_GET_IS_LOCKED = 'opendxp.admin.dataobject.get.isLocked';

/**
* Fired before the request params are parsed.
Expand All @@ -363,7 +363,7 @@ class AdminEvents
*
* @var string
*/
const OBJECT_GET_PRE_SEND_DATA = 'opendxp.admin.dataobject.get.preSendData';
public const string OBJECT_GET_PRE_SEND_DATA = 'opendxp.admin.dataobject.get.preSendData';

/**
* Subject: \OpenDxp\Bundle\AdminBundle\Controller\Admin\DataObject\DataObjectHelperController
Expand All @@ -377,7 +377,7 @@ class AdminEvents
*
* @var string
*/
const OBJECT_GRID_GET_COLUMN_CONFIG_PRE_SEND_DATA = 'opendxp.admin.dataobject.gridGetColumnConfig.preSendData';
public const string OBJECT_GRID_GET_COLUMN_CONFIG_PRE_SEND_DATA = 'opendxp.admin.dataobject.gridGetColumnConfig.preSendData';

/**
* Subject: \OpenDxp\Bundle\AdminBundle\Controller\Admin\DataObjectController
Expand All @@ -388,7 +388,7 @@ class AdminEvents
*
* @var string
*/
const OBJECT_TREE_GET_CHILDREN_BY_ID_PRE_SEND_DATA = 'opendxp.admin.dataobject.treeGetChildrenById.preSendData';
public const string OBJECT_TREE_GET_CHILDREN_BY_ID_PRE_SEND_DATA = 'opendxp.admin.dataobject.treeGetChildrenById.preSendData';

/**
* Subject: \OpenDxp\Bundle\AdminBundle\Controller\Admin\ClassController
Expand All @@ -400,7 +400,7 @@ class AdminEvents
*
* @var string
*/
const CLASS_FIELDCOLLECTION_LIST_PRE_SEND_DATA = 'opendxp.admin.class.fieldcollectionList.preSendData';
public const string CLASS_FIELDCOLLECTION_LIST_PRE_SEND_DATA = 'opendxp.admin.class.fieldcollectionList.preSendData';

/**
* Subject: \OpenDxp\Bundle\AdminBundle\Controller\Admin\ClassController
Expand All @@ -412,7 +412,7 @@ class AdminEvents
*
* @var string
*/
const CLASS_OBJECT_ICONS_PRE_SEND_DATA = 'opendxp.admin.class.dataobject.preSendData';
public const string CLASS_OBJECT_ICONS_PRE_SEND_DATA = 'opendxp.admin.class.dataobject.preSendData';

/**
* Subject: \OpenDxp\Bundle\AdminBundle\Controller\Admin\ClassController
Expand All @@ -424,7 +424,7 @@ class AdminEvents
*
* @var string
*/
const CLASS_OBJECTBRICK_LIST_PRE_SEND_DATA = 'opendxp.admin.class.objectbrickList.preSendData';
public const string CLASS_OBJECTBRICK_LIST_PRE_SEND_DATA = 'opendxp.admin.class.objectbrickList.preSendData';

/**
* Subject: \OpenDxp\Bundle\AdminBundle\Controller\Admin\ClassController
Expand All @@ -435,7 +435,7 @@ class AdminEvents
*
* @var string
*/
const CLASS_OBJECTBRICK_UPDATE_DEFINITION = 'opendxp.admin.class.objectbrick.updateDefinition';
public const string CLASS_OBJECTBRICK_UPDATE_DEFINITION = 'opendxp.admin.class.objectbrick.updateDefinition';

/**
* Subject: \OpenDxp\Bundle\AdminBundle\Controller\Admin\ClassController
Expand All @@ -446,7 +446,7 @@ class AdminEvents
*
* @var string
*/
const CLASS_SELECTOPTIONS_LIST_PRE_SEND_DATA = 'opendxp.admin.class.selectoptionsList.preSendData';
public const string CLASS_SELECTOPTIONS_LIST_PRE_SEND_DATA = 'opendxp.admin.class.selectoptionsList.preSendData';

/**
* Subject: \OpenDxp\Bundle\AdminBundle\Controller\Admin\ClassController
Expand All @@ -457,7 +457,7 @@ class AdminEvents
*
* @var string
*/
const CLASS_SELECTOPTIONS_UPDATE_CONFIGURATION = 'opendxp.admin.class.selectoptions.updateDefinition';
public const string CLASS_SELECTOPTIONS_UPDATE_CONFIGURATION = 'opendxp.admin.class.selectoptions.updateDefinition';

/**
* Fired before an element is opened
Expand All @@ -471,7 +471,7 @@ class AdminEvents
*
* @var string
*/
const RESOLVE_ELEMENT = 'opendxp.admin.resolve.element';
public const string RESOLVE_ELEMENT = 'opendxp.admin.resolve.element';

/**
* Fired before an element is opened
Expand All @@ -484,7 +484,7 @@ class AdminEvents
*
* @var string
*/
const RESOLVE_ELEMENT_ADMIN_STYLE = 'opendxp.admin.resolve.elementAdminStyle';
public const string RESOLVE_ELEMENT_ADMIN_STYLE = 'opendxp.admin.resolve.elementAdminStyle';

/**
* Subject: \OpenDxp\Bundle\AdminBundle\Controller\Admin\Asset\AssetController
Expand All @@ -496,7 +496,7 @@ class AdminEvents
*
* @var string
*/
const ASSET_METADATA_PRE_SET = 'opendxp.admin.asset.metadata.preSave';
public const string ASSET_METADATA_PRE_SET = 'opendxp.admin.asset.metadata.preSave';

/**
* This event is fired after OpenDXP generates the runtime Perspective
Expand All @@ -509,5 +509,5 @@ class AdminEvents
*
* @var string
*/
public const PERSPECTIVE_POST_GET_RUNTIME = 'opendxp.admin.perspective.postGetRuntime';
public const string PERSPECTIVE_POST_GET_RUNTIME = 'opendxp.admin.perspective.postGetRuntime';
}
4 changes: 1 addition & 3 deletions src/Event/AssetEvents.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ class AssetEvents
{
/**
* @Event("OpenDxp\Bundle\AdminBundle\Event\Model\AssetDeleteInfoEvent")
*
* @var string
*/
const DELETE_INFO = 'opendxp.asset.deleteInfo';
public const string DELETE_INFO = 'opendxp.asset.deleteInfo';
}
Loading