diff --git a/core/assets/vendor/domready/ready.min.js b/core/assets/vendor/domready/ready.min.js index 1fbe09e..de84761 100644 --- a/core/assets/vendor/domready/ready.min.js +++ b/core/assets/vendor/domready/ready.min.js @@ -1,4 +1,4 @@ /*! * domready (c) Dustin Diaz 2014 - License MIT */ -!function(e,t){typeof module!="undefined"?module.exports=t():typeof define=="function"&&typeof define.amd=="object"?define(t):this[e]=t()}("domready",function(){var e=[],t,n=document,r=n.documentElement.doScroll,i="DOMContentLoaded",s=(r?/^loaded|^c/:/^loaded|^i|^c/).test(n.readyState);return s||n.addEventListener(i,t=function(){n.removeEventListener(i,t),s=1;while(t=e.shift())t()}),function(t){s?setTimeout(t,0):e.push(t)}}) \ No newline at end of file +!function(name,definition){if(typeof module!="undefined")module.exports=definition();else if(typeof define=="function"&&typeof define.amd=="object")define(definition);else this[name]=definition()}("domready",function(){var fns=[],listener,doc=document,hack=doc.documentElement.doScroll,domContentLoaded="DOMContentLoaded",loaded=(hack?/^loaded|^c/:/^loaded|^i|^c/).test(doc.readyState);if(!loaded)doc.addEventListener(domContentLoaded,listener=function(){doc.removeEventListener(domContentLoaded,listener);loaded=1;while(listener=fns.shift())listener()});return function(fn){loaded?fn():fns.push(fn)}}); \ No newline at end of file diff --git a/core/core.libraries.yml b/core/core.libraries.yml index 56030cb..d9cba3c 100644 --- a/core/core.libraries.yml +++ b/core/core.libraries.yml @@ -34,10 +34,10 @@ ckeditor: domready: remote: https://github.com/ded/domready - version: "1.0.8" + version: "1.0.7" license: name: MIT - url: https://github.com/ded/domready/blob/v1.0.8/LICENSE + url: https://github.com/ded/domready/blob/v1.0.7/LICENSE gpl-compatible: true js: assets/vendor/domready/ready.min.js: { weight: -21, minified: true } diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 61e4de1..62bbb58 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1088,7 +1088,7 @@ function template_preprocess_feed_icon(&$variables) { function theme_indentation($variables) { $output = ''; for ($n = 0; $n < $variables['size']; $n++) { - $output .= '
 
'; + $output .= '
 
