Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
project
drupal
Commits
c79ac2f7
Commit
c79ac2f7
authored
Apr 26, 2014
by
alexpott
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue
#2238077
by Berdir, alexpott, tim.plunkett: Rename EntityFormController to EntityForm.
parent
3937bda8
Changes
122
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
122 changed files
with
356 additions
and
356 deletions
+356
-356
core/lib/Drupal/Core/Entity/ContentEntityConfirmFormBase.php
core/lib/Drupal/Core/Entity/ContentEntityConfirmFormBase.php
+1
-1
core/lib/Drupal/Core/Entity/ContentEntityForm.php
core/lib/Drupal/Core/Entity/ContentEntityForm.php
+4
-4
core/lib/Drupal/Core/Entity/ContentEntityFormInterface.php
core/lib/Drupal/Core/Entity/ContentEntityFormInterface.php
+3
-3
core/lib/Drupal/Core/Entity/EntityConfirmFormBase.php
core/lib/Drupal/Core/Entity/EntityConfirmFormBase.php
+1
-1
core/lib/Drupal/Core/Entity/EntityForm.php
core/lib/Drupal/Core/Entity/EntityForm.php
+5
-5
core/lib/Drupal/Core/Entity/EntityFormBuilder.php
core/lib/Drupal/Core/Entity/EntityFormBuilder.php
+5
-5
core/lib/Drupal/Core/Entity/EntityFormInterface.php
core/lib/Drupal/Core/Entity/EntityFormInterface.php
+6
-6
core/lib/Drupal/Core/Entity/EntityManager.php
core/lib/Drupal/Core/Entity/EntityManager.php
+1
-1
core/lib/Drupal/Core/Entity/EntityManagerInterface.php
core/lib/Drupal/Core/Entity/EntityManagerInterface.php
+5
-5
core/lib/Drupal/Core/Entity/EntityTypeInterface.php
core/lib/Drupal/Core/Entity/EntityTypeInterface.php
+2
-2
core/lib/Drupal/Core/Entity/HtmlEntityFormController.php
core/lib/Drupal/Core/Entity/HtmlEntityFormController.php
+3
-3
core/lib/Drupal/Core/Form/FormBuilderInterface.php
core/lib/Drupal/Core/Form/FormBuilderInterface.php
+1
-1
core/modules/action/action.module
core/modules/action/action.module
+2
-2
core/modules/action/lib/Drupal/action/ActionAddForm.php
core/modules/action/lib/Drupal/action/ActionAddForm.php
+4
-4
core/modules/action/lib/Drupal/action/ActionEditForm.php
core/modules/action/lib/Drupal/action/ActionEditForm.php
+15
-0
core/modules/action/lib/Drupal/action/ActionEditFormController.php
...les/action/lib/Drupal/action/ActionEditFormController.php
+0
-15
core/modules/action/lib/Drupal/action/ActionFormBase.php
core/modules/action/lib/Drupal/action/ActionFormBase.php
+4
-4
core/modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php
.../modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php
+1
-1
core/modules/aggregator/lib/Drupal/aggregator/FeedForm.php
core/modules/aggregator/lib/Drupal/aggregator/FeedForm.php
+3
-3
core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockForm.php
.../custom_block/lib/Drupal/custom_block/CustomBlockForm.php
+6
-6
core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeForm.php
...tom_block/lib/Drupal/custom_block/CustomBlockTypeForm.php
+6
-6
core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php
...stom_block/lib/Drupal/custom_block/Entity/CustomBlock.php
+3
-3
core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php
..._block/lib/Drupal/custom_block/Entity/CustomBlockType.php
+3
-3
core/modules/block/lib/Drupal/block/BlockForm.php
core/modules/block/lib/Drupal/block/BlockForm.php
+5
-5
core/modules/block/lib/Drupal/block/Entity/Block.php
core/modules/block/lib/Drupal/block/Entity/Block.php
+1
-1
core/modules/block/lib/Drupal/block/Tests/BlockUiTest.php
core/modules/block/lib/Drupal/block/Tests/BlockUiTest.php
+1
-1
core/modules/block/tests/Drupal/block/Tests/BlockFormTest.php
.../modules/block/tests/Drupal/block/Tests/BlockFormTest.php
+9
-9
core/modules/book/lib/Drupal/book/Form/BookOutlineForm.php
core/modules/book/lib/Drupal/book/Form/BookOutlineForm.php
+2
-2
core/modules/book/lib/Drupal/book/Form/BookRemoveForm.php
core/modules/book/lib/Drupal/book/Form/BookRemoveForm.php
+1
-1
core/modules/comment/lib/Drupal/comment/CommentForm.php
core/modules/comment/lib/Drupal/comment/CommentForm.php
+10
-10
core/modules/comment/lib/Drupal/comment/Entity/Comment.php
core/modules/comment/lib/Drupal/comment/Entity/Comment.php
+1
-1
core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestForm.php
...sts/config_test/lib/Drupal/config_test/ConfigTestForm.php
+5
-5
core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigQueryTest.php
...ig_test/lib/Drupal/config_test/Entity/ConfigQueryTest.php
+1
-1
core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigTest.php
.../config_test/lib/Drupal/config_test/Entity/ConfigTest.php
+1
-1
core/modules/config_translation/lib/Drupal/config_translation/Form/ConfigTranslationAddForm.php
...upal/config_translation/Form/ConfigTranslationAddForm.php
+1
-1
core/modules/config_translation/lib/Drupal/config_translation/Form/ConfigTranslationEditForm.php
...pal/config_translation/Form/ConfigTranslationEditForm.php
+1
-1
core/modules/contact/contact.module
core/modules/contact/contact.module
+1
-1
core/modules/contact/lib/Drupal/contact/CategoryForm.php
core/modules/contact/lib/Drupal/contact/CategoryForm.php
+7
-7
core/modules/contact/lib/Drupal/contact/Entity/Category.php
core/modules/contact/lib/Drupal/contact/Entity/Category.php
+2
-2
core/modules/contact/lib/Drupal/contact/Entity/Message.php
core/modules/contact/lib/Drupal/contact/Entity/Message.php
+1
-1
core/modules/contact/lib/Drupal/contact/MessageForm.php
core/modules/contact/lib/Drupal/contact/MessageForm.php
+7
-7
core/modules/content_translation/content_translation.module
core/modules/content_translation/content_translation.module
+5
-5
core/modules/content_translation/lib/Drupal/content_translation/Form/ContentTranslationDeleteForm.php
...content_translation/Form/ContentTranslationDeleteForm.php
+1
-1
core/modules/entity/lib/Drupal/entity/EntityFormModeListBuilder.php
...es/entity/lib/Drupal/entity/EntityFormModeListBuilder.php
+1
-1
core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeFormBase.php
...tity/lib/Drupal/entity/Form/EntityDisplayModeFormBase.php
+2
-2
core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayModeTest.php
.../entity/lib/Drupal/entity/Tests/EntityDisplayModeTest.php
+1
-1
core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php
.../modules/filter/lib/Drupal/filter/Entity/FilterFormat.php
+3
-3
core/modules/filter/lib/Drupal/filter/FilterFormatAccess.php
core/modules/filter/lib/Drupal/filter/FilterFormatAccess.php
+2
-2
core/modules/filter/lib/Drupal/filter/FilterFormatAddForm.php
.../modules/filter/lib/Drupal/filter/FilterFormatAddForm.php
+3
-3
core/modules/filter/lib/Drupal/filter/FilterFormatEditForm.php
...modules/filter/lib/Drupal/filter/FilterFormatEditForm.php
+3
-3
core/modules/filter/lib/Drupal/filter/FilterFormatFormBase.php
...modules/filter/lib/Drupal/filter/FilterFormatFormBase.php
+5
-5
core/modules/forum/forum.module
core/modules/forum/forum.module
+3
-3
core/modules/forum/lib/Drupal/forum/Form/ContainerForm.php
core/modules/forum/lib/Drupal/forum/Form/ContainerForm.php
+3
-3
core/modules/forum/lib/Drupal/forum/Form/ForumForm.php
core/modules/forum/lib/Drupal/forum/Form/ForumForm.php
+4
-4
core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php
...odules/image/lib/Drupal/image/Form/ImageStyleFormBase.php
+3
-3
core/modules/language/lib/Drupal/language/Form/LanguageFormBase.php
...es/language/lib/Drupal/language/Form/LanguageFormBase.php
+3
-3
core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php
...odules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php
+1
-1
core/modules/menu_link/lib/Drupal/menu_link/MenuLinkForm.php
core/modules/menu_link/lib/Drupal/menu_link/MenuLinkForm.php
+9
-10
core/modules/menu_ui/lib/Drupal/menu_ui/MenuForm.php
core/modules/menu_ui/lib/Drupal/menu_ui/MenuForm.php
+6
-6
core/modules/menu_ui/menu_ui.module
core/modules/menu_ui/menu_ui.module
+3
-3
core/modules/node/lib/Drupal/node/Entity/Node.php
core/modules/node/lib/Drupal/node/Entity/Node.php
+2
-2
core/modules/node/lib/Drupal/node/Entity/NodeType.php
core/modules/node/lib/Drupal/node/Entity/NodeType.php
+2
-2
core/modules/node/lib/Drupal/node/NodeForm.php
core/modules/node/lib/Drupal/node/NodeForm.php
+8
-8
core/modules/node/lib/Drupal/node/NodeTypeForm.php
core/modules/node/lib/Drupal/node/NodeTypeForm.php
+3
-3
core/modules/node/lib/Drupal/node/NodeTypeListBuilder.php
core/modules/node/lib/Drupal/node/NodeTypeListBuilder.php
+1
-1
core/modules/node/node.api.php
core/modules/node/node.api.php
+2
-2
core/modules/node/node.pages.inc
core/modules/node/node.pages.inc
+1
-1
core/modules/responsive_image/lib/Drupal/responsive_image/Entity/ResponsiveImageMapping.php
...Drupal/responsive_image/Entity/ResponsiveImageMapping.php
+3
-3
core/modules/responsive_image/lib/Drupal/responsive_image/ResponsiveImageMappingForm.php
...ib/Drupal/responsive_image/ResponsiveImageMappingForm.php
+6
-6
core/modules/search/lib/Drupal/search/Form/SearchPageAddForm.php
...dules/search/lib/Drupal/search/Form/SearchPageAddForm.php
+1
-1
core/modules/search/lib/Drupal/search/Form/SearchPageEditForm.php
...ules/search/lib/Drupal/search/Form/SearchPageEditForm.php
+1
-1
core/modules/search/lib/Drupal/search/Form/SearchPageForm.php
.../modules/search/lib/Drupal/search/Form/SearchPageForm.php
+2
-2
core/modules/search/lib/Drupal/search/Form/SearchPageFormBase.php
...ules/search/lib/Drupal/search/Form/SearchPageFormBase.php
+3
-3
core/modules/shortcut/src/Entity/Shortcut.php
core/modules/shortcut/src/Entity/Shortcut.php
+2
-2
core/modules/shortcut/src/Entity/ShortcutSet.php
core/modules/shortcut/src/Entity/ShortcutSet.php
+3
-3
core/modules/shortcut/src/Form/SetCustomize.php
core/modules/shortcut/src/Form/SetCustomize.php
+2
-2
core/modules/shortcut/src/ShortcutForm.php
core/modules/shortcut/src/ShortcutForm.php
+4
-4
core/modules/shortcut/src/ShortcutSetForm.php
core/modules/shortcut/src/ShortcutSetForm.php
+7
-7
core/modules/system/entity.api.php
core/modules/system/entity.api.php
+3
-3
core/modules/system/lib/Drupal/system/Form/DateFormatAddForm.php
...dules/system/lib/Drupal/system/Form/DateFormatAddForm.php
+1
-1
core/modules/system/lib/Drupal/system/Form/DateFormatEditForm.php
...ules/system/lib/Drupal/system/Form/DateFormatEditForm.php
+1
-1
core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php
...ules/system/lib/Drupal/system/Form/DateFormatFormBase.php
+3
-3
core/modules/system/lib/Drupal/system/Tests/Entity/EntityFormTest.php
.../system/lib/Drupal/system/Tests/Entity/EntityFormTest.php
+1
-1
core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php
.../entity_test/lib/Drupal/entity_test/Entity/EntityTest.php
+2
-2
core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestBaseFieldDisplay.php
.../Drupal/entity_test/Entity/EntityTestBaseFieldDisplay.php
+1
-1
core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php
...ty_test/lib/Drupal/entity_test/Entity/EntityTestCache.php
+1
-1
core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMul.php
...tity_test/lib/Drupal/entity_test/Entity/EntityTestMul.php
+2
-2
core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMulRev.php
...y_test/lib/Drupal/entity_test/Entity/EntityTestMulRev.php
+2
-2
core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php
...tity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php
+2
-2
core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestDeleteForm.php
...tity_test/lib/Drupal/entity_test/EntityTestDeleteForm.php
+2
-2
core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestForm.php
...les/entity_test/lib/Drupal/entity_test/EntityTestForm.php
+7
-6
core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php
core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php
+1
-1
core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php
...odules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php
+1
-1
core/modules/taxonomy/lib/Drupal/taxonomy/TermForm.php
core/modules/taxonomy/lib/Drupal/taxonomy/TermForm.php
+4
-4
core/modules/taxonomy/lib/Drupal/taxonomy/TermTranslationHandler.php
...s/taxonomy/lib/Drupal/taxonomy/TermTranslationHandler.php
+1
-1
core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php
core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php
+1
-1
core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyForm.php
core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyForm.php
+4
-4
core/modules/user/lib/Drupal/user/AccountForm.php
core/modules/user/lib/Drupal/user/AccountForm.php
+4
-4
core/modules/user/lib/Drupal/user/Entity/Role.php
core/modules/user/lib/Drupal/user/Entity/Role.php
+1
-1
core/modules/user/lib/Drupal/user/Entity/User.php
core/modules/user/lib/Drupal/user/Entity/User.php
+2
-2
core/modules/user/lib/Drupal/user/Form/UserCancelForm.php
core/modules/user/lib/Drupal/user/Form/UserCancelForm.php
+1
-1
core/modules/user/lib/Drupal/user/Form/UserMultipleCancelConfirm.php
...s/user/lib/Drupal/user/Form/UserMultipleCancelConfirm.php
+1
-1
core/modules/user/lib/Drupal/user/ProfileForm.php
core/modules/user/lib/Drupal/user/ProfileForm.php
+2
-2
core/modules/user/lib/Drupal/user/ProfileTranslationHandler.php
...odules/user/lib/Drupal/user/ProfileTranslationHandler.php
+1
-1
core/modules/user/lib/Drupal/user/RegisterForm.php
core/modules/user/lib/Drupal/user/RegisterForm.php
+6
-6
core/modules/user/lib/Drupal/user/RoleForm.php
core/modules/user/lib/Drupal/user/RoleForm.php
+3
-3
core/modules/user/user.module
core/modules/user/user.module
+1
-1
core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlockBase.php
...es/views/lib/Drupal/views/Plugin/Block/ViewsBlockBase.php
+1
-1
core/modules/views/lib/Drupal/views/Tests/Wizard/BasicTest.php
...modules/views/lib/Drupal/views/Tests/Wizard/BasicTest.php
+1
-1
core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormBase.php
.../views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormBase.php
+1
-1
core/modules/views_ui/lib/Drupal/views_ui/ViewAddForm.php
core/modules/views_ui/lib/Drupal/views_ui/ViewAddForm.php
+3
-3
core/modules/views_ui/lib/Drupal/views_ui/ViewCloneForm.php
core/modules/views_ui/lib/Drupal/views_ui/ViewCloneForm.php
+2
-2
core/modules/views_ui/lib/Drupal/views_ui/ViewDeleteForm.php
core/modules/views_ui/lib/Drupal/views_ui/ViewDeleteForm.php
+2
-2
core/modules/views_ui/lib/Drupal/views_ui/ViewEditForm.php
core/modules/views_ui/lib/Drupal/views_ui/ViewEditForm.php
+3
-3
core/modules/views_ui/lib/Drupal/views_ui/ViewFormBase.php
core/modules/views_ui/lib/Drupal/views_ui/ViewFormBase.php
+4
-4
core/modules/views_ui/lib/Drupal/views_ui/ViewListBuilder.php
.../modules/views_ui/lib/Drupal/views_ui/ViewListBuilder.php
+1
-1
core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewForm.php
.../modules/views_ui/lib/Drupal/views_ui/ViewPreviewForm.php
+3
-3
core/modules/views_ui/views_ui.module
core/modules/views_ui/views_ui.module
+5
-5
core/scripts/switch-psr4.sh
core/scripts/switch-psr4.sh
+1
-1
core/tests/Drupal/Tests/Core/Entity/Enhancer/EntityRouteEnhancerTest.php
...al/Tests/Core/Entity/Enhancer/EntityRouteEnhancerTest.php
+1
-1
core/tests/Drupal/Tests/Core/Entity/EntityFormBuilderTest.php
.../tests/Drupal/Tests/Core/Entity/EntityFormBuilderTest.php
+2
-2
core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
+9
-9
No files found.
core/lib/Drupal/Core/Entity/ContentEntityConfirmFormBase.php
View file @
c79ac2f7
...
...
@@ -13,7 +13,7 @@
/**
* Provides a generic base class for an entity-based confirmation form.
*/
abstract
class
ContentEntityConfirmFormBase
extends
ContentEntityForm
Controller
implements
ConfirmFormInterface
{
abstract
class
ContentEntityConfirmFormBase
extends
ContentEntityForm
implements
ConfirmFormInterface
{
/**
* {@inheritdoc}
...
...
core/lib/Drupal/Core/Entity/ContentEntityForm
Controller
.php
→
core/lib/Drupal/Core/Entity/ContentEntityForm.php
View file @
c79ac2f7
...
...
@@ -2,7 +2,7 @@
/**
* @file
* Contains \Drupal\Core\Entity\ContentEntityForm
Controller
.
* Contains \Drupal\Core\Entity\ContentEntityForm.
*/
namespace
Drupal\Core\Entity
;
...
...
@@ -12,11 +12,11 @@
use
Symfony\Component\DependencyInjection\ContainerInterface
;
/**
* Entity form
controller
variant for content entity types.
* Entity form variant for content entity types.
*
* @see \Drupal\Core\ContentEntityBase
*/
class
ContentEntityForm
Controller
extends
EntityForm
Controller
implements
ContentEntityForm
Controller
Interface
{
class
ContentEntityForm
extends
EntityForm
implements
ContentEntityFormInterface
{
/**
* The entity manager.
...
...
@@ -26,7 +26,7 @@ class ContentEntityFormController extends EntityFormController implements Conten
protected
$entityManager
;
/**
* Constructs a ContentEntityForm
Controller
object.
* Constructs a ContentEntityForm object.
*
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
* The entity manager.
...
...
core/lib/Drupal/Core/Entity/ContentEntityForm
Controller
Interface.php
→
core/lib/Drupal/Core/Entity/ContentEntityFormInterface.php
View file @
c79ac2f7
...
...
@@ -2,7 +2,7 @@
/**
* @file
* Contains \Drupal\Core\Entity\ContentEntityForm
Controller
Interface.
* Contains \Drupal\Core\Entity\ContentEntityFormInterface.
*/
namespace
Drupal\Core\Entity
;
...
...
@@ -10,9 +10,9 @@
use
Drupal\Core\Entity\Display\EntityFormDisplayInterface
;
/**
* Defines a common interface for content entity form
controller
classes.
* Defines a common interface for content entity form classes.
*/
interface
ContentEntityForm
Controller
Interface
extends
EntityForm
Controller
Interface
{
interface
ContentEntityFormInterface
extends
EntityFormInterface
{
/**
* Returns the form display.
...
...
core/lib/Drupal/Core/Entity/EntityConfirmFormBase.php
View file @
c79ac2f7
...
...
@@ -14,7 +14,7 @@
/**
* Provides a generic base class for an entity-based confirmation form.
*/
abstract
class
EntityConfirmFormBase
extends
EntityForm
Controller
implements
ConfirmFormInterface
{
abstract
class
EntityConfirmFormBase
extends
EntityForm
implements
ConfirmFormInterface
{
/**
* {@inheritdoc}
...
...
core/lib/Drupal/Core/Entity/EntityForm
Controller
.php
→
core/lib/Drupal/Core/Entity/EntityForm.php
View file @
c79ac2f7
...
...
@@ -2,7 +2,7 @@
/**
* @file
* Contains \Drupal\Core\Entity\EntityForm
Controller
.
* Contains \Drupal\Core\Entity\EntityForm.
*/
namespace
Drupal\Core\Entity
;
...
...
@@ -12,9 +12,9 @@
use
Drupal\Core\Render\Element
;
/**
* Base class for entity form
controller
s.
* Base class for entity forms.
*/
class
EntityForm
Controller
extends
FormBase
implements
EntityForm
Controller
Interface
{
class
EntityForm
extends
FormBase
implements
EntityFormInterface
{
/**
* The name of the current operation.
...
...
@@ -129,7 +129,7 @@ protected function init(array &$form_state) {
/**
* Returns the actual form array to be built.
*
* @see \Drupal\Core\Entity\EntityForm
Controller
::build()
* @see \Drupal\Core\Entity\EntityForm::build()
*/
public
function
form
(
array
$form
,
array
&
$form_state
)
{
$entity
=
$this
->
entity
;
...
...
@@ -152,7 +152,7 @@ public function form(array $form, array &$form_state) {
/**
* Process callback: assigns weights and hides extra fields.
*
* @see \Drupal\Core\Entity\EntityForm
Controller
::form()
* @see \Drupal\Core\Entity\EntityForm::form()
*/
public
function
processForm
(
$element
,
$form_state
,
$form
)
{
// If the form is cached, process callbacks may not have a valid reference
...
...
core/lib/Drupal/Core/Entity/EntityFormBuilder.php
View file @
c79ac2f7
...
...
@@ -45,14 +45,14 @@ public function __construct(EntityManagerInterface $entity_manager, FormBuilderI
* {@inheritdoc}
*/
public
function
getForm
(
EntityInterface
$entity
,
$operation
=
'default'
,
array
$form_state
=
array
())
{
$
controller
=
$this
->
entityManager
->
getForm
Controller
(
$entity
->
getEntityTypeId
(),
$operation
);
$
controller
->
setEntity
(
$entity
);
$
form_object
=
$this
->
entityManager
->
getForm
Object
(
$entity
->
getEntityTypeId
(),
$operation
);
$
form_object
->
setEntity
(
$entity
);
$form_state
[
'build_info'
][
'callback_object'
]
=
$
controller
;
$form_state
[
'build_info'
][
'base_form_id'
]
=
$
controller
->
getBaseFormID
();
$form_state
[
'build_info'
][
'callback_object'
]
=
$
form_object
;
$form_state
[
'build_info'
][
'base_form_id'
]
=
$
form_object
->
getBaseFormID
();
$form_state
[
'build_info'
]
+=
array
(
'args'
=>
array
());
return
$this
->
formBuilder
->
buildForm
(
$
controller
->
getFormId
(),
$form_state
);
return
$this
->
formBuilder
->
buildForm
(
$
form_object
->
getFormId
(),
$form_state
);
}
}
core/lib/Drupal/Core/Entity/EntityForm
Controller
Interface.php
→
core/lib/Drupal/Core/Entity/EntityFormInterface.php
View file @
c79ac2f7
...
...
@@ -2,7 +2,7 @@
/**
* @file
* Contains \Drupal\Core\Entity\EntityForm
Controller
Interface.
* Contains \Drupal\Core\Entity\EntityFormInterface.
*/
namespace
Drupal\Core\Entity
;
...
...
@@ -12,9 +12,9 @@
use
Drupal\Core\StringTranslation\TranslationInterface
;
/**
* Defines a common interface for entity form
controller
classes.
* Defines a common interface for entity form classes.
*/
interface
EntityForm
Controller
Interface
extends
BaseFormIdInterface
{
interface
EntityFormInterface
extends
BaseFormIdInterface
{
/**
* Returns the code identifying the active form language.
...
...
@@ -49,7 +49,7 @@ public function isDefaultFormLangcode(array $form_state);
public
function
setOperation
(
$operation
);
/**
* Returns the operation identifying the form
controller
.
* Returns the operation identifying the form.
*
* @return string
* The name of the operation.
...
...
@@ -74,7 +74,7 @@ public function getEntity();
*
* Sets the form entity which will be used for populating form element
* defaults. Usually, the form entity gets updated by
* \Drupal\Core\Entity\EntityForm
Controller
Interface::submit(), however this may
* \Drupal\Core\Entity\EntityFormInterface::submit(), however this may
* be used to completely exchange the form entity, e.g. when preparing the
* rebuild of a multi-step form.
*
...
...
@@ -92,7 +92,7 @@ public function setEntity(EntityInterface $entity);
* the submitted form values are copied to entity properties. The form's
* entity remains unchanged.
*
* @see \Drupal\Core\Entity\EntityForm
Controller
Interface::getEntity()
* @see \Drupal\Core\Entity\EntityFormInterface::getEntity()
*
* @param array $form
* A nested array form elements comprising the form.
...
...
core/lib/Drupal/Core/Entity/EntityManager.php
View file @
c79ac2f7
...
...
@@ -217,7 +217,7 @@ public function getListBuilder($entity_type) {
/**
* {@inheritdoc}
*/
public
function
getForm
Controller
(
$entity_type
,
$operation
)
{
public
function
getForm
Object
(
$entity_type
,
$operation
)
{
if
(
!
isset
(
$this
->
controllers
[
'form'
][
$operation
][
$entity_type
]))
{
if
(
!
$class
=
$this
->
getDefinition
(
$entity_type
,
TRUE
)
->
getFormClass
(
$operation
))
{
throw
new
InvalidPluginDefinitionException
(
$entity_type
,
sprintf
(
'The "%s" entity type did not specify a "%s" form class.'
,
$entity_type
,
$operation
));
...
...
core/lib/Drupal/Core/Entity/EntityManagerInterface.php
View file @
c79ac2f7
...
...
@@ -150,17 +150,17 @@ public function getViewBuilder($entity_type);
public
function
getListBuilder
(
$entity_type
);
/**
* Creates a new form
controller
instance.
* Creates a new form instance.
*
* @param string $entity_type
* The entity type for this form
controller
.
* The entity type for this form.
* @param string $operation
* The name of the operation to use, e.g., 'default'.
*
* @return \Drupal\Core\Entity\EntityForm
Controller
Interface
* A form
controller
instance.
* @return \Drupal\Core\Entity\EntityFormInterface
* A form instance.
*/
public
function
getForm
Controller
(
$entity_type
,
$operation
);
public
function
getForm
Object
(
$entity_type
,
$operation
);
/**
* Clears static and persistent field definition caches.
...
...
core/lib/Drupal/Core/Entity/EntityTypeInterface.php
View file @
c79ac2f7
...
...
@@ -202,7 +202,7 @@ public function getControllerClass($controller_type);
* operations. The name of the operation is passed also to the form
* controller's constructor, so that one class can be used for multiple
* entity forms when the forms are similar. The classes must implement
* \Drupal\Core\Entity\EntityForm
Controller
Interface.
* \Drupal\Core\Entity\EntityFormInterface.
* - list: The name of the class that provides listings of the entities. The
* class must implement \Drupal\Core\Entity\EntityListBuilderInterface.
* - render: The name of the class that is used to render the entities. The
...
...
@@ -251,7 +251,7 @@ public function getFormClass($operation);
* The operation to use this form class for.
* @param string $class
* The form class implementing
* \Drupal\Core\Entity\EntityForm
Controller
Interface.
* \Drupal\Core\Entity\EntityFormInterface.
*
* @return static
*
...
...
core/lib/Drupal/Core/Entity/HtmlEntityFormController.php
View file @
c79ac2f7
...
...
@@ -53,8 +53,8 @@ public function __construct(ControllerResolverInterface $resolver, EntityManager
* defaults:
* _entity_form: 'node.edit'
* @endcode
* This means that the edit form
controller
for the node entity will used.
* If the entity type has a default form
controller
, only the name of the
* This means that the edit form for the node entity will used.
* If the entity type has a default form, only the name of the
* entity {param} needs to be passed:
* @code
* path: '/foo/{node}/baz'
...
...
@@ -74,7 +74,7 @@ protected function getFormObject(Request $request, $form_arg) {
$entity
=
$this
->
manager
->
getStorage
(
$entity_type
)
->
create
(
array
());
}
return
$this
->
manager
->
getForm
Controller
(
$entity_type
,
$operation
)
->
setEntity
(
$entity
);
return
$this
->
manager
->
getForm
Object
(
$entity_type
,
$operation
)
->
setEntity
(
$entity
);
}
}
core/lib/Drupal/Core/Form/FormBuilderInterface.php
View file @
c79ac2f7
...
...
@@ -195,7 +195,7 @@ public function getForm($form_arg);
* storage. The recommended way to ensure that the chosen key doesn't
* conflict with ones used by the Form API or other modules is to use the
* module name as the key name or a prefix for the key name. For example,
* the entity form
controller
classes use $this->entity in entity forms,
* the entity form classes use $this->entity in entity forms,
* or $form_state['controller']->getEntity() outside the controller, to
* store information about the entity being edited, and this information
* stays available across successive clicks of the "Preview" button (if
...
...
core/modules/action/action.module
View file @
c79ac2f7
...
...
@@ -50,8 +50,8 @@ function action_permission() {
function
action_entity_type_build
(
array
&
$entity_types
)
{
/** @var $entity_types \Drupal\Core\Entity\EntityTypeInterface[] */
$entity_types
[
'action'
]
->
setFormClass
(
'add'
,
'Drupal\action\ActionAddForm
Controller
'
)
->
setFormClass
(
'edit'
,
'Drupal\action\ActionEditForm
Controller
'
)
->
setFormClass
(
'add'
,
'Drupal\action\ActionAddForm'
)
->
setFormClass
(
'edit'
,
'Drupal\action\ActionEditForm'
)
->
setFormClass
(
'delete'
,
'Drupal\action\Form\ActionDeleteForm'
)
->
setListBuilderClass
(
'Drupal\action\ActionListBuilder'
)
->
setLinkTemplate
(
'delete-form'
,
'action.delete'
)
...
...
core/modules/action/lib/Drupal/action/ActionAddForm
Controller
.php
→
core/modules/action/lib/Drupal/action/ActionAddForm.php
View file @
c79ac2f7
...
...
@@ -2,7 +2,7 @@
/**
* @file
* Contains \Drupal\action\ActionAddForm
Controller
.
* Contains \Drupal\action\ActionAddForm.
*/
namespace
Drupal\action
;
...
...
@@ -13,9 +13,9 @@
use
Symfony\Component\DependencyInjection\ContainerInterface
;
/**
* Provides a form
controller
for action add forms.
* Provides a form for action add forms.
*/
class
ActionAddForm
Controller
extends
ActionForm
Controller
Base
{
class
ActionAddForm
extends
ActionFormBase
{
/**
* The action manager.
...
...
@@ -25,7 +25,7 @@ class ActionAddFormController extends ActionFormControllerBase {
protected
$actionManager
;
/**
* Constructs a new ActionAddForm
Controller
.
* Constructs a new ActionAddForm.
*
* @param \Drupal\Core\Entity\EntityStorageInterface $storage
* The action storage.
...
...
core/modules/action/lib/Drupal/action/ActionEditForm.php
0 → 100644
View file @
c79ac2f7
<?php
/**
* @file
* Contains Drupal\action\ActionEditForm.
*/
namespace
Drupal\action
;
/**
* Provides a form for action edit forms.
*/
class
ActionEditForm
extends
ActionFormBase
{
}
core/modules/action/lib/Drupal/action/ActionEditFormController.php
deleted
100644 → 0
View file @
3937bda8
<?php
/**
* @file
* Contains Drupal\action\ActionEditFormController.
*/
namespace
Drupal\action
;
/**
* Provides a form controller for action edit forms.
*/
class
ActionEditFormController
extends
ActionFormControllerBase
{
}
core/modules/action/lib/Drupal/action/ActionForm
Controller
Base.php
→
core/modules/action/lib/Drupal/action/ActionFormBase.php
View file @
c79ac2f7
...
...
@@ -2,20 +2,20 @@
/**
* @file
* Contains Drupal\action\ActionEditForm
Controller
.
* Contains Drupal\action\ActionEditForm.
*/
namespace
Drupal\action
;
use
Drupal\Core\Entity\EntityForm
Controller
;
use
Drupal\Core\Entity\EntityForm
;
use
Drupal\Core\Entity\EntityStorageInterface
;
use
Drupal\Core\Plugin\PluginFormInterface
;
use
Symfony\Component\DependencyInjection\ContainerInterface
;
/**
* Provides a base form
controller
for action forms.
* Provides a base form for action forms.
*/
abstract
class
ActionForm
Controller
Base
extends
EntityForm
Controller
{
abstract
class
ActionFormBase
extends
EntityForm
{
/**
* The action plugin being configured.
...
...
core/modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php
View file @
c79ac2f7
...
...
@@ -24,7 +24,7 @@
* "storage" = "Drupal\aggregator\FeedStorage",
* "view_builder" = "Drupal\aggregator\FeedViewBuilder",
* "form" = {
* "default" = "Drupal\aggregator\FeedForm
Controller
",
* "default" = "Drupal\aggregator\FeedForm",
* "delete" = "Drupal\aggregator\Form\FeedDeleteForm",
* "delete_items" = "Drupal\aggregator\Form\FeedItemsDeleteForm",
* }
...
...
core/modules/aggregator/lib/Drupal/aggregator/FeedForm
Controller
.php
→
core/modules/aggregator/lib/Drupal/aggregator/FeedForm.php
View file @
c79ac2f7
...
...
@@ -2,13 +2,13 @@
/**
* @file
* Contains \Drupal\aggregator\FeedForm
Controller
.
* Contains \Drupal\aggregator\FeedForm.
*/
namespace
Drupal\aggregator
;
use
Drupal\Component\Utility\String
;
use
Drupal\Core\Entity\ContentEntityForm
Controller
;
use
Drupal\Core\Entity\ContentEntityForm
;
use
Drupal\Core\Entity\EntityManagerInterface
;
use
Drupal\Core\Language\Language
;
use
Symfony\Component\DependencyInjection\ContainerInterface
;
...
...
@@ -16,7 +16,7 @@
/**
* Form controller for the aggregator feed edit forms.
*/
class
FeedForm
Controller
extends
ContentEntityForm
Controller
{
class
FeedForm
extends
ContentEntityForm
{
/**
* {@inheritdoc}
...
...
core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockForm
Controller
.php
→
core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockForm.php
View file @
c79ac2f7
...
...
@@ -2,13 +2,13 @@
/**
* @file
* Contains \Drupal\custom_block\CustomBlockForm
Controller
.
* Contains \Drupal\custom_block\CustomBlockForm.
*/
namespace
Drupal\custom_block
;
use
Drupal\Core\Cache\Cache
;
use
Drupal\Core\Entity\ContentEntityForm
Controller
;
use
Drupal\Core\Entity\ContentEntityForm
;
use
Drupal\Core\Entity\EntityManagerInterface
;
use
Drupal\Core\Entity\EntityStorageInterface
;
use
Drupal\Core\Language\Language
;
...
...
@@ -18,7 +18,7 @@
/**
* Form controller for the custom block edit forms.
*/
class
CustomBlockForm
Controller
extends
ContentEntityForm
Controller
{
class
CustomBlockForm
extends
ContentEntityForm
{
/**
* The custom block storage.
...
...
@@ -35,7 +35,7 @@ class CustomBlockFormController extends ContentEntityFormController {
protected
$languageManager
;
/**
* Constructs a CustomBlockForm
Controller
object.
* Constructs a CustomBlockForm object.
*
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
* The entity manager.
...
...
@@ -63,7 +63,7 @@ public static function create(ContainerInterface $container) {
}
/**
* Overrides \Drupal\Core\Entity\EntityForm
Controller
::prepareEntity().
* Overrides \Drupal\Core\Entity\EntityForm::prepareEntity().
*
* Prepares the custom block object.
*
...
...
@@ -167,7 +167,7 @@ public function form(array $form, array &$form_state) {
}
/**
* Overrides \Drupal\Core\Entity\EntityForm
Controller
::submit().
* Overrides \Drupal\Core\Entity\EntityForm::submit().
*
* Updates the custom block object by processing the submitted values.
*
...
...
core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeForm
Controller
.php
→
core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeForm.php
View file @
c79ac2f7
...
...
@@ -2,21 +2,21 @@
/**
* @file
* Contains \Drupal\custom_block\CustomBlockTypeForm
Controller
.
* Contains \Drupal\custom_block\CustomBlockTypeForm.
*/
namespace
Drupal\custom_block
;
use
Drupal\Core\Entity\EntityForm
Controller
;
use
Drupal\Core\Entity\EntityForm
;
use
Drupal\Core\Entity\EntityTypeInterface
;
/**
* Base form
controller
for category edit forms.
* Base form for category edit forms.
*/
class
CustomBlockTypeForm
Controller
extends
EntityForm
Controller
{
class
CustomBlockTypeForm
extends
EntityForm
{
/**
* Overrides \Drupal\Core\Entity\EntityForm
Controller
::form().
* Overrides \Drupal\Core\Entity\EntityForm::form().
*/
public
function
form
(
array
$form
,
array
&
$form_state
)
{
$form
=
parent
::
form
(
$form
,
$form_state
);
...
...
@@ -85,7 +85,7 @@ public function form(array $form, array &$form_state) {
}
/**
* Overrides \Drupal\Core\Entity\EntityForm
Controller
::save().
* Overrides \Drupal\Core\Entity\EntityForm::save().
*/
public
function
save
(
array
$form
,
array
&
$form_state
)
{
$block_type
=
$this
->
entity
;
...
...
core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php
View file @
c79ac2f7
...
...
@@ -25,10 +25,10 @@
* "list_builder" = "Drupal\custom_block\CustomBlockListBuilder",
* "view_builder" = "Drupal\custom_block\CustomBlockViewBuilder",
* "form" = {
* "add" = "Drupal\custom_block\CustomBlockForm
Controller
",
* "edit" = "Drupal\custom_block\CustomBlockForm
Controller
",
* "add" = "Drupal\custom_block\CustomBlockForm",
* "edit" = "Drupal\custom_block\CustomBlockForm",
* "delete" = "Drupal\custom_block\Form\CustomBlockDeleteForm",
* "default" = "Drupal\custom_block\CustomBlockForm
Controller
"
* "default" = "Drupal\custom_block\CustomBlockForm"
* },
* "translation" = "Drupal\custom_block\CustomBlockTranslationHandler"
* },
...
...
core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php
View file @
c79ac2f7
...
...
@@ -19,9 +19,9 @@
* label = @Translation("Custom block type"),
* controllers = {
* "form" = {
* "default" = "Drupal\custom_block\CustomBlockTypeForm
Controller
",
* "add" = "Drupal\custom_block\CustomBlockTypeForm
Controller
",
* "edit" = "Drupal\custom_block\CustomBlockTypeForm
Controller
",
* "default" = "Drupal\custom_block\CustomBlockTypeForm",
* "add" = "Drupal\custom_block\CustomBlockTypeForm",
* "edit" = "Drupal\custom_block\CustomBlockTypeForm",
* "delete" = "Drupal\custom_block\Form\CustomBlockTypeDeleteForm"
* },
* "list_builder" = "Drupal\custom_block\CustomBlockTypeListBuilder"
...
...
core/modules/block/lib/Drupal/block/BlockForm
Controller
.php
→
core/modules/block/lib/Drupal/block/BlockForm.php
View file @
c79ac2f7
...
...
@@ -2,14 +2,14 @@
/**
* @file
* Contains \Drupal\block\BlockForm
Controller
.
* Contains \Drupal\block\BlockForm.
*/
namespace
Drupal\block
;
use
Drupal\Core\Cache\Cache
;
use
Drupal\Core\Config\ConfigFactoryInterface
;
use
Drupal\Core\Entity\EntityForm
Controller
;
use
Drupal\Core\Entity\EntityForm
;
use
Drupal\Core\Entity\EntityManagerInterface
;
use
Drupal\Core\Language\Language
;
use
Drupal\Core\Language\LanguageManagerInterface
;
...
...
@@ -17,9 +17,9 @@
use
Symfony\Component\DependencyInjection\ContainerInterface
;
/**
* Provides form
controller
for block instance forms.
* Provides form for block instance forms.
*/
class
BlockForm
Controller
extends
EntityForm
Controller
{
class
BlockForm
extends
EntityForm
{
/**
* The block entity.
...
...
@@ -50,7 +50,7 @@ class BlockFormController extends EntityFormController {
protected
$configFactory
;
/**
* Constructs a BlockForm
Controller
object.
* Constructs a BlockForm object.
*
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
* The entity manager.
...
...
core/modules/block/lib/Drupal/block/Entity/Block.php
View file @
c79ac2f7
...
...
@@ -26,7 +26,7 @@
* "view_builder" = "Drupal\block\BlockViewBuilder",
* "list_builder" = "Drupal\block\BlockListBuilder",
* "form" = {
* "default" = "Drupal\block\BlockForm
Controller
",
* "default" = "Drupal\block\BlockForm",
* "delete" = "Drupal\block\Form\BlockDeleteForm"
* }
* },
...
...
core/modules/block/lib/Drupal/block/Tests/BlockUiTest.php
View file @
c79ac2f7
...
...
@@ -158,7 +158,7 @@ public function testCandidateBlockList() {