' . t('The Content Moderation module provides basic moderation for content. For more information, see the online documentation for the Content Moderation module.', array(':content_moderation' => 'https://www.drupal.org/documentation/modules/workbench_moderation/')) . '
'; return $output; - - default: } } @@ -173,7 +171,7 @@ function content_moderation_entity_view(array &$build, EntityInterface $entity, * mandatory for any user that wants to moderate things. */ function content_moderation_node_access(NodeInterface $entity, $operation, AccountInterface $account) { - /** @var \Drupal\content_moderation\ModerationInformationInterface $modinfo */ + /** @var \Drupal\content_moderation\ModerationInformationInterface $moderation_info */ $moderation_info = Drupal::service('content_moderation.moderation_information'); if ($operation == 'view') { diff --git a/core/modules/content_moderation/src/Access/LatestRevisionCheck.php b/core/modules/content_moderation/src/Access/LatestRevisionCheck.php index f0ae4b4..c5747f3 100644 --- a/core/modules/content_moderation/src/Access/LatestRevisionCheck.php +++ b/core/modules/content_moderation/src/Access/LatestRevisionCheck.php @@ -60,7 +60,7 @@ public function access(Route $route, RouteMatchInterface $route_match) { * @param \Drupal\Core\Routing\RouteMatchInterface $route_match * The parametrized route * - * @return ContentEntityInterface + * @return \Drupal\Core\Entity\ContentEntityInterface * returns the Entity in question. * * @throws \Exception diff --git a/core/modules/content_moderation/src/Entity/Handler/NodeModerationHandler.php b/core/modules/content_moderation/src/Entity/Handler/NodeModerationHandler.php index c3a0e3d..7f81ff1 100644 --- a/core/modules/content_moderation/src/Entity/Handler/NodeModerationHandler.php +++ b/core/modules/content_moderation/src/Entity/Handler/NodeModerationHandler.php @@ -17,7 +17,7 @@ public function onPresave(ContentEntityInterface $entity, $default_revision, $pu if ($this->shouldModerate($entity)) { parent::onPresave($entity, $default_revision, $published_state); // Only nodes have a concept of published. - /** @var $entity Node */ + /** @var \Drupal\node\NodeInterface $entity */ $entity->setPublished($published_state); } } diff --git a/core/modules/content_moderation/src/EntityTypeInfo.php b/core/modules/content_moderation/src/EntityTypeInfo.php index ffd48e4..7528dbb 100644 --- a/core/modules/content_moderation/src/EntityTypeInfo.php +++ b/core/modules/content_moderation/src/EntityTypeInfo.php @@ -208,7 +208,7 @@ public function entityExtraFieldInfo() { foreach ($this->getModeratedBundles() as $bundle) { $return[$bundle['entity']][$bundle['bundle']]['display']['content_moderation_control'] = [ 'label' => $this->t('Moderation control'), - 'description' => $this->t('Status listing and form for the entitiy\'s moderation state.'), + 'description' => $this->t('Status listing and form for the entity\'s moderation state.'), 'weight' => -20, 'visible' => TRUE, ]; @@ -319,13 +319,13 @@ public function entityBundleFieldInfoAlter(&$fields, EntityTypeInterface $entity */ public function bundleFormAlter(array &$form, FormStateInterface $form_state, $form_id) { if ($this->moderationInfo->isRevisionableBundleForm($form_state->getFormObject())) { - /* @var ConfigEntityTypeInterface $bundle */ + /* @var \Drupal\Core\Config\Entity\ConfigEntityTypeInterface $bundle */ $bundle = $form_state->getFormObject()->getEntity(); $this->entityTypeManager->getHandler($bundle->getEntityType()->getBundleOf(), 'moderation')->enforceRevisionsBundleFormAlter($form, $form_state, $form_id); } elseif ($this->moderationInfo->isModeratedEntityForm($form_state->getFormObject())) { - /* @var ContentEntityInterface $entity */ + /* @var \Drupal\Core\Entity\ContentEntityInterface $entity */ $entity = $form_state->getFormObject()->getEntity(); $this->entityTypeManager->getHandler($entity->getEntityTypeId(), 'moderation')->enforceRevisionsEntityFormAlter($form, $form_state, $form_id); @@ -347,7 +347,7 @@ public function bundleFormAlter(array &$form, FormStateInterface $form_state, $f * The current state of the form. */ public static function bundleFormRedirect(array &$form, FormStateInterface $form_state) { - /* @var ContentEntityInterface $entity */ + /* @var \Drupal\Core\Entity\ContentEntityInterface $entity */ $entity = $form_state->getFormObject()->getEntity(); $moderation_info = \Drupal::getContainer()->get('content_moderation.moderation_information'); diff --git a/core/modules/content_moderation/src/Event/ContentModerationEvents.php b/core/modules/content_moderation/src/Event/ContentModerationEvents.php index 9c8c5bf..31484bc 100644 --- a/core/modules/content_moderation/src/Event/ContentModerationEvents.php +++ b/core/modules/content_moderation/src/Event/ContentModerationEvents.php @@ -5,7 +5,7 @@ final class ContentModerationEvents { /** - * This event is fired everytime a state is changed. + * This event is fired every time a state is changed. * * @Event */ diff --git a/core/modules/content_moderation/src/Form/BundleModerationConfigurationForm.php b/core/modules/content_moderation/src/Form/BundleModerationConfigurationForm.php index d072860..f024942 100644 --- a/core/modules/content_moderation/src/Form/BundleModerationConfigurationForm.php +++ b/core/modules/content_moderation/src/Form/BundleModerationConfigurationForm.php @@ -50,7 +50,7 @@ public function getBaseFormId() { * {@inheritdoc} */ public function form(array $form, FormStateInterface $form_state) { - /* @var ConfigEntityTypeInterface $bundle */ + /* @var \Drupal\Core\Config\Entity\ConfigEntityTypeInterface $bundle */ $bundle = $form_state->getFormObject()->getEntity(); $form['enable_moderation_state'] = [ '#type' => 'checkbox', @@ -176,7 +176,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) { // If moderation is enabled, revisions MUST be enabled as well. // Otherwise we can't have forward revisions. if ($form_state->getValue('enable_moderation_state')) { - /* @var ConfigEntityTypeInterface $bundle */ + /* @var \Drupal\Core\Config\Entity\ConfigEntityTypeInterface $bundle */ $bundle = $form_state->getFormObject()->getEntity(); $this->entityTypeManager->getHandler($bundle->getEntityType()->getBundleOf(), 'moderation')->onBundleModerationConfigurationFormSubmit($bundle); diff --git a/core/modules/content_moderation/src/Form/EntityModerationForm.php b/core/modules/content_moderation/src/Form/EntityModerationForm.php index 85e6805..734b56a 100644 --- a/core/modules/content_moderation/src/Form/EntityModerationForm.php +++ b/core/modules/content_moderation/src/Form/EntityModerationForm.php @@ -56,7 +56,7 @@ public function getFormId() { * @inheritDoc */ public function buildForm(array $form, FormStateInterface $form_state, ContentEntityInterface $entity = NULL) { - /** @var ModerationState $current_state */ + /** @var \Drupal\content_moderation\Entity\ModerationState $current_state */ $current_state = $entity->moderation_state->entity; $transitions = $this->validation->getValidTransitions($entity, $this->currentUser()); @@ -125,7 +125,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) { drupal_set_message($this->t('The moderation state has been updated.')); - /** @var ModerationState $state */ + /** @var \Drupal\content_moderation\Entity\ModerationState $state */ $state = $this->entityTypeManager->getStorage('moderation_state')->load($new_state); // The page we're on likely won't be visible if we just set the entity to diff --git a/core/modules/content_moderation/src/ModerationInformationInterface.php b/core/modules/content_moderation/src/ModerationInformationInterface.php index f9f3a24..afecbc3 100644 --- a/core/modules/content_moderation/src/ModerationInformationInterface.php +++ b/core/modules/content_moderation/src/ModerationInformationInterface.php @@ -65,7 +65,7 @@ public function isModeratableBundle(EntityTypeInterface $entity_type, $bundle); * @param EntityTypeInterface[] $entity_types * The master entity type list filter. * - * @return ConfigEntityTypeInterface[] + * @return \Drupal\Core\Config\Entity\ConfigEntityTypeInterface[] * An array of only the config entities we want to modify. */ public function selectRevisionableEntityTypes(array $entity_types); @@ -78,7 +78,7 @@ public function selectRevisionableEntityTypes(array $entity_types); * @param EntityTypeInterface[] $entity_types * The master entity type list filter. * - * @return ContentEntityTypeInterface[] + * @return \Drupal\Core\Entity\ContentEntityTypeInterface[] * An array of only the content entity definitions we want to modify. */ public function selectRevisionableEntities(array $entity_types); diff --git a/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutPublishNode.php b/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutPublishNode.php index c82e03d..3975492 100644 --- a/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutPublishNode.php +++ b/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutPublishNode.php @@ -10,7 +10,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; /** - * Alternate action plugin that knows to opt-out of modifying moderated entites. + * Alternate action plugin that can opt-out of modifying moderated entities. * * @see \Drupal\node\Plugin\Action\PublishNode */ diff --git a/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutUnpublishNode.php b/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutUnpublishNode.php index eed2cd4..f006595 100644 --- a/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutUnpublishNode.php +++ b/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutUnpublishNode.php @@ -10,7 +10,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; /** - * Alternate action plugin that knows to opt-out of modifying moderated entites. + * Alternate action plugin that can opt-out of modifying moderated entities. * * @see \Drupal\node\Plugin\Action\UnpublishNode */ diff --git a/core/modules/content_moderation/src/Plugin/Derivative/DynamicLocalTasks.php b/core/modules/content_moderation/src/Plugin/Derivative/DynamicLocalTasks.php index f55bf1b..eab8f94 100644 --- a/core/modules/content_moderation/src/Plugin/Derivative/DynamicLocalTasks.php +++ b/core/modules/content_moderation/src/Plugin/Derivative/DynamicLocalTasks.php @@ -93,7 +93,7 @@ public function getDerivativeDefinitions($base_plugin_definition) { } /** - * Returns an array of content entities that are potentially moderateable. + * Returns an array of content entities that are potentially moderatable. * * @return EntityTypeInterface[] * An array of just those entities we care about. diff --git a/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php b/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php index e1b70c5..d5de21d 100644 --- a/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php +++ b/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php @@ -93,7 +93,7 @@ class ModerationStateWidget extends OptionsSelectWidget implements ContainerFact * @param \Drupal\Core\Entity\EntityStorageInterface $moderation_state_transition_storage * Moderation state transition storage. * @param \Drupal\Core\Entity\Query\QueryInterface $entity_query - * Moderation transation entity query service. + * Moderation transition entity query service. */ public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, array $third_party_settings, AccountInterface $current_user, EntityTypeManagerInterface $entity_type_manager, EntityStorageInterface $moderation_state_storage, EntityStorageInterface $moderation_state_transition_storage, QueryInterface $entity_query, ModerationInformation $moderation_information, StateTransitionValidation $validator) { parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $third_party_settings); @@ -150,7 +150,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen $transitions = $this->validator->getValidTransitions($entity, $this->currentUser); $target_states = []; - /** @var ModerationStateTransition $transition */ + /** @var \Drupal\content_moderation\Entity\ModerationStateTransition $transition */ foreach ($transitions as $transition) { $target_states[$transition->getToState()] = $transition->label(); } diff --git a/core/modules/content_moderation/src/Plugin/Menu/EditTab.php b/core/modules/content_moderation/src/Plugin/Menu/EditTab.php index f492574..0c466b4 100644 --- a/core/modules/content_moderation/src/Plugin/Menu/EditTab.php +++ b/core/modules/content_moderation/src/Plugin/Menu/EditTab.php @@ -18,7 +18,7 @@ class EditTab extends LocalTaskDefault implements ContainerFactoryPluginInterfac use StringTranslationTrait; /** - * The moderatio information service. + * The moderation information service. * * @var \Drupal\content_moderation\ModerationInformation */ diff --git a/core/modules/content_moderation/src/Plugin/views/filter/LatestRevision.php b/core/modules/content_moderation/src/Plugin/views/filter/LatestRevision.php index 995fcee..f6d3814 100644 --- a/core/modules/content_moderation/src/Plugin/views/filter/LatestRevision.php +++ b/core/modules/content_moderation/src/Plugin/views/filter/LatestRevision.php @@ -102,7 +102,7 @@ public function query() { $table = $this->ensureMyTable(); - /** @var Sql $query */ + /** @var \Drupal\views\Plugin\views\query\Sql $query */ $query = $this->query; $definition = $this->entityTypeManager->getDefinition($this->getEntityType()); diff --git a/core/modules/content_moderation/src/StateTransitionValidation.php b/core/modules/content_moderation/src/StateTransitionValidation.php index cd511e9..f01f0e6 100644 --- a/core/modules/content_moderation/src/StateTransitionValidation.php +++ b/core/modules/content_moderation/src/StateTransitionValidation.php @@ -90,7 +90,7 @@ protected function getPossibleTransitions() { * @param \Drupal\Core\Session\AccountInterface $user * The account that wants to perform a transition. * - * @return ModerationState[] + * @return \Drupal\content_moderation\Entity\ModerationState[] * Returns an array of States to which the specified user may transition the * entity. */ @@ -99,7 +99,7 @@ public function getValidTransitionTargets(ContentEntityInterface $entity, Accoun $states_for_bundle = $bundle->getThirdPartySetting('content_moderation', 'allowed_moderation_states', []); - /** @var ModerationState $state */ + /** @var \Drupal\content_moderation\Entity\ModerationState $state */ $state = $entity->moderation_state->entity; $current_state_id = $state->id(); @@ -128,7 +128,7 @@ public function getValidTransitionTargets(ContentEntityInterface $entity, Accoun public function getValidTransitions(ContentEntityInterface $entity, AccountInterface $user) { $bundle = $this->loadBundleEntity($entity->getEntityType()->getBundleEntityType(), $entity->bundle()); - /** @var ModerationState $current_state */ + /** @var \Drupal\content_moderation\Entity\ModerationState $current_state */ $current_state = $entity->moderation_state->entity; $current_state_id = $current_state ? $current_state->id() : $bundle->getThirdPartySetting('content_moderation', 'default_moderation_state'); @@ -175,7 +175,7 @@ protected function getTransitionsFrom($state_name) { * @param string $from * The origin state machine name. * @param string $to - * The desetination state machine name. + * The destination state machine name. * @param \Drupal\Core\Session\AccountInterface $user * The user to validate. * diff --git a/core/modules/content_moderation/src/Tests/ModerationLocaleTest.php b/core/modules/content_moderation/src/Tests/ModerationLocaleTest.php index ec835c6..5a77fc5 100644 --- a/core/modules/content_moderation/src/Tests/ModerationLocaleTest.php +++ b/core/modules/content_moderation/src/Tests/ModerationLocaleTest.php @@ -20,7 +20,7 @@ class ModerationLocaleTest extends ModerationStateTestBase { * Test that an article can be translated and its translations can be * moderated separately as core does. */ - function testTranslateModeratedContent() { + public function testTranslateModeratedContent() { $this->drupalLogin($this->rootUser); // Enable moderation on Article node type. diff --git a/core/modules/content_moderation/src/Tests/NodeAccessTest.php b/core/modules/content_moderation/src/Tests/NodeAccessTest.php index 8148168..69aa21e 100644 --- a/core/modules/content_moderation/src/Tests/NodeAccessTest.php +++ b/core/modules/content_moderation/src/Tests/NodeAccessTest.php @@ -2,7 +2,6 @@ namespace Drupal\content_moderation\Tests; - /** * Tests permission access control around nodes. * @@ -45,7 +44,7 @@ public function testPageAccess() { return; } - /** @var NodeInterface $node */ + /** @var \Drupal\node\NodeInterface $node */ $node = reset($nodes); $view_path = 'node/' . $node->id(); diff --git a/core/modules/content_moderation/tests/src/Functional/LatestRevisionViewsFilterTest.php b/core/modules/content_moderation/tests/src/Functional/LatestRevisionViewsFilterTest.php index 308c2d3..5d7e92e 100644 --- a/core/modules/content_moderation/tests/src/Functional/LatestRevisionViewsFilterTest.php +++ b/core/modules/content_moderation/tests/src/Functional/LatestRevisionViewsFilterTest.php @@ -4,14 +4,12 @@ use Drupal\node\Entity\Node; use Drupal\node\Entity\NodeType; -use Drupal\simpletest\BrowserTestBase; +use Drupal\Tests\BrowserTestBase; /** * Tests the "Latest Revision" views filter. * * @group content_moderation - * @runTestsInSeparateProcesses - * @preserveGlobalState disabled */ class LatestRevisionViewsFilterTest extends BrowserTestBase { diff --git a/core/modules/content_moderation/tests/src/Kernel/EntityStateChangeValidationTest.php b/core/modules/content_moderation/tests/src/Kernel/EntityStateChangeValidationTest.php index 86b214f..a93571a 100644 --- a/core/modules/content_moderation/tests/src/Kernel/EntityStateChangeValidationTest.php +++ b/core/modules/content_moderation/tests/src/Kernel/EntityStateChangeValidationTest.php @@ -84,7 +84,7 @@ public function testLegacyContent() { 'type' => 'example', ]); $node_type->save(); - /** @var NodeInterface $node */ + /** @var \Drupal\node\NodeInterface $node */ $node = Node::create([ 'type' => 'example', 'title' => 'Test title', @@ -124,7 +124,7 @@ public function testLegacyMultilingualContent() { 'type' => 'example', ]); $node_type->save(); - /** @var NodeInterface $node */ + /** @var \Drupal\node\NodeInterface $node */ $node = Node::create([ 'type' => 'example', 'title' => 'Test title', @@ -154,7 +154,7 @@ public function testLegacyMultilingualContent() { $node = Node::load($nid); $node_fr = $node->getTranslation('fr'); - /** @var NodeInterface $node_fr */ + /** @var \Drupal\node\NodeInterface $node_fr */ $node_fr->setTitle('Nouveau'); $node_fr->save(); } diff --git a/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldTest.php b/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldTest.php index ca022ff..34668a6 100644 --- a/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldTest.php +++ b/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldTest.php @@ -31,8 +31,8 @@ protected function setUp() { public function testModerationStateFieldIsCreated() { // There should be no updates as moderation_state_install() should have // applied the new field. - $this->assertTrue(empty($this->container->get('entity.definition_update_manager')->needsUpdates()['node'])); - $this->assertTrue(!empty($this->container->get('entity_field.manager')->getFieldStorageDefinitions('node')['moderation_state'])); + $this->assertEmpty($this->container->get('entity.definition_update_manager')->needsUpdates()['node']); + $this->assertNotEmpty($this->container->get('entity_field.manager')->getFieldStorageDefinitions('node')['moderation_state']); } } diff --git a/core/modules/content_moderation/tests/src/Unit/LatestRevisionCheckTest.php b/core/modules/content_moderation/tests/src/Unit/LatestRevisionCheckTest.php index 11a65b7..21373cc 100644 --- a/core/modules/content_moderation/tests/src/Unit/LatestRevisionCheckTest.php +++ b/core/modules/content_moderation/tests/src/Unit/LatestRevisionCheckTest.php @@ -34,13 +34,13 @@ class LatestRevisionCheckTest extends \PHPUnit_Framework_TestCase { */ public function testLatestAccessPermissions($entity_class, $entity_type, $has_forward, $result_class) { - /** @var EntityInterface $entity */ + /** @var \Drupal\Core\Entity\EntityInterface $entity */ $entity = $this->prophesize($entity_class); $entity->getCacheContexts()->willReturn([]); $entity->getCacheTags()->willReturn([]); $entity->getCacheMaxAge()->willReturn(0); - /** @var ModerationInformationInterface $mod_info */ + /** @var \Drupal\content_moderation\ModerationInformation $mod_info */ $mod_info = $this->prophesize(ModerationInformation::class); $mod_info->hasForwardRevision($entity->reveal())->willReturn($has_forward); @@ -53,7 +53,7 @@ public function testLatestAccessPermissions($entity_class, $entity_type, $has_fo $lrc = new LatestRevisionCheck($mod_info->reveal()); - /** @var AccessResult $result */ + /** @var \Drupal\Core\Access\AccessResult $result */ $result = $lrc->access($route->reveal(), $route_match->reveal()); $this->assertInstanceOf($result_class, $result);