'; } return $output; } diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php index 33cefbd..180d7ac 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php @@ -20,7 +20,12 @@ class ConfigEntityType extends EntityType implements ConfigEntityTypeInterface { /** * The config prefix set in the configuration entity type annotation. * - * @see \Drupal\Core\Config\Entity\ConfigEntityTypeInterface::getConfigPrefix() + * The default configuration prefix is constructed from the name of the module + * that provides the entity type and the ID of the entity type. If a + * config_prefix annotation is present it will be used in place of the entity + * type ID. + * + * @see \Drupal\Core\Config\Entity\ConfigEntityType::getConfigPrefix() */ protected $config_prefix; @@ -84,7 +89,10 @@ public function __construct($definition) { */ public function getConfigPrefix() { // Ensure that all configuration entities are prefixed by the name of the - // module that provides the configuration entity type. + // module that provides the configuration entity type. This ensures that + // default configuration will be created as expected during module + // installation and dependencies can be calculated without the modules that + // provide the entity types being installed. if (isset($this->config_prefix)) { $config_prefix = $this->provider . '.' . $this->config_prefix; } diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityTypeInterface.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityTypeInterface.php index cd00139..668d983 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityTypeInterface.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityTypeInterface.php @@ -49,21 +49,15 @@ /** * Gets the config prefix used by the configuration entity type. * - * The config prefix is used to prefix configuration entity IDs when they are - * stored in the configuration system. The default config prefix is - * constructed from the name of the module that provides the entity type and - * the ID of the entity type. If a config_prefix annotation is present it will - * be used in place of the entity type ID. + * Ensures that all configuration entities are prefixed by the module that + * provides the configuration entity type. This ensures that if a + * configuration entity is contained in a extension's default configuration, + * it will be created during extension installation. Additionally, it allows + * dependencies to be calculated without the modules that provide + * configuration entity types being installed. * - * Prefixing with the module that provides the configuration entity type - * ensures that configuration entities depend on the module that provides the - * configuration entity type. - * - * @return string - * The config prefix. - * - * @throws \Drupal\Core\Config\ConfigPrefixLengthException - * Exception thrown when the length of the prefix exceeds PREFIX_LENGTH. + * @return string|bool + * The config prefix, or FALSE if not a configuration entity type. */ public function getConfigPrefix(); diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php index 0aeb13f..16de8fb 100644 --- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php +++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php @@ -981,7 +981,7 @@ public function referencedEntities() { } /** - * Gets the value of the given entity key, if defined. + * Returns the value of the given entity key, if defined. * * @param string $key * Name of the entity key, for example id, revision or bundle. diff --git a/core/lib/Drupal/Core/Entity/ContentEntityFormInterface.php b/core/lib/Drupal/Core/Entity/ContentEntityFormInterface.php index 8fae58e..4f130dc 100644 --- a/core/lib/Drupal/Core/Entity/ContentEntityFormInterface.php +++ b/core/lib/Drupal/Core/Entity/ContentEntityFormInterface.php @@ -16,7 +16,7 @@ interface ContentEntityFormInterface extends EntityFormInterface { /** - * Gets the form display. + * Returns the form display. * * @param \Drupal\Core\Form\FormStateInterface $form_state * The current state of the form. @@ -40,7 +40,7 @@ public function getFormDisplay(FormStateInterface $form_state); public function setFormDisplay(EntityFormDisplayInterface $form_display, FormStateInterface $form_state); /** - * Gets the code identifying the active form language. + * Returns the code identifying the active form language. * * @param \Drupal\Core\Form\FormStateInterface $form_state * The current state of the form. diff --git a/core/lib/Drupal/Core/Entity/Display/EntityDisplayInterface.php b/core/lib/Drupal/Core/Entity/Display/EntityDisplayInterface.php index a49d223..f128331 100644 --- a/core/lib/Drupal/Core/Entity/Display/EntityDisplayInterface.php +++ b/core/lib/Drupal/Core/Entity/Display/EntityDisplayInterface.php @@ -72,7 +72,7 @@ public function setComponent($name, array $options = array()); public function removeComponent($name); /** - * Gets the highest weight of the components in the display. + * Returns the highest weight of the components in the display. * * @return int|null * The highest weight of the components in the display, or NULL if the @@ -81,7 +81,7 @@ public function removeComponent($name); public function getHighestWeight(); /** - * Gets the renderer plugin for a field (e.g. widget, formatter). + * Returns the renderer plugin for a field (e.g. widget, formatter). * * @param string $field_name * The field name. @@ -92,7 +92,7 @@ public function getHighestWeight(); public function getRenderer($field_name); /** - * Gets the entity type for which this display is used. + * Returns the entity type for which this display is used. * * @return string * The entity type id. @@ -100,7 +100,7 @@ public function getRenderer($field_name); public function getTargetEntityTypeId(); /** - * Gets the view or form mode to be displayed. + * Returns the view or form mode to be displayed. * * @return string * The mode to be displayed. @@ -108,7 +108,7 @@ public function getTargetEntityTypeId(); public function getMode(); /** - * Gets the original view or form mode that was requested. + * Returns the original view or form mode that was requested. * * @return string * The original mode that was requested. @@ -116,7 +116,7 @@ public function getMode(); public function getOriginalMode(); /** - * Gets the bundle to be displayed. + * Returns the bundle to be displayed. * * @return string * The bundle to be displayed. diff --git a/core/lib/Drupal/Core/Entity/Display/EntityViewDisplayInterface.php b/core/lib/Drupal/Core/Entity/Display/EntityViewDisplayInterface.php index ce54810..3771d81 100644 --- a/core/lib/Drupal/Core/Entity/Display/EntityViewDisplayInterface.php +++ b/core/lib/Drupal/Core/Entity/Display/EntityViewDisplayInterface.php @@ -15,7 +15,7 @@ interface EntityViewDisplayInterface extends EntityDisplayInterface { /** - * Builds a renderable array for the components of an entity. + * Returns a renderable array for the components of an entity. * * See the buildMultiple() method for details. * @@ -30,7 +30,7 @@ public function build(FieldableEntityInterface $entity); /** - * Builds a renderable array for the components of a set of entities. + * Returns a renderable array for the components of a set of entities. * * This only includes the components handled by the Display object, but * excludes 'extra fields', that are typically rendered through specific, diff --git a/core/lib/Drupal/Core/Entity/Entity.php b/core/lib/Drupal/Core/Entity/Entity.php index 102b318..a5c3d0f 100644 --- a/core/lib/Drupal/Core/Entity/Entity.php +++ b/core/lib/Drupal/Core/Entity/Entity.php @@ -67,7 +67,7 @@ public function __construct(array $values, $entity_type) { } /** - * Gets the entity manager. + * Returns the entity manager. * * @return \Drupal\Core\Entity\EntityManagerInterface */ @@ -76,7 +76,7 @@ protected function entityManager() { } /** - * Gets the language manager. + * Returns the language manager. * * @return \Drupal\Core\Language\LanguageManagerInterface */ @@ -85,7 +85,7 @@ protected function languageManager() { } /** - * Gets the UUID generator. + * Returns the UUID generator. * * @return \Drupal\Component\Uuid\UuidInterface */ @@ -235,7 +235,7 @@ public function hasLinkTemplate($rel) { } /** - * Gets an array link templates. + * Returns an array link templates. * * @return array * An array of link templates containing paths. @@ -274,7 +274,7 @@ public function url($rel = 'canonical', $options = array()) { } /** - * Gets an array of placeholders for this entity. + * Returns an array of placeholders for this entity. * * Individual entity classes may override this method to add additional * placeholders if desired. If so, they should be sure to replicate the diff --git a/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php b/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php index cf19b0c..0cf0edc 100644 --- a/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php +++ b/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php @@ -34,7 +34,7 @@ public function __construct(SelectionPluginManagerInterface $selection_manager) } /** - * Gets matched labels based on a given search string. + * Returns matched labels based on a given search string. * * @param string $target_type * The ID of the target entity type. diff --git a/core/lib/Drupal/Core/Entity/EntityChangedInterface.php b/core/lib/Drupal/Core/Entity/EntityChangedInterface.php index 3013f11..f5ee395 100644 --- a/core/lib/Drupal/Core/Entity/EntityChangedInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityChangedInterface.php @@ -22,7 +22,7 @@ interface EntityChangedInterface { /** - * Gets the timestamp of the last entity change. + * Returns the timestamp of the last entity change. * * @return int * The timestamp of the last entity save operation. diff --git a/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManager.php b/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManager.php index c2a6fad..99aa59d 100644 --- a/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManager.php +++ b/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManager.php @@ -146,7 +146,7 @@ public function applyUpdates() { } /** - * Gets a list of changes to entity type and field storage definitions. + * Returns a list of changes to entity type and field storage definitions. * * @return array * An associative array keyed by entity type id of change descriptors. Every diff --git a/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManagerInterface.php b/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManagerInterface.php index 8eee170..25bbdad 100644 --- a/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManagerInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManagerInterface.php @@ -64,7 +64,7 @@ public function needsUpdates(); /** - * Gets a human readable summary of the detected changes. + * Returns a human readable summary of the detected changes. * * @return array * An associative array keyed by entity type id. Each entry is an array of diff --git a/core/lib/Drupal/Core/Entity/EntityDeleteFormTrait.php b/core/lib/Drupal/Core/Entity/EntityDeleteFormTrait.php index d35bcea..7e4ce04 100644 --- a/core/lib/Drupal/Core/Entity/EntityDeleteFormTrait.php +++ b/core/lib/Drupal/Core/Entity/EntityDeleteFormTrait.php @@ -22,7 +22,7 @@ use ConfigDependencyDeleteFormTrait; /** - * Gets the entity of this form. + * Returns the entity of this form. * * Provided by \Drupal\Core\Entity\EntityForm. * @@ -62,7 +62,7 @@ public function getConfirmText() { } /** - * Gets the message to display to the user after deleting the entity. + * Returns the message to display to the user after deleting the entity. * * @return string * The translated string of the deletion message. diff --git a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php index d5cda65..ca17e64 100644 --- a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php +++ b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php @@ -388,7 +388,7 @@ public function getHighestWeight() { } /** - * Gets the field definition of a field. + * Returns the field definition of a field. */ protected function getFieldDefinition($field_name) { $definitions = $this->getFieldDefinitions(); @@ -396,7 +396,7 @@ protected function getFieldDefinition($field_name) { } /** - * Gets the definitions of the fields that are candidate for display. + * Returns the definitions of the fields that are candidate for display. */ protected function getFieldDefinitions() { if (!isset($this->fieldDefinitions)) { diff --git a/core/lib/Drupal/Core/Entity/EntityDisplayModeInterface.php b/core/lib/Drupal/Core/Entity/EntityDisplayModeInterface.php index 2575346..0ed6b71 100644 --- a/core/lib/Drupal/Core/Entity/EntityDisplayModeInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityDisplayModeInterface.php @@ -15,7 +15,7 @@ interface EntityDisplayModeInterface extends ConfigEntityInterface { /** - * Gets the entity type this display mode is used for. + * Returns the entity type this display mode is used for. * * @return string * The entity type name. diff --git a/core/lib/Drupal/Core/Entity/EntityForm.php b/core/lib/Drupal/Core/Entity/EntityForm.php index 6d61d0c..fb015c7 100644 --- a/core/lib/Drupal/Core/Entity/EntityForm.php +++ b/core/lib/Drupal/Core/Entity/EntityForm.php @@ -129,7 +129,7 @@ protected function init(FormStateInterface $form_state) { } /** - * Gets the actual form array to be built. + * Returns the actual form array to be built. * * @see \Drupal\Core\Entity\EntityForm::processForm() * @see \Drupal\Core\Entity\EntityForm::afterBuild() diff --git a/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php b/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php index 3549f4c..889ed6b 100644 --- a/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php @@ -13,7 +13,7 @@ interface EntityFormBuilderInterface { /** - * Gets the built and processed entity form for the given entity. + * Returns the built and processed entity form for the given entity. * * @param \Drupal\Core\Entity\EntityInterface $entity * The entity to be created or edited. diff --git a/core/lib/Drupal/Core/Entity/EntityFormInterface.php b/core/lib/Drupal/Core/Entity/EntityFormInterface.php index 26ce909..29b248b 100644 --- a/core/lib/Drupal/Core/Entity/EntityFormInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityFormInterface.php @@ -29,7 +29,7 @@ public function setOperation($operation); /** - * Gets the operation identifying the form. + * Returns the operation identifying the form. * * @return string * The name of the operation. @@ -37,7 +37,7 @@ public function setOperation($operation); public function getOperation(); /** - * Gets the form entity. + * Returns the form entity. * * The form entity which has been used for populating form element defaults. * diff --git a/core/lib/Drupal/Core/Entity/EntityHandlerBase.php b/core/lib/Drupal/Core/Entity/EntityHandlerBase.php index c325542..541fc51 100644 --- a/core/lib/Drupal/Core/Entity/EntityHandlerBase.php +++ b/core/lib/Drupal/Core/Entity/EntityHandlerBase.php @@ -28,7 +28,7 @@ protected $moduleHandler; /** - * Gets the module handler. + * Returns the module handler. * * @return \Drupal\Core\Extension\ModuleHandlerInterface * The module handler. diff --git a/core/lib/Drupal/Core/Entity/EntityInterface.php b/core/lib/Drupal/Core/Entity/EntityInterface.php index 284b396..7b5ebc7 100644 --- a/core/lib/Drupal/Core/Entity/EntityInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityInterface.php @@ -18,7 +18,7 @@ interface EntityInterface extends AccessibleInterface, CacheableDependencyInterface { /** - * Gets the entity UUID (Universally Unique Identifier). + * Returns the entity UUID (Universally Unique Identifier). * * The UUID is guaranteed to be unique and can be used to identify an entity * across multiple systems. @@ -29,7 +29,7 @@ public function uuid(); /** - * Gets the identifier. + * Returns the identifier. * * @return string|int|null * The entity identifier, or NULL if the object does not yet have an @@ -38,7 +38,7 @@ public function uuid(); public function id(); /** - * Gets the language of the entity. + * Returns the language of the entity. * * @return \Drupal\Core\Language\LanguageInterface * The language object. @@ -46,7 +46,7 @@ public function id(); public function language(); /** - * Determines whether the entity is new. + * Returns whether the entity is new. * * Usually an entity is new if no ID exists for it yet. However, entities may * be enforced to be new with existing IDs too. @@ -75,7 +75,7 @@ public function isNew(); public function enforceIsNew($value = TRUE); /** - * Gets the ID of the type of the entity. + * Returns the ID of the type of the entity. * * @return string * The entity type ID. @@ -83,7 +83,7 @@ public function enforceIsNew($value = TRUE); public function getEntityTypeId(); /** - * Gets the bundle of the entity. + * Returns the bundle of the entity. * * @return string * The bundle of the entity. Defaults to the entity type ID if the entity @@ -92,7 +92,7 @@ public function getEntityTypeId(); public function bundle(); /** - * Gets the label of the entity. + * Returns the label of the entity. * * @return string|null * The label of the entity, or NULL if there is no label defined. @@ -100,7 +100,7 @@ public function bundle(); public function label(); /** - * Gets the URI elements of the entity. + * Returns the URI elements of the entity. * * URI templates might be set in the links array in an annotation, for * example: @@ -131,7 +131,7 @@ public function label(); public function urlInfo($rel = 'canonical', array $options = array()); /** - * Gets the public URL for this entity. + * Returns the public URL for this entity. * * @param string $rel * The link relationship type, for example: canonical or edit-form. @@ -162,7 +162,7 @@ public function url($rel = 'canonical', $options = array()); public function link($text = NULL, $rel = 'canonical', array $options = []); /** - * Gets the internal path for this entity. + * Returns the internal path for this entity. * * self::url() will return the full path including any prefixes, fragments, or * query strings. This path does not include those. @@ -190,7 +190,7 @@ public function getSystemPath($rel = 'canonical'); public function hasLinkTemplate($key); /** - * Gets a list of URI relationships supported by this entity. + * Returns a list of URI relationships supported by this entity. * * @return string[] * An array of link relationships supported by this entity. @@ -341,7 +341,7 @@ public static function postLoad(EntityStorageInterface $storage, array &$entitie public function createDuplicate(); /** - * Gets the entity type definition. + * Returns the entity type definition. * * @return \Drupal\Core\Entity\EntityTypeInterface * The entity type definition. @@ -349,7 +349,7 @@ public function createDuplicate(); public function getEntityType(); /** - * Gets a list of entities referenced by this entity. + * Returns a list of entities referenced by this entity. * * @return \Drupal\Core\Entity\EntityInterface[] * An array of entities. @@ -357,7 +357,7 @@ public function getEntityType(); public function referencedEntities(); /** - * Gets the original ID. + * Returns the original ID. * * @return int|string|null * The original ID, or NULL if no ID was set or for entity types that do not @@ -377,7 +377,7 @@ public function getOriginalId(); public function setOriginalId($id); /** - * Gets an array of all property values. + * Returns an array of all property values. * * @return mixed[] * An array of property values, keyed by property name. @@ -385,7 +385,7 @@ public function setOriginalId($id); public function toArray(); /** - * Gets a typed data object for this entity object. + * Returns a typed data object for this entity object. * * The returned typed data object wraps this entity and allows dealing with * entities based on the generic typed data API. diff --git a/core/lib/Drupal/Core/Entity/EntityListBuilder.php b/core/lib/Drupal/Core/Entity/EntityListBuilder.php index dbc77c9..22322f8 100644 --- a/core/lib/Drupal/Core/Entity/EntityListBuilder.php +++ b/core/lib/Drupal/Core/Entity/EntityListBuilder.php @@ -101,7 +101,7 @@ protected function getEntityIds() { } /** - * Gets the escaped label of an entity. + * Returns the escaped label of an entity. * * @param \Drupal\Core\Entity\EntityInterface $entity * The entity being listed. @@ -234,7 +234,7 @@ public function render() { } /** - * Gets the title of the page. + * Returns the title of the page. * * @return string * A string title of the page. diff --git a/core/lib/Drupal/Core/Entity/EntityListBuilderInterface.php b/core/lib/Drupal/Core/Entity/EntityListBuilderInterface.php index 67e65a3..fce074c 100644 --- a/core/lib/Drupal/Core/Entity/EntityListBuilderInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityListBuilderInterface.php @@ -48,7 +48,7 @@ public function load(); public function getOperations(EntityInterface $entity); /** - * Builds a listing of entities for the given entity type. + * Returns a listing of entities for the given entity type. * * @return array * A render array as expected by drupal_render(). diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php index a49377f..ae6009d 100644 --- a/core/lib/Drupal/Core/Entity/EntityManager.php +++ b/core/lib/Drupal/Core/Entity/EntityManager.php @@ -913,7 +913,7 @@ public function getFormModes($entity_type_id) { } /** - * Gets the entity display mode info for all entity types. + * Returns the entity display mode info for all entity types. * * @param string $display_type * The display type to be retrieved. It can be "view_mode" or "form_mode". @@ -944,7 +944,7 @@ protected function getAllDisplayModesByEntityType($display_type) { } /** - * Gets the entity display mode info for a specific entity type. + * Returns the entity display mode info for a specific entity type. * * @param string $display_type * The display type to be retrieved. It can be "view_mode" or "form_mode". @@ -982,7 +982,7 @@ public function getFormModeOptions($entity_type, $include_disabled = FALSE) { } /** - * Gets an array of display mode options. + * Returns an array of display mode options. * * @param string $display_type * The display type to be retrieved. It can be "view_mode" or "form_mode". diff --git a/core/lib/Drupal/Core/Entity/EntityManagerInterface.php b/core/lib/Drupal/Core/Entity/EntityManagerInterface.php index d75e28f..b3bda8b 100644 --- a/core/lib/Drupal/Core/Entity/EntityManagerInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityManagerInterface.php @@ -118,7 +118,7 @@ public function getFieldStorageDefinitions($entity_type_id); public function getLastInstalledFieldStorageDefinitions($entity_type_id); /** - * Gets a lightweight map of fields across bundles. + * Returns a lightweight map of fields across bundles. * * @return array * An array keyed by entity type. Each value is an array which keys are @@ -129,7 +129,7 @@ public function getLastInstalledFieldStorageDefinitions($entity_type_id); public function getFieldMap(); /** - * Gets a lightweight map of fields across bundles filtered by field type. + * Returns a lightweight map of fields across bundles filtered by field type. * * @param string $field_type * The field type to filter by. @@ -280,7 +280,7 @@ public function getHandler($entity_type, $handler_type); public function createHandlerInstance($class, EntityTypeInterface $definition = null); /** - * Gets the bundle info of an entity type. + * Get the bundle info of an entity type. * * @param string $entity_type * The entity type. @@ -291,7 +291,7 @@ public function createHandlerInstance($class, EntityTypeInterface $definition = public function getBundleInfo($entity_type); /** - * Gets the "extra fields" for a bundle. + * Retrieves the "extra fields" for a bundle. * * @param string $entity_type_id * The entity type ID. @@ -320,7 +320,7 @@ public function getBundleInfo($entity_type); public function getExtraFields($entity_type_id, $bundle); /** - * Gets the entity translation to be used in the given context. + * Returns the entity translation to be used in the given context. * * This will check whether a translation for the desired language is available * and if not, it will fall back to the most appropriate translation based on @@ -350,7 +350,7 @@ public function getTranslationFromContext(EntityInterface $entity, $langcode = N public function getDefinition($entity_type_id, $exception_on_invalid = TRUE); /** - * Gets the entity type definition in its most recently installed state. + * Returns the entity type definition in its most recently installed state. * * During the application lifetime, entity type definitions can change. For * example, updated code can be deployed. The getDefinition() method will @@ -389,7 +389,7 @@ public function getLastInstalledDefinition($entity_type_id); public function getDefinitions(); /** - * Gets the entity view mode info for all entity types. + * Returns the entity view mode info for all entity types. * * @return array * The view mode info for all entity types. @@ -397,7 +397,7 @@ public function getDefinitions(); public function getAllViewModes(); /** - * Gets the entity view mode info for a specific entity type. + * Returns the entity view mode info for a specific entity type. * * @param string $entity_type_id * The entity type whose view mode info should be returned. @@ -408,7 +408,7 @@ public function getAllViewModes(); public function getViewModes($entity_type_id); /** - * Gets the entity form mode info for all entity types. + * Returns the entity form mode info for all entity types. * * @return array * The form mode info for all entity types. @@ -416,7 +416,7 @@ public function getViewModes($entity_type_id); public function getAllFormModes(); /** - * Gets the entity form mode info for a specific entity type. + * Returns the entity form mode info for a specific entity type. * * @param string $entity_type_id * The entity type whose form mode info should be returned. @@ -427,7 +427,7 @@ public function getAllFormModes(); public function getFormModes($entity_type_id); /** - * Gets an array of view mode options. + * Returns an array of view mode options. * * @param string $entity_type_id * The entity type whose view mode options should be returned. @@ -440,7 +440,7 @@ public function getFormModes($entity_type_id); public function getViewModeOptions($entity_type_id, $include_disabled = FALSE); /** - * Gets an array of form mode options. + * Returns an array of form mode options. * * @param string $entity_type_id * The entity type whose form mode options should be returned. @@ -492,7 +492,7 @@ public function loadEntityByUuid($entity_type_id, $uuid); public function loadEntityByConfigTarget($entity_type_id, $target); /** - * Gets the entity type ID based on the class that is called on. + * Returns the entity type ID based on the class that is called on. * * Compares the class this is called on against the known entity classes * and returns the entity type ID of a direct match or a subclass as fallback, diff --git a/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionInterface.php b/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionInterface.php index 65d86c9..fb4ea5d 100644 --- a/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionInterface.php @@ -23,7 +23,7 @@ interface SelectionInterface extends PluginFormInterface { /** - * Gets the list of referenceable entities. + * Returns a list of referenceable entities. * * @return array * A nested array of entities, the first level is keyed by the diff --git a/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionPluginManagerInterface.php b/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionPluginManagerInterface.php index a318611..278e3c4 100644 --- a/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionPluginManagerInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionPluginManagerInterface.php @@ -30,7 +30,7 @@ public function getPluginId($target_type, $base_plugin_id); /** - * Gets the selection plugins that can reference a specific entity type. + * Returns selection plugins that can reference a specific entity type. * * @param string $entity_type_id * A Drupal entity type ID. diff --git a/core/lib/Drupal/Core/Entity/EntityResolverManager.php b/core/lib/Drupal/Core/Entity/EntityResolverManager.php index cadd158..36a0abf 100644 --- a/core/lib/Drupal/Core/Entity/EntityResolverManager.php +++ b/core/lib/Drupal/Core/Entity/EntityResolverManager.php @@ -217,7 +217,7 @@ public function setRouteOptions(Route $route) { } /** - * Gets the list of all entity types. + * Returns a list of all entity types. * * @return \Drupal\Core\Entity\EntityTypeInterface[] */ diff --git a/core/lib/Drupal/Core/Entity/EntityStorageInterface.php b/core/lib/Drupal/Core/Entity/EntityStorageInterface.php index 98cd4b4..17a264b 100644 --- a/core/lib/Drupal/Core/Entity/EntityStorageInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityStorageInterface.php @@ -148,7 +148,7 @@ public function delete(array $entities); public function save(EntityInterface $entity); /** - * Gets an entity query instance. + * Returns an entity query instance. * * @param string $conjunction * (optional) The logical operator for the query, either: @@ -163,7 +163,7 @@ public function save(EntityInterface $entity); public function getQuery($conjunction = 'AND'); /** - * Gets an aggregated query instance. + * Returns an aggregated query instance. * * @param string $conjunction * (optional) The logical operator for the query, either: @@ -178,7 +178,7 @@ public function getQuery($conjunction = 'AND'); public function getAggregateQuery($conjunction = 'AND'); /** - * Gets the entity type ID. + * Returns the entity type ID. * * @return string * The entity type ID. @@ -186,7 +186,7 @@ public function getAggregateQuery($conjunction = 'AND'); public function getEntityTypeId(); /** - * Gets the entity type definition. + * Returns the entity type definition. * * @return \Drupal\Core\Entity\EntityTypeInterface * Entity type definition. diff --git a/core/lib/Drupal/Core/Entity/EntityTypeEventSubscriberTrait.php b/core/lib/Drupal/Core/Entity/EntityTypeEventSubscriberTrait.php index f63bc8f..1324d3a 100644 --- a/core/lib/Drupal/Core/Entity/EntityTypeEventSubscriberTrait.php +++ b/core/lib/Drupal/Core/Entity/EntityTypeEventSubscriberTrait.php @@ -19,7 +19,7 @@ trait EntityTypeEventSubscriberTrait { /** - * Gets the subscribed events. + * Returns the subscribed events. * * @return array * An array of subscribed event names. diff --git a/core/lib/Drupal/Core/Entity/EntityTypeInterface.php b/core/lib/Drupal/Core/Entity/EntityTypeInterface.php index 46c2058..5963b37 100644 --- a/core/lib/Drupal/Core/Entity/EntityTypeInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityTypeInterface.php @@ -51,7 +51,7 @@ public function get($property); public function set($property, $value); /** - * Gets the unique identifier of the entity type. + * Returns the unique identifier of the entity type. * * @return string * The unique identifier of the entity type. @@ -59,7 +59,7 @@ public function set($property, $value); public function id(); /** - * Gets the name of the provider of this entity type. + * Returns the name of the provider of this entity type. * * @return string * The name of the provider of this entity type. @@ -67,7 +67,7 @@ public function id(); public function getProvider(); /** - * Gets the name of the entity type class. + * Returns the name of the entity type class. * * @return string * The name of the entity type class. @@ -75,7 +75,7 @@ public function getProvider(); public function getClass(); /** - * Gets the name of the original entity type class. + * Returns the name of the original entity type class. * * In case the class name was changed with setClass(), this will return * the initial value. Useful when trying to identify the entity type ID based @@ -87,7 +87,7 @@ public function getClass(); public function getOriginalClass(); /** - * Gets an array of entity keys. + * Returns an array of entity keys. * * @return array * An array describing how the Field API can extract certain information @@ -120,7 +120,7 @@ public function getOriginalClass(); public function getKeys(); /** - * Gets a specific entity key. + * Returns a specific entity key. * * @param string $key * The name of the entity key to return. @@ -203,7 +203,7 @@ public function hasHandlerClass($handler_type, $nested = FALSE); public function getHandlerClass($handler_type); /** - * Gets an array of handlers. + * Returns an array of handlers. * * @return array * An associative array where the keys are the names of different handler @@ -233,7 +233,7 @@ public function getHandlerClass($handler_type); public function getHandlerClasses(); /** - * Gets the storage class. + * Returns the storage class. * * @return string * The class for this entity type's storage. @@ -251,7 +251,7 @@ public function getStorageClass(); public function setStorageClass($class); /** - * Gets the form class for a specific operation. + * Returns the form class for a specific operation. * * @param string $operation * The name of the operation to use, e.g., 'default'. @@ -303,7 +303,7 @@ public function hasRouteProviders(); public function getRouteProviderClasses(); /** - * Gets the list class. + * Returns the list class. * * @return string * The class for this entity type's list. @@ -329,7 +329,7 @@ public function setListBuilderClass($class); public function hasListBuilderClass(); /** - * Gets the view builder class. + * Returns the view builder class. * * @return string * The class for this entity type's view builder. @@ -337,7 +337,7 @@ public function hasListBuilderClass(); public function getViewBuilderClass(); /** - * Gets the view builder class. + * Returns the view builder class. * * @param string $class * The class for this entity type's view builder. @@ -355,7 +355,7 @@ public function setViewBuilderClass($class); public function hasViewBuilderClass(); /** - * Gets the access control class. + * Returns the access control class. * * @return string * The class for this entity type's access control. @@ -363,7 +363,7 @@ public function hasViewBuilderClass(); public function getAccessControlClass(); /** - * Gets the access class. + * Returns the access class. * * @param string $class * The class for this entity type's access. @@ -396,7 +396,7 @@ public function isSubclassOf($class); public function setHandlerClass($handler_type, $value); /** - * Gets the name of the default administrative permission. + * Returns the name of the default administrative permission. * * The default \Drupal\Core\Entity\EntityAccessControlHandler class checks this * permission for all operations in its checkAccess() method. Entities with @@ -408,7 +408,7 @@ public function setHandlerClass($handler_type, $value); public function getAdminPermission(); /** - * Gets the permission granularity level. + * Returns the permission granularity level. * * The allowed values are respectively "entity_type" or "bundle". * @@ -419,7 +419,7 @@ public function getAdminPermission(); public function getPermissionGranularity(); /** - * Gets the link templates using the URI template syntax. + * Returns link templates using the URI template syntax. * * Links are an array of standard link relations to the URI template that * should be used for them. Where possible, link relationships should use @@ -449,7 +449,7 @@ public function getPermissionGranularity(); public function getLinkTemplates(); /** - * Gets the link template for a given key. + * Returns the link template for a given key. * * @param string $key * The link type. @@ -523,14 +523,14 @@ public function setLabelCallback($callback); public function hasLabelCallback(); /** - * Gets the name of the entity type which provides bundles. + * Returns the name of the entity type which provides bundles. * * @return string */ public function getBundleEntityType(); /** - * Gets the entity type for which this entity provides bundles. + * Returns the entity type for which this entity provides bundles. * * It can be used by other modules to act accordingly; for example, * the Field UI module uses it to add operation links to manage fields and @@ -543,7 +543,7 @@ public function getBundleEntityType(); public function getBundleOf(); /** - * Gets the label for the bundle. + * Returns the label for the bundle. * * @return string|null * The bundle label, or NULL if none exists. @@ -551,7 +551,7 @@ public function getBundleOf(); public function getBundleLabel(); /** - * Gets the name of the entity's base table. + * Returns the name of the entity's base table. * * @todo Used by SqlContentEntityStorage only. * @@ -578,7 +578,7 @@ public function isTranslatable(); public function isRevisionable(); /** - * Gets the name of the entity's revision data table. + * Returns the name of the entity's revision data table. * * @todo Used by SqlContentEntityStorage only. * @@ -589,7 +589,7 @@ public function isRevisionable(); public function getRevisionDataTable(); /** - * Gets the name of the entity's revision table. + * Returns the name of the entity's revision table. * * @todo Used by SqlContentEntityStorage only. * @@ -599,7 +599,7 @@ public function getRevisionDataTable(); public function getRevisionTable(); /** - * Gets the name of the entity's data table. + * Returns the name of the entity's data table. * * @todo Used by SqlContentEntityStorage only. * @@ -609,7 +609,7 @@ public function getRevisionTable(); public function getDataTable(); /** - * Gets the human-readable name of the entity type. + * Returns the human-readable name of the entity type. * * @return string * The human-readable name of the entity type. @@ -617,7 +617,7 @@ public function getDataTable(); public function getLabel(); /** - * Gets the lowercase form of the human-readable entity type name. + * Returns the lowercase form of the human-readable entity type name. * * @return string * The lowercase form of the human-readable entity type name. @@ -625,7 +625,7 @@ public function getLabel(); public function getLowercaseLabel(); /** - * Gets a callable that can be used to provide the entity URI. + * Returns a callable that can be used to provide the entity URI. * * This is only called if there is no matching link template for the link * relationship type, and there is no bundle-specific callback provided. @@ -684,7 +684,7 @@ public function getConfigDependencyKey(); public function isCommonReferenceTarget(); /** - * Gets an array of validation constraints. + * Returns an array of validation constraints. * * See \Drupal\Core\TypedData\DataDefinitionInterface::getConstraints() for * details on how constraints are defined. diff --git a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php index e9fdb13..6d2caf7 100644 --- a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php +++ b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php @@ -378,7 +378,7 @@ public function resetCache(array $entities = NULL) { } /** - * Determines whether the view mode is cacheable. + * Returns TRUE if the view mode is cacheable. * * @param string $view_mode * Name of the view mode that should be rendered. @@ -437,7 +437,7 @@ public function viewFieldItem(FieldItemInterface $item, $display = array()) { } /** - * Gets an EntityViewDisplay for rendering an individual field. + * Returns an EntityViewDisplay for rendering an individual field. * * @param \Drupal\Core\Entity\EntityInterface $entity * The entity. diff --git a/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php b/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php index 0549060..c3e167a 100644 --- a/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php @@ -36,7 +36,7 @@ public function buildComponents(array &$build, array $entities, array $displays, $view_mode, $langcode = NULL); /** - * Builds the render array for the provided entity. + * Returns the render array for the provided entity. * * @param \Drupal\Core\Entity\EntityInterface $entity * The entity to render. @@ -58,7 +58,7 @@ public function buildComponents(array &$build, array $entities, array $displays, public function view(EntityInterface $entity, $view_mode = 'full', $langcode = NULL); /** - * Builds the render array for the provided entities. + * Returns the render array for the provided entities. * * @param array $entities * An array of entities implementing EntityInterface to view. @@ -89,7 +89,7 @@ public function viewMultiple(array $entities = array(), $view_mode = 'full', $la public function resetCache(array $entities = NULL); /** - * Builds a renderable array for the value of a single field in an entity. + * Returns a renderable array for the value of a single field in an entity. * * The resulting output is a fully themed field with label and multiple * values. @@ -133,7 +133,7 @@ public function resetCache(array $entities = NULL); public function viewField(FieldItemListInterface $items, $display_options = array()); /** - * Builds a renderable array for a single field item. + * Returns a renderable array for a single field item. * * @param \Drupal\Core\Field\FieldItemInterface $item * FieldItem to be displayed. diff --git a/core/lib/Drupal/Core/Entity/EntityWithPluginCollectionInterface.php b/core/lib/Drupal/Core/Entity/EntityWithPluginCollectionInterface.php index 3cc13e0..dd92a5a 100644 --- a/core/lib/Drupal/Core/Entity/EntityWithPluginCollectionInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityWithPluginCollectionInterface.php @@ -17,7 +17,7 @@ interface EntityWithPluginCollectionInterface extends EntityInterface { /** - * Gets the plugin collections used by this entity. + * Returns the plugin collections used by this entity. * * @return \Drupal\Component\Plugin\LazyPluginCollection[] * An array of plugin collections, keyed by the property name they use to diff --git a/core/lib/Drupal/Core/Entity/FieldableEntityInterface.php b/core/lib/Drupal/Core/Entity/FieldableEntityInterface.php index 813a910..566f9b2 100644 --- a/core/lib/Drupal/Core/Entity/FieldableEntityInterface.php +++ b/core/lib/Drupal/Core/Entity/FieldableEntityInterface.php @@ -99,7 +99,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type); public static function bundleFieldDefinitions(EntityTypeInterface $entity_type, $bundle, array $base_field_definitions); /** - * Determines whether the entity has a field with the given name. + * Returns whether the entity has a field with the given name. * * @param string $field_name * The field name. @@ -131,7 +131,7 @@ public function getFieldDefinition($name); public function getFieldDefinitions(); /** - * Gets an array of all field values. + * Returns an array of all field values. * * Gets an array of plain field values, including only non-computed values. * Note that the structure varies by entity type and bundle. diff --git a/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityReference.php b/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityReference.php index 00590a5..0bf641d 100644 --- a/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityReference.php +++ b/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityReference.php @@ -46,7 +46,7 @@ class EntityReference extends DataReferenceBase { protected $id; /** - * Gets the definition of the referenced entity. + * Returns the definition of the referenced entity. * * @return \Drupal\Core\Entity\TypedData\EntityDataDefinitionInterface * The reference target's definition. diff --git a/core/lib/Drupal/Core/Entity/Query/QueryFactoryInterface.php b/core/lib/Drupal/Core/Entity/Query/QueryFactoryInterface.php index 7b57d7e..c42635c 100644 --- a/core/lib/Drupal/Core/Entity/Query/QueryFactoryInterface.php +++ b/core/lib/Drupal/Core/Entity/Query/QueryFactoryInterface.php @@ -27,7 +27,7 @@ public function get(EntityTypeInterface $entity_type, $conjunction); /** - * Instantiates an aggregation query object for a given entity type. + * Returns a aggregation query object for a given entity type. * * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type * The entity type definition. diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Query.php b/core/lib/Drupal/Core/Entity/Query/Sql/Query.php index 62e04f9..6269617 100644 --- a/core/lib/Drupal/Core/Entity/Query/Sql/Query.php +++ b/core/lib/Drupal/Core/Entity/Query/Sql/Query.php @@ -288,7 +288,7 @@ protected function getSqlField($field, $langcode) { } /** - * Determines whether the query requires GROUP BY and ORDER BY MIN/MAX. + * Returns whether the query requires GROUP BY and ORDER BY MIN/MAX. * * @return bool */ diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php index 98f4f84..31925b4 100644 --- a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php +++ b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php @@ -289,7 +289,7 @@ protected function addJoin($type, $table, $join_condition, $langcode) { } /** - * Gets the schema for the given table. + * Returns the schema for the given table. * * @param string $table * The table name. diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/TablesInterface.php b/core/lib/Drupal/Core/Entity/Query/Sql/TablesInterface.php index c805543..0301396 100644 --- a/core/lib/Drupal/Core/Entity/Query/Sql/TablesInterface.php +++ b/core/lib/Drupal/Core/Entity/Query/Sql/TablesInterface.php @@ -34,7 +34,7 @@ public function addField($field, $type, $langcode); /** - * Determines whether the given field is case sensitive. + * Returns whether the given field is case sensitive. * * This information can only be provided after it was added with addField(). * diff --git a/core/lib/Drupal/Core/Entity/RevisionableInterface.php b/core/lib/Drupal/Core/Entity/RevisionableInterface.php index f9433bc..312d975 100644 --- a/core/lib/Drupal/Core/Entity/RevisionableInterface.php +++ b/core/lib/Drupal/Core/Entity/RevisionableInterface.php @@ -13,7 +13,7 @@ interface RevisionableInterface { /** - * Determines whether a new revision should be created on save. + * Returns whether a new revision should be created on save. * * @return bool * TRUE if a new revision should be created. @@ -36,7 +36,7 @@ public function isNewRevision(); public function setNewRevision($value = TRUE); /** - * Gets the revision identifier of the entity. + * Returns the revision identifier of the entity. * * @return * The revision identifier of the entity, or NULL if the entity does not diff --git a/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php b/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php index ac12621..c51ef08 100644 --- a/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php +++ b/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php @@ -288,7 +288,7 @@ public function requiresDedicatedTableStorage(FieldStorageDefinitionInterface $s } /** - * Gets a list of dedicated table names for this mapping. + * Returns a list of dedicated table names for this mapping. * * @return string[] * An array of table names. diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php index f0a03f0..924f6a8 100644 --- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php +++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php @@ -216,7 +216,7 @@ protected function initTableLayout() { } /** - * Gets the base table name. + * Returns the base table name. * * @return string * The table name. @@ -226,7 +226,7 @@ public function getBaseTable() { } /** - * Gets the revision table name. + * Returns the revision table name. * * @return string|false * The table name or FALSE if it is not available. @@ -236,7 +236,7 @@ public function getRevisionTable() { } /** - * Gets the data table name. + * Returns the data table name. * * @return string|false * The table name or FALSE if it is not available. @@ -246,7 +246,7 @@ public function getDataTable() { } /** - * Gets the revision data table name. + * Returns the revision data table name. * * @return string|false * The table name or FALSE if it is not available. @@ -256,7 +256,7 @@ public function getRevisionDataTable() { } /** - * Gets the entity type's storage schema object. + * Returns the entity type's storage schema object. * * @return \Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema * The schema object. @@ -586,7 +586,7 @@ public function resetCache(array $ids = NULL) { } /** - * Builds the cache ID for the passed in entity ID. + * Returns the cache ID for the passed in entity ID. * * @param int $id * Entity ID for which the cache ID should be built. @@ -1781,7 +1781,7 @@ public function countFieldData($storage_definition, $as_bool = FALSE) { } /** - * Determines whether the passed field has been already deleted. + * Returns whether the passed field has been already deleted. * * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $storage_definition * The field storage definition. diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php index b81f705..b066969 100644 --- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php +++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php @@ -108,7 +108,7 @@ public function __construct(EntityManagerInterface $entity_manager, ContentEntit } /** - * Gets the keyvalue collection for tracking the installed schema. + * Returns the keyvalue collection for tracking the installed schema. * * @return \Drupal\Core\KeyValueStore\KeyValueStoreInterface * @@ -473,7 +473,7 @@ protected function checkEntityType(EntityTypeInterface $entity_type) { } /** - * Gets the entity schema for the specified entity type. + * Returns the entity schema for the specified entity type. * * Entity types may override this method in order to optimize the generated * schema of the entity tables. However, only cross-field optimizations should @@ -578,7 +578,7 @@ protected function getEntitySchemaTables() { } /** - * Gets entity schema definitions for index and key definitions. + * Returns entity schema definitions for index and key definitions. * * @param \Drupal\Core\Entity\ContentEntityTypeInterface $entity_type * The entity type definition. @@ -616,7 +616,7 @@ protected function getEntitySchemaData(ContentEntityTypeInterface $entity_type, } /** - * Gets an index schema array for a given field. + * Returns an index schema array for a given field. * * @param string $field_name * The name of the field. @@ -633,7 +633,7 @@ protected function getFieldIndexes($field_name, array $field_schema, array $colu } /** - * Gets a unique key schema array for a given field. + * Returns a unique key schema array for a given field. * * @param string $field_name * The name of the field. @@ -650,7 +650,7 @@ protected function getFieldUniqueKeys($field_name, array $field_schema, array $c } /** - * Gets field schema data for the given key. + * Returns field schema data for the given key. * * @param string $field_name * The name of the field. @@ -720,7 +720,7 @@ protected function getFieldSchemaIdentifierName($entity_type_id, $field_name, $k } /** - * Gets field foreign keys. + * Returns field foreign keys. * * @param string $field_name * The name of the field. @@ -1389,7 +1389,7 @@ protected function updateSharedTableSchema(FieldStorageDefinitionInterface $stor } /** - * Gets the schema for a single field definition. + * Returns the schema for a single field definition. * * Entity types may override this method in order to optimize the generated * schema for given field. While all optimizations that apply to a single @@ -1533,7 +1533,7 @@ protected function addSharedTableFieldForeignKey(FieldStorageDefinitionInterface } /** - * Gets the SQL schema for a dedicated table. + * Returns the SQL schema for a dedicated table. * * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $storage_definition * The field storage definition. @@ -1700,7 +1700,7 @@ protected function getDedicatedTableSchema(FieldStorageDefinitionInterface $stor } /** - * Gets the name to be used for the given entity index. + * Returns the name to be used for the given entity index. * * @param \Drupal\Core\Entity\ContentEntityTypeInterface $entity_type * The entity type. diff --git a/core/lib/Drupal/Core/Entity/Sql/TableMappingInterface.php b/core/lib/Drupal/Core/Entity/Sql/TableMappingInterface.php index 9d555a1..3c11df5 100644 --- a/core/lib/Drupal/Core/Entity/Sql/TableMappingInterface.php +++ b/core/lib/Drupal/Core/Entity/Sql/TableMappingInterface.php @@ -25,7 +25,7 @@ interface TableMappingInterface { /** - * Gets a list of table names for this mapping. + * Returns a list of table names for this mapping. * * @return string[] * An array of table names. @@ -33,7 +33,7 @@ public function getTableNames(); /** - * Gets a list of all database columns for a given table. + * Returns a list of all database columns for a given table. * * @param string $table_name * The name of the table to return the columns for. @@ -45,7 +45,7 @@ public function getTableNames(); public function getAllColumns($table_name); /** - * Gets a list of names of fields stored in the specified table. + * Returns a list of names of fields stored in the specified table. * * @param string $table_name * The name of the table to return the field names for. @@ -56,7 +56,7 @@ public function getAllColumns($table_name); public function getFieldNames($table_name); /** - * Gets a mapping of field columns to database columns for a given field. + * Returns a mapping of field columns to database columns for a given field. * * @param string $field_name * The name of the entity field to return the column mapping for. @@ -69,7 +69,7 @@ public function getFieldNames($table_name); public function getColumnNames($field_name); /** - * Gets a list of extra database columns, which store denormalized data. + * Returns a list of extra database columns, which store denormalized data. * * These database columns do not belong to any entity fields. Any normalized * data that is stored should be associated with an entity field. @@ -83,7 +83,7 @@ public function getColumnNames($field_name); public function getExtraColumns($table_name); /** - * Gets the list of columns that can not be used as field type columns. + * A list of columns that can not be used as field type columns. * * @return array */ @@ -104,7 +104,7 @@ public function getReservedColumns(); public function getFieldColumnName(FieldStorageDefinitionInterface $storage_definition, $property_name); /** - * Gets the table name for a given column. + * Returns the table name for a given column. * * @param string $field_name * The name of the entity field to return the column mapping for. diff --git a/core/lib/Drupal/Core/Entity/TypedData/EntityDataDefinitionInterface.php b/core/lib/Drupal/Core/Entity/TypedData/EntityDataDefinitionInterface.php index b597a47..4d0a6c7 100644 --- a/core/lib/Drupal/Core/Entity/TypedData/EntityDataDefinitionInterface.php +++ b/core/lib/Drupal/Core/Entity/TypedData/EntityDataDefinitionInterface.php @@ -15,7 +15,7 @@ interface EntityDataDefinitionInterface extends ComplexDataDefinitionInterface { /** - * Gets the entity type ID. + * Returns the entity type ID. * * @return string|null * The entity type ID, or NULL if the entity type is unknown. @@ -33,7 +33,7 @@ public function getEntityTypeId(); public function setEntityTypeId($entity_type_id); /** - * Gets the array of possible entity bundles. + * Returns the array of possible entity bundles. * * @return array|null * The array of possible bundles, or NULL for any. diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextareaWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextareaWidget.php index 44af9df..8658dd0 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextareaWidget.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextareaWidget.php @@ -78,7 +78,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen '#default_value' => $items[$delta]->value, '#rows' => $this->getSetting('rows'), '#placeholder' => $this->getSetting('placeholder'), - '#attributes' => array('class' => array('js-text-full', 'text-full')), + '#attributes' => array('class' => array('text-full')), ); return $element; diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextfieldWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextfieldWidget.php index 79bc044..0ed4239 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextfieldWidget.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextfieldWidget.php @@ -79,7 +79,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen '#size' => $this->getSetting('size'), '#placeholder' => $this->getSetting('placeholder'), '#maxlength' => $this->getFieldSetting('max_length'), - '#attributes' => array('class' => array('js-text-full', 'text-full')), + '#attributes' => array('class' => array('text-full')), ); return $element; diff --git a/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php b/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php index dc99483..c8ae6cb 100644 --- a/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php +++ b/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php @@ -44,7 +44,7 @@ public static function create(ContainerInterface $container) { /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'authorize_filetransfer_form'; } diff --git a/core/misc/tabledrag.js b/core/misc/tabledrag.js index 01d4654..61f8e29 100644 --- a/core/misc/tabledrag.js +++ b/core/misc/tabledrag.js @@ -1274,7 +1274,7 @@ return '*'; }, tableDragIndentation: function () { - return '
 
'; + return '
 
'; }, tableDragChangedWarning: function () { return ''; diff --git a/core/modules/block/tests/modules/block_test_views/block_test_views.info.yml b/core/modules/block/tests/modules/block_test_views/block_test_views.info.yml index 6e95c52..f7a32c0 100644 --- a/core/modules/block/tests/modules/block_test_views/block_test_views.info.yml +++ b/core/modules/block/tests/modules/block_test_views/block_test_views.info.yml @@ -1,7 +1,7 @@ name: 'Block test views' type: module description: 'Provides a view and block to test block displays in views.' -package: Testing +package: Core version: VERSION core: 8.x dependencies: diff --git a/core/modules/comment/src/Form/CommentAdminOverview.php b/core/modules/comment/src/Form/CommentAdminOverview.php index 0941c53..9205de8 100644 --- a/core/modules/comment/src/Form/CommentAdminOverview.php +++ b/core/modules/comment/src/Form/CommentAdminOverview.php @@ -85,7 +85,7 @@ public static function create(ContainerInterface $container) { /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'comment_admin_overview'; } diff --git a/core/modules/config/src/Form/ConfigSingleExportForm.php b/core/modules/config/src/Form/ConfigSingleExportForm.php index 440de7f..c95f0d8 100644 --- a/core/modules/config/src/Form/ConfigSingleExportForm.php +++ b/core/modules/config/src/Form/ConfigSingleExportForm.php @@ -68,7 +68,7 @@ public static function create(ContainerInterface $container) { /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'config_single_export_form'; } diff --git a/core/modules/config/src/Form/ConfigSingleImportForm.php b/core/modules/config/src/Form/ConfigSingleImportForm.php index 15f173d..84c19db 100644 --- a/core/modules/config/src/Form/ConfigSingleImportForm.php +++ b/core/modules/config/src/Form/ConfigSingleImportForm.php @@ -74,7 +74,7 @@ public static function create(ContainerInterface $container) { /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'config_single_import_form'; } diff --git a/core/modules/config_translation/src/Form/ConfigTranslationDeleteForm.php b/core/modules/config_translation/src/Form/ConfigTranslationDeleteForm.php index 0707a74..f603740 100644 --- a/core/modules/config_translation/src/Form/ConfigTranslationDeleteForm.php +++ b/core/modules/config_translation/src/Form/ConfigTranslationDeleteForm.php @@ -109,7 +109,7 @@ public function getCancelUrl() { /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'config_translation_delete_form'; } diff --git a/core/modules/dblog/src/Form/DblogClearLogForm.php b/core/modules/dblog/src/Form/DblogClearLogForm.php index 355a575..e647ca4 100644 --- a/core/modules/dblog/src/Form/DblogClearLogForm.php +++ b/core/modules/dblog/src/Form/DblogClearLogForm.php @@ -46,7 +46,7 @@ public static function create(ContainerInterface $container) { /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'dblog_clear_log_form'; } diff --git a/core/modules/dblog/src/Form/DblogFilterForm.php b/core/modules/dblog/src/Form/DblogFilterForm.php index 1795129..c18b2b3 100644 --- a/core/modules/dblog/src/Form/DblogFilterForm.php +++ b/core/modules/dblog/src/Form/DblogFilterForm.php @@ -18,7 +18,7 @@ class DblogFilterForm extends FormBase { /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'dblog_filter_form'; } diff --git a/core/modules/field_ui/src/Form/FieldStorageAddForm.php b/core/modules/field_ui/src/Form/FieldStorageAddForm.php index 5f087a6..b26c225 100644 --- a/core/modules/field_ui/src/Form/FieldStorageAddForm.php +++ b/core/modules/field_ui/src/Form/FieldStorageAddForm.php @@ -87,7 +87,7 @@ public function __construct(EntityManagerInterface $entity_manager, FieldTypePlu /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'field_ui_field_storage_add_form'; } diff --git a/core/modules/filter/templates/text-format-wrapper.html.twig b/core/modules/filter/templates/text-format-wrapper.html.twig index 367de09..ce3ba55 100644 --- a/core/modules/filter/templates/text-format-wrapper.html.twig +++ b/core/modules/filter/templates/text-format-wrapper.html.twig @@ -15,7 +15,7 @@ * @ingroup themeable */ #} -
+
{{ children }} {% if description %} {{ description }}
diff --git a/core/modules/language/src/Form/NegotiationConfigureForm.php b/core/modules/language/src/Form/NegotiationConfigureForm.php index da2574b..2b049fd 100644 --- a/core/modules/language/src/Form/NegotiationConfigureForm.php +++ b/core/modules/language/src/Form/NegotiationConfigureForm.php @@ -114,7 +114,7 @@ public static function create(ContainerInterface $container) { /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'language_negotiation_configure_form'; } diff --git a/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php b/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php index ceb6244..8dea61c 100644 --- a/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php +++ b/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php @@ -18,7 +18,7 @@ class LanguageConfigurationElement extends FormBase { /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'language_elements_configuration_element'; } diff --git a/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php b/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php index a3f1269..eda727a 100644 --- a/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php +++ b/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php @@ -17,7 +17,7 @@ class LanguageConfigurationElementTest extends FormBase { /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'language_elements_configuration_element_test'; } diff --git a/core/modules/locale/src/Form/ExportForm.php b/core/modules/locale/src/Form/ExportForm.php index db4ec70..035b2e8 100644 --- a/core/modules/locale/src/Form/ExportForm.php +++ b/core/modules/locale/src/Form/ExportForm.php @@ -50,7 +50,7 @@ public static function create(ContainerInterface $container) { /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'locale_translate_export_form'; } diff --git a/core/modules/locale/src/Form/ImportForm.php b/core/modules/locale/src/Form/ImportForm.php index 1728879..ca706ea 100644 --- a/core/modules/locale/src/Form/ImportForm.php +++ b/core/modules/locale/src/Form/ImportForm.php @@ -65,7 +65,7 @@ public function __construct(ModuleHandlerInterface $module_handler, Configurable /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'locale_translate_import_form'; } diff --git a/core/modules/locale/src/Form/TranslationStatusForm.php b/core/modules/locale/src/Form/TranslationStatusForm.php index 0b57ca6..c8338cd 100644 --- a/core/modules/locale/src/Form/TranslationStatusForm.php +++ b/core/modules/locale/src/Form/TranslationStatusForm.php @@ -59,7 +59,7 @@ public function __construct(ModuleHandlerInterface $module_handler, StateInterfa /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'locale_translation_status_form'; } diff --git a/core/modules/node/css/node.module.css b/core/modules/node/css/node.module.css index 397adb5..cc865b6 100644 --- a/core/modules/node/css/node.module.css +++ b/core/modules/node/css/node.module.css @@ -22,7 +22,6 @@ float: left; /* LTR */ width: 65%; padding-right: 2em; /* LTR */ - box-sizing: border-box; } [dir="rtl"] .layout-region-node-main, diff --git a/core/modules/node/css/node.preview.css b/core/modules/node/css/node.preview.css index 4847d3f..481a02e 100644 --- a/core/modules/node/css/node.preview.css +++ b/core/modules/node/css/node.preview.css @@ -8,7 +8,6 @@ z-index: 499; width: 100%; padding: 10px; - box-sizing: border-box; } @media only screen and (min-width: 36em) { @@ -17,6 +16,6 @@ } [dir="rtl"] .node-preview-container .form-type-select { margin-right: 25%; - margin-left: 0; + margin-left: 0%; } } diff --git a/core/modules/search/src/Form/SearchPageForm.php b/core/modules/search/src/Form/SearchPageForm.php index 1f8d017..29fb254 100644 --- a/core/modules/search/src/Form/SearchPageForm.php +++ b/core/modules/search/src/Form/SearchPageForm.php @@ -32,7 +32,7 @@ class SearchPageForm extends EntityForm { /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'search_form'; } diff --git a/core/modules/search/src/SearchPageListBuilder.php b/core/modules/search/src/SearchPageListBuilder.php index 55e3f97..7c3140c 100644 --- a/core/modules/search/src/SearchPageListBuilder.php +++ b/core/modules/search/src/SearchPageListBuilder.php @@ -80,7 +80,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'search_admin_settings'; } diff --git a/core/modules/search/tests/modules/search_embedded_form/src/Form/SearchEmbeddedForm.php b/core/modules/search/tests/modules/search_embedded_form/src/Form/SearchEmbeddedForm.php index bbfbe76..3bb04e0 100644 --- a/core/modules/search/tests/modules/search_embedded_form/src/Form/SearchEmbeddedForm.php +++ b/core/modules/search/tests/modules/search_embedded_form/src/Form/SearchEmbeddedForm.php @@ -18,7 +18,7 @@ class SearchEmbeddedForm extends FormBase { /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'search_embedded_form'; } diff --git a/core/modules/shortcut/src/Form/SwitchShortcutSet.php b/core/modules/shortcut/src/Form/SwitchShortcutSet.php index 5388db5..72f5160 100644 --- a/core/modules/shortcut/src/Form/SwitchShortcutSet.php +++ b/core/modules/shortcut/src/Form/SwitchShortcutSet.php @@ -57,7 +57,7 @@ public static function create(ContainerInterface $container) { /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'shortcut_set_switch'; } diff --git a/core/modules/system/css/system.module.css b/core/modules/system/css/system.module.css index b38c5e5..0359e4b 100644 --- a/core/modules/system/css/system.module.css +++ b/core/modules/system/css/system.module.css @@ -134,14 +134,14 @@ a.tabledrag-handle:focus .handle { .touch .draggable.drag a.tabledrag-handle .handle { background-position: 50% -32px; } -.indentation { +div.js-indentation { float: left; /* LTR */ height: 1.7em; margin: -0.4em 0.2em -0.4em -0.4em; /* LTR */ padding: 0.42em 0 0.42em 0.6em; /* LTR */ width: 20px; } -[dir="rtl"] .indentation { +[dir="rtl"] div.js-indentation { float: right; margin: -0.4em -0.4em -0.4em 0.2em; padding: 0.42em 0.6em 0.42em 0; diff --git a/core/modules/system/src/Form/ThemeAdminForm.php b/core/modules/system/src/Form/ThemeAdminForm.php index ed00639..27f8098 100644 --- a/core/modules/system/src/Form/ThemeAdminForm.php +++ b/core/modules/system/src/Form/ThemeAdminForm.php @@ -17,7 +17,7 @@ class ThemeAdminForm extends ConfigFormBase { /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'system_themes_admin_form'; } diff --git a/core/modules/system/src/Tests/Common/AttachedAssetsTest.php b/core/modules/system/src/Tests/Common/AttachedAssetsTest.php index 21dc6b2..8c9c217 100644 --- a/core/modules/system/src/Tests/Common/AttachedAssetsTest.php +++ b/core/modules/system/src/Tests/Common/AttachedAssetsTest.php @@ -288,7 +288,7 @@ function testVersionQueryString() { $js = $this->assetResolver->getJsAssets($assets, FALSE)[1]; $js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js); $rendered_js = $this->renderer->render($js_render_array); - $this->assertTrue(strpos($rendered_js, 'core/assets/vendor/backbone/backbone-min.js?v=1.1.2') > 0 && strpos($rendered_js, 'core/assets/vendor/domready/ready.min.js?v=1.0.8') > 0 , 'JavaScript version identifiers correctly appended to URLs'); + $this->assertTrue(strpos($rendered_js, 'core/assets/vendor/backbone/backbone-min.js?v=1.1.2') > 0 && strpos($rendered_js, 'core/assets/vendor/domready/ready.min.js?v=1.0.7') > 0 , 'JavaScript version identifiers correctly appended to URLs'); } /** diff --git a/core/modules/system/templates/indentation.html.twig b/core/modules/system/templates/indentation.html.twig index e07e3c1..e5e7b32 100644 --- a/core/modules/system/templates/indentation.html.twig +++ b/core/modules/system/templates/indentation.html.twig @@ -17,4 +17,4 @@ See https://api.drupal.org/api/function/theme_indentation/8 for details. After copying this file to your theme's folder and customizing it, remove this HTML comment. --> -{% for i in 1..size if size > 0 %}
 
{% endfor %} +{% for i in 1..size if size > 0 %}
 
{% endfor %} diff --git a/core/modules/system/tests/modules/session_test/src/Form/SessionTestForm.php b/core/modules/system/tests/modules/session_test/src/Form/SessionTestForm.php index 1de250a..6c6706f 100644 --- a/core/modules/system/tests/modules/session_test/src/Form/SessionTestForm.php +++ b/core/modules/system/tests/modules/session_test/src/Form/SessionTestForm.php @@ -19,7 +19,7 @@ class SessionTestForm extends FormBase { /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'session_test_form'; } diff --git a/core/modules/taxonomy/src/Tests/TaxonomyTermIndentationTest.php b/core/modules/taxonomy/src/Tests/TaxonomyTermIndentationTest.php index 3ff4d76..d6e1e28 100644 --- a/core/modules/taxonomy/src/Tests/TaxonomyTermIndentationTest.php +++ b/core/modules/taxonomy/src/Tests/TaxonomyTermIndentationTest.php @@ -53,7 +53,7 @@ function testTermIndentation() { // Submit the edited form and check for HTML indentation element presence. $this->drupalPostForm('admin/structure/taxonomy/manage/' . $this->vocabulary->get('vid') . '/overview', $edit, t('Save')); - $this->assertPattern('|
 
|'); + $this->assertPattern('|
 
|'); // Check explicitly that term 2's parent is term 1. $parents = taxonomy_term_load_parents($term2->id()); @@ -69,7 +69,7 @@ function testTermIndentation() { $this->drupalPostForm('admin/structure/taxonomy/manage/' . $this->vocabulary->get('vid' ) . '/overview', $edit, t('Save')); // All terms back at the root level, no indentation should be present. - $this->assertNoPattern('|
 
|'); + $this->assertNoPattern('|
 
|'); // Check explicitly that term 2 has no parents. \Drupal::entityManager()->getStorage('taxonomy_term')->resetCache(); diff --git a/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWithSummaryWidget.php b/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWithSummaryWidget.php index c6bef4f..ba8c875 100644 --- a/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWithSummaryWidget.php +++ b/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWithSummaryWidget.php @@ -78,8 +78,8 @@ function formElement(FieldItemListInterface $items, $delta, array $element, arra '#attached' => array( 'library' => array('text/drupal.text'), ), - '#attributes' => array('class' => array('js-text-summary', 'text-summary')), - '#prefix' => '
', + '#attributes' => array('class' => array('text-summary')), + '#prefix' => '
', '#suffix' => '
', '#weight' => -10, ); diff --git a/core/modules/text/text.js b/core/modules/text/text.js index 7360e44..2ab1d0a 100644 --- a/core/modules/text/text.js +++ b/core/modules/text/text.js @@ -7,12 +7,12 @@ */ Drupal.behaviors.textSummary = { attach: function (context, settings) { - $(context).find('.js-text-summary').once('text-summary').each(function () { - var $widget = $(this).closest('.js-text-format-wrapper'); + $(context).find('.text-summary').once('text-summary').each(function () { + var $widget = $(this).closest('.text-format-wrapper'); - var $summary = $widget.find('.js-text-summary-wrapper'); + var $summary = $widget.find('.text-summary-wrapper'); var $summaryLabel = $summary.find('label').eq(0); - var $full = $widget.find('.js-text-full').closest('.form-item'); + var $full = $widget.find('.text-full').closest('.form-item'); var $fullLabel = $full.find('label').eq(0); // Create a placeholder label when the field cardinality is greater @@ -41,7 +41,7 @@ }).appendTo($summaryLabel); // If no summary is set, hide the summary field. - if ($widget.find('.js-text-summary').val() === '') { + if ($widget.find('.text-summary').val() === '') { $link.trigger('click'); } }); diff --git a/core/modules/tour/tests/tour_test/tour_test.info.yml b/core/modules/tour/tests/tour_test/tour_test.info.yml index 7b31a6f..e55953a 100644 --- a/core/modules/tour/tests/tour_test/tour_test.info.yml +++ b/core/modules/tour/tests/tour_test/tour_test.info.yml @@ -1,7 +1,7 @@ name: Tour module tests type: module description: Tests module for tour module. -package: Testing +package: Core version: VERSION core: 8.x dependencies: diff --git a/core/modules/tracker/config/optional/views.view.tracker.yml b/core/modules/tracker/config/optional/views.view.tracker.yml new file mode 100644 index 0000000..a4ba16a --- /dev/null +++ b/core/modules/tracker/config/optional/views.view.tracker.yml @@ -0,0 +1,872 @@ +langcode: en +status: true +dependencies: + module: + - comment + - history + - node + - tracker + - user +id: tracker +label: Tracker +module: tracker +description: 'Shows all new activity on the system.' +tag: default +base_table: node_field_data +base_field: nid +core: '8' +display: + default: + id: default + display_title: Master + display_plugin: default + position: 0 + display_options: + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + title: 'Recent content' + access: + type: perm + options: + perm: 'access content' + cache: + type: none + options: { } + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + pager: + type: mini + options: + items_per_page: 25 + offset: 0 + id: 0 + total_pages: null + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 20, 40, 60' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + tags: + previous: ‹‹ + next: ›› + relationships: + uid: + id: uid + table: node_field_data + field: uid + plugin_id: standard + relationship: none + group_type: group + admin_label: author + required: false + fields: + type: + id: type + table: node_field_data + field: type + relationship: none + group_type: group + admin_label: '' + label: Type + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: target_id + type: entity_reference_label + settings: + link: true + group_column: target_id + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + entity_type: node + entity_field: type + plugin_id: field + title: + id: title + table: node_field_data + field: title + relationship: none + group_type: group + admin_label: '' + label: Title + exclude: true + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: true + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + entity_type: node + entity_field: title + plugin_id: field + timestamp: + id: timestamp + table: history + field: timestamp + relationship: none + group_type: group + admin_label: '' + label: 'Has new content' + exclude: true + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: null + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + plugin_id: history_user_timestamp + nothing: + id: nothing + table: views + field: nothing + relationship: none + group_type: group + admin_label: '' + label: Title + exclude: false + alter: + alter_text: true + text: '{{ title }} {{ timestamp }}' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: null + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: false + plugin_id: custom + name: + id: name + table: users_field_data + field: name + relationship: uid + group_type: group + admin_label: '' + label: '' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: user_name + settings: + link_to_entity: true + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + entity_type: user + entity_field: name + plugin_id: field + comment_count: + id: comment_count + table: comment_entity_statistics + field: comment_count + relationship: none + group_type: group + admin_label: '' + label: 'Comment count' + exclude: true + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + set_precision: false + precision: 0 + decimal: . + separator: ',' + format_plural: false + format_plural_string: "1\x03@count" + prefix: '' + suffix: '' + plugin_id: numeric + new_comments: + id: new_comments + table: node + field: new_comments + relationship: none + group_type: group + admin_label: '' + label: 'New comments' + exclude: true + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + set_precision: false + precision: 0 + decimal: . + separator: ',' + format_plural: false + format_plural_string: "1\x03@count" + prefix: '' + suffix: '' + link_to_comment: true + entity_type: node + plugin_id: node_new_comments + nothing_1: + id: nothing_1 + table: views + field: nothing + relationship: none + group_type: group + admin_label: '' + label: Replies + exclude: false + alter: + alter_text: true + text: '{{ comment_count }}
{{ new_comments }}' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: null + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: false + plugin_id: custom + last_comment_timestamp_1: + id: last_comment_timestamp_1 + table: comment_entity_statistics + field: last_comment_timestamp + relationship: none + group_type: group + admin_label: '' + label: 'Last updated' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: null + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + date_format: 'time ago' + custom_date_format: '' + timezone: '' + plugin_id: comment_last_timestamp + sorts: + last_comment_timestamp_1: + id: last_comment_timestamp_1 + table: comment_entity_statistics + field: last_comment_timestamp + relationship: none + group_type: group + admin_label: '' + order: ASC + exposed: false + expose: + label: '' + granularity: second + plugin_id: date + arguments: + uid_touch_tracker: + id: uid_touch_tracker + table: node_field_data + field: uid_touch_tracker + relationship: none + group_type: group + admin_label: '' + default_action: ignore + exception: + value: all + title_enable: false + title: All + title_enable: false + title: '' + default_argument_type: fixed + default_argument_options: + argument: '' + default_argument_skip_url: false + summary_options: + base_path: '' + count: true + items_per_page: 25 + override: false + summary: + sort_order: asc + number_of_records: 0 + format: default_summary + specify_validation: true + validate: + type: none + fail: 'not found' + validate_options: { } + plugin_id: tracker_user_uid + filters: + status: + id: status + table: node_field_data + field: status + value: true + group: 0 + expose: + operator: '0' + plugin_id: boolean + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + override: true + sticky: false + caption: '' + summary: '' + description: '' + columns: + type: type + title: title + name: name + comment_count_1: comment_count_1 + last_comment_timestamp_1: last_comment_timestamp_1 + timestamp: title + new_comments: new_comments + info: + type: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + title: + sortable: true + default_sort_order: asc + align: '' + separator: ' ' + empty_column: false + responsive: '' + name: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + comment_count_1: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + last_comment_timestamp_1: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + timestamp: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + new_comments: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + default: '-1' + empty_table: false + row: + type: fields + options: + inline: { } + separator: '' + hide_empty: false + default_field_elements: true + header: { } + footer: { } + empty: + area: + id: area + table: views + field: area + relationship: none + group_type: group + admin_label: '' + empty: true + tokenize: false + content: + value: '

No content available.

' + format: basic_html + plugin_id: text + display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - 'user.node_grants:view' + cacheable: false + page_1: + id: page_1 + display_title: Page + display_plugin: page + position: 1 + display_options: + query: + type: views_query + options: { } + path: activity + menu: + type: 'default tab' + title: 'Recent content' + description: '' + parent: contact.site_page + weight: 0 + context: '0' + menu_name: footer + tab_options: + type: none + title: 'Recent content' + description: '' + weight: 0 + display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - 'user.node_grants:view' + cacheable: false + page_2: + display_plugin: page + id: page_2 + display_title: 'Page 2' + position: 2 + display_options: + path: user/%user/activity + menu: + type: tab + title: Track + description: '' + menu_name: admin + weight: 0 + context: '0' + defaults: + access: true + arguments: false + arguments: + uid_touch_tracker: + id: uid_touch_tracker + table: node_field_data + field: uid_touch_tracker + relationship: none + group_type: group + admin_label: '' + default_action: ignore + exception: + value: all + title_enable: false + title: All + title_enable: true + title: '%1' + default_argument_type: fixed + default_argument_options: + argument: '' + default_argument_skip_url: false + summary_options: + base_path: '' + count: true + items_per_page: 25 + override: false + summary: + sort_order: asc + number_of_records: 0 + format: default_summary + specify_validation: true + validate: + type: none + fail: 'not found' + validate_options: { } + plugin_id: tracker_user_uid + display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - 'user.node_grants:view' + cacheable: false + page_3: + id: page_3 + display_title: 'Page 3' + display_plugin: page + position: 3 + display_options: + query: + type: views_query + options: { } + path: activity/%user + menu: + type: tab + title: 'Your recent content' + description: '' + parent: '' + weight: 0 + context: '0' + menu_name: main + tab_options: + type: normal + title: 'Recent content' + description: '' + menu_name: main + weight: 0 + display_description: '' + display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - 'user.node_grants:view' + cacheable: false diff --git a/core/modules/tracker/src/Controller/TrackerPage.php b/core/modules/tracker/src/Controller/TrackerPage.php deleted file mode 100644 index a9d667a..0000000 --- a/core/modules/tracker/src/Controller/TrackerPage.php +++ /dev/null @@ -1,24 +0,0 @@ -getUsername()); - } -} diff --git a/core/modules/tracker/src/Tests/TrackerNodeAccessTest.php b/core/modules/tracker/src/Tests/TrackerNodeAccessTest.php index 9a52768..3471603 100644 --- a/core/modules/tracker/src/Tests/TrackerNodeAccessTest.php +++ b/core/modules/tracker/src/Tests/TrackerNodeAccessTest.php @@ -26,7 +26,7 @@ class TrackerNodeAccessTest extends WebTestBase { * * @var array */ - public static $modules = array('node', 'comment', 'tracker', 'node_access_test'); + public static $modules = array('node', 'comment', 'tracker', 'history', 'node_access_test', 'views'); protected function setUp() { parent::setUp(); diff --git a/core/modules/tracker/src/Tests/TrackerTest.php b/core/modules/tracker/src/Tests/TrackerTest.php index a09eb5c..0463679 100644 --- a/core/modules/tracker/src/Tests/TrackerTest.php +++ b/core/modules/tracker/src/Tests/TrackerTest.php @@ -26,7 +26,7 @@ class TrackerTest extends WebTestBase { * * @var array */ - public static $modules = array('comment', 'tracker', 'history', 'node_test'); + public static $modules = array('comment', 'tracker', 'history', 'views'); /** * The main user for testing. @@ -158,7 +158,7 @@ function testTrackerNewNodes() { $node = $this->drupalCreateNode($edit); $title = $edit['title']; $this->drupalGet('activity'); - $this->assertPattern('/' . $title . '.*new/', 'New nodes are flagged as such in the activity listing.'); + $this->assertPattern($title . ' new', 'New nodes are flagged as such in the tracker listing.'); $this->drupalGet('node/' . $node->id()); // Simulate the JavaScript on the node page to mark the node as read. @@ -170,11 +170,11 @@ function testTrackerNewNodes() { ), )); $this->drupalGet('activity'); - $this->assertNoPattern('/' . $title . '.*new/', 'Visited nodes are not flagged as new.'); + $this->assertNoPattern($title . ' new', 'Visited nodes are not flagged as new.'); $this->drupalLogin($this->otherUser); $this->drupalGet('activity'); - $this->assertPattern('/' . $title . '.*new/', 'For another user, new nodes are flagged as such in the tracker listing.'); + $this->assertPattern($title . ' new', 'For another user, new nodes are flagged as such in the tracker listing.'); $this->drupalGet('node/' . $node->id()); // Simulate the JavaScript on the node page to mark the node as read. @@ -186,7 +186,7 @@ function testTrackerNewNodes() { ), )); $this->drupalGet('activity'); - $this->assertNoPattern('/' . $title . '.*new/', 'For another user, visited nodes are not flagged as new.'); + $this->assertNoPattern($title . ' new', 'For another user, visited nodes are not flagged as new.'); } /** @@ -383,6 +383,6 @@ function testTrackerAdminUnpublish() { $this->drupalPostForm('admin/content', $edit, t('Apply')); $this->drupalGet('activity'); - $this->assertText(t('No content available.'), 'A node is displayed on the tracker listing pages.'); + $this->assertText(t('No content available.'), 'A node is not displayed on the tracker listing pages.'); } } diff --git a/core/modules/tracker/tracker.info.yml b/core/modules/tracker/tracker.info.yml index 79d179d..4127281 100644 --- a/core/modules/tracker/tracker.info.yml +++ b/core/modules/tracker/tracker.info.yml @@ -4,6 +4,7 @@ description: 'Enables tracking of recent content for users.' dependencies: - node - comment + - views package: Core version: VERSION core: 8.x diff --git a/core/modules/tracker/tracker.links.menu.yml b/core/modules/tracker/tracker.links.menu.yml deleted file mode 100644 index fe12bc4..0000000 --- a/core/modules/tracker/tracker.links.menu.yml +++ /dev/null @@ -1,3 +0,0 @@ -tracker.page: - title: 'Recent content' - route_name: tracker.page diff --git a/core/modules/tracker/tracker.links.task.yml b/core/modules/tracker/tracker.links.task.yml deleted file mode 100644 index 4896057..0000000 --- a/core/modules/tracker/tracker.links.task.yml +++ /dev/null @@ -1,15 +0,0 @@ -tracker.page_tab: - route_name: tracker.page - title: 'Recent content' - base_route: tracker.page - -tracker.users_recent_tab: - route_name: tracker.users_recent_content - title: 'My recent content' - base_route: tracker.page - class: '\Drupal\tracker\Plugin\Menu\UserTrackerTab' - -tracker.user_tab: - route_name: tracker.user_tab - base_route: entity.user.canonical - title: 'Activity' diff --git a/core/modules/tracker/tracker.module b/core/modules/tracker/tracker.module index fba29f8..42010e7 100644 --- a/core/modules/tracker/tracker.module +++ b/core/modules/tracker/tracker.module @@ -10,7 +10,6 @@ use Drupal\Core\Routing\RouteMatchInterface; use Drupal\node\Entity\Node; use Drupal\node\NodeInterface; -use Drupal\Core\Session\AccountInterface; /** * Implements hook_help(). @@ -23,7 +22,9 @@ function tracker_help($route_name, RouteMatchInterface $route_match) { $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Tracking new and updated site content') . '
'; - $output .= '
' . t('The Recent content page shows new and updated content in reverse chronological order, listing the content type, title, author\'s name, number of comments, and time of last update. Content is considered updated when changes occur in the text, or when new comments are added. The My recent content tab limits the list to the currently logged-in user.', array('!recent' => \Drupal::url('tracker.page'))) . '
'; + $output .= '
' . t('The Recent content page shows new and updated content in reverse chronological order, listing the content type, title, author\'s name, number of comments, and time of last update. Content is considered updated when changes occur in the text, or when new comments are added. The My recent content tab limits the list to the currently logged-in user.', [ + '!recent' => \Drupal::url('view.tracker.page_1'), + ]) . '
'; $output .= '
' . t('Tracking user-specific content') . '
'; $output .= '
' . t("To follow a specific user's new and updated content, select the Activity tab from the user's profile page.") . '
'; $output .= '
'; @@ -133,36 +134,16 @@ function tracker_cron() { } /** - * Access callback: Determines access permission for a user's own account. - * - * @param int $account - * The account ID to check. - * - * @return boolean - * TRUE if a user is accessing tracking info for their own account and - * has permission to access the content. - * - * @see tracker_menu() + * Implements hook_local_tasks_alter(). */ -function _tracker_myrecent_access(AccountInterface $account) { - // This path is only allowed for authenticated users looking at their own content. - return $account->id() && (\Drupal::currentUser()->id() == $account->id()) && $account->hasPermission('access content'); -} - -/** - * Access callback: Determines access permission for an account. - * - * @param int $account - * The user account ID to track. - * - * @return boolean - * TRUE if a user has permission to access the account for $account and - * has permission to access the content. - * - * @see tracker_menu() - */ -function _tracker_user_access($account) { - return $account->access('view') && $account->hasPermission('access content'); +function tracker_local_tasks_alter(&$local_tasks) { + $tracker_tasks = [ + 'views_view:view.tracker.page_1', + 'views_view:view.tracker.page_3' + ]; + foreach ($tracker_tasks as $task_name) { + $local_tasks[$task_name]['class'] = '\Drupal\tracker\Plugin\Menu\UserTrackerTab'; + } } /** diff --git a/core/modules/tracker/tracker.pages.inc b/core/modules/tracker/tracker.pages.inc deleted file mode 100644 index 5eac748..0000000 --- a/core/modules/tracker/tracker.pages.inc +++ /dev/null @@ -1,139 +0,0 @@ -extend('Drupal\Core\Database\Query\PagerSelectExtender') - ->addMetaData('base_table', 'tracker_user') - ->condition('t.uid', $account->id()); - } - else { - $query = db_select('tracker_node', 't', array('target' => 'replica')) - ->extend('Drupal\Core\Database\Query\PagerSelectExtender') - ->addMetaData('base_table', 'tracker_node'); - } - - // This array acts as a placeholder for the data selected later - // while keeping the correct order. - $tracker_data = $query - ->addTag('node_access') - ->fields('t', array('nid', 'changed')) - ->condition('t.published', 1) - ->orderBy('t.changed', 'DESC') - ->limit(25) - ->execute() - ->fetchAllAssoc('nid'); - - $rows = array(); - if (!empty($tracker_data)) { - // Load nodes into an array with the same order as $tracker_data. - $nodes = Node::loadMultiple(array_keys($tracker_data)); - - // Enrich the node data. - $result = \Drupal::service('comment.statistics')->read($nodes, 'node', FALSE); - foreach ($result as $statistics) { - // The node ID may not be unique; there can be multiple comment fields. - // Make comment_count the total of all comments. - $nid = $statistics->entity_id; - if (empty($nodes[$nid]->comment_count) - || !is_numeric($nodes[$nid]->comment_count)) { - $nodes[$nid]->comment_count = $statistics->comment_count; - } - else { - $nodes[$nid]->comment_count += $statistics->comment_count; - } - } - - // Display the data. - foreach ($nodes as $node) { - // Set the last activity time from tracker data. This also takes into - // account comment activity, so getChangedTime() is not used. - $node->last_activity = $tracker_data[$node->id()]->changed; - - // Determine the number of comments. - $comments = 0; - if ($node->comment_count) { - $comments = $node->comment_count; - - if ($new = \Drupal::service('comment.manager')->getCountNewComments($node)) { - $comments = array( - '#type' => 'link', - '#url' => $node->urlInfo(), - '#title' => \Drupal::translation()->formatPlural($new, '1 new', '@count new'), - '#options' => array( - 'fragment' => 'new', - ), - '#prefix' => $node->comment_count . '
', - ); - } - } - - $mark_build = array( - '#theme' => 'mark', - '#status' => node_mark($node->id(), $node->getChangedTime()), - ); - - $row = array( - 'type' => SafeMarkup::checkPlain(node_get_type_label($node)), - 'title' => array( - 'data' => array( - '#type' => 'link', - '#url' => $node->urlInfo(), - '#title' => $node->getTitle(), - '#suffix' => ' ' . drupal_render($mark_build), - ), - ), - 'author' => array( - 'data' => array( - '#theme' => 'username', - '#account' => $node->getOwner(), - ), - ), - 'comments' => array( - 'class' => array('comments'), - 'data' => $comments, - ), - 'last updated' => array( - 'data' => t('!time ago', array( - '!time' => \Drupal::service('date.formatter')->formatInterval(REQUEST_TIME - $node->last_activity), - )), - ), - ); - - $rows[] = $row; - } - } - - $page['tracker'] = array( - '#rows' => $rows, - '#header' => array(t('Type'), t('Title'), t('Author'), t('Comments'), t('Last updated')), - '#type' => 'table', - '#empty' => t('No content available.'), - ); - $page['pager'] = array( - '#type' => 'pager', - '#weight' => 10, - ); - $page['#sorted'] = TRUE; - - return $page; -} diff --git a/core/modules/tracker/tracker.routing.yml b/core/modules/tracker/tracker.routing.yml deleted file mode 100644 index d227f6d..0000000 --- a/core/modules/tracker/tracker.routing.yml +++ /dev/null @@ -1,26 +0,0 @@ -tracker.page: - path: '/activity' - defaults: - _controller: '\Drupal\tracker\Controller\TrackerPage::getContent' - _title: 'Recent content' - requirements: - _permission: 'access content' - -tracker.users_recent_content: - path: '/activity/{user}' - defaults: - _controller: '\Drupal\tracker\Controller\TrackerUserRecent::getContent' - _title: 'My recent content' - requirements: - _permission: 'access content' - _access_tracker_own_information: 'TRUE' - -tracker.user_tab: - path: '/user/{user}/activity' - defaults: - _controller: '\Drupal\tracker\Controller\TrackerUserTab::getContent' - _title_callback: '\Drupal\tracker\Controller\TrackerUserTab::getTitle' - requirements: - _permission: 'access content' - _entity_access: 'user.view' - diff --git a/core/modules/update/src/Form/UpdateManagerInstall.php b/core/modules/update/src/Form/UpdateManagerInstall.php index b14a60f..43d1f62 100644 --- a/core/modules/update/src/Form/UpdateManagerInstall.php +++ b/core/modules/update/src/Form/UpdateManagerInstall.php @@ -49,7 +49,7 @@ public function __construct($root, ModuleHandlerInterface $module_handler) { /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'update_manager_install_form'; } diff --git a/core/modules/update/src/Form/UpdateManagerUpdate.php b/core/modules/update/src/Form/UpdateManagerUpdate.php index f0f64ea..f4d7cfb 100644 --- a/core/modules/update/src/Form/UpdateManagerUpdate.php +++ b/core/modules/update/src/Form/UpdateManagerUpdate.php @@ -50,7 +50,7 @@ public function __construct(ModuleHandlerInterface $module_handler, StateInterfa /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'update_manager_update_form'; } diff --git a/core/modules/update/src/Form/UpdateReady.php b/core/modules/update/src/Form/UpdateReady.php index 8f6b6bf..8e106fe 100644 --- a/core/modules/update/src/Form/UpdateReady.php +++ b/core/modules/update/src/Form/UpdateReady.php @@ -60,7 +60,7 @@ public function __construct($root, ModuleHandlerInterface $module_handler, State /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'update_manager_update_ready_form'; } diff --git a/core/modules/user/src/Form/UserPasswordResetForm.php b/core/modules/user/src/Form/UserPasswordResetForm.php index 58f177f..6709084 100644 --- a/core/modules/user/src/Form/UserPasswordResetForm.php +++ b/core/modules/user/src/Form/UserPasswordResetForm.php @@ -48,7 +48,7 @@ public static function create(ContainerInterface $container) { /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'user_pass_reset'; } diff --git a/core/modules/views/src/Form/ViewsForm.php b/core/modules/views/src/Form/ViewsForm.php index 1cabb8d..4951777 100644 --- a/core/modules/views/src/Form/ViewsForm.php +++ b/core/modules/views/src/Form/ViewsForm.php @@ -103,7 +103,7 @@ public static function create(ContainerInterface $container, $view_id = NULL, $v /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { $parts = array( 'views_form', $this->viewId, diff --git a/core/modules/views/src/Form/ViewsFormMainForm.php b/core/modules/views/src/Form/ViewsFormMainForm.php index 8ad9745..31d6ae5 100644 --- a/core/modules/views/src/Form/ViewsFormMainForm.php +++ b/core/modules/views/src/Form/ViewsFormMainForm.php @@ -16,7 +16,7 @@ class ViewsFormMainForm implements FormInterface { /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { } /** diff --git a/core/modules/views/src/Plugin/views/display/Feed.php b/core/modules/views/src/Plugin/views/display/Feed.php index baa5d6b..2126723 100644 --- a/core/modules/views/src/Plugin/views/display/Feed.php +++ b/core/modules/views/src/Plugin/views/display/Feed.php @@ -265,7 +265,6 @@ public function attachTo(ViewExecutable $clone, $display_id, array &$build) { // Defer to the feed style; it may put in meta information, and/or // attach a feed icon. - $clone->setArguments($this->view->args); $clone->setDisplay($this->display['id']); $clone->buildTitle(); if ($plugin = $clone->display_handler->getPlugin('style')) { diff --git a/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php b/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php index 41e9de6..512541e 100644 --- a/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php +++ b/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php @@ -22,7 +22,7 @@ class DisplayFeedTest extends PluginTestBase { * * @var array */ - public static $testViews = array('test_display_feed', 'test_attached_disabled', 'test_feed_icon'); + public static $testViews = array('test_display_feed', 'test_attached_disabled'); /** * Modules to enable. @@ -45,7 +45,7 @@ protected function setUp() { */ public function testFeedOutput() { $this->drupalCreateContentType(['type' => 'page']); - $node = $this->drupalCreateNode(); + $this->drupalCreateNode(); // Test the site name setting. $site_name = $this->randomMachineName(); @@ -74,16 +74,6 @@ public function testFeedOutput() { $this->drupalGet(''); $feed_icon = $this->cssSelect('div.view-id-test_display_feed a.feed-icon'); $this->assertTrue(strpos($feed_icon[0]['href'], 'test-feed-display.xml'), 'The feed icon was found.'); - - // Test feed display attached to page display with arguments. - $this->drupalGet('test-feed-icon/' . $node->id()); - $page_url = $this->getUrl(); - $icon_href = $this->cssSelect('a.feed-icon[href *= "test-feed-icon"]')[0]['href']; - $this->assertEqual($icon_href, $page_url . '/feed', 'The feed icon was found.'); - $link_href = $this->cssSelect('link[type = "application/rss+xml"][href *= "test-feed-icon"]')[0]['href']; - $this->assertEqual($link_href, $page_url . '/feed', 'The RSS link was found.'); - $feed_link = simplexml_load_string($this->drupalGet($icon_href))->channel->link; - $this->assertEqual($feed_link, $page_url, 'The channel link was found.'); } /** diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_icon.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_icon.yml deleted file mode 100644 index dc81943..0000000 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_icon.yml +++ /dev/null @@ -1,216 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - user.role.authenticated - module: - - node - - user -id: test_feed_icon -label: test_feed_icon -module: views -description: '' -tag: '' -base_table: node_field_data -base_field: nid -core: 8.x -display: - default: - display_plugin: default - id: default - display_title: Master - position: 0 - display_options: - access: - type: role - options: - role: - authenticated: authenticated - cache: - type: none - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: some - options: - items_per_page: 10 - offset: 0 - style: - type: default - row: - type: fields - fields: - title: - id: title - table: node_field_data - field: title - settings: - link_to_entity: false - plugin_id: field - relationship: none - group_type: group - admin_label: '' - label: '' - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: value - type: string - group_column: value - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false - multi_type: separator - separator: ', ' - field_api_classes: false - filters: { } - sorts: { } - title: test_feed_icon - header: { } - footer: { } - empty: { } - relationships: { } - arguments: - nid: - id: nid - table: node_field_data - field: nid - relationship: none - group_type: group - admin_label: '' - default_action: ignore - exception: - value: all - title_enable: false - title: All - title_enable: false - title: '' - default_argument_type: fixed - default_argument_options: - argument: '' - default_argument_skip_url: false - summary_options: - base_path: '' - count: true - items_per_page: 25 - override: false - summary: - sort_order: asc - number_of_records: 0 - format: default_summary - specify_validation: false - validate: - type: none - fail: 'not found' - validate_options: { } - break_phrase: false - not: false - entity_type: node - entity_field: nid - plugin_id: numeric - display_extenders: { } - link_url: '' - link_display: page_1 - cache_metadata: - contexts: - - 'languages:language_content' - - 'languages:language_interface' - - url - - 'user.node_grants:view' - cacheable: false - feed_1: - display_plugin: feed - id: feed_1 - display_title: Feed - position: 2 - display_options: - display_extenders: { } - pager: - type: some - style: - type: rss - row: - type: node_rss - path: test-feed-icon/%/feed - displays: - default: default - page_1: page_1 - cache_metadata: - contexts: - - 'languages:language_content' - - 'languages:language_interface' - - url - - 'user.node_grants:view' - cacheable: false - page_1: - display_plugin: page - id: page_1 - display_title: Page - position: 1 - display_options: - display_extenders: { } - path: test-feed-icon/% - cache_metadata: - contexts: - - 'languages:language_content' - - 'languages:language_interface' - - url - - 'user.node_grants:view' - cacheable: false diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php index 9b1053f..397cb9d 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php @@ -1681,7 +1681,7 @@ public function getBaseFormId() { /** * {@inheritdoc} */ - public function getFormId() { + public function getFormID() { return 'the_form_id'; } diff --git a/core/themes/classy/templates/content-edit/text-format-wrapper.html.twig b/core/themes/classy/templates/content-edit/text-format-wrapper.html.twig index 4bd1566..b8e0250 100644 --- a/core/themes/classy/templates/content-edit/text-format-wrapper.html.twig +++ b/core/themes/classy/templates/content-edit/text-format-wrapper.html.twig @@ -13,7 +13,7 @@ * @see template_preprocess_text_format_wrapper() */ #} -
+
{{ children }} {% if description %} {%