Skip to content

Commit

Permalink
Replace TODO comments with NEXT_MAJOR
Browse files Browse the repository at this point in the history
  • Loading branch information
franmomu authored and OskarStark committed Feb 16, 2020
1 parent 7715094 commit 467a143
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
10 changes: 5 additions & 5 deletions src/Admin/AbstractAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -1148,7 +1148,7 @@ public function getBatchActions()
$actions = $this->configureBatchActions($actions);

foreach ($this->getExtensions() as $extension) {
// TODO: remove method check in next major release
// NEXT_MAJOR: remove method check
if (method_exists($extension, 'configureBatchActions')) {
$actions = $extension->configureBatchActions($this, $actions);
}
Expand Down Expand Up @@ -2750,7 +2750,7 @@ public function getActionButtons($action, $object = null)
$list = $this->configureActionButtons($action, $object);

foreach ($this->getExtensions() as $extension) {
// TODO: remove method check in next major release
// NEXT_MAJOR: remove method check
if (method_exists($extension, 'configureActionButtons')) {
$list = $extension->configureActionButtons($this, $list, $action, $object);
}
Expand Down Expand Up @@ -2871,7 +2871,7 @@ final protected function getDefaultFilterValues()
$this->configureDefaultFilterValues($defaultFilterValues);

foreach ($this->getExtensions() as $extension) {
// NEXT_MAJOR: remove method check in next major release
// NEXT_MAJOR: remove method check
if (method_exists($extension, 'configureDefaultFilterValues')) {
$extension->configureDefaultFilterValues($this, $defaultFilterValues);
}
Expand Down Expand Up @@ -2929,7 +2929,7 @@ protected function configureSideMenu(MenuItemInterface $menu, $action, AdminInte
protected function configureTabMenu(MenuItemInterface $menu, $action, AdminInterface $childAdmin = null)
{
// Use configureSideMenu not to mess with previous overrides
// TODO remove once deprecation period is over
// NEXT_MAJOR: remove this line
$this->configureSideMenu($menu, $action, $childAdmin);
}

Expand Down Expand Up @@ -3132,7 +3132,7 @@ protected function getAccess()
], $this->getAccessMapping());

foreach ($this->extensions as $extension) {
// TODO: remove method check in next major release
// NEXT_MAJOR: remove method check
if (method_exists($extension, 'getAccessMapping')) {
$access = array_merge($access, $extension->getAccessMapping($this));
}
Expand Down
2 changes: 1 addition & 1 deletion src/Admin/AbstractAdminExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function configureSideMenu(AdminInterface $admin, MenuItemInterface $menu
public function configureTabMenu(AdminInterface $admin, MenuItemInterface $menu, $action, AdminInterface $childAdmin = null)
{
// Use configureSideMenu not to mess with previous overrides
// TODO remove once deprecation period is over
// NEXT_MAJOR: remove this line
$this->configureSideMenu($admin, $menu, $action, $childAdmin);
}

Expand Down
2 changes: 1 addition & 1 deletion src/Admin/AccessRegistryInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function checkAccess($action, $object = null);
/*
* Hook to handle access authorization, without throwing an exception.
*
* TODO: uncomment this method for next major release
* NEXT_MAJOR: uncomment this method
*/
// public function hasAccess(string $action, ?object $object = null): bool;
}
10 changes: 5 additions & 5 deletions src/Admin/AdminExtensionInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -105,21 +105,21 @@ public function getPersistentParameters(AdminInterface $admin);
/**
* Return the controller access mapping.
*/
// TODO: Uncomment in next major release
// NEXT_MAJOR: Uncomment this method
// public function getAccessMapping(AdminInterface $admin): array;

/**
* Returns the list of batch actions.
*/
// TODO: Uncomment in next major release
// NEXT_MAJOR: Uncomment this method
// public function configureBatchActions(AdminInterface $admin, array $actions): array;

/**
* Get a chance to modify export fields.
*
* @return string[]
*/
// TODO: Uncomment in next major release
// NEXT_MAJOR: Uncomment this method
// public function configureExportFields(AdminInterface $admin, array $fields): array;

/**
Expand Down Expand Up @@ -155,11 +155,11 @@ public function postRemove(AdminInterface $admin, $object);
/*
* Get all action buttons for an action
*/
// TODO: Uncomment in next major release
// NEXT_MAJOR: Uncomment this method
// public function configureActionButtons(AdminInterface $admin, array $list, string $action, object $object): array;

/*
* NEXT_MAJOR: Uncomment in next major release
* NEXT_MAJOR: Uncomment this method
*
* Returns a list of default filters
*/
Expand Down
6 changes: 3 additions & 3 deletions src/Admin/AdminInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ public function getListModes();
/**
* Check the current request is given route or not.
*
* TODO: uncomment this method before releasing 4.0
* NEXT_MAJOR: uncomment this method
*
* ```
* $this->isCurrentRoute('create'); // is create page?
Expand All @@ -678,13 +678,13 @@ public function getListMode();
*/
// public function configureActionButtons(string $action, ?object $object = null): array;

//TODO: uncomment this method for 4.0
// NEXT_MAJOR: uncomment this method for 4.0
/*
* Returns the result link for an object.
*/
//public function getSearchResultLink(object $object): ?string

// TODO: uncomment this method in 4.0
// NEXT_MAJOR: uncomment this method in 4.0
// /**
// * Setting to true will enable mosaic button for the admin screen.
// * Setting to false will hide mosaic button for the admin screen.
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/views/Form/silex_form_div_layout.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{#
This file doesn't seem to be used anymore ; commenting it for now in order not to mess with user's configurations.
TODO: Remove it and all of its references
NEXT_MAJOR: Remove it and all of its references
#}

{#
Expand Down

0 comments on commit 467a143

Please sign in to comment